X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/2af82975cd968ec09683ae5b16a9aa157a7f2176..57ce75eb67e292b2ddb7036619646ab73690ecfd:/nominatim/cli.py diff --git a/nominatim/cli.py b/nominatim/cli.py index e584e9d9..0876d9a4 100644 --- a/nominatim/cli.py +++ b/nominatim/cli.py @@ -112,30 +112,6 @@ class CommandlineParser: # pylint: disable=C0111 # Using non-top-level imports to make pyosmium optional for replication only. # pylint: disable=E0012,C0415 - - -class SetupSpecialPhrases: - """\ - Maintain special phrases. - """ - - @staticmethod - def add_args(parser): - group = parser.add_argument_group('Input arguments') - group.add_argument('--from-wiki', action='store_true', - help='Pull special phrases from the OSM wiki.') - group = parser.add_argument_group('Output arguments') - group.add_argument('-o', '--output', default='-', - help="""File to write the preprocessed phrases to. - If omitted, it will be written to stdout.""") - - @staticmethod - def run(args): - if args.output != '-': - raise NotImplementedError('Only output to stdout is currently implemented.') - return run_legacy_script('specialphrases.php', '--wiki-import', nominatim_env=args) - - class UpdateAddData: """\ Add additional data from a file or an online source. @@ -168,10 +144,10 @@ class UpdateAddData: def run(args): if args.tiger_data: return tiger_data.add_tiger_data(args.config.get_libpq_dsn(), - args.tiger_data, - args.threads or 1, - args.config, - args.sqllib_dir) + args.tiger_data, + args.threads or 1, + args.config, + args.sqllib_dir) params = ['update.php'] if args.file: @@ -278,7 +254,7 @@ def nominatim(**kwargs): parser.add_subcommand('freeze', clicmd.SetupFreeze) parser.add_subcommand('replication', clicmd.UpdateReplication) - parser.add_subcommand('special-phrases', SetupSpecialPhrases) + parser.add_subcommand('special-phrases', clicmd.ImportSpecialPhrases) parser.add_subcommand('add-data', UpdateAddData) parser.add_subcommand('index', clicmd.UpdateIndex)