X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c48fb88e6b4020e960ccb656cb0741ab5f2fec74..3e64019afe8419ea5b35a3fbd1e6c9dabfc8d983:/test/bdd/steps/osm_data.py?ds=sidebyside diff --git a/test/bdd/steps/osm_data.py b/test/bdd/steps/osm_data.py index d0d8d892..122b2461 100644 --- a/test/bdd/steps/osm_data.py +++ b/test/bdd/steps/osm_data.py @@ -78,15 +78,11 @@ 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, housenumber, street, addr_place, isin, postcode, - country_code, 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, interpolationtype, street, addr_place, - postcode, calculated_country_code, linegeo) - SELECT osm_id, housenumber, street, addr_place, - postcode, country_code, geometry from place + """insert into location_property_osmline (osm_id, address, linegeo) + SELECT osm_id, address, geometry from place WHERE class='place' and type='houses' and osm_type='W' and ST_GeometryType(geometry) = 'ST_LineString'""") context.db.commit()