X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/616789bbccd4b35cc643b20c5af3c9835eb22643..87907916ff06741bd4627101d30e6e11b8ea1a1a:/nominatim/cli.py diff --git a/nominatim/cli.py b/nominatim/cli.py index 55f51aac..533a920e 100644 --- a/nominatim/cli.py +++ b/nominatim/cli.py @@ -13,7 +13,6 @@ from nominatim.tools.exec_utils import run_legacy_script, run_php_server from nominatim.errors import UsageError from nominatim import clicmd from nominatim.clicmd.args import NominatimArgs -from nominatim.tools import tiger_data LOG = logging.getLogger() @@ -121,7 +120,7 @@ class UpdateAddData: """\ Add additional data from a file or an online source. - Data is only imported, not indexed. You need to call `nominatim-update index` + Data is only imported, not indexed. You need to call `nominatim index` to complete the process. """ @@ -147,9 +146,14 @@ class UpdateAddData: @staticmethod def run(args): + from nominatim.tokenizer import factory as tokenizer_factory + from nominatim.tools import tiger_data + if args.tiger_data: + tokenizer = tokenizer_factory.get_tokenizer_for_db(args.config) return tiger_data.add_tiger_data(args.tiger_data, - args.config, args.threads or 1) + args.config, args.threads or 1, + tokenizer) params = ['update.php'] if args.file: @@ -259,7 +263,7 @@ def get_set_parser(**kwargs): parser.add_subcommand('add-data', UpdateAddData) parser.add_subcommand('index', clicmd.UpdateIndex) - parser.add_subcommand('refresh', clicmd.UpdateRefresh) + parser.add_subcommand('refresh', clicmd.UpdateRefresh()) parser.add_subcommand('admin', clicmd.AdminFuncs)