add lookup of address interpolations

nominatim/api/lookup.py

@@ -64,6 +64,35 @@ async def find_in_placex(conn: SearchConnection, place: ntyp.PlaceRef,
     return (await conn.execute(sql)).one_or_none()
 
 
+async def find_in_osmline(conn: SearchConnection, place: ntyp.PlaceRef,
+                          details: ntyp.LookupDetails) -> Optional[SaRow]:
+    """ Search for the given place in the osmline table and return the
+        base information.
+    """
+    t = conn.t.osmline
+    sql = sa.select(t.c.place_id, t.c.osm_id, t.c.parent_place_id,
+                    t.c.indexed_date, t.c.startnumber, t.c.endnumber,
+                    t.c.step, t.c.address, t.c.postcode, t.c.country_code,
+                    sa.func.ST_X(sa.func.ST_Centroid(t.c.linegeo)).label('x'),
+                    sa.func.ST_Y(sa.func.ST_Centroid(t.c.linegeo)).label('y'),
+                    _select_column_geometry(t.c.linegeo, details.geometry_output))
+
+    if isinstance(place, ntyp.PlaceID):
+        sql = sql.where(t.c.place_id == place.place_id)
+    elif isinstance(place, ntyp.OsmID) and place.osm_type == 'W':
+        # There may be multiple interpolations for a single way.
+        # If 'class' contains a number, return the one that belongs to that number.
+        sql = sql.where(t.c.osm_id == place.osm_id).limit(1)
+        if place.osm_class and place.osm_class.isdigit():
+            sql = sql.order_by(sa.func.greatest(0,
+                                    sa.func.least(int(place.osm_class) - t.c.endnumber),
+                                           t.c.startnumber - int(place.osm_class)))
+    else:
+        return None
+
+    return (await conn.execute(sql)).one_or_none()
+
+
 async def get_place_by_id(conn: SearchConnection, place: ntyp.PlaceRef,
                           details: ntyp.LookupDetails) -> Optional[nres.SearchResult]:
     """ Retrieve a place with additional details from the database.
@@ -77,5 +106,11 @@ async def get_place_by_id(conn: SearchConnection, place: ntyp.PlaceRef,
         await nres.add_result_details(conn, result, details)
         return result
 
+    row = await find_in_osmline(conn, place, details)
+    if row is not None:
+        result = nres.create_from_osmline_row(row=row)
+        await nres.add_result_details(conn, result, details)
+        return result
+
     # Nothing found under this ID.
     return None

nominatim/api/results.py

@@ -135,6 +135,11 @@ class SearchResult:
         return '{"type": "Point","coordinates": [%f, %f]}' % self.centroid
 
 
+def _filter_geometries(row: SaRow) -> Dict[str, str]:
+    return {k[9:]: v for k, v in row._mapping.items() # pylint: disable=W0212
+            if k.startswith('geometry_')}
+
+
 def create_from_placex_row(row: SaRow) -> SearchResult:
     """ Construct a new SearchResult and add the data from the result row
         from the placex table.
@@ -157,10 +162,30 @@ def create_from_placex_row(row: SaRow) -> SearchResult:
                           importance=row.importance,
                           country_code=row.country_code,
                           indexed_date=getattr(row, 'indexed_date'),
-                          centroid=Point(row.x, row.y))
+                          centroid=Point(row.x, row.y),
+                          geometry = _filter_geometries(row))
 
-    result.geometry = {k[9:]: v for k, v in row._mapping.items() # pylint: disable=W0212
-                       if k.startswith('geometry_')}
+    return result
+
+
+def create_from_osmline_row(row: SaRow) -> SearchResult:
+    """ Construct a new SearchResult and add the data from the result row
+        from the osmline table.
+    """
+    result = SearchResult(source_table=SourceTable.OSMLINE,
+                          place_id=row.place_id,
+                          parent_place_id=row.parent_place_id,
+                          osm_object=('W', row.osm_id),
+                          category=('place', 'houses'),
+                          address=row.address,
+                          postcode=row.postcode,
+                          extratags={'startnumber': str(row.startnumber),
+                                     'endnumber': str(row.endnumber),
+                                     'step': str(row.step)},
+                          country_code=row.country_code,
+                          indexed_date=getattr(row, 'indexed_date'),
+                          centroid=Point(row.x, row.y),
+                          geometry = _filter_geometries(row))
 
     return result