X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/7c7d15fe82f5516f6d65308bb6318618921fb2dc..8e212a3d0c5df2cd6af04f8b7af1f74ca158aa0e:/test/bdd/steps/table_compare.py diff --git a/test/bdd/steps/table_compare.py b/test/bdd/steps/table_compare.py index ca6c3020..cf2e12f1 100644 --- a/test/bdd/steps/table_compare.py +++ b/test/bdd/steps/table_compare.py @@ -157,11 +157,15 @@ class DBRow: ST_SetSRID('{geomtxt}'::geometry, 4326))""".format(**self.db_row)) return cur.fetchone()[0] - x, y = expected.split(' ') + if ' ' in expected: + x, y = expected.split(' ') + else: + x, y = self.context.osm.grid_node(int(expected)) + return Almost(float(x)) == self.db_row['cx'] and Almost(float(y)) == self.db_row['cy'] def _has_geometry(self, expected): - geom = self.context.osm.parse_geometry(expected, self.context.scene) + geom = self.context.osm.parse_geometry(expected) with self.context.db.cursor() as cur: cur.execute("""SELECT ST_Equals(ST_SnapToGrid({}, 0.00001, 0.00001), ST_SnapToGrid(ST_SetSRID('{}'::geometry, 4326), 0.00001, 0.00001))""".format(