have reverse fall back to country table when no country is found

diff --git a/src/nominatim_api/reverse.py b/src/nominatim_api/reverse.py
index 1b06e659fbfb5b98edf16d708f13bb3c0e0d8ee3..8a75c5b94961b5885f0da5391b2f2cbd24fa22cc 100644 (file)
--- a/src/nominatim_api/reverse.py
+++ b/src/nominatim_api/reverse.py
@@ -478,14 +478,15 @@ class ReverseGeocoder:
         log().var_dump('Country codes', ccodes)
         return ccodes
 
         log().var_dump('Country codes', ccodes)
         return ccodes
 

-    async def lookup_country(self, ccodes: List[str]) -> Optional[SaRow]:
+    async def lookup_country(self, ccodes: List[str]) -> Tuple[Optional[SaRow], RowFunc]:

         """ Lookup the country for the current search.
         """
         """ Lookup the country for the current search.
         """

+        row_func = nres.create_from_placex_row

         if not ccodes:
             ccodes = await self.lookup_country_codes()
 
         if not ccodes:
         if not ccodes:
             ccodes = await self.lookup_country_codes()
 
         if not ccodes:

-            return None
+            return None, row_func

 
         t = self.conn.t.placex
         if self.max_rank > 4:
 
         t = self.conn.t.placex
         if self.max_rank > 4:


@@ -537,7 +538,32 @@ class ReverseGeocoder:
 
             address_row = (await self.conn.execute(sql, self.bind_params)).one_or_none()
 
 
             address_row = (await self.conn.execute(sql, self.bind_params)).one_or_none()
 

-        return address_row
+        if address_row is None:
+            # finally fall back to country table
+            t = self.conn.t.country_name
+            tgrid = self.conn.t.country_grid
+
+            sql = sa.select(tgrid.c.country_code,
+                            tgrid.c.geometry.ST_Centroid().ST_Collect().ST_Centroid()
+                                 .label('centroid'),
+                            tgrid.c.geometry.ST_Collect().ST_Expand(0).label('bbox'))\
+                    .where(tgrid.c.country_code.in_(ccodes))\
+                    .group_by(tgrid.c.country_code)
+
+            sub = sql.subquery('grid')
+            sql = sa.select(t.c.country_code,
+                            t.c.name.merge(t.c.derived_name).label('name'),
+                            sub.c.centroid, sub.c.bbox)\
+                    .join(sub, t.c.country_code == sub.c.country_code)\
+                    .order_by(t.c.country_code)\
+                    .limit(1)
+
+            sql = self._add_geometry_columns(sql, sub.c.centroid)
+
+            address_row = (await self.conn.execute(sql, self.bind_params)).one_or_none()
+            row_func = nres.create_from_country_row
+
+        return address_row, row_func

 
     async def lookup(self, coord: AnyPoint) -> Optional[nres.ReverseResult]:
         """ Look up a single coordinate. Returns the place information,
 
     async def lookup(self, coord: AnyPoint) -> Optional[nres.ReverseResult]:
         """ Look up a single coordinate. Returns the place information,


@@ -566,12 +592,12 @@ class ReverseGeocoder:
             if self.max_rank > 4:
                 row = await self.lookup_area()
             if row is None and self.layer_enabled(DataLayer.ADDRESS):
             if self.max_rank > 4:
                 row = await self.lookup_area()
             if row is None and self.layer_enabled(DataLayer.ADDRESS):

-                row = await self.lookup_country(ccodes)
+                row, row_func = await self.lookup_country(ccodes)

 
         result = row_func(row, nres.ReverseResult)
         if result is not None:
             assert row is not None
 
         result = row_func(row, nres.ReverseResult)
         if result is not None:
             assert row is not None

-            result.distance = row.distance
+            result.distance = getattr(row,  'distance', 0)

             if hasattr(row, 'bbox'):
                 result.bbox = Bbox.from_wkb(row.bbox)
             await nres.add_result_details(self.conn, [result], self.params)
             if hasattr(row, 'bbox'):
                 result.bbox = Bbox.from_wkb(row.bbox)
             await nres.add_result_details(self.conn, [result], self.params)

diff --git a/test/bdd/api/reverse/queries.feature b/test/bdd/api/reverse/queries.feature
index f154b18debb7a99ec845ea67d4c8a5159986d6d2..fc28cee31e080acf9f32771954dbe0ea9198cdab 100644 (file)
--- a/test/bdd/api/reverse/queries.feature
+++ b/test/bdd/api/reverse/queries.feature
@@ -10,15 +10,19 @@ Feature: Reverse geocoding
     Examples:
      | lat      | lon |
      | 0.0      | 0.0 |
     Examples:
      | lat      | lon |
      | 0.0      | 0.0 |

-     | -34.830  | -56.105 |
-     | 45.174   | -103.072 |
-     | 21.156   | -12.2744 |

      | 91.3     | 0.4    |
      | -700     | 0.4    |
      | 0.2      | 324.44 |
      | 0.2      | -180.4 |
 
 
      | 91.3     | 0.4    |
      | -700     | 0.4    |
      | 0.2      | 324.44 |
      | 0.2      | -180.4 |
 
 

+    Scenario: Unknown countries fall back to default country grid
+        When sending v1/reverse at 45.174,-103.072
+        Then results contain
+          | category | type    | display_name |
+          | place    | country | United States |
+
+

     @Tiger
     Scenario: TIGER house number
         When sending v1/reverse at 32.4752389363,-86.4810198619
     @Tiger
     Scenario: TIGER house number
         When sending v1/reverse at 32.4752389363,-86.4810198619