X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6867b240d5d23c22ae04c57d65881d54d793da73..b1b25d9a10ea7b97e12effc4313f140c17730c78:/test/bdd/steps/osm_data.py diff --git a/test/bdd/steps/osm_data.py b/test/bdd/steps/osm_data.py index f56a106a..bb146ce4 100644 --- a/test/bdd/steps/osm_data.py +++ b/test/bdd/steps/osm_data.py @@ -4,13 +4,13 @@ import random import os from nose.tools import * # for assert functions -@given(u'the (\d+ )?grid') +@given(u'the ([0-9.]+ )?grid') def define_node_grid(context, grid_step): """ Define a grid of node positions. """ if grid_step is not None: - grid_step = int(grd_step.strip()) + grid_step = float(grid_step.strip()) else: grid_step = 0.00001 @@ -78,8 +78,8 @@ def update_from_osm_file(context): context.nominatim.run_setup_script('create-functions', 'create-partition-functions') cur = context.db.cursor() - cur.execute("""insert into placex (osm_type, osm_id, class, type, name, - admin_level, address, extratags, geometry) select * from place""") + cur.execute("""insert into placex (osm_type, osm_id, class, type, name, admin_level, address, extratags, geometry) + select osm_type, osm_id, class, type, name, admin_level, address, extratags, geometry from place""") cur.execute( """insert into location_property_osmline (osm_id, address, linegeo) SELECT osm_id, address, geometry from place