Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / clicmd / special_phrases.py

diff --git a/nominatim/clicmd/special_phrases.py b/nominatim/clicmd/special_phrases.py
index 8198a4c39cf49ebde42e881c2133c0fe01fc95b5..002960feb2049b9d850ea54aeebc7b1644ba4dd1 100644 (file)
--- a/nominatim/clicmd/special_phrases.py
+++ b/nominatim/clicmd/special_phrases.py
@@ -1,14 +1,16 @@
 """
-    Implementation of the 'import-special-phrases' command.
+    Implementation of the 'special-phrases' command.
 """
 import logging
-from nominatim.tools.special_phrases import import_from_wiki
+from nominatim.tools import SpecialPhrasesImporter
 from nominatim.db.connection import connect
 
 LOG = logging.getLogger()
 
 # Do not repeat documentation of subcommand classes.
 # pylint: disable=C0111
+# Using non-top-level imports to avoid eventually unused imports.
+# pylint: disable=E0012,C0415
 
 class ImportSpecialPhrases:
     """\
@@ -17,13 +19,18 @@ class ImportSpecialPhrases:
     @staticmethod
     def add_args(parser):
         group = parser.add_argument_group('Input arguments')
-        group.add_argument('--from-wiki', action='store_true',
+        group.add_argument('--import-from-wiki', action='store_true',
                            help='Import special phrases from the OSM wiki to the database.')
 
     @staticmethod
     def run(args):
-        if args.from_wiki:
+        from ..tokenizer import factory as tokenizer_factory
+
+        if args.import_from_wiki:
             LOG.warning('Special phrases importation starting')
+            tokenizer = tokenizer_factory.get_tokenizer_for_db(args.config)
             with connect(args.config.get_libpq_dsn()) as db_connection:
-                import_from_wiki(args, db_connection)
+                SpecialPhrasesImporter(
+                    args.config, args.phplib_dir, db_connection
+                ).import_from_wiki(tokenizer)
         return 0