Merge remote-tracking branch 'upstream/master'

diff --git a/nominatim/db/sqlalchemy_types.py b/nominatim/db/sqlalchemy_types.py
index 9e1f9fcecf8c1dc819e616bbbe708f40ccfd7949..7b9590363db2a055962e61ac2d850397cfc0e5d2 100644 (file)
--- a/nominatim/db/sqlalchemy_types.py
+++ b/nominatim/db/sqlalchemy_types.py
@@ -70,11 +70,12 @@ class Geometry(types.UserDefinedType): # type: ignore[type-arg]
 
 
         def ST_DWithin_no_index(self, other: SaColumn, distance: SaColumn) -> SaColumn:
-            return sa.func._ST_DWithin(self, other, distance, type_=sa.Boolean)
+            return sa.func.ST_DWithin(sa.func.coalesce(sa.null(), self),
+                                      other, distance, type_=sa.Boolean)
 
 
-        def ST_Intersects_no_index(self, other: SaColumn) -> SaColumn:
-            return sa.func._ST_Intersects(self, other, type_=sa.Boolean)
+        def ST_Intersects_no_index(self, other: SaColumn) -> 'sa.Operators':
+            return sa.func.coalesce(sa.null(), self).op('&&')(other)
 
 
         def ST_Distance(self, other: SaColumn) -> SaColumn: