Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / steps / db_ops.py

diff --git a/test/bdd/steps/db_ops.py b/test/bdd/steps/db_ops.py
index 3c5c56323af6d916c71537918e704c8ee607ad82..fa66cd4df260765ce9d44ef676bc556a3a319ec1 100644 (file)
--- a/test/bdd/steps/db_ops.py
+++ b/test/bdd/steps/db_ops.py
@@ -61,8 +61,11 @@ class PlaceColumn:
                                            for _ in range(int(random.random()*30))))
 
         if self.columns['osm_type'] == 'N' and self.geometry is None:
-            self.geometry = "ST_SetSRID(ST_Point(%f, %f), 4326)" % (
-                            random.random()*360 - 180, random.random()*180 - 90)
+            pt = self.context.osm.grid_node(self.columns['osm_id'])
+            if pt is None:
+                pt = (random.random()*360 - 180, random.random()*180 - 90)
+
+            self.geometry = "ST_SetSRID(ST_Point(%f, %f), 4326)" % pt
         else:
             assert_is_not_none(self.geometry, "Geometry missing")
         query = 'INSERT INTO place (%s, geometry) values(%s, %s)' % (
@@ -216,9 +219,13 @@ def import_and_index_data_from_place_table(context):
            geometry)
            select * from place where not (class='place' and type='houses' and osm_type='W')""")
     cur.execute(
-        """select insert_osmline (osm_id, housenumber, street, addr_place,
-           postcode, country_code, geometry)
-           from place where class='place' and type='houses' and osm_type='W'""")
+            """insert into location_property_osmline
+               (osm_id, interpolationtype, street, addr_place,
+                postcode, calculated_country_code, linegeo)
+             SELECT osm_id, housenumber, street, addr_place,
+                    postcode, country_code, geometry from place
+              WHERE class='place' and type='houses' and osm_type='W'
+                    and ST_GeometryType(geometry) = 'ST_LineString'""")
     context.db.commit()
     context.nominatim.run_setup_script('index', 'index-noanalyse')
 
@@ -373,7 +380,8 @@ def check_location_property_osmline(context, oid, neg):
     eq_('W', nid.typ, "interpolation must be a way")
 
     cur.execute("""SELECT *, ST_AsText(linegeo) as geomtxt
-                   FROM location_property_osmline WHERE osm_id = %s""",
+                   FROM location_property_osmline
+                   WHERE osm_id = %s AND startnumber IS NOT NULL""",
                 (nid.oid, ))
 
     if neg: