Query database instead of overpass

geocode/model.py

@@ -2,6 +2,10 @@ from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.schema import Column
 from sqlalchemy.types import Integer, Float, Numeric, String
 from sqlalchemy.dialects import postgresql
+from sqlalchemy.orm import column_property
+from sqlalchemy.ext.hybrid import hybrid_property
+from sqlalchemy import func
+
 from geoalchemy2 import Geometry
 from .database import session
 
@@ -12,10 +16,22 @@ class Polygon(Base):
     __tablename__ = "planet_osm_polygon"
 
     osm_id = Column(Integer, primary_key=True, autoincrement=False)
+    admin_level = Column(String)
 
     way_area = Column(Float)
     tags = Column(postgresql.HSTORE)
     way = Column(Geometry("GEOMETRY", srid=4326, spatial_index=True), nullable=False)
+    area = column_property(func.ST_Area(way))
+
+    @hybrid_property
+    def area_in_sq_km(self):
+        return self.area / (1000 * 1000)
+
+    @classmethod
+    def coords_within(cls, lat, lon):
+        point = func.ST_SetSRID(func.ST_MakePoint(lon, lat), 4326)
+        return cls.query.filter(cls.admin_level.isnot(None),
+                                func.ST_Within(point, cls.way))
 
 class Scotland(Base):
     __tablename__ = "scotland"

geocode/overpass.py

@@ -1,36 +0,0 @@
-from flask import current_app
-from . import headers
-import os
-import json
-import requests
-
-OVERPASS_URL = "https://lz4.overpass-api.de"
-
-
-def run_query(oql):
-    return requests.post(
-        OVERPASS_URL + "/api/interpreter", data=oql.encode("utf-8"), headers=headers
-    )
-
-
-def is_in_lat_lon(lat, lon):
-    oql = f"""
-[out:json][timeout:25];
-is_in({lat},{lon})->.a;
-(way(pivot.a); rel(pivot.a););
-out bb tags qt;"""
-
-    return run_query(oql)
-
-
-def get_osm_elements(lat, lon):
-    filename = f"cache/{lat}_{lon}.json"
-    use_cache = current_app.config["USE_CACHE"]
-
-    if use_cache and os.path.exists(filename):
-        return json.load(open(filename))["elements"]
-
-    r = is_in_lat_lon(lat, lon)
-    if use_cache:
-        open(filename, "wb").write(r.content)
-    return r.json()["elements"]