split cli.py by subcommands

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

diff --git a/test/bdd/steps/steps_osm_data.py b/test/bdd/steps/steps_osm_data.py
index 465ad7182902744c8fb64ac27bb4a020f5035959..3858198b680112017d785c522a62ca4f1b6c2243 100644 (file)
--- a/test/bdd/steps/steps_osm_data.py
+++ b/test/bdd/steps/steps_osm_data.py
@@ -22,6 +22,10 @@ def write_opl_file(opl, grid):
 
         return fd.name
 
 
         return fd.name
 

+@given(u'the scene (?P<scene>.+)')
+def set_default_scene(context, scene):
+    context.scene = scene
+

 @given(u'the ([0-9.]+ )?grid')
 def define_node_grid(context, grid_step):
     """
 @given(u'the ([0-9.]+ )?grid')
 def define_node_grid(context, grid_step):
     """


@@ -35,7 +39,7 @@ def define_node_grid(context, grid_step):
         grid_step = 0.00001
 
     context.osm.set_grid([context.table.headings] + [list(h) for h in context.table],
         grid_step = 0.00001
 
     context.osm.set_grid([context.table.headings] + [list(h) for h in context.table],

-                          grid_step)
+                         grid_step)

 
 
 @when(u'loading osm data')
 
 
 @when(u'loading osm data')


@@ -70,17 +74,7 @@ def update_from_osm_file(context):
 
     The data is expected as attached text in OPL format.
     """
 
     The data is expected as attached text in OPL format.
     """

-    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            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
-              WHERE class='place' and type='houses' and osm_type='W'
-                    and ST_GeometryType(geometry) = 'ST_LineString'""")
-    context.db.commit()
+    context.nominatim.copy_from_place(context.db)

     context.nominatim.run_setup_script('index', 'index-noanalyse')
     context.nominatim.run_setup_script('create-functions', 'create-partition-functions',
                                        'enable-diff-updates')
     context.nominatim.run_setup_script('index', 'index-noanalyse')
     context.nominatim.run_setup_script('create-functions', 'create-partition-functions',
                                        'enable-diff-updates')