datamarket 0.9.34__py3-none-any.whl → 0.9.36__py3-none-any.whl

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/params/nominatim.py

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

{datamarket-0.9.34.dist-info → datamarket-0.9.36.dist-info}/METADATA

@@ -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.dist-info → datamarket-0.9.36.dist-info}/RECORD

@@ -4,12 +4,12 @@ datamarket/interfaces/alchemy.py,sha256=mQwjDqBpz1QHRV2JTCALvn5iK_ky69oE2Gw-EtRX
 datamarket/interfaces/aws.py,sha256=7KLUeBxmPN7avEMPsu5HC_KHB1N7W6Anp2X8fo43mlw,2383
 datamarket/interfaces/drive.py,sha256=shbV5jpQVe_KPE-8Idx6Z9te5Zu1SmVfrvSAyd9ZIgE,2915
 datamarket/interfaces/ftp.py,sha256=o0KlJxtksbop9OjCiQRzyAa2IeG_ExVXagS6apwrAQo,1881
-datamarket/interfaces/nominatim.py,sha256=xrVADpWiNRKcshDVw75i-8phrql_6sBYf8Wre8mQZk4,12419
+datamarket/interfaces/nominatim.py,sha256=XzqBFVBzGU2BIFnFueZ56tk4JhaQgj5dvFalnCG6Zxk,12417
 datamarket/interfaces/peerdb.py,sha256=cwYwvO740GyaPo9zLAwJsf3UeJDGDiYzjQVM9Q6s-_g,23652
 datamarket/interfaces/proxy.py,sha256=updoOStKd8-nQBbxWbnD9eOt6HksnYi-5dQ0rEySf5M,3152
 datamarket/interfaces/tinybird.py,sha256=AYrcRGNOCoCt7ojilkWa27POROee9sTCwZ61GGHEPeM,2698
 datamarket/params/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-datamarket/params/nominatim.py,sha256=pBYRfoBkkLBg2INbFymefmYSzaAVujQSpEro5c1hD_I,1143
+datamarket/params/nominatim.py,sha256=XrCru3yEbs-X3ueOaCeSTBZwi4CWHW7oNhEyexBleMw,1184
 datamarket/utils/__init__.py,sha256=8D5a8oKgqd6WA1RUkiKCn4l_PVemtyuckxQut0vDHXM,20
 datamarket/utils/airflow.py,sha256=al0vc0YUikNu3Oy51VSn52I7pMU40akFBOl_UlHa2E4,795
 datamarket/utils/alchemy.py,sha256=SRq6kgh1aANXVShBPgAuglmNhZssPWwWEY503gKSia8,635
@@ -21,7 +21,7 @@ datamarket/utils/strings/normalization.py,sha256=QLZ-THzjGOK9eWPPR1PrsffwQkSOx_M
 datamarket/utils/strings/obfuscation.py,sha256=8gMepfjPq0N4_IpKR6i2dy_9VJugQ3qJiRiRvKavB3s,5246
 datamarket/utils/typer.py,sha256=FDF3l6gh3UlAFPsHCtesnekvct2rKz0oFn3uKARBQvE,814
 datamarket/utils/types.py,sha256=vxdQZdwdXrfPR4Es52gBgol-tMRIOD6oK9cBo3rB0JQ,74
-datamarket-0.9.34.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-datamarket-0.9.34.dist-info/METADATA,sha256=iG_qBXikXQBY-7c4JMb26VDYPXII_oOQ3CziD3mJxEE,6871
-datamarket-0.9.34.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-datamarket-0.9.34.dist-info/RECORD,,
+datamarket-0.9.36.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+datamarket-0.9.36.dist-info/METADATA,sha256=btNtbOyIdvhPwecYvODNFruyWAWyr3y2Psa2U6G3D30,6871
+datamarket-0.9.36.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+datamarket-0.9.36.dist-info/RECORD,,