From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 12 Aug 2023 19:13:36 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~55
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/ef1869e918c96958a319d4b702db8c3714480111?hp=56f9535aa9cf3f9f500471603e5876cd3e0ddb0b

Merge remote-tracking branch 'upstream/master'
---

diff --git a/nominatim/db/sqlalchemy_types.py b/nominatim/db/sqlalchemy_types.py
index 9e1f9fce..7b959036 100644
--- 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: