plot-finder 0.3.2__tar.gz → 0.3.4__tar.gz

{plot_finder-0.3.2 → plot_finder-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plot-finder
-Version: 0.3.2
+Version: 0.3.4
 Summary: Query Polish ULDK (GUGiK) API to find land parcels by TERYT ID or coordinates
 Author: Ernest Ilchenko
 License-Expression: MIT

{plot_finder-0.3.2 → plot_finder-0.3.4}/plot_finder/analyzer.py

@@ -61,6 +61,43 @@ _VOIVODESHIP_MAP = {
 }
 
 
+_PLACE_CATEGORIES: dict[str, str] = {
+    # education
+    "school": "education", "kindergarten": "education",
+    "university": "education", "college": "education",
+    # finance
+    "atm": "finance", "bank": "finance",
+    # transport
+    "bus_stop": "transport", "bus_station": "transport",
+    "platform": "transport", "stop_position": "transport",
+    "tram_stop": "transport", "station": "transport", "halt": "transport",
+    "ferry_terminal": "transport", "aerodrome": "transport",
+    # infrastructure
+    "supermarket": "infrastructure", "convenience": "infrastructure",
+    "mall": "infrastructure", "pharmacy": "infrastructure",
+    "hospital": "infrastructure", "clinic": "infrastructure",
+    "doctors": "infrastructure", "dentist": "infrastructure",
+    "post_office": "infrastructure", "fuel": "infrastructure",
+    "police": "infrastructure", "fire_station": "infrastructure",
+    "place_of_worship": "infrastructure", "restaurant": "infrastructure",
+    "cafe": "infrastructure",
+    # green_areas
+    "park": "green_areas", "garden": "green_areas",
+    "nature_reserve": "green_areas", "playground": "green_areas",
+    "forest": "green_areas", "wood": "green_areas",
+    # water
+    "water": "water", "river": "water", "lake": "water",
+    "pond": "water", "reservoir": "water",
+    "stream": "water", "canal": "water",
+    # nuisances
+    "line": "nuisances", "transformer": "nuisances",
+    "plant": "nuisances", "generator": "nuisances",
+    "industrial": "nuisances", "landfill": "nuisances",
+    "quarry": "nuisances", "works": "nuisances",
+    "wastewater_plant": "nuisances", "sawmill": "nuisances",
+}
+
+
 class PlotAnalyzer:
     def __init__(self, plot: Plot, *, radius: int = 1000, openweather_api_key: str | None = None) -> None:
         self.plot = plot
@@ -87,6 +124,63 @@ class PlotAnalyzer:
         lon, lat = _EPSG2180_TO_WGS84.transform(x, y)
         return lat, lon
 
+    # ------------------------------------------------------------------
+    # Bulk fetch — one Overpass request for all categories
+    # ------------------------------------------------------------------
+
+    def all_places(self, radius: int | None = None) -> dict[str, list[Place]]:
+        """Fetch all POI categories in a single Overpass request.
+
+        Returns a dict with keys: education, finance, transport,
+        infrastructure, green_areas, water, nuisances.
+        Also populates the cache so subsequent calls to individual
+        methods (e.g. education()) return instantly.
+        """
+        r = radius or self.radius
+        key = ("all_places", r)
+        if key in self._cache:
+            return self._cache[key]
+
+        query = f"""
+        [out:json][timeout:60];
+        (
+          nwr["amenity"~"school|kindergarten|university|college|atm|bank|bus_station|pharmacy|hospital|clinic|doctors|dentist|post_office|fuel|police|fire_station|place_of_worship|restaurant|cafe|ferry_terminal"](around:{r},{self._lat},{self._lon});
+          nwr["shop"~"supermarket|convenience|mall"](around:{r},{self._lat},{self._lon});
+          nwr["highway"="bus_stop"](around:{r},{self._lat},{self._lon});
+          nwr["public_transport"~"platform|stop_position"](around:{r},{self._lat},{self._lon});
+          nwr["railway"~"tram_stop|station|halt"](around:{r},{self._lat},{self._lon});
+          nwr["aeroway"="aerodrome"](around:{r},{self._lat},{self._lon});
+          nwr["leisure"~"park|garden|nature_reserve|playground"](around:{r},{self._lat},{self._lon});
+          nwr["landuse"~"forest|industrial|landfill|quarry"](around:{r},{self._lat},{self._lon});
+          nwr["natural"~"water|wood"](around:{r},{self._lat},{self._lon});
+          nwr["water"~"river|lake|pond|reservoir"](around:{r},{self._lat},{self._lon});
+          nwr["waterway"~"river|stream|canal"](around:{r},{self._lat},{self._lon});
+          nwr["power"~"line|transformer|plant|generator"](around:{r},{self._lat},{self._lon});
+          nwr["man_made"~"works|wastewater_plant"](around:{r},{self._lat},{self._lon});
+          nwr["craft"="sawmill"](around:{r},{self._lat},{self._lon});
+        );
+        out center;
+        """
+
+        all_results = self._run_overpass(query)
+
+        categories: dict[str, list[Place]] = {
+            "education": [], "finance": [], "transport": [],
+            "infrastructure": [], "green_areas": [], "water": [],
+            "nuisances": [],
+        }
+
+        for place in all_results:
+            cat = _PLACE_CATEGORIES.get(place.kind)
+            if cat:
+                categories[cat].append(place)
+
+        for cat_name, places in categories.items():
+            self._cache[(cat_name, r)] = places
+
+        self._cache[key] = categories
+        return categories
+
     # ------------------------------------------------------------------
     # Overpass-based place methods (cached)
     # ------------------------------------------------------------------

{plot_finder-0.3.2 → plot_finder-0.3.4}/plot_finder/plot.py

@@ -29,9 +29,15 @@ class Plot(BaseModel):
     @computed_field  # type: ignore[prop-decorator]
     @property
     def area(self) -> float | None:
+        """Area in m². Transforms to EPSG:2180 if needed."""
         if not self.geom_wkt:
             return None
         geom = shapely.wkt.loads(self.geom_wkt)
+        if self.srid != 2180:
+            from pyproj import Transformer
+            from shapely.ops import transform
+            t = Transformer.from_crs(f"EPSG:{self.srid}", "EPSG:2180", always_xy=True)
+            geom = transform(t.transform, geom)
         return round(geom.area, 2)
 
     @computed_field  # type: ignore[prop-decorator]

{plot_finder-0.3.2 → plot_finder-0.3.4}/plot_finder/report.py

@@ -8,7 +8,6 @@ from pydantic import BaseModel
 from plot_finder.air import AirQuality
 from plot_finder.climate import Climate
 from plot_finder.exceptions import (
-    NothingFoundError,
     OpenMeteoError,
     OSRMError,
     OpenWeatherAuthError,
@@ -64,11 +63,13 @@ class PlotReporter:
         if a.plot.geom_wkt:
             data["geometry"] = self._geometry_wgs84(a.plot.geom_wkt)
 
-        for category in ("education", "finance", "transport", "infrastructure", "green_areas", "water", "nuisances"):
-            try:
-                data[category] = getattr(a, category)()
-            except (NothingFoundError, OverpassError, OSRMError):
-                pass
+        try:
+            places = a.all_places()
+            for category in ("education", "finance", "transport", "infrastructure", "green_areas", "water", "nuisances"):
+                if places.get(category):
+                    data[category] = places[category]
+        except (OverpassError, OSRMError):
+            pass
 
         try:
             data["air_quality"] = a.air_quality()

{plot_finder-0.3.2 → plot_finder-0.3.4}/plot_finder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plot-finder
-Version: 0.3.2
+Version: 0.3.4
 Summary: Query Polish ULDK (GUGiK) API to find land parcels by TERYT ID or coordinates
 Author: Ernest Ilchenko
 License-Expression: MIT

{plot_finder-0.3.2 → plot_finder-0.3.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "plot-finder"
-version = "0.3.2"
+version = "0.3.4"
 description = "Query Polish ULDK (GUGiK) API to find land parcels by TERYT ID or coordinates"
 readme = "README.md"
 license = "MIT"