X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/02068aec7fac3448ad5ff4272364a74465b6d3ee..67462e095319038fa53636decb69dcf40f0c6dee:/test/bdd/steps/steps_osm_data.py?ds=sidebyside diff --git a/test/bdd/steps/steps_osm_data.py b/test/bdd/steps/steps_osm_data.py index d6945387..0c1b421d 100644 --- a/test/bdd/steps/steps_osm_data.py +++ b/test/bdd/steps/steps_osm_data.py @@ -1,15 +1,16 @@ -# SPDX-License-Identifier: GPL-2.0-only +# SPDX-License-Identifier: GPL-3.0-or-later # # This file is part of Nominatim. (https://nominatim.org) # -# Copyright (C) 2022 by the Nominatim developer community. +# Copyright (C) 2024 by the Nominatim developer community. # For a full list of authors see the git log. import tempfile import random import os from pathlib import Path -from nominatim.tools.exec_utils import run_osm2pgsql +from nominatim_db.tools.exec_utils import run_osm2pgsql +from nominatim_db.tools.replication import run_osm2pgsql_updates from geometry_alias import ALIASES @@ -17,7 +18,8 @@ def get_osm2pgsql_options(nominatim_env, fname, append): return dict(import_file=fname, osm2pgsql=str(nominatim_env.build_dir / 'osm2pgsql' / 'osm2pgsql'), osm2pgsql_cache=50, - osm2pgsql_style=str(nominatim_env.src_dir / 'settings' / 'import-extratags.style'), + osm2pgsql_style=str(nominatim_env.get_test_config().get_import_style_file()), + osm2pgsql_style_path=nominatim_env.get_test_config().config_dir, threads=1, dsn=nominatim_env.get_libpq_dsn(), flatnode_file='', @@ -47,9 +49,14 @@ def write_opl_file(opl, grid): return fd.name -@given(u'the scene (?P.+)') -def set_default_scene(context, scene): - context.scene = scene +@given('the lua style file') +def lua_style_file(context): + """ Define a custom style file to use for the import. + """ + style = Path(context.nominatim.website_dir.name) / 'custom.lua' + style.write_text(context.text) + context.nominatim.test_env['NOMINATIM_IMPORT_STYLE'] = str(style) + @given(u'the ([0-9.]+ )?grid(?: with origin (?P.*))?') def define_node_grid(context, grid_step, origin): @@ -68,7 +75,7 @@ def define_node_grid(context, grid_step, origin): # TODO coordinate coords = origin.split(',') if len(coords) != 2: - raise RuntimeError('Grid origin expects orgin with x,y coordinates.') + raise RuntimeError('Grid origin expects origin with x,y coordinates.') origin = (float(coords[0]), float(coords[1])) elif origin in ALIASES: origin = ALIASES[origin] @@ -121,6 +128,15 @@ def update_from_osm_file(context): # 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) + +@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')