lhpapi 1.0.4__tar.gz → 1.0.6__tar.gz

{lhpapi-1.0.4 → lhpapi-1.0.6}/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.0.6 (2025-10-06)
+### Fixed
+- Fix RP name and url generation
+
+## 1.0.5 (2025-05-24)
+### Fixed
+- Fix BB encoding
+
 ## 1.0.4 (2024-12-24)
 ### Fixed
 - Fix NI invalid values

{lhpapi-1.0.4 → lhpapi-1.0.6}/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 stephan192
+Copyright (c) 2025 stephan192
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{lhpapi-1.0.4 → lhpapi-1.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lhpapi
-Version: 1.0.4
+Version: 1.0.6
 Summary: API to retrieve data from the Länderübergreifendes Hochwasser Portal (LHP)
 Project-URL: Homepage, https://github.com/stephan192/lhpapi
 Project-URL: Issues, https://github.com/stephan192/lhpapi/issues

{lhpapi-1.0.4 → lhpapi-1.0.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "lhpapi"
-version = "1.0.4"
+version = "1.0.6"
 authors = [
     { name="stephan192", email="stephan192@outlook.com" },
 ]

{lhpapi-1.0.4 → lhpapi-1.0.6}/src/lhpapi/bb_api.py

@@ -70,7 +70,10 @@ def init_BB(ident: str) -> StaticData:  # pylint: disable=invalid-name
     """Init data for Brandenburg."""
     try:
         # Get data
-        page = fetch_text("https://pegelportal.brandenburg.de/start.php")
+        page = fetch_text(
+            "https://pegelportal.brandenburg.de/start.php",
+            forced_encoding="ISO-8859-15",
+        )
         lines = page.split("\n")
         # Parse data
         start_found = False
@@ -105,7 +108,10 @@ def update_BB(static_data: StaticData) -> DynamicData:  # pylint: disable=invali
     """Update data for Brandenburg."""
     try:
         # Get data
-        page = fetch_text("https://pegelportal.brandenburg.de/start.php")
+        page = fetch_text(
+            "https://pegelportal.brandenburg.de/start.php",
+            forced_encoding="ISO-8859-15",
+        )
         lines = page.split("\n")
         # Parse data
         start_found = False

{lhpapi-1.0.4 → lhpapi-1.0.6}/src/lhpapi/hh_api.py

@@ -54,14 +54,14 @@ def update_HH(static_data: StaticData) -> DynamicData:  # pylint: disable=invali
             text = div.getText()
             level = convert_to_float(
                 text[
-                    text.find("Wasserstand") + 11 : text.find("[NHN\u00A0+/-\u00A0cm]")
+                    text.find("Wasserstand") + 11 : text.find("[NHN\u00a0+/-\u00a0cm]")
                 ]
                 .replace(".", "")
                 .strip()
             )
             last_update = convert_to_datetime(
                 text[
-                    text.find("\u00A0\u00A0\u00A0 um") + 6 : text.find("Trend")
+                    text.find("\u00a0\u00a0\u00a0 um") + 6 : text.find("Trend")
                 ].strip(),
                 "%d.%m.%Y %H:%M",
             )

{lhpapi-1.0.4 → lhpapi-1.0.6}/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