X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/82a0e23265bac61904dd3692f0fd57a73d2b7dc3..c20f8b13a57f25ce9dff25cf17666f5ddb790812:/test/bdd/steps/db_ops.py

diff --git a/test/bdd/steps/db_ops.py b/test/bdd/steps/db_ops.py
index 3f6c7976..82209462 100644
--- a/test/bdd/steps/db_ops.py
+++ b/test/bdd/steps/db_ops.py
@@ -23,7 +23,7 @@ class PlaceColumn:
         else:
             assert_in(key, ('class', 'type', 'street', 'addr_place',
                             'isin', 'postcode'))
-            self.columns[key] = value
+            self.columns[key] = None if value == '' else value
 
     def set_key_name(self, value):
         self.add_hstore('name', 'name', value)
@@ -39,10 +39,10 @@ class PlaceColumn:
         self.columns['admin_level'] = int(value)
 
     def set_key_housenr(self, value):
-        self.columns['housenumber'] = value
+        self.columns['housenumber'] = None if value == '' else value
 
     def set_key_country(self, value):
-        self.columns['country_code'] = value
+        self.columns['country_code'] = None if value == '' else value
 
     def set_key_geometry(self, value):
         self.geometry = self.context.osm.parse_geometry(value, self.context.scene)
@@ -98,7 +98,7 @@ class NominatimID:
         params = [self.typ, self. oid]
 
         if self.cls is not None:
-            where += ' class = %s'
+            where += ' and class = %s'
             params.append(self.cls)
 
         return where, params
@@ -111,15 +111,21 @@ class NominatimID:
         return cur.fetchone()[0]
 
 
-def assert_db_column(row, column, value):
+def assert_db_column(row, column, value, context):
     if column == 'object':
         return
 
     if column.startswith('centroid'):
-        fac = float(column[9:]) if h.startswith('centroid*') else 1.0
+        fac = float(column[9:]) if column.startswith('centroid*') else 1.0
         x, y = value.split(' ')
         assert_almost_equal(float(x) * fac, row['cx'])
         assert_almost_equal(float(y) * fac, row['cy'])
+    elif column == 'geometry':
+        geom = context.osm.parse_geometry(value, context.scene)
+        cur = context.db.cursor()
+        cur.execute("SELECT ST_Equals(%s, ST_SetSRID(%%s::geometry, 4326))" % geom,
+                    (row['geomtxt'],))
+        eq_(cur.fetchone()[0], True)
     else:
         eq_(value, str(row[column]),
             "Row '%s': expected: %s, got: %s"
@@ -213,7 +219,32 @@ def import_and_index_data_from_place_table(context):
     context.db.commit()
     context.nominatim.run_setup_script('index', 'index-noanalyse')
 
+@when("updating places")
+def update_place_table(context):
+    context.nominatim.run_setup_script(
+        'create-functions', 'create-partition-functions', 'enable-diff-updates')
+    cur = context.db.cursor()
+    for r in context.table:
+        col = PlaceColumn(context, False)
+
+        for h in r.headings:
+            col.add(h, r[h])
 
+        col.db_insert(cur)
+
+    context.db.commit()
+    context.nominatim.run_update_script('index')
+
+@when("marking for delete (?P<oids>.*)")
+def delete_places(context, oids):
+    context.nominatim.run_setup_script(
+        'create-functions', 'create-partition-functions', 'enable-diff-updates')
+    cur = context.db.cursor()
+    for oid in oids.split(','):
+        where, params = NominatimID(oid).table_select()
+        cur.execute("DELETE FROM place WHERE " + where, params)
+    context.db.commit()
+    context.nominatim.run_update_script('index')
 
 @then("placex contains(?P<exact> exactly)?")
 def check_placex_contents(context, exact):
@@ -247,7 +278,7 @@ def check_placex_contents(context, exact):
                         eq_(NominatimID(row[h]).get_place_id(context.db.cursor()),
                             res[h])
                 else:
-                    assert_db_column(res, h, row[h])
+                    assert_db_column(res, h, row[h], context)
 
     if exact:
         cur.execute('SELECT osm_type, osm_id, class from placex')
@@ -278,11 +309,49 @@ def check_search_name_contents(context):
                         assert_in(wid[0], res[h],
                                   "Missing term for %s/%s: %s" % (pid, h, wid[1]))
                 else:
-                    assert_db_column(res, h, row[h])
+                    assert_db_column(res, h, row[h], context)
 
 
     context.db.commit()
 
+@then("(?P<oid>\w+) expands to interpolation")
+def check_location_property_osmline(context, oid):
+    cur = context.db.cursor(cursor_factory=psycopg2.extras.DictCursor)
+    nid = NominatimID(oid)
+
+    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""",
+                (nid.oid, ))
+
+    todo = list(range(len(list(context.table))))
+    for res in cur:
+        for i in todo:
+            row = context.table[i]
+            if (int(row['start']) == res['startnumber']
+                and int(row['end']) == res['endnumber']):
+                todo.remove(i)
+                break
+        else:
+            assert False, "Unexpected row %s" % (str(res))
+
+        for h in row.headings:
+            if h in ('start', 'end'):
+                continue
+            elif h == 'parent_place_id':
+                if row[h] == '0':
+                    eq_(0, res[h])
+                elif row[h] == '-':
+                    assert_is_none(res[h])
+                else:
+                    eq_(NominatimID(row[h]).get_place_id(context.db.cursor()),
+                        res[h])
+            else:
+                assert_db_column(res, h, row[h], context)
+
+    eq_(todo, [])
+
 
 @then("placex has no entry for (?P<oid>.*)")
 def check_placex_has_entry(context, oid):