move PlaceInfo into data submodule

This data structure is shared between indexer and tokenizer.
This commit is contained in:
Sarah Hoffmann 2022-07-06 10:54:47 +02:00
parent 69e51aebab
commit bce93d60bd
14 changed files with 13 additions and 13 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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()

View File

@ -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):

View File

@ -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):

View File

@ -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

View File

@ -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

View File

@ -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})

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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():