Show map on details page

Includes pin and polygon

Closes: #4
This commit is contained in:
Edward Betts 2023-11-03 10:32:18 +00:00
parent d24744bc29
commit a6286cb05f
4 changed files with 74 additions and 5 deletions

View file

@ -14,7 +14,7 @@ from sqlalchemy.types import Float, Integer, Numeric, String
from .database import session
Base = declarative_base()
Base.query = session.query_property() # type:ignore
Base.query = session.query_property()
class Polygon(Base):
@ -30,6 +30,9 @@ class Polygon(Base):
tags = Column(postgresql.HSTORE)
way = Column(Geometry("GEOMETRY", srid=4326, spatial_index=True), nullable=False)
area = column_property(func.ST_Area(way, False))
geojson_str = column_property(
func.ST_AsGeoJSON(way, maxdecimaldigits=6), deferred=True
)
@property
def osm_url(self) -> str:
@ -48,7 +51,7 @@ class Polygon(Base):
) -> sqlalchemy.orm.query.Query: # type: ignore
"""Polygons that contain given coordinates."""
point = func.ST_SetSRID(func.ST_MakePoint(lon, lat), 4326)
q = cls.query.filter( # type: ignore
q = cls.query.filter(
or_(
cls.boundary == "political",
and_(

View file

@ -189,6 +189,7 @@ def build_dict(hit: Hit | None, lat: str | float, lon: str | float) -> WikidataD
"admin_level": hit.get("admin_level"),
"wikidata": hit["wikidata"],
"element": hit.get("element"),
"geojson": hit.get("geojson"),
}
if not commons_cat:
return ret