X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/200eae3bc0b559e7df7c1d1fb50141830c2f1849..734dff037405469ada9a226be9c98be583823226:/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 336fb707..4cee75f7 100644 --- a/test/bdd/steps/steps_osm_data.py +++ b/test/bdd/steps/steps_osm_data.py @@ -1,22 +1,22 @@ -# 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.tools.replication import run_osm2pgsql_updates +from nominatim_db.tools.exec_utils import run_osm2pgsql +from nominatim_db.tools.replication import run_osm2pgsql_updates from geometry_alias import ALIASES def get_osm2pgsql_options(nominatim_env, fname, append): return dict(import_file=fname, - osm2pgsql=str(nominatim_env.build_dir / 'osm2pgsql' / 'osm2pgsql'), + osm2pgsql='osm2pgsql', osm2pgsql_cache=50, osm2pgsql_style=str(nominatim_env.get_test_config().get_import_style_file()), osm2pgsql_style_path=nominatim_env.get_test_config().config_dir, @@ -75,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]