Merge pull request #3586 from lonvia/reduce-lookup-calls

[nominatim.git] / src / nominatim_db / tools / special_phrases / sp_csv_loader.py

diff --git a/src/nominatim_db/tools/special_phrases/sp_csv_loader.py b/src/nominatim_db/tools/special_phrases/sp_csv_loader.py
index 9f472e682f37085775bd73b7fb1d3dbdebe1083b..9556b88424ab221292b4d7fb18e8ff3cb0aed57b 100644 (file)
--- a/src/nominatim_db/tools/special_phrases/sp_csv_loader.py
+++ b/src/nominatim_db/tools/special_phrases/sp_csv_loader.py
@@ -13,9 +13,10 @@ from typing import Iterable
 import csv
 import os
 
 import csv
 import os
 

-from nominatim_core.errors import UsageError
+from ...errors import UsageError

 from .special_phrase import SpecialPhrase
 
 from .special_phrase import SpecialPhrase
 

+

 class SPCsvLoader:
     """
         Handles loading of special phrases from external csv file.
 class SPCsvLoader:
     """
         Handles loading of special phrases from external csv file.


@@ -23,7 +24,6 @@ class SPCsvLoader:
     def __init__(self, csv_path: str) -> None:
         self.csv_path = csv_path
 
     def __init__(self, csv_path: str) -> None:
         self.csv_path = csv_path
 

-

     def generate_phrases(self) -> Iterable[SpecialPhrase]:
         """ Open and parse the given csv file.
             Create the corresponding SpecialPhrases.
     def generate_phrases(self) -> Iterable[SpecialPhrase]:
         """ Open and parse the given csv file.
             Create the corresponding SpecialPhrases.


@@ -35,7 +35,6 @@ class SPCsvLoader:
             for row in reader:
                 yield SpecialPhrase(row['phrase'], row['class'], row['type'], row['operator'])
 
             for row in reader:
                 yield SpecialPhrase(row['phrase'], row['class'], row['type'], row['operator'])
 

-

     def _check_csv_validity(self) -> None:
         """
             Check that the csv file has the right extension.
     def _check_csv_validity(self) -> None:
         """
             Check that the csv file has the right extension.