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 a35a97423938da2cdecc8da13d875475c5026050..99e825925ad63443b305543624cde60572740fee 100644 (file)
--- a/nominatim/clicmd/special_phrases.py
+++ b/nominatim/clicmd/special_phrases.py
@@ -1,5 +1,5 @@
 """
 """

-    Implementation of the 'import-special-phrases' command.
+    Implementation of the 'special-phrases' command.

 """
 import logging
 from nominatim.tools.special_phrases import SpecialPhrasesImporter
 """
 import logging
 from nominatim.tools.special_phrases import SpecialPhrasesImporter


@@ -17,12 +17,12 @@ class ImportSpecialPhrases:
     @staticmethod
     def add_args(parser):
         group = parser.add_argument_group('Input arguments')
     @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):
                            help='Import special phrases from the OSM wiki to the database.')
 
     @staticmethod
     def run(args):

-        if args.from_wiki:
+        if args.import_from_wiki:

             LOG.warning('Special phrases importation starting')
             with connect(args.config.get_libpq_dsn()) as db_connection:
                 SpecialPhrasesImporter(
             LOG.warning('Special phrases importation starting')
             with connect(args.config.get_libpq_dsn()) as db_connection:
                 SpecialPhrasesImporter(