Merge remote-tracking branch 'upstream/master'

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

diff --git a/nominatim/clicmd/transition.py b/nominatim/clicmd/transition.py
index b8db1a38ee745fd2062f2dd63aa49d21707e3710..c9341f496d57efac9fd3527fdfffe3ba73618be1 100644 (file)
--- a/nominatim/clicmd/transition.py
+++ b/nominatim/clicmd/transition.py
@@ -43,6 +43,8 @@ class AdminTransition:
                            help='Index the data')
         group.add_argument('--create-search-indices', action='store_true',
                            help='Create additional indices required for search and update')
                            help='Index the data')
         group.add_argument('--create-search-indices', action='store_true',
                            help='Create additional indices required for search and update')

+        group.add_argument('--create-country-names', action='store_true',
+                           help='Create search index for default country names.')

         group = parser.add_argument_group('Options')
         group.add_argument('--no-partitions', action='store_true',
                            help='Do not partition search indices')
         group = parser.add_argument_group('Options')
         group.add_argument('--no-partitions', action='store_true',
                            help='Do not partition search indices')


@@ -58,10 +60,12 @@ class AdminTransition:
                            help="Ignore certain erros on import.")
         group.add_argument('--reverse-only', action='store_true',
                            help='Do not create search tables and indexes')
                            help="Ignore certain erros on import.")
         group.add_argument('--reverse-only', action='store_true',
                            help='Do not create search tables and indexes')

+        group.add_argument('--tiger-data', metavar='FILE',
+                           help='File to import')

 
     @staticmethod
 
     @staticmethod

-    def run(args):
-        from ..tools import database_import
+    def run(args): # pylint: disable=too-many-statements
+        from ..tools import database_import, tiger_data

         from ..tools import refresh
 
         if args.create_db:
         from ..tools import refresh
 
         if args.create_db:


@@ -127,3 +131,16 @@ class AdminTransition:
             LOG.warning('Create Search indices')
             with connect(args.config.get_libpq_dsn()) as conn:
                 database_import.create_search_indices(conn, args.config, args.sqllib_dir, args.drop)
             LOG.warning('Create Search indices')
             with connect(args.config.get_libpq_dsn()) as conn:
                 database_import.create_search_indices(conn, args.config, args.sqllib_dir, args.drop)

+
+        if args.tiger_data:
+            LOG.warning('Tiger data')
+            tiger_data.add_tiger_data(args.config.get_libpq_dsn(),
+                                      args.tiger_data,
+                                      args.threads or 1,
+                                      args.config,
+                                      args.sqllib_dir)
+
+        if args.create_country_names:
+            LOG.warning('Create search index for default country names.')
+            with connect(args.config.get_libpq_dsn()) as conn:
+                database_import.create_country_names(conn, args.config)