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

have ADDRESS_LEVEL_CONFIG use load_sub_configuration

Browse Source 
This means that relative paths now are looked up in the
project directory.
This commit is contained in:
Sarah Hoffmann
2021-10-22 16:31:33 +02:00
parent c77df2d1eb
commit 0ae8d7ac08
8 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/python/test_cli.py
View File

@@ -186,7 +186,7 @@ class TestCliWithDb:
mock_func_factory(nominatim.tools.database_import, 'create_partition_tables'),
mock_func_factory(nominatim.tools.database_import, 'create_search_indices'),
mock_func_factory(nominatim.tools.country_info, 'create_country_names'),
mock_func_factory(nominatim.tools.refresh, 'load_address_levels_from_file'),
mock_func_factory(nominatim.tools.refresh, 'load_address_levels_from_config'),
mock_func_factory(nominatim.tools.postcodes, 'update_postcodes'),
mock_func_factory(nominatim.indexer.indexer.Indexer, 'index_full'),
mock_func_factory(nominatim.tools.refresh, 'setup_website'),
@@ -321,7 +321,7 @@ class TestCliWithDb:
assert func.called == 1
@pytest.mark.parametrize("command,func", [
('address-levels', 'load_address_levels_from_file'),
('address-levels', 'load_address_levels_from_config'),
('wiki-data', 'import_wikipedia_articles'),
('importance', 'recompute_importance'),
('website', 'setup_website'),

21
test/python/test_tools_refresh_address_levels.py
View File

@@ -6,28 +6,31 @@ from pathlib import Path
import pytest
from nominatim.tools.refresh import load_address_levels, load_address_levels_from_file
from nominatim.tools.refresh import load_address_levels, load_address_levels_from_config
def test_load_ranks_def_config(temp_db_conn, temp_db_cursor, def_config):
load_address_levels_from_file(temp_db_conn, Path(def_config.ADDRESS_LEVEL_CONFIG))
load_address_levels_from_config(temp_db_conn, def_config)
assert temp_db_cursor.table_rows('address_levels') > 0
def test_load_ranks_from_file(temp_db_conn, temp_db_cursor, tmp_path):
test_file = tmp_path / 'test_levels.json'
def test_load_ranks_from_project_dir(def_config, temp_db_conn, temp_db_cursor,
tmp_path):
test_file = tmp_path / 'address-levels.json'
test_file.write_text('[{"tags":{"place":{"sea":2}}}]')
def_config.project_dir = tmp_path
load_address_levels_from_file(temp_db_conn, test_file)
load_address_levels_from_config(temp_db_conn, def_config)
assert temp_db_cursor.table_rows('address_levels') > 0
assert temp_db_cursor.table_rows('address_levels') == 1
def test_load_ranks_from_broken_file(temp_db_conn, tmp_path):
test_file = tmp_path / 'test_levels.json'
def test_load_ranks_from_broken_file(def_config, temp_db_conn, tmp_path):
test_file = tmp_path / 'address-levels.json'
test_file.write_text('[{"tags":"place":{"sea":2}}}]')
def_config.project_dir = tmp_path
with pytest.raises(json.decoder.JSONDecodeError):
load_address_levels_from_file(temp_db_conn, test_file)
load_address_levels_from_config(temp_db_conn, def_config)
def test_load_ranks_country(temp_db_conn, temp_db_cursor):