From: Sarah Hoffmann Date: Wed, 6 Jul 2022 08:54:47 +0000 (+0200) Subject: move PlaceInfo into data submodule X-Git-Tag: v4.1.0~15^2~2 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/bce93d60bd9480e4b1f6c9a899ee6b8d60485352 move PlaceInfo into data submodule This data structure is shared between indexer and tokenizer. --- diff --git a/nominatim/indexer/place_info.py b/nominatim/data/place_info.py similarity index 100% rename from nominatim/indexer/place_info.py rename to nominatim/data/place_info.py diff --git a/nominatim/indexer/runners.py b/nominatim/indexer/runners.py index 9a30ffe6..21b6a44d 100644 --- a/nominatim/indexer/runners.py +++ b/nominatim/indexer/runners.py @@ -12,7 +12,7 @@ import functools from psycopg2 import sql as pysql -from nominatim.indexer.place_info import PlaceInfo +from nominatim.data.place_info import PlaceInfo # pylint: disable=C0111 diff --git a/nominatim/tokenizer/base.py b/nominatim/tokenizer/base.py index f81b3bc2..70a54bfd 100644 --- a/nominatim/tokenizer/base.py +++ b/nominatim/tokenizer/base.py @@ -12,7 +12,7 @@ from abc import ABC, abstractmethod from typing import List, Tuple, Dict, Any from nominatim.config import Configuration -from nominatim.indexer.place_info import PlaceInfo +from nominatim.data.place_info import PlaceInfo # pylint: disable=unnecessary-pass diff --git a/nominatim/tokenizer/icu_tokenizer.py b/nominatim/tokenizer/icu_tokenizer.py index a6ff08a4..171d4392 100644 --- a/nominatim/tokenizer/icu_tokenizer.py +++ b/nominatim/tokenizer/icu_tokenizer.py @@ -16,7 +16,7 @@ from textwrap import dedent from nominatim.db.connection import connect from nominatim.db.utils import CopyBuffer from nominatim.db.sql_preprocessor import SQLPreprocessor -from nominatim.indexer.place_info import PlaceInfo +from nominatim.data.place_info import PlaceInfo from nominatim.tokenizer.icu_rule_loader import ICURuleLoader from nominatim.tokenizer.base import AbstractAnalyzer, AbstractTokenizer diff --git a/nominatim/tools/tiger_data.py b/nominatim/tools/tiger_data.py index 6e37df5e..9903ea2b 100644 --- a/nominatim/tools/tiger_data.py +++ b/nominatim/tools/tiger_data.py @@ -17,7 +17,7 @@ from nominatim.db.connection import connect from nominatim.db.async_connection import WorkerPool from nominatim.db.sql_preprocessor import SQLPreprocessor from nominatim.errors import UsageError -from nominatim.indexer.place_info import PlaceInfo +from nominatim.data.place_info import PlaceInfo LOG = logging.getLogger() diff --git a/test/python/dummy_tokenizer.py b/test/python/dummy_tokenizer.py index 57bf2f2f..ed32c650 100644 --- a/test/python/dummy_tokenizer.py +++ b/test/python/dummy_tokenizer.py @@ -7,7 +7,7 @@ """ Tokenizer for testing. """ -from nominatim.indexer.place_info import PlaceInfo +from nominatim.data.place_info import PlaceInfo from nominatim.config import Configuration def create(dsn, data_dir): diff --git a/test/python/tokenizer/sanitizers/test_clean_housenumbers.py b/test/python/tokenizer/sanitizers/test_clean_housenumbers.py index 34cc7413..128e1201 100644 --- a/test/python/tokenizer/sanitizers/test_clean_housenumbers.py +++ b/test/python/tokenizer/sanitizers/test_clean_housenumbers.py @@ -10,7 +10,7 @@ Tests for the sanitizer that normalizes housenumbers. import pytest from nominatim.tokenizer.place_sanitizer import PlaceSanitizer -from nominatim.indexer.place_info import PlaceInfo +from nominatim.data.place_info import PlaceInfo @pytest.fixture def sanitize(request): diff --git a/test/python/tokenizer/sanitizers/test_clean_postcodes.py b/test/python/tokenizer/sanitizers/test_clean_postcodes.py index 44376196..2446999a 100644 --- a/test/python/tokenizer/sanitizers/test_clean_postcodes.py +++ b/test/python/tokenizer/sanitizers/test_clean_postcodes.py @@ -10,7 +10,7 @@ Tests for the sanitizer that normalizes postcodes. import pytest from nominatim.tokenizer.place_sanitizer import PlaceSanitizer -from nominatim.indexer.place_info import PlaceInfo +from nominatim.data.place_info import PlaceInfo from nominatim.tools import country_info @pytest.fixture diff --git a/test/python/tokenizer/sanitizers/test_split_name_list.py b/test/python/tokenizer/sanitizers/test_split_name_list.py index 47bd1e44..67157fba 100644 --- a/test/python/tokenizer/sanitizers/test_split_name_list.py +++ b/test/python/tokenizer/sanitizers/test_split_name_list.py @@ -10,7 +10,7 @@ Tests for the sanitizer that splits multivalue lists. import pytest from nominatim.tokenizer.place_sanitizer import PlaceSanitizer -from nominatim.indexer.place_info import PlaceInfo +from nominatim.data.place_info import PlaceInfo from nominatim.errors import UsageError diff --git a/test/python/tokenizer/sanitizers/test_strip_brace_terms.py b/test/python/tokenizer/sanitizers/test_strip_brace_terms.py index c37562dd..eb554364 100644 --- a/test/python/tokenizer/sanitizers/test_strip_brace_terms.py +++ b/test/python/tokenizer/sanitizers/test_strip_brace_terms.py @@ -10,7 +10,7 @@ Tests for the sanitizer that handles braced suffixes. import pytest from nominatim.tokenizer.place_sanitizer import PlaceSanitizer -from nominatim.indexer.place_info import PlaceInfo +from nominatim.data.place_info import PlaceInfo def run_sanitizer_on(**kwargs): place = PlaceInfo({'name': kwargs}) diff --git a/test/python/tokenizer/sanitizers/test_tag_analyzer_by_language.py b/test/python/tokenizer/sanitizers/test_tag_analyzer_by_language.py index dfd25113..fd4be01f 100644 --- a/test/python/tokenizer/sanitizers/test_tag_analyzer_by_language.py +++ b/test/python/tokenizer/sanitizers/test_tag_analyzer_by_language.py @@ -9,7 +9,7 @@ Tests for the sanitizer that enables language-dependent analyzers. """ import pytest -from nominatim.indexer.place_info import PlaceInfo +from nominatim.data.place_info import PlaceInfo from nominatim.tokenizer.place_sanitizer import PlaceSanitizer from nominatim.tools.country_info import setup_country_config diff --git a/test/python/tokenizer/test_icu.py b/test/python/tokenizer/test_icu.py index b9de97bc..7f0ffce1 100644 --- a/test/python/tokenizer/test_icu.py +++ b/test/python/tokenizer/test_icu.py @@ -17,7 +17,7 @@ from nominatim.tokenizer import icu_tokenizer import nominatim.tokenizer.icu_rule_loader from nominatim.db import properties from nominatim.db.sql_preprocessor import SQLPreprocessor -from nominatim.indexer.place_info import PlaceInfo +from nominatim.data.place_info import PlaceInfo from mock_icu_word_table import MockIcuWordTable diff --git a/test/python/tokenizer/test_legacy.py b/test/python/tokenizer/test_legacy.py index 8f79e242..57a82b8a 100644 --- a/test/python/tokenizer/test_legacy.py +++ b/test/python/tokenizer/test_legacy.py @@ -12,7 +12,7 @@ import re import pytest -from nominatim.indexer.place_info import PlaceInfo +from nominatim.data.place_info import PlaceInfo from nominatim.tokenizer import legacy_tokenizer from nominatim.db import properties from nominatim.errors import UsageError diff --git a/test/python/tokenizer/test_place_sanitizer.py b/test/python/tokenizer/test_place_sanitizer.py index 2dd4e58a..31401bd1 100644 --- a/test/python/tokenizer/test_place_sanitizer.py +++ b/test/python/tokenizer/test_place_sanitizer.py @@ -11,7 +11,7 @@ import pytest from nominatim.errors import UsageError import nominatim.tokenizer.place_sanitizer as sanitizer -from nominatim.indexer.place_info import PlaceInfo +from nominatim.data.place_info import PlaceInfo def test_placeinfo_clone_new_name():