Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / steps / osm_data.py

diff --git a/test/bdd/steps/osm_data.py b/test/bdd/steps/osm_data.py
index 588dcefe06c64c39cb99c2413de6dacc8b9a319d..bb146ce4d1145f8016318b9e4773299f3e2d29a2 100644 (file)
--- 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
 
 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:
 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
 
     else:
         grid_step = 0.00001
 


@@ -78,13 +78,13 @@ def update_from_osm_file(context):
     context.nominatim.run_setup_script('create-functions', 'create-partition-functions')
 
     cur = context.db.cursor()
     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(
     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, 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()
     context.nominatim.run_setup_script('index', 'index-noanalyse')
     context.nominatim.run_setup_script('create-functions', 'create-partition-functions',
     context.db.commit()
     context.nominatim.run_setup_script('index', 'index-noanalyse')
     context.nominatim.run_setup_script('create-functions', 'create-partition-functions',