X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/4f2d73aa7c185af5546094449355580d3564cdc6..193cf663283d3543d335ca3949c2d510920f85ff:/test/bdd/steps/db_ops.py?ds=inline diff --git a/test/bdd/steps/db_ops.py b/test/bdd/steps/db_ops.py index b7fa1a88..df1d1688 100644 --- 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)' % ( @@ -90,6 +93,12 @@ class NominatimID: self.oid = m.group('id') self.cls = m.group('cls') + def __str__(self): + if self.cls is None: + return self.typ + self.oid + + return '%s%d:%s' % (self.typ, self.oid, self.cls) + def table_select(self): """ Return where clause and parameter list to select the object from a Nominatim table. @@ -106,7 +115,9 @@ class NominatimID: def get_place_id(self, cur): where, params = self.table_select() cur.execute("SELECT place_id FROM placex WHERE %s" % where, params) - eq_(1, cur.rowcount, "Expected exactly 1 entry in placex found %s" % cur.rowcount) + eq_(1, cur.rowcount, + "Expected exactly 1 entry in placex for %s found %s" + % (str(self), cur.rowcount)) return cur.fetchone()[0] @@ -118,14 +129,17 @@ def assert_db_column(row, column, value, context): if column.startswith('centroid'): 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']) + assert_almost_equal(float(x) * fac, row['cx'], "Bad x coordinate") + assert_almost_equal(float(y) * fac, row['cy'], "Bad y coordinate") 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) + query = "SELECT ST_Equals(ST_SnapToGrid(%s, 0.00001, 0.00001), ST_SnapToGrid(ST_SetSRID('%s'::geometry, 4326), 0.00001, 0.00001))" % ( + geom, row['geomtxt'],) + cur.execute(query) + eq_(cur.fetchone()[0], True, "(Row %s failed: %s)" % (column, query)) + elif value == '-': + assert_is_none(row[column], "Row %s" % column) else: eq_(value, str(row[column]), "Row '%s': expected: %s, got: %s" @@ -213,9 +227,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') @@ -233,7 +251,14 @@ def update_place_table(context): col.db_insert(cur) context.db.commit() - context.nominatim.run_update_script('index') + + while True: + context.nominatim.run_update_script('index') + + cur = context.db.cursor() + cur.execute("SELECT 'a' FROM placex WHERE indexed_status != 0 LIMIT 1") + if cur.rowcount == 0: + break @when("marking for delete (?P.*)") def delete_places(context, oids): @@ -244,7 +269,14 @@ def delete_places(context, oids): where, params = NominatimID(oid).table_select() cur.execute("DELETE FROM place WHERE " + where, params) context.db.commit() - context.nominatim.run_update_script('index') + + while True: + context.nominatim.run_update_script('index') + + cur = context.db.cursor() + cur.execute("SELECT 'a' FROM placex WHERE indexed_status != 0 LIMIT 1") + if cur.rowcount == 0: + break @then("placex contains(?P exactly)?") def check_placex_contents(context, exact): @@ -258,6 +290,7 @@ def check_placex_contents(context, exact): ST_X(centroid) as cx, ST_Y(centroid) as cy FROM placex where %s""" % where, params) + assert_less(0, cur.rowcount, "No rows found for " + row['object']) for res in cur: if exact: @@ -286,6 +319,52 @@ def check_placex_contents(context, exact): context.db.commit() +@then("place contains(?P exactly)?") +def check_placex_contents(context, exact): + cur = context.db.cursor(cursor_factory=psycopg2.extras.DictCursor) + + expected_content = set() + for row in context.table: + nid = NominatimID(row['object']) + where, params = nid.table_select() + cur.execute("""SELECT *, ST_AsText(geometry) as geomtxt, + ST_GeometryType(geometry) as geometrytype + FROM place where %s""" % where, + params) + assert_less(0, cur.rowcount, "No rows found for " + row['object']) + + for res in cur: + if exact: + expected_content.add((res['osm_type'], res['osm_id'], res['class'])) + for h in row.headings: + msg = "%s: %s" % (row['object'], h) + if h in ('name', 'extratags'): + if row[h] == '-': + assert_is_none(res[h], msg) + else: + vdict = eval('{' + row[h] + '}') + assert_equals(vdict, res[h], msg) + elif h.startswith('name+'): + assert_equals(res['name'][h[5:]], row[h], msg) + elif h.startswith('extratags+'): + assert_equals(res['extratags'][h[10:]], row[h], msg) + elif h in ('linked_place_id', 'parent_place_id'): + if row[h] == '0': + assert_equals(0, res[h], msg) + elif row[h] == '-': + assert_is_none(res[h], msg) + else: + assert_equals(NominatimID(row[h]).get_place_id(context.db.cursor()), + res[h], msg) + else: + assert_db_column(res, h, row[h], context) + + if exact: + cur.execute('SELECT osm_type, osm_id, class from place') + eq_(expected_content, set([(r[0], r[1], r[2]) for r in cur])) + + context.db.commit() + @then("search_name contains") def check_search_name_contents(context): cur = context.db.cursor(cursor_factory=psycopg2.extras.DictCursor) @@ -294,6 +373,7 @@ def check_search_name_contents(context): pid = NominatimID(row['object']).get_place_id(cur) cur.execute("""SELECT *, ST_X(centroid) as cx, ST_Y(centroid) as cy FROM search_name WHERE place_id = %s""", (pid, )) + assert_less(0, cur.rowcount, "No rows found for " + row['object']) for res in cur: for h in row.headings: @@ -314,6 +394,27 @@ def check_search_name_contents(context): context.db.commit() +@then("place_addressline contains") +def check_place_addressline(context): + cur = context.db.cursor(cursor_factory=psycopg2.extras.DictCursor) + + for row in context.table: + pid = NominatimID(row['object']).get_place_id(cur) + apid = NominatimID(row['address']).get_place_id(cur) + cur.execute(""" SELECT * FROM place_addressline + WHERE place_id = %s AND address_place_id = %s""", + (pid, apid)) + assert_less(0, cur.rowcount, + "No rows found for place %s and address %s" + % (row['object'], row['address'])) + + for res in cur: + for h in row.headings: + if h not in ('address', 'object'): + assert_db_column(res, h, row[h], context) + + context.db.commit() + @then("(?P\w+) expands to(?P no)? interpolation") def check_location_property_osmline(context, oid, neg): cur = context.db.cursor(cursor_factory=psycopg2.extras.DictCursor) @@ -322,7 +423,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: @@ -357,12 +459,12 @@ def check_location_property_osmline(context, oid, neg): eq_(todo, []) -@then("placex has no entry for (?P.*)") -def check_placex_has_entry(context, oid): +@then("(?Pplacex|place) has no entry for (?P.*)") +def check_placex_has_entry(context, table, oid): cur = context.db.cursor(cursor_factory=psycopg2.extras.DictCursor) nid = NominatimID(oid) where, params = nid.table_select() - cur.execute("SELECT * FROM placex where %s" % where, params) + cur.execute("SELECT * FROM %s where %s" % (table, where), params) eq_(0, cur.rowcount) context.db.commit()