Skip to content

remove unused wms parsing functions, remove need for harmony map dict… #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
monodo merged 2 commits into from
Dec 1, 2025
Merged

remove unused wms parsing functions, remove need for harmony map dict… #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
baac538
remove unused wms parsing functions, remove need for harmony map dict…
monodo Dec 1, 2025
f1a731d
fix for VS
monodo Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 24 additions & 117 deletions settings_values/cantons.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@
],
},
],
"harmonyMap": [
{"sum": 1, "value": 1},
{"sum": 2, "value": 2},
{"sum": 3, "value": 3},
],
},
"ZH": {
"active": False,
Expand Down Expand Up @@ -144,19 +139,19 @@
],
}
],
"harmonyMap": [
{"sum": 1, "value": 1},
{"sum": 2, "value": 2},
{"sum": 3, "value": 3},
],
},
"VS": {
"active": True,
"name": "VS",
"exampleLocation": [
[2596336, 1122359, 1, "CLASSGV 1"],
[2598146, 1124454, 1, "CLASSGV 2"],
[2598043, 1123873, 2, "CLASSGV 3"],
[
2598043,
1123873,
3,
"CLASSGV 4",
], # REST response is CLASSGV 4. Clarify classification with VS
[2597117, 1120835, 3, "CLASSGV 4"],
[2598068.4, 1130927.1, 4, "CLASSGV 5"],
],
Expand All @@ -174,39 +169,33 @@
"propertyName": "CLASSGV",
"propertyValues": [
{
"name": 1,
"name": "1",
"desc": "Sondes géothermiques admises (max. 200 m sans étude)",
"summand": 1,
},
{
"name": 2,
"name": "2",
"desc": "Sondes géothermiques limitées à 100 m de profondeur",
"summand": 1,
},
{
"name": 3,
"name": "3",
"desc": "Au cas par cas - Etude préalable (contacter le SEN)",
"summand": 2,
},
{
"name": 4,
"name": "4",
"desc": "Sondes géothermiques interdites",
"summand": 3,
},
{
"name": 5,
"name": "5",
"desc": "Hors zone (contacter le SEN)",
"summand": 4,
"summand": 3,
},
],
}
],
"harmonyMap": [
{"sum": 1, "value": 1},
{"sum": 2, "value": 2},
{"sum": 3, "value": 3},
{"sum": 4, "value": 4},
],
},
"VD": {
"active": True,
Expand Down Expand Up @@ -241,11 +230,6 @@
],
}
],
"harmonyMap": [
{"sum": 1, "value": 1},
{"sum": 2, "value": 2},
{"sum": 3, "value": 3},
],
},
"UR": {
"style": "",
Expand Down Expand Up @@ -288,11 +272,6 @@
],
}
],
"harmonyMap": [
{"sum": 1, "value": 1},
{"sum": 2, "value": 2},
{"sum": 3, "value": 3},
],
},
"TI": {
"active": True,
Expand Down Expand Up @@ -321,11 +300,6 @@
],
}
],
"harmonyMap": [
{"sum": 1, "value": 1},
{"sum": 2, "value": 2},
{"sum": 3, "value": 3},
],
},
"TG": {
"active": True,
Expand Down Expand Up @@ -374,11 +348,6 @@
],
}
],
"harmonyMap": [
{"sum": 1, "value": 1},
{"sum": 2, "value": 2},
{"sum": 3, "value": 3},
],
},
"SZ": {
"active": True,
Expand Down Expand Up @@ -408,11 +377,6 @@
],
}
],
"harmonyMap": [
{"sum": 1, "value": 1},
{"sum": 2, "value": 2},
{"sum": 3, "value": 3},
],
},
"SH": {
"active": True,
Expand Down Expand Up @@ -458,11 +422,6 @@
],
}
],
"harmonyMap": [
{"sum": 1, "value": 1},
{"sum": 2, "value": 2},
{"sum": 3, "value": 3},
],
},
"SG": {
"active": True,
Expand Down Expand Up @@ -500,11 +459,6 @@
],
}
],
"harmonyMap": [
{"sum": 1, "value": 1},
{"sum": 2, "value": 2},
{"sum": 3, "value": 3},
],
},
"OW": {
"active": True,
Expand Down Expand Up @@ -562,11 +516,6 @@
],
}
],
"harmonyMap": [
{"sum": 1, "value": 1},
{"sum": 2, "value": 2},
{"sum": 3, "value": 3},
],
},
"NW": {
"active": True,
Expand Down Expand Up @@ -632,11 +581,6 @@
],
}
],
"harmonyMap": [
{"sum": 1, "value": 1},
{"sum": 2, "value": 2},
{"sum": 3, "value": 3},
],
},
"LU": {
"active": True,
Expand All @@ -645,7 +589,12 @@
[2665393, 1217714, 1, "ews_zulaessig"],
[2652462, 1196901, 2, "ews_zulaessig & ews_zulaessig_auflagen"],
[2651972, 1200000, 3, "ews_nicht_zulaessig & ews_zulaessig_auflagen"],
[2645371, 1200735, 2, "ews_vorabklaeren"],
[
2645371,
1200735,
2,
"ews_vorabklaeren",
], # TODO: check with LU how to map lanslide areas
[2645598, 1202446, 3, "ews_nicht_zulaessig"],
],
"wmsUrl": "https://public.geo.lu.ch/ogd/services/managed/EWNUTZXX_COL_V3_MP/MapServer/WMSServer",
Expand All @@ -654,29 +603,30 @@
"infoFormat": "application/geo+json",
"style": "",
"loopLayers": True,
# no property values for this canton, only layers are matched if request hits a polygon
"layers": [
{
"name": "3",
"desc": "ews_zulaessig",
"propertyName": "Bewertungskriterium",
"propertyName": "Erdwärmenutzung zulässig",
"summand": 1,
},
{
"name": "1",
"desc": "ews_vorabklaeren",
"propertyName": "Bewertungskriterium",
"propertyName": "Erdwärmenutzung zulässig mit Auflagen",
"summand": 2,
},
{
"name": "2",
"desc": "ews_zulaessig_auflagen",
"propertyName": "Bewertungskriterium",
"summand": 10,
"propertyName": "Erdwärmenutzung zulässig mit Auflagen",
"summand": 2,
},
{
"name": "0",
"desc": "ews_nicht_zulaessig",
"propertyName": "Bewertungskriterium",
"propertyName": "Erdwärmenutzung nicht zulässig",
"summand": 3,
},
],
Expand Down Expand Up @@ -713,11 +663,6 @@
],
}
],
"harmonyMap": [
{"sum": 1, "value": 1},
{"sum": 2, "value": 2},
{"sum": 3, "value": 3},
],
},
"GL": {
"active": True,
Expand All @@ -741,7 +686,6 @@
],
}
],
"harmonyMap": [{"sum": 2, "value": 2}, {"sum": 3, "value": 3}],
},
"GE": {
"active": True,
Expand Down Expand Up @@ -781,11 +725,6 @@
],
}
],
"harmonyMap": [
{"sum": 1, "value": 1},
{"sum": 2, "value": 2},
{"sum": 3, "value": 3},
],
},
"FR": {
"active": True,
Expand Down Expand Up @@ -821,11 +760,6 @@
],
}
],
"harmonyMap": [
{"sum": 1, "value": 1},
{"sum": 2, "value": 2},
{"sum": 3, "value": 3},
],
},
"BL": {
"active": True,
Expand Down Expand Up @@ -876,13 +810,6 @@
],
}
],
"active": True,
"harmonyMap": [
{"sum": 1, "value": 1},
{"sum": 2, "value": 2},
{"sum": 3, "value": 3},
{"sum": 4, "value": 4},
],
},
"BE": {
"active": True,
Expand Down Expand Up @@ -923,11 +850,6 @@
],
}
],
"harmonyMap": [
{"sum": 1, "value": 1},
{"sum": 2, "value": 2},
{"sum": 3, "value": 3},
],
},
"AR": {
"active": True,
Expand Down Expand Up @@ -966,11 +888,6 @@
],
}
],
"harmonyMap": [
{"sum": 1, "value": 1},
{"sum": 2, "value": 2},
{"sum": 3, "value": 3},
],
},
"AI": {
"active": True,
Expand Down Expand Up @@ -999,11 +916,6 @@
],
}
],
"harmonyMap": [
{"sum": 1, "value": 1},
{"sum": 2, "value": 2},
{"sum": 3, "value": 3},
],
},
"AG": {
"active": True,
Expand Down Expand Up @@ -1049,11 +961,6 @@
],
}
],
"harmonyMap": [
{"sum": 1, "value": 1},
{"sum": 2, "value": 2},
{"sum": 3, "value": 3},
],
},
}
}
4 changes: 1 addition & 3 deletions src/routes/drill_category.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@ async def get_drill_category(
"detail": result["error"],
}
# --- Process features into ground category ---
features = services.process_ground_category(
features, canton_config["layers"], canton_config["harmonyMap"]
)
features = services.process_ground_category(features, canton_config["layers"])

return {
"coord_x": coord_x,
Expand Down
Loading