more formatting fixes

[nominatim.git] / nominatim / indexer / runners.py

diff --git a/nominatim/indexer/runners.py b/nominatim/indexer/runners.py
index 459f80044f90b1dc10aa61ba9741591bf3aca27a..181de45a18af06a4792209c45d1278abcc35cdbc 100644 (file)
--- a/nominatim/indexer/runners.py
+++ b/nominatim/indexer/runners.py
@@ -25,10 +25,11 @@ class AbstractPlacexRunner:
                    SET indexed_status = 0, address = v.addr, token_info = v.ti
                    FROM (VALUES {}) as v(id, addr, ti)
                    WHERE place_id = v.id
-               """.format(','.join(["(%s, %s::hstore, %s::jsonb)"]  * num_places))
+               """.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):
@@ -116,7 +124,7 @@ class InterpolationRunner:
                    SET indexed_status = 0, address = v.addr, token_info = v.ti
                    FROM (VALUES {}) as v(id, addr, ti)
                    WHERE place_id = v.id
-               """.format(','.join(["(%s, %s::hstore, %s::jsonb)"]  * num_places))
+               """.format(','.join(["(%s, %s::hstore, %s::jsonb)"] * num_places))
 
 
     def index_places(self, worker, places):