datamarket 0.9.34__tar.gz → 0.9.36__tar.gz

{datamarket-0.9.34 → datamarket-0.9.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datamarket
-Version: 0.9.34
+Version: 0.9.36
 Summary: Utilities that integrate advanced scraping knowledge into just one library.
 Home-page: https://datamarket.es
 License: GPL-3.0-or-later

{datamarket-0.9.34 → datamarket-0.9.36}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "datamarket"
-version = "0.9.34"
+version = "0.9.36"
 description = "Utilities that integrate advanced scraping knowledge into just one library."
 authors = ["DataMarket <techsupport@datamarket.es>"]
 license = "GPL-3.0-or-later"

{datamarket-0.9.34 → datamarket-0.9.36}/src/datamarket/interfaces/nominatim.py

@@ -10,7 +10,7 @@ import requests
 from geopy.distance import geodesic
 from jellyfish import jaro_winkler_similarity
 
-from ..params.nominatim import POSTCODES
+from ..params.nominatim import CITY_TO_PROVINCE, POSTCODES
 from ..utils.strings import normalize
 
 ########################################################################################################################
@@ -88,7 +88,7 @@ class Nominatim:
             "country": raw_address.get("country"),
             "country_code": (raw_address.get("country_code") or "").lower(),
             "state": raw_address.get("state"),
-            "province": raw_address.get("province"),
+            "province": raw_address.get("province") or CITY_TO_PROVINCE.get(city),
             "city": city,
             "postcode": postcode,
             "district": district,
@@ -203,7 +203,7 @@ class Nominatim:
         dist_geonames: float,
         authoritative_postcode: Optional[str],
         authoritative_province_from_postcode: Optional[str],
-        nominatim_address_province_raw: Optional[str],
+        nominatim_province: Optional[str],
     ) -> Dict[str, Optional[str]]:
         """
         Selects the final address result based on distances and applies the authoritative postcode/province.
@@ -211,7 +211,7 @@ class Nominatim:
         if dist_nominatim <= dist_geonames and dist_nominatim != float("inf"):
             final_result = parsed_nominatim_result
             final_result["postcode"] = authoritative_postcode
-            final_result["province"] = nominatim_address_province_raw
+            final_result["province"] = nominatim_province
         elif dist_geonames < dist_nominatim and dist_geonames != float("inf"):
             final_result = parsed_geonames_result
             final_result["postcode"] = authoritative_postcode
@@ -251,9 +251,9 @@ class Nominatim:
         parsed_geonames_result = self._parse_geonames_result(geonames_response)
 
         # Determine authoritative postcode
-        raw_nominatim_province = nominatim_response.get("address", {}).get("province")
+        nominatim_province = parsed_nominatim_result.get("province")
         selected_postcode, selected_province_from_postcode = self._select_postcode_and_derived_province(
-            parsed_nominatim_result, parsed_geonames_result, raw_nominatim_province
+            parsed_nominatim_result, parsed_geonames_result, nominatim_province
         )
 
         # Calculate distances
@@ -280,7 +280,7 @@ class Nominatim:
             dist_geonames,
             selected_postcode,
             selected_province_from_postcode,
-            raw_nominatim_province,
+            nominatim_province,
         )
 
         return final_result

{datamarket-0.9.34 → datamarket-0.9.36}/src/datamarket/params/nominatim.py

@@ -1,3 +1,5 @@
+CITY_TO_PROVINCE = {"Madrid": "Madrid"}
+
 POSTCODES = {
     "01": "Álava",
     "02": "Albacete",