X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/0ab0f0ea44c2e93043f00e90c2935f7e742ed9e4..f71478e49c1a9462ca3b94a72d280581d98b8fff:/nominatim/clicmd/setup.py?ds=sidebyside

diff --git a/nominatim/clicmd/setup.py b/nominatim/clicmd/setup.py
index c870fb17..8464e151 100644
--- a/nominatim/clicmd/setup.py
+++ b/nominatim/clicmd/setup.py
@@ -18,7 +18,7 @@ from nominatim.config import Configuration
 from nominatim.db.connection import connect
 from nominatim.db import status, properties
 from nominatim.tokenizer.base import AbstractTokenizer
-from nominatim.version import version_str
+from nominatim.version import NOMINATIM_VERSION
 from nominatim.clicmd.args import NominatimArgs
 from nominatim.errors import UsageError
 
@@ -58,8 +58,6 @@ class SetupAll:
         group2.add_argument('--no-updates', action='store_true',
                            help="Do not keep tables that are only needed for "
                                 "updating the database later")
-        group2.add_argument('--osm-views', action='store_true',
-                            help='Import OSM views GeoTIFF')
         group2.add_argument('--offline', action='store_true',
                             help="Do not attempt to load any additional data from the internet")
         group3 = parser.add_argument_group('Expert options')
@@ -89,7 +87,7 @@ class SetupAll:
 
             LOG.warning('Setting up country tables')
             country_info.setup_country_tables(args.config.get_libpq_dsn(),
-                                              args.data_dir,
+                                              args.config.lib_dir.data,
                                               args.no_partitions)
 
             LOG.warning('Importing OSM data file')
@@ -98,8 +96,6 @@ class SetupAll:
                                             drop=args.no_updates,
                                             ignore_errors=args.ignore_errors)
 
-            self._setup_tables(args.config, args.reverse_only)
-
             LOG.warning('Importing wikipedia importance data')
             data_path = Path(args.config.WIKIPEDIA_DATA_PATH or args.project_dir)
             if refresh.import_wikipedia_articles(args.config.get_libpq_dsn(),
@@ -108,15 +104,13 @@ class SetupAll:
                           'Calculating importance values of locations will not '
                           'use Wikipedia importance data.')
 
-            LOG.warning('Importing OSM views GeoTIFF data')
-            data_path = Path(args.project_dir)
-            num = refresh.import_osm_views_geotiff(args.config.get_libpq_dsn(), data_path)
-            if num == 1:
-                LOG.error('OSM views GeoTIFF file not found. '
-                        'Calculating importance values of locations will not use OSM views data.')
-            elif num == 2:
-                LOG.error('PostGIS version number is less than 3. '
-                        'Calculating importance values of locations will not use OSM views data.')
+            LOG.warning('Importing secondary importance raster data')
+            if refresh.import_secondary_importance(args.config.get_libpq_dsn(),
+                                                   args.project_dir) != 0:
+                LOG.error('Secondary importance file not imported. '
+                          'Falling back to default ranking.')
+
+            self._setup_tables(args.config, args.reverse_only)
 
         if args.continue_at is None or args.continue_at == 'load-data':
             LOG.warning('Initialise tables')
@@ -211,4 +205,4 @@ class SetupAll:
                 except Exception as exc: # pylint: disable=broad-except
                     LOG.error('Cannot determine date of database: %s', exc)
 
-            properties.set_property(conn, 'database_version', version_str())
+            properties.set_property(conn, 'database_version', str(NOMINATIM_VERSION))