"""
Implementation of the acutal database accesses for forward search.
"""
+from typing import List, Tuple, AsyncIterator
import abc
+import sqlalchemy as sa
+from sqlalchemy.dialects.postgresql import ARRAY, array_agg
+
+from nominatim.typing import SaFromClause, SaScalarSelect, SaColumn, \
+ SaExpression, SaSelect, SaRow
from nominatim.api.connection import SearchConnection
-from nominatim.api.types import SearchDetails
+from nominatim.api.types import SearchDetails, DataLayer, GeometryFormat, Bbox
import nominatim.api.results as nres
from nominatim.api.search.db_search_fields import SearchData, WeightedCategories
+#pylint: disable=singleton-comparison
+#pylint: disable=too-many-branches,too-many-arguments,too-many-locals,too-many-statements
+
+def _select_placex(t: SaFromClause) -> SaSelect:
+ return sa.select(t.c.place_id, t.c.osm_type, t.c.osm_id, t.c.name,
+ t.c.class_, t.c.type,
+ t.c.address, t.c.extratags,
+ t.c.housenumber, t.c.postcode, t.c.country_code,
+ t.c.importance, t.c.wikipedia,
+ t.c.parent_place_id, t.c.rank_address, t.c.rank_search,
+ t.c.centroid,
+ t.c.geometry.ST_Expand(0).label('bbox'))
+
+
+def _add_geometry_columns(sql: SaSelect, col: SaColumn, details: SearchDetails) -> SaSelect:
+ if not details.geometry_output:
+ return sql
+
+ out = []
+
+ if details.geometry_simplification > 0.0:
+ col = col.ST_SimplifyPreserveTopology(details.geometry_simplification)
+
+ if details.geometry_output & GeometryFormat.GEOJSON:
+ out.append(col.ST_AsGeoJSON().label('geometry_geojson'))
+ if details.geometry_output & GeometryFormat.TEXT:
+ out.append(col.ST_AsText().label('geometry_text'))
+ if details.geometry_output & GeometryFormat.KML:
+ out.append(col.ST_AsKML().label('geometry_kml'))
+ if details.geometry_output & GeometryFormat.SVG:
+ out.append(col.ST_AsSVG().label('geometry_svg'))
+
+ return sql.add_columns(*out)
+
+
+def _make_interpolation_subquery(table: SaFromClause, inner: SaFromClause,
+ numerals: List[int], details: SearchDetails) -> SaScalarSelect:
+ all_ids = array_agg(table.c.place_id) # type: ignore[no-untyped-call]
+ sql = sa.select(all_ids).where(table.c.parent_place_id == inner.c.place_id)
+
+ if len(numerals) == 1:
+ sql = sql.where(sa.between(numerals[0], table.c.startnumber, table.c.endnumber))\
+ .where((numerals[0] - table.c.startnumber) % table.c.step == 0)
+ else:
+ sql = sql.where(sa.or_(
+ *(sa.and_(sa.between(n, table.c.startnumber, table.c.endnumber),
+ (n - table.c.startnumber) % table.c.step == 0)
+ for n in numerals)))
+
+ if details.excluded:
+ sql = sql.where(table.c.place_id.not_in(details.excluded))
+
+ return sql.scalar_subquery()
+
+
+def _filter_by_layer(table: SaFromClause, layers: DataLayer) -> SaColumn:
+ orexpr: List[SaExpression] = []
+ if layers & DataLayer.ADDRESS and layers & DataLayer.POI:
+ orexpr.append(table.c.rank_address.between(1, 30))
+ elif layers & DataLayer.ADDRESS:
+ orexpr.append(table.c.rank_address.between(1, 29))
+ orexpr.append(sa.and_(table.c.rank_address == 30,
+ sa.or_(table.c.housenumber != None,
+ table.c.address.has_key('housename'))))
+ elif layers & DataLayer.POI:
+ orexpr.append(sa.and_(table.c.rank_address == 30,
+ table.c.class_.not_in(('place', 'building'))))
+
+ if layers & DataLayer.MANMADE:
+ exclude = []
+ if not layers & DataLayer.RAILWAY:
+ exclude.append('railway')
+ if not layers & DataLayer.NATURAL:
+ exclude.extend(('natural', 'water', 'waterway'))
+ orexpr.append(sa.and_(table.c.class_.not_in(tuple(exclude)),
+ table.c.rank_address == 0))
+ else:
+ include = []
+ if layers & DataLayer.RAILWAY:
+ include.append('railway')
+ if layers & DataLayer.NATURAL:
+ include.extend(('natural', 'water', 'waterway'))
+ orexpr.append(sa.and_(table.c.class_.in_(tuple(include)),
+ table.c.rank_address == 0))
+
+ if len(orexpr) == 1:
+ return orexpr[0]
+
+ return sa.or_(*orexpr)
+
+
+def _interpolated_position(table: SaFromClause, nr: SaColumn) -> SaColumn:
+ pos = sa.cast(nr - table.c.startnumber, sa.Float) / (table.c.endnumber - table.c.startnumber)
+ return sa.case(
+ (table.c.endnumber == table.c.startnumber, table.c.linegeo.ST_Centroid()),
+ else_=table.c.linegeo.ST_LineInterpolatePoint(pos)).label('centroid')
+
+
+async def _get_placex_housenumbers(conn: SearchConnection,
+ place_ids: List[int],
+ details: SearchDetails) -> AsyncIterator[nres.SearchResult]:
+ t = conn.t.placex
+ sql = _select_placex(t).where(t.c.place_id.in_(place_ids))
+
+ sql = _add_geometry_columns(sql, t.c.geometry, details)
+
+ for row in await conn.execute(sql):
+ result = nres.create_from_placex_row(row, nres.SearchResult)
+ assert result
+ result.bbox = Bbox.from_wkb(row.bbox.data)
+ yield result
+
+
+async def _get_osmline(conn: SearchConnection, place_ids: List[int],
+ numerals: List[int],
+ details: SearchDetails) -> AsyncIterator[nres.SearchResult]:
+ t = conn.t.osmline
+ values = sa.values(sa.Column('nr', sa.Integer()), name='housenumber')\
+ .data([(n,) for n in numerals])
+ sql = sa.select(t.c.place_id, t.c.osm_id,
+ t.c.parent_place_id, t.c.address,
+ values.c.nr.label('housenumber'),
+ _interpolated_position(t, values.c.nr),
+ t.c.postcode, t.c.country_code)\
+ .where(t.c.place_id.in_(place_ids))\
+ .join(values, values.c.nr.between(t.c.startnumber, t.c.endnumber))
+
+ if details.geometry_output:
+ sub = sql.subquery()
+ sql = _add_geometry_columns(sa.select(sub), sub.c.centroid, details)
+
+ for row in await conn.execute(sql):
+ result = nres.create_from_osmline_row(row, nres.SearchResult)
+ assert result
+ yield result
+
+
+async def _get_tiger(conn: SearchConnection, place_ids: List[int],
+ numerals: List[int], osm_id: int,
+ details: SearchDetails) -> AsyncIterator[nres.SearchResult]:
+ t = conn.t.tiger
+ values = sa.values(sa.Column('nr', sa.Integer()), name='housenumber')\
+ .data([(n,) for n in numerals])
+ sql = sa.select(t.c.place_id, t.c.parent_place_id,
+ sa.literal('W').label('osm_type'),
+ sa.literal(osm_id).label('osm_id'),
+ values.c.nr.label('housenumber'),
+ _interpolated_position(t, values.c.nr),
+ t.c.postcode)\
+ .where(t.c.place_id.in_(place_ids))\
+ .join(values, values.c.nr.between(t.c.startnumber, t.c.endnumber))
+
+ if details.geometry_output:
+ sub = sql.subquery()
+ sql = _add_geometry_columns(sa.select(sub), sub.c.centroid, details)
+
+ for row in await conn.execute(sql):
+ result = nres.create_from_tiger_row(row, nres.SearchResult)
+ assert result
+ yield result
+
+
class AbstractSearch(abc.ABC):
""" Encapuslation of a single lookup in the database.
"""
details: SearchDetails) -> nres.SearchResults:
""" Find results for the search in the database.
"""
- return nres.SearchResults([])
+ results = nres.SearchResults()
+ base = await self.search.lookup(conn, details)
+
+ if not base:
+ return results
+
+ base.sort(key=lambda r: (r.accuracy, r.rank_search))
+ max_accuracy = base[0].accuracy + 0.5
+ base = nres.SearchResults(r for r in base if r.source_table == nres.SourceTable.PLACEX
+ and r.accuracy <= max_accuracy
+ and r.bbox and r.bbox.area < 20)
+
+ if base:
+ baseids = [b.place_id for b in base[:5] if b.place_id]
+
+ for category, penalty in self.categories:
+ await self.lookup_category(results, conn, baseids, category, penalty, details)
+ if len(results) >= details.max_results:
+ break
+
+ return results
+
+
+ async def lookup_category(self, results: nres.SearchResults,
+ conn: SearchConnection, ids: List[int],
+ category: Tuple[str, str], penalty: float,
+ details: SearchDetails) -> None:
+ """ Find places of the given category near the list of
+ place ids and add the results to 'results'.
+ """
+ table = await conn.get_class_table(*category)
+
+ t = conn.t.placex.alias('p')
+ tgeom = conn.t.placex.alias('pgeom')
+
+ sql = _select_placex(t).where(tgeom.c.place_id.in_(ids))\
+ .where(t.c.class_ == category[0])\
+ .where(t.c.type == category[1])
+
+ if table is None:
+ # No classtype table available, do a simplified lookup in placex.
+ sql = sql.join(tgeom, t.c.geometry.ST_DWithin(tgeom.c.centroid, 0.01))\
+ .order_by(tgeom.c.centroid.ST_Distance(t.c.centroid))
+ else:
+ # Use classtype table. We can afford to use a larger
+ # radius for the lookup.
+ sql = sql.join(table, t.c.place_id == table.c.place_id)\
+ .join(tgeom,
+ sa.case((sa.and_(tgeom.c.rank_address < 9,
+ tgeom.c.geometry.ST_GeometryType().in_(
+ ('ST_Polygon', 'ST_MultiPolygon'))),
+ tgeom.c.geometry.ST_Contains(table.c.centroid)),
+ else_ = tgeom.c.centroid.ST_DWithin(table.c.centroid, 0.05)))\
+ .order_by(tgeom.c.centroid.ST_Distance(table.c.centroid))
+
+ if details.countries:
+ sql = sql.where(t.c.country_code.in_(details.countries))
+ if details.min_rank > 0:
+ sql = sql.where(t.c.rank_address >= details.min_rank)
+ if details.max_rank < 30:
+ sql = sql.where(t.c.rank_address <= details.max_rank)
+ if details.excluded:
+ sql = sql.where(t.c.place_id.not_in(details.excluded))
+ if details.layers is not None:
+ sql = sql.where(_filter_by_layer(t, details.layers))
+
+ for row in await conn.execute(sql.limit(details.max_results)):
+ result = nres.create_from_placex_row(row, nres.SearchResult)
+ assert result
+ result.accuracy = self.penalty + penalty
+ result.bbox = Bbox.from_wkb(row.bbox.data)
+ results.append(result)
+
class PoiSearch(AbstractSearch):
details: SearchDetails) -> nres.SearchResults:
""" Find results for the search in the database.
"""
- return nres.SearchResults([])
+ t = conn.t.placex
+
+ rows: List[SaRow] = []
+
+ if details.near and details.near_radius is not None and details.near_radius < 0.2:
+ # simply search in placex table
+ sql = _select_placex(t) \
+ .where(t.c.linked_place_id == None) \
+ .where(t.c.geometry.ST_DWithin(details.near.sql_value(),
+ details.near_radius)) \
+ .order_by(t.c.centroid.ST_Distance(details.near.sql_value()))
+
+ if self.countries:
+ sql = sql.where(t.c.country_code.in_(self.countries.values))
+
+ if details.viewbox is not None and details.bounded_viewbox:
+ sql = sql.where(t.c.geometry.intersects(details.viewbox.sql_value()))
+
+ classtype = self.categories.values
+ if len(classtype) == 1:
+ sql = sql.where(t.c.class_ == classtype[0][0]) \
+ .where(t.c.type == classtype[0][1])
+ else:
+ sql = sql.where(sa.or_(*(sa.and_(t.c.class_ == cls, t.c.type == typ)
+ for cls, typ in classtype)))
+
+ rows.extend(await conn.execute(sql.limit(details.max_results)))
+ else:
+ # use the class type tables
+ for category in self.categories.values:
+ table = await conn.get_class_table(*category)
+ if table is not None:
+ sql = _select_placex(t)\
+ .join(table, t.c.place_id == table.c.place_id)\
+ .where(t.c.class_ == category[0])\
+ .where(t.c.type == category[1])
+
+ if details.viewbox is not None and details.bounded_viewbox:
+ sql = sql.where(table.c.centroid.intersects(details.viewbox.sql_value()))
+
+ if details.near:
+ sql = sql.order_by(table.c.centroid.ST_Distance(details.near.sql_value()))\
+ .where(table.c.centroid.ST_DWithin(details.near.sql_value(),
+ details.near_radius or 0.5))
+
+ if self.countries:
+ sql = sql.where(t.c.country_code.in_(self.countries.values))
+
+ rows.extend(await conn.execute(sql.limit(details.max_results)))
+
+ results = nres.SearchResults()
+ for row in rows:
+ result = nres.create_from_placex_row(row, nres.SearchResult)
+ assert result
+ result.accuracy = self.penalty + self.categories.get_penalty((row.class_, row.type))
+ result.bbox = Bbox.from_wkb(row.bbox.data)
+ results.append(result)
+
+ return results
class CountrySearch(AbstractSearch):
details: SearchDetails) -> nres.SearchResults:
""" Find results for the search in the database.
"""
- return nres.SearchResults([])
+ t = conn.t.placex
+
+ sql = _select_placex(t)\
+ .where(t.c.country_code.in_(self.countries.values))\
+ .where(t.c.rank_address == 4)
+
+ sql = _add_geometry_columns(sql, t.c.geometry, details)
+
+ if details.excluded:
+ sql = sql.where(t.c.place_id.not_in(details.excluded))
+
+ if details.viewbox is not None and details.bounded_viewbox:
+ sql = sql.where(t.c.geometry.intersects(details.viewbox.sql_value()))
+
+ if details.near is not None and details.near_radius is not None:
+ sql = sql.where(t.c.geometry.ST_DWithin(details.near.sql_value(),
+ details.near_radius))
+
+ results = nres.SearchResults()
+ for row in await conn.execute(sql):
+ result = nres.create_from_placex_row(row, nres.SearchResult)
+ assert result
+ result.accuracy = self.penalty + self.countries.get_penalty(row.country_code, 5.0)
+ results.append(result)
+
+ return results or await self.lookup_in_country_table(conn, details)
+
+
+ async def lookup_in_country_table(self, conn: SearchConnection,
+ details: SearchDetails) -> nres.SearchResults:
+ """ Look up the country in the fallback country tables.
+ """
+ t = conn.t.country_name
+ tgrid = conn.t.country_grid
+
+ sql = sa.select(tgrid.c.country_code,
+ tgrid.c.geometry.ST_Centroid().ST_Collect().ST_Centroid()
+ .label('centroid'))\
+ .where(tgrid.c.country_code.in_(self.countries.values))\
+ .group_by(tgrid.c.country_code)
+
+ if details.viewbox is not None and details.bounded_viewbox:
+ sql = sql.where(tgrid.c.geometry.intersects(details.viewbox.sql_value()))
+ if details.near is not None and details.near_radius is not None:
+ sql = sql.where(tgrid.c.geometry.ST_DWithin(details.near.sql_value(),
+ details.near_radius))
+
+ sub = sql.subquery('grid')
+
+ sql = sa.select(t.c.country_code,
+ (t.c.name
+ + sa.func.coalesce(t.c.derived_name,
+ sa.cast('', type_=conn.t.types.Composite))
+ ).label('name'),
+ sub.c.centroid)\
+ .join(sub, t.c.country_code == sub.c.country_code)
+
+ results = nres.SearchResults()
+ for row in await conn.execute(sql):
+ result = nres.create_from_country_row(row, nres.SearchResult)
+ assert result
+ result.accuracy = self.penalty + self.countries.get_penalty(row.country_code, 5.0)
+ results.append(result)
+
+ return results
+
class PostcodeSearch(AbstractSearch):
details: SearchDetails) -> nres.SearchResults:
""" Find results for the search in the database.
"""
- return nres.SearchResults([])
+ t = conn.t.postcode
+
+ sql = sa.select(t.c.place_id, t.c.parent_place_id,
+ t.c.rank_search, t.c.rank_address,
+ t.c.postcode, t.c.country_code,
+ t.c.geometry.label('centroid'))\
+ .where(t.c.postcode.in_(self.postcodes.values))
+
+ sql = _add_geometry_columns(sql, t.c.geometry, details)
+
+ penalty: SaExpression = sa.literal(self.penalty)
+
+ if details.viewbox is not None:
+ if details.bounded_viewbox:
+ sql = sql.where(t.c.geometry.intersects(details.viewbox.sql_value()))
+ else:
+ penalty += sa.case((t.c.geometry.intersects(details.viewbox.sql_value()), 0.0),
+ (t.c.geometry.intersects(details.viewbox_x2.sql_value()), 1.0),
+ else_=2.0)
+
+ if details.near is not None:
+ if details.near_radius is not None:
+ sql = sql.where(t.c.geometry.ST_DWithin(details.near.sql_value(),
+ details.near_radius))
+ sql = sql.order_by(t.c.geometry.ST_Distance(details.near.sql_value()))
+
+ if self.countries:
+ sql = sql.where(t.c.country_code.in_(self.countries.values))
+
+ if details.excluded:
+ sql = sql.where(t.c.place_id.not_in(details.excluded))
+
+ if self.lookups:
+ assert len(self.lookups) == 1
+ assert self.lookups[0].lookup_type == 'restrict'
+ tsearch = conn.t.search_name
+ sql = sql.where(tsearch.c.place_id == t.c.parent_place_id)\
+ .where(sa.func.array_cat(tsearch.c.name_vector,
+ tsearch.c.nameaddress_vector,
+ type_=ARRAY(sa.Integer))
+ .contains(self.lookups[0].tokens))
+
+ for ranking in self.rankings:
+ penalty += ranking.sql_penalty(conn.t.search_name)
+ penalty += sa.case(*((t.c.postcode == v, p) for v, p in self.postcodes),
+ else_=1.0)
+
+
+ sql = sql.add_columns(penalty.label('accuracy'))
+ sql = sql.order_by('accuracy')
+
+ results = nres.SearchResults()
+ for row in await conn.execute(sql.limit(details.max_results)):
+ result = nres.create_from_postcode_row(row, nres.SearchResult)
+ assert result
+ result.accuracy = row.accuracy
+ results.append(result)
+
+ return results
+
class PlaceSearch(AbstractSearch):
details: SearchDetails) -> nres.SearchResults:
""" Find results for the search in the database.
"""
- return nres.SearchResults([])
+ t = conn.t.placex.alias('p')
+ tsearch = conn.t.search_name.alias('s')
+ limit = details.max_results
+
+ sql = sa.select(t.c.place_id, t.c.osm_type, t.c.osm_id, t.c.name,
+ t.c.class_, t.c.type,
+ t.c.address, t.c.extratags,
+ t.c.housenumber, t.c.postcode, t.c.country_code,
+ t.c.wikipedia,
+ t.c.parent_place_id, t.c.rank_address, t.c.rank_search,
+ t.c.centroid,
+ t.c.geometry.ST_Expand(0).label('bbox'))\
+ .where(t.c.place_id == tsearch.c.place_id)
+
+
+ sql = _add_geometry_columns(sql, t.c.geometry, details)
+
+ penalty: SaExpression = sa.literal(self.penalty)
+ for ranking in self.rankings:
+ penalty += ranking.sql_penalty(tsearch)
+
+ for lookup in self.lookups:
+ sql = sql.where(lookup.sql_condition(tsearch))
+
+ if self.countries:
+ sql = sql.where(tsearch.c.country_code.in_(self.countries.values))
+
+ if self.postcodes:
+ tpc = conn.t.postcode
+ if self.expected_count > 1000:
+ # Many results expected. Restrict by postcode.
+ sql = sql.where(sa.select(tpc.c.postcode)
+ .where(tpc.c.postcode.in_(self.postcodes.values))
+ .where(tsearch.c.centroid.ST_DWithin(tpc.c.geometry, 0.12))
+ .exists())
+
+ # Less results, only have a preference for close postcodes
+ pc_near = sa.select(sa.func.min(tpc.c.geometry.ST_Distance(tsearch.c.centroid)))\
+ .where(tpc.c.postcode.in_(self.postcodes.values))\
+ .scalar_subquery()
+ penalty += sa.case((t.c.postcode.in_(self.postcodes.values), 0.0),
+ else_=sa.func.coalesce(pc_near, 2.0))
+
+ if details.viewbox is not None:
+ if details.bounded_viewbox:
+ sql = sql.where(tsearch.c.centroid.intersects(details.viewbox.sql_value()))
+ else:
+ penalty += sa.case((t.c.geometry.intersects(details.viewbox.sql_value()), 0.0),
+ (t.c.geometry.intersects(details.viewbox_x2.sql_value()), 1.0),
+ else_=2.0)
+
+ if details.near is not None:
+ if details.near_radius is not None:
+ sql = sql.where(tsearch.c.centroid.ST_DWithin(details.near.sql_value(),
+ details.near_radius))
+ sql = sql.add_columns(-tsearch.c.centroid.ST_Distance(details.near.sql_value())
+ .label('importance'))
+ sql = sql.order_by(sa.desc(sa.text('importance')))
+ else:
+ sql = sql.order_by(penalty - sa.case((tsearch.c.importance > 0, tsearch.c.importance),
+ else_=0.75001-(sa.cast(tsearch.c.search_rank, sa.Float())/40)))
+ sql = sql.add_columns(t.c.importance)
+
+
+ sql = sql.add_columns(penalty.label('accuracy'))\
+ .order_by(sa.text('accuracy'))
+
+ if self.housenumbers:
+ hnr_regexp = f"\\m({'|'.join(self.housenumbers.values)})\\M"
+ sql = sql.where(tsearch.c.address_rank.between(16, 30))\
+ .where(sa.or_(tsearch.c.address_rank < 30,
+ t.c.housenumber.regexp_match(hnr_regexp, flags='i')))
+
+ # Cross check for housenumbers, need to do that on a rather large
+ # set. Worst case there are 40.000 main streets in OSM.
+ inner = sql.limit(10000).subquery()
+
+ # Housenumbers from placex
+ thnr = conn.t.placex.alias('hnr')
+ pid_list = array_agg(thnr.c.place_id) # type: ignore[no-untyped-call]
+ place_sql = sa.select(pid_list)\
+ .where(thnr.c.parent_place_id == inner.c.place_id)\
+ .where(thnr.c.housenumber.regexp_match(hnr_regexp, flags='i'))\
+ .where(thnr.c.linked_place_id == None)\
+ .where(thnr.c.indexed_status == 0)
+
+ if details.excluded:
+ place_sql = place_sql.where(thnr.c.place_id.not_in(details.excluded))
+ if self.qualifiers:
+ place_sql = place_sql.where(self.qualifiers.sql_restrict(thnr))
+
+ numerals = [int(n) for n in self.housenumbers.values if n.isdigit()]
+ interpol_sql: SaExpression
+ tiger_sql: SaExpression
+ if numerals and \
+ (not self.qualifiers or ('place', 'house') in self.qualifiers.values):
+ # Housenumbers from interpolations
+ interpol_sql = _make_interpolation_subquery(conn.t.osmline, inner,
+ numerals, details)
+ # Housenumbers from Tiger
+ tiger_sql = sa.case((inner.c.country_code == 'us',
+ _make_interpolation_subquery(conn.t.tiger, inner,
+ numerals, details)
+ ), else_=None)
+ else:
+ interpol_sql = sa.literal(None)
+ tiger_sql = sa.literal(None)
+
+ unsort = sa.select(inner, place_sql.scalar_subquery().label('placex_hnr'),
+ interpol_sql.label('interpol_hnr'),
+ tiger_sql.label('tiger_hnr')).subquery('unsort')
+ sql = sa.select(unsort)\
+ .order_by(sa.case((unsort.c.placex_hnr != None, 1),
+ (unsort.c.interpol_hnr != None, 2),
+ (unsort.c.tiger_hnr != None, 3),
+ else_=4),
+ unsort.c.accuracy)
+ else:
+ sql = sql.where(t.c.linked_place_id == None)\
+ .where(t.c.indexed_status == 0)
+ if self.qualifiers:
+ sql = sql.where(self.qualifiers.sql_restrict(t))
+ if details.excluded:
+ sql = sql.where(tsearch.c.place_id.not_in(details.excluded))
+ if details.min_rank > 0:
+ sql = sql.where(sa.or_(tsearch.c.address_rank >= details.min_rank,
+ tsearch.c.search_rank >= details.min_rank))
+ if details.max_rank < 30:
+ sql = sql.where(sa.or_(tsearch.c.address_rank <= details.max_rank,
+ tsearch.c.search_rank <= details.max_rank))
+ if details.layers is not None:
+ sql = sql.where(_filter_by_layer(t, details.layers))
+
+
+ results = nres.SearchResults()
+ for row in await conn.execute(sql.limit(limit)):
+ result = nres.create_from_placex_row(row, nres.SearchResult)
+ assert result
+ result.bbox = Bbox.from_wkb(row.bbox.data)
+ result.accuracy = row.accuracy
+ if not details.excluded or not result.place_id in details.excluded:
+ results.append(result)
+
+ if self.housenumbers and row.rank_address < 30:
+ if row.placex_hnr:
+ subs = _get_placex_housenumbers(conn, row.placex_hnr, details)
+ elif row.interpol_hnr:
+ subs = _get_osmline(conn, row.interpol_hnr, numerals, details)
+ elif row.tiger_hnr:
+ subs = _get_tiger(conn, row.tiger_hnr, numerals, row.osm_id, details)
+ else:
+ subs = None
+
+ if subs is not None:
+ async for sub in subs:
+ assert sub.housenumber
+ sub.accuracy = result.accuracy
+ if not any(nr in self.housenumbers.values
+ for nr in sub.housenumber.split(';')):
+ sub.accuracy += 0.6
+ results.append(sub)
+
+ result.accuracy += 1.0 # penalty for missing housenumber
+
+ return results
projects / nominatim.git / blobdiff