hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-14 18:37:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove support for deprecated gazetteer osm2pgsql output

Browse Source
This commit is contained in:
Sarah Hoffmann
2025-06-25 23:09:08 +02:00
parent f97a0a76f2
commit f9eb93c4ab
7 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/python/tools/conftest.py
View File

@@ -26,7 +26,8 @@ fi
return dict(osm2pgsql=str(osm2pgsql_exec),
osm2pgsql_cache=10,
osm2pgsql_style='style.file',
osm2pgsql_style='style.lua',
osm2pgsql_style_path=tmp_path,
threads=1,
dsn='dbname=' + temp_db,
flatnode_file='',

4
test/python/tools/test_add_osm_data.py
View File

@@ -37,7 +37,7 @@ def test_import_osm_file_simple(dsn, table_factory, osm2pgsql_options, capfd):
captured = capfd.readouterr()
assert '--append' in captured.out
assert '--output gazetteer' in captured.out
assert '--output flex' in captured.out
assert f'--style {osm2pgsql_options["osm2pgsql_style"]}' in captured.out
assert f'--number-processes {osm2pgsql_options["threads"]}' in captured.out
assert f'--cache {osm2pgsql_options["osm2pgsql_cache"]}' in captured.out
@@ -57,7 +57,7 @@ def test_import_osm_object_main_api(dsn, osm2pgsql_options, monkeypatch,
assert get_url_mock.url.startswith(url)
assert '--append' in captured.out
assert '--output gazetteer' in captured.out
assert '--output flex' in captured.out
assert f'--style {osm2pgsql_options["osm2pgsql_style"]}' in captured.out
assert f'--number-processes {osm2pgsql_options["threads"]}' in captured.out
assert f'--cache {osm2pgsql_options["osm2pgsql_cache"]}' in captured.out

2
test/python/tools/test_database_import.py
View File

@@ -83,7 +83,7 @@ def test_import_osm_data_simple(table_factory, osm2pgsql_options, capfd):
captured = capfd.readouterr()
assert '--create' in captured.out
assert '--output gazetteer' in captured.out
assert '--output flex' in captured.out
assert f'--style {osm2pgsql_options["osm2pgsql_style"]}' in captured.out
assert f'--number-processes {osm2pgsql_options["threads"]}' in captured.out
assert f'--cache {osm2pgsql_options["osm2pgsql_cache"]}' in captured.out