diff --git a/CHANGELOG.md b/CHANGELOG.md index 959d366..a5e2c8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.0.6 (2025-10-06) +### Fixed +- Fix RP name and url generation + ## 1.0.5 (2025-05-24) ### Fixed - Fix BB encoding diff --git a/docs/pegel.json b/docs/pegel.json index bbb3fb1..96da026 100644 --- a/docs/pegel.json +++ b/docs/pegel.json @@ -153,6 +153,7 @@ "BB_5872802": "Dobbrikow, Hammerbrücke / Pfefferfließ", "BB_5873101": "Trebitz / Plane", "BB_5873301": "Golzow, Brücke / Plane", + "BB_5873302": "Golzow, Schleusengraben / Freigraben", "BB_5873401": "Rädigke, Venturi / Plane", "BB_5873402": "Rädigke, Mühle / Mühlgraben Rädigke", "BB_5873600": "Göttin / Plane", @@ -1620,6 +1621,7 @@ "HE_24741303": "Hainstadt / Mümling", "HE_24760625": "Wersau / Gersprenz", "HE_24761005": "Groß-Bieberau2 / Fischbach", + "HE_24761050": "Groß-Bieberau1 / Gersprenz", "HE_24762653": "Harreshausen / Gersprenz", "HE_24780757": "Steinau / Kinzig", "HE_24781000": "Mauswinkel / Riedbach", @@ -1930,6 +1932,7 @@ "MV_04581.3": "Stralsund Tierpark / Mühlgraben", "MV_04584.0": "Lüssow / Borgwallsee", "MV_04587.2": "Krummenhagen / Krummenhagener See", + "MV_04587.4": "Schöpfwerk Zarrendorf UP / Krummenhagener See", "MV_04588.1": "Schöpfwerk Zarrendorf OP / Mühlgraben", "MV_04591.0": "Andershof / Andershofer Teich", "MV_04602.0": "Stönkvitz / Sehrower Bach", @@ -2121,7 +2124,6 @@ "MV_9690093": "Koserow / Ostsee", "NI_10110": "Salzderhelden / Leine", "NI_133": "Schwinge Sperrwerk / Schwinge", - "NI_181": "Gandersum / Ems", "NI_20061": "Alfhausen-Rieste / Ableiter zur Hase", "NI_20090": "Thülsfeld / Soeste", "NI_3437108": "Beesten / Große Aa", @@ -2137,6 +2139,7 @@ "NI_3671101": "Herzlake / Hase", "NI_3675101": "Haselünne / Hase", "NI_3691102": "Bokeloh / Hase", + "NI_3951102": "Gandersum / Ems", "NI_4569105": "Bad Pyrmont / Emmer", "NI_4569106": "Welsede / Emmer", "NI_4589101": "Uchtdorf / Exter", @@ -2157,6 +2160,7 @@ "NI_4833101": "Langlingen / Aller", "NI_4836128": "Beedenbostel / Aschau", "NI_4836129": "Lachendorf / Lachte", + "NI_4843105": "Broistedt / Fuhse", "NI_4845103": "Peine / Fuhse", "NI_4849104": "Wathlingen / Fuhse", "NI_4869108": "Feuerschützenbostel / Örtze", @@ -2222,7 +2226,7 @@ "NI_9374105": "Bensersiel / Nordsee", "NI_9429105": "Vareler Schleuse / Nordsee", "NW_000504": "Bimmen / Rhein", - "NW_0022810": "Mülheim / Ruhr", + "NW_0022810": "Mülheim_Güte / Ruhr", "NW_004157": "Hattingen / Ruhr", "NW_104": "Bad-Honnef / Rhein", "NW_1234512345": "Soestbach / Soestbach", @@ -2495,6 +2499,7 @@ "NW_4667100000100": "Oberahle / Else", "NW_4670000000100": "Loehne / Werre", "NW_47100100": "WSV_Porta / Weser", + "NW_47138": "DuisburgLaar / Rhein", "NW_4714900000100": "Rodenbeck / Bastau", "NW_47300100": "WSV_Petershagen / Weser", "NW_4745000000100": "Bierde / Gehle", @@ -2518,35 +2523,35 @@ "NW_9286453000200": "Heek / Dinkel", "NW_9286455000200": "Gronau / Dinkel", "RP_1032137010": "Camping Falkley / Nette", - "RP_1032137020": "Thür / Nette", + "RP_1032137020": "Thür", "RP_1032137030": "Hammesmühle / Nette", "RP_1032137040": "Bermel-KA / Elzbach", "RP_1032137050": "Monreal - Schnürenhof / Elzbach", - "RP_1032137060": "Virneburg (ecoLog 1000) / Elzbach", - "RP_1032233010": "Nitz / Elzbach", - "RP_1033143010": "Brexbach - Drosselbauwerk / Saynbach", - "RP_1033143020": "Hüttenmühle / Saynbach", + "RP_1032137060": "Virneburg (ecoLog 1000) / Nitzbach", + "RP_1032233010": "Nitz / Nitzbach", + "RP_1033143010": "Brexbach - Drosselbauwerk / Brexbach", + "RP_1033143020": "Hüttenmühle / Masselbach", "RP_1033143030": "Breitenau / Saynbach", "RP_1034232010": "Hermespand / Prüm", "RP_1034232020": "Niederprüm / Prüm", - "RP_1034232030": "Niedermehlen / Prüm", + "RP_1034232030": "Niedermehlen / Mehlenbach", "RP_1034232040": "Pittenbach / Prüm", - "RP_1034232050": "Habscheid / Our", + "RP_1034232050": "Habscheid / Alfbach", "RP_1034232060": "Kinzenburg / Prüm", "RP_1034232070": "Mauel / Prüm", "RP_1034232080": "Merkeshausen / Prüm", "RP_1034232090": "Brecht / Prüm", "RP_1034232100": "Bettingen / Prüm", - "RP_1034232110": "Holsthum Prüm / Enz", + "RP_1034232110": "Holsthum Prüm / Prüm", "RP_1034232120": "Neurath / Arzfeld / Enz", "RP_1034232130": "Neuerburg / Enz", "RP_1034232140": "Sinspelt Gemeindehaus / Enz", "RP_1034232150": "Enzen / Enz", "RP_1034232160": "Holsthum Schloss / Enz", - "RP_1034232170": "Philippsheim Kahlenbach / Kyll", - "RP_1034232180": "Geichlingen / Enz", - "RP_1034232190": "Hüttingen bei Lahr / Enz", - "RP_1034232200": "Hickershausen / Irsen", + "RP_1034232170": "Philippsheim Kahlenbach / Kahlenbach", + "RP_1034232180": "Geichlingen / Geichlingerbach", + "RP_1034232190": "Hüttingen bei Lahr", + "RP_1034232200": "Hickershausen / Mannerbach", "RP_1034232210": "Irrhausen / Irsen", "RP_1034232220": "Sevenig (Our) / Irsen", "RP_1034232230": "Machtemesmühle / Irsen", diff --git a/docs/pegel.md b/docs/pegel.md index a42a4f2..8737ef5 100644 --- a/docs/pegel.md +++ b/docs/pegel.md @@ -154,6 +154,7 @@ | BB_5872802 | Dobbrikow, Hammerbrücke / Pfefferfließ | | BB_5873101 | Trebitz / Plane | | BB_5873301 | Golzow, Brücke / Plane | +| BB_5873302 | Golzow, Schleusengraben / Freigraben | | BB_5873401 | Rädigke, Venturi / Plane | | BB_5873402 | Rädigke, Mühle / Mühlgraben Rädigke | | BB_5873600 | Göttin / Plane | @@ -1621,6 +1622,7 @@ | HE_24741303 | Hainstadt / Mümling | | HE_24760625 | Wersau / Gersprenz | | HE_24761005 | Groß-Bieberau2 / Fischbach | +| HE_24761050 | Groß-Bieberau1 / Gersprenz | | HE_24762653 | Harreshausen / Gersprenz | | HE_24780757 | Steinau / Kinzig | | HE_24781000 | Mauswinkel / Riedbach | @@ -1931,6 +1933,7 @@ | MV_04581.3 | Stralsund Tierpark / Mühlgraben | | MV_04584.0 | Lüssow / Borgwallsee | | MV_04587.2 | Krummenhagen / Krummenhagener See | +| MV_04587.4 | Schöpfwerk Zarrendorf UP / Krummenhagener See | | MV_04588.1 | Schöpfwerk Zarrendorf OP / Mühlgraben | | MV_04591.0 | Andershof / Andershofer Teich | | MV_04602.0 | Stönkvitz / Sehrower Bach | @@ -2122,7 +2125,6 @@ | MV_9690093 | Koserow / Ostsee | | NI_10110 | Salzderhelden / Leine | | NI_133 | Schwinge Sperrwerk / Schwinge | -| NI_181 | Gandersum / Ems | | NI_20061 | Alfhausen-Rieste / Ableiter zur Hase | | NI_20090 | Thülsfeld / Soeste | | NI_3437108 | Beesten / Große Aa | @@ -2138,6 +2140,7 @@ | NI_3671101 | Herzlake / Hase | | NI_3675101 | Haselünne / Hase | | NI_3691102 | Bokeloh / Hase | +| NI_3951102 | Gandersum / Ems | | NI_4569105 | Bad Pyrmont / Emmer | | NI_4569106 | Welsede / Emmer | | NI_4589101 | Uchtdorf / Exter | @@ -2158,6 +2161,7 @@ | NI_4833101 | Langlingen / Aller | | NI_4836128 | Beedenbostel / Aschau | | NI_4836129 | Lachendorf / Lachte | +| NI_4843105 | Broistedt / Fuhse | | NI_4845103 | Peine / Fuhse | | NI_4849104 | Wathlingen / Fuhse | | NI_4869108 | Feuerschützenbostel / Örtze | @@ -2223,7 +2227,7 @@ | NI_9374105 | Bensersiel / Nordsee | | NI_9429105 | Vareler Schleuse / Nordsee | | NW_000504 | Bimmen / Rhein | -| NW_0022810 | Mülheim / Ruhr | +| NW_0022810 | Mülheim_Güte / Ruhr | | NW_004157 | Hattingen / Ruhr | | NW_104 | Bad-Honnef / Rhein | | NW_1234512345 | Soestbach / Soestbach | @@ -2496,6 +2500,7 @@ | NW_4667100000100 | Oberahle / Else | | NW_4670000000100 | Loehne / Werre | | NW_47100100 | WSV_Porta / Weser | +| NW_47138 | DuisburgLaar / Rhein | | NW_4714900000100 | Rodenbeck / Bastau | | NW_47300100 | WSV_Petershagen / Weser | | NW_4745000000100 | Bierde / Gehle | @@ -2519,35 +2524,35 @@ | NW_9286453000200 | Heek / Dinkel | | NW_9286455000200 | Gronau / Dinkel | | RP_1032137010 | Camping Falkley / Nette | -| RP_1032137020 | Thür / Nette | +| RP_1032137020 | Thür | | RP_1032137030 | Hammesmühle / Nette | | RP_1032137040 | Bermel-KA / Elzbach | | RP_1032137050 | Monreal - Schnürenhof / Elzbach | -| RP_1032137060 | Virneburg (ecoLog 1000) / Elzbach | -| RP_1032233010 | Nitz / Elzbach | -| RP_1033143010 | Brexbach - Drosselbauwerk / Saynbach | -| RP_1033143020 | Hüttenmühle / Saynbach | +| RP_1032137060 | Virneburg (ecoLog 1000) / Nitzbach | +| RP_1032233010 | Nitz / Nitzbach | +| RP_1033143010 | Brexbach - Drosselbauwerk / Brexbach | +| RP_1033143020 | Hüttenmühle / Masselbach | | RP_1033143030 | Breitenau / Saynbach | | RP_1034232010 | Hermespand / Prüm | | RP_1034232020 | Niederprüm / Prüm | -| RP_1034232030 | Niedermehlen / Prüm | +| RP_1034232030 | Niedermehlen / Mehlenbach | | RP_1034232040 | Pittenbach / Prüm | -| RP_1034232050 | Habscheid / Our | +| RP_1034232050 | Habscheid / Alfbach | | RP_1034232060 | Kinzenburg / Prüm | | RP_1034232070 | Mauel / Prüm | | RP_1034232080 | Merkeshausen / Prüm | | RP_1034232090 | Brecht / Prüm | | RP_1034232100 | Bettingen / Prüm | -| RP_1034232110 | Holsthum Prüm / Enz | +| RP_1034232110 | Holsthum Prüm / Prüm | | RP_1034232120 | Neurath / Arzfeld / Enz | | RP_1034232130 | Neuerburg / Enz | | RP_1034232140 | Sinspelt Gemeindehaus / Enz | | RP_1034232150 | Enzen / Enz | | RP_1034232160 | Holsthum Schloss / Enz | -| RP_1034232170 | Philippsheim Kahlenbach / Kyll | -| RP_1034232180 | Geichlingen / Enz | -| RP_1034232190 | Hüttingen bei Lahr / Enz | -| RP_1034232200 | Hickershausen / Irsen | +| RP_1034232170 | Philippsheim Kahlenbach / Kahlenbach | +| RP_1034232180 | Geichlingen / Geichlingerbach | +| RP_1034232190 | Hüttingen bei Lahr | +| RP_1034232200 | Hickershausen / Mannerbach | | RP_1034232210 | Irrhausen / Irsen | | RP_1034232220 | Sevenig (Our) / Irsen | | RP_1034232230 | Machtemesmühle / Irsen | diff --git a/docs/update_pegel_list.py b/docs/update_pegel_list.py index 7ccd640..571e2e3 100644 --- a/docs/update_pegel_list.py +++ b/docs/update_pegel_list.py @@ -315,7 +315,15 @@ def get_rp_stations() -> tuple[str, str]: for key in measurementsites: site = measurementsites[key] ident = "RP_" + site["number"] - name = site["name"] + " / " + rivers[site["rivers"][0]]["name"] + if site["type"] == "default": + name = site["name"] + " / " + rivers[site["rivers"][0]]["name"] + elif site["type"] == "municipal": + if site["riverMunicipalName"] is not None: + name = site["name"] + " / " + site["riverMunicipalName"] + else: + name = site["name"] + else: + continue stations.append((ident, name)) return stations diff --git a/pyproject.toml b/pyproject.toml index 157b904..291c8ab 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "lhpapi" -version = "1.0.5" +version = "1.0.6" authors = [ { name="stephan192", email="stephan192@outlook.com" }, ] diff --git a/src/lhpapi/rp_api.py b/src/lhpapi/rp_api.py index d808f99..2ae07a6 100644 --- a/src/lhpapi/rp_api.py +++ b/src/lhpapi/rp_api.py @@ -26,19 +26,22 @@ def init_RP(ident: str) -> StaticData: # pylint: disable=invalid-name for key in measurementsites: site = measurementsites[key] if site["number"] == ident[3:]: - name = site["name"] + " / " + rivers[site["rivers"][0]]["name"] + url = "https://www.hochwasser.rlp.de/" + if site["type"] == "default": + name = site["name"] + " / " + rivers[site["rivers"][0]]["name"] + url = url + "flussgebiet/" + elif site["type"] == "municipal": + if site["riverMunicipalName"] is not None: + name = site["name"] + " / " + site["riverMunicipalName"] + else: + name = site["name"] + else: + continue url = ( - "https://www.hochwasser.rlp.de/flussgebiet/" - + riverareas[str(site["riverAreas"][0])]["name"].lower() + url + + riverareas[str(site["riverAreas"][0])]["slug"] + "/" - + site["name"] - .replace(" ", "-") - .replace(",", "") - .replace("ß", "ss") - .replace("ä", "ae") - .replace("ö", "oe") - .replace("ü", "ue") - .lower() + + site["slug"] ) try: stage_levels = [None] * 4