X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/b45f761227ffed8eb328df7a5d9e979197b8c690..4bb4db0668a37979725678a1690f6163d5cae03f:/nominatim/api/types.py diff --git a/nominatim/api/types.py b/nominatim/api/types.py index 87568a09..9d19b75d 100644 --- a/nominatim/api/types.py +++ b/nominatim/api/types.py @@ -15,8 +15,7 @@ import enum import math from struct import unpack -from geoalchemy2 import WKTElement -import geoalchemy2.functions +import sqlalchemy as sa from nominatim.errors import UsageError @@ -122,10 +121,10 @@ class Point(NamedTuple): return Point(x, y) - def sql_value(self) -> WKTElement: + def sql_value(self) -> str: """ Create an SQL expression for the point. """ - return WKTElement(f'POINT({self.x} {self.y})', srid=4326) + return f'POINT({self.x} {self.y})' @@ -182,7 +181,7 @@ class Bbox: def sql_value(self) -> Any: """ Create an SQL expression for the box. """ - return geoalchemy2.functions.ST_MakeEnvelope(*self.coords, 4326) + return sa.func.ST_MakeEnvelope(*self.coords, 4326) def contains(self, pt: Point) -> bool: