Merge remote-tracking branch 'upstream/master'

[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 0082bd081e3056445ea3dd6383fb3db4cea9611c..7590b17c9c81c7a97c4f9cfc0bdf339db2cc4405 100644 (file)
--- a/test/bdd/steps/steps_osm_data.py
+++ b/test/bdd/steps/steps_osm_data.py
@@ -10,6 +10,7 @@ import os
 from pathlib import Path
 
 from nominatim.tools.exec_utils import run_osm2pgsql
 from pathlib import Path
 
 from nominatim.tools.exec_utils import run_osm2pgsql

+from nominatim.tools.replication import run_osm2pgsql_updates

 
 from geometry_alias import ALIASES
 
 
 from geometry_alias import ALIASES
 


@@ -118,6 +119,15 @@ def update_from_osm_file(context):
     # create an OSM file and import it
     fname = write_opl_file(context.text, context.osm)
     try:
     # create an OSM file and import it
     fname = write_opl_file(context.text, context.osm)
     try:

-        run_osm2pgsql(get_osm2pgsql_options(context.nominatim, fname, append=True))
+        run_osm2pgsql_updates(context.db,
+                              get_osm2pgsql_options(context.nominatim, fname, append=True))

     finally:
         os.remove(fname)
     finally:
         os.remove(fname)

+
+@when('indexing')
+def index_database(context):
+    """
+    Run the Nominatim indexing step. This will process data previously
+    loaded with 'updating osm data'
+    """
+    context.nominatim.run_nominatim('index')