X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6ce6f62b8ef7cec8b5950293516845e319dd5f06..f8b5a63de39691ea6e7fcb9180a856f0d2650999:/nominatim/indexer/runners.py diff --git a/nominatim/indexer/runners.py b/nominatim/indexer/runners.py index 459f8004..aa607faa 100644 --- a/nominatim/indexer/runners.py +++ b/nominatim/indexer/runners.py @@ -28,7 +28,8 @@ class AbstractPlacexRunner: """.format(','.join(["(%s, %s::hstore, %s::jsonb)"] * num_places)) - def get_place_details(self, worker, ids): + @staticmethod + def get_place_details(worker, ids): worker.perform("""SELECT place_id, (placex_prepare_update(placex)).* FROM placex WHERE place_id IN %s""", (tuple((p[0] for p in ids)), )) @@ -103,12 +104,19 @@ class InterpolationRunner: @staticmethod def sql_get_objects(): - return """SELECT place_id, get_interpolation_address(address, osm_id) as address + return """SELECT place_id FROM location_property_osmline WHERE indexed_status > 0 ORDER BY geometry_sector""" + @staticmethod + def get_place_details(worker, ids): + worker.perform("""SELECT place_id, get_interpolation_address(address, osm_id) as address + FROM location_property_osmline WHERE place_id IN %s""", + (tuple((p[0] for p in ids)), )) + + @staticmethod @functools.lru_cache(maxsize=1) def _index_sql(num_places):