update Search.md, fix typo (#3454)

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

diff --git a/nominatim/clicmd/refresh.py b/nominatim/clicmd/refresh.py
index 8838a740aced4a7e2f059501bf58fba68c012858..5eac53da14cebbaa7e44f81861b882c3c68e26f6 100644 (file)
--- a/nominatim/clicmd/refresh.py
+++ b/nominatim/clicmd/refresh.py
@@ -63,8 +63,8 @@ class UpdateRefresh:
                            help='Update the PL/pgSQL functions in the database')
         group.add_argument('--wiki-data', action='store_true',
                            help='Update Wikipedia/data importance numbers')
                            help='Update the PL/pgSQL functions in the database')
         group.add_argument('--wiki-data', action='store_true',
                            help='Update Wikipedia/data importance numbers')

-        group.add_argument('--osm-views', action='store_true',
-                           help='Update OSM views/data importance numbers')
+        group.add_argument('--secondary-importance', action='store_true',
+                           help='Update secondary importance raster data')

         group.add_argument('--importance', action='store_true',
                            help='Recompute place importances (expensive!)')
         group.add_argument('--website', action='store_true',
         group.add_argument('--importance', action='store_true',
                            help='Recompute place importances (expensive!)')
         group.add_argument('--website', action='store_true',


@@ -89,6 +89,7 @@ class UpdateRefresh:
         from ..tools import refresh, postcodes
         from ..indexer.indexer import Indexer
 
         from ..tools import refresh, postcodes
         from ..indexer.indexer import Indexer
 

+        need_function_refresh = args.functions

 
         if args.postcodes:
             if postcodes.can_compute(args.config.get_libpq_dsn()):
 
         if args.postcodes:
             if postcodes.can_compute(args.config.get_libpq_dsn()):


@@ -110,41 +111,47 @@ class UpdateRefresh:
 
         if args.word_counts:
             LOG.warning('Recompute word statistics')
 
         if args.word_counts:
             LOG.warning('Recompute word statistics')

-            self._get_tokenizer(args.config).update_statistics()
+            self._get_tokenizer(args.config).update_statistics(args.config,
+                                                               threads=args.threads or 1)

 
         if args.address_levels:
             LOG.warning('Updating address levels')
             with connect(args.config.get_libpq_dsn()) as conn:
                 refresh.load_address_levels_from_config(conn, args.config)
 
 
         if args.address_levels:
             LOG.warning('Updating address levels')
             with connect(args.config.get_libpq_dsn()) as conn:
                 refresh.load_address_levels_from_config(conn, args.config)
 

-        if args.functions:
-            LOG.warning('Create functions')
+        # Attention: must come BEFORE functions
+        if args.secondary_importance:

             with connect(args.config.get_libpq_dsn()) as conn:
             with connect(args.config.get_libpq_dsn()) as conn:

-                refresh.create_functions(conn, args.config,
-                                         args.diffs, args.enable_debug_statements)
-                self._get_tokenizer(args.config).update_sql_functions(args.config)
+                # If the table did not exist before, then the importance code
+                # needs to be enabled.
+                if not conn.table_exists('secondary_importance'):
+                    args.functions = True
+
+            LOG.warning('Import secondary importance raster data from %s', args.project_dir)
+            if refresh.import_secondary_importance(args.config.get_libpq_dsn(),
+                                                args.project_dir) > 0:
+                LOG.fatal('FATAL: Cannot update secondary importance raster data')
+                return 1
+            need_function_refresh = True

 
         if args.wiki_data:
             data_path = Path(args.config.WIKIPEDIA_DATA_PATH
                              or args.project_dir)
 
         if args.wiki_data:
             data_path = Path(args.config.WIKIPEDIA_DATA_PATH
                              or args.project_dir)

-            LOG.warning('Import wikipdia article importance from %s', data_path)
+            LOG.warning('Import wikipedia article importance from %s', data_path)

             if refresh.import_wikipedia_articles(args.config.get_libpq_dsn(),
                                                  data_path) > 0:
             if refresh.import_wikipedia_articles(args.config.get_libpq_dsn(),
                                                  data_path) > 0:

-                LOG.fatal('FATAL: Wikipedia importance dump file not found')
+                LOG.fatal('FATAL: Wikipedia importance file not found in %s', data_path)

                 return 1
                 return 1

+            need_function_refresh = True

 
 

-        if args.osm_views:
-            data_path = Path(args.project_dir)
-            LOG.warning('Import OSM views GeoTIFF data from %s', data_path)
+        if need_function_refresh:
+            LOG.warning('Create functions')

             with connect(args.config.get_libpq_dsn()) as conn:
             with connect(args.config.get_libpq_dsn()) as conn:

-                if refresh.import_osm_views_geotiff(conn, data_path) == 1:
-                    LOG.fatal('FATAL: OSM views GeoTIFF file not found')
-                    return 1
-                if refresh.import_osm_views_geotiff(conn, data_path) == 2:
-                    LOG.fatal('FATAL: PostGIS version number is less than 3')
-                    return 1
-
-        # Attention: importance MUST come after wiki data import.
+                refresh.create_functions(conn, args.config,
+                                         args.diffs, args.enable_debug_statements)
+                self._get_tokenizer(args.config).update_sql_functions(args.config)
+
+        # Attention: importance MUST come after wiki data import and after functions.

         if args.importance:
             LOG.warning('Update importance values for database')
             with connect(args.config.get_libpq_dsn()) as conn:
         if args.importance:
             LOG.warning('Update importance values for database')
             with connect(args.config.get_libpq_dsn()) as conn: