Enhanced the implementation of OSM views GeoTIFF import functionality

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

diff --git a/nominatim/clicmd/setup.py b/nominatim/clicmd/setup.py
index 297244331b5f6e5065030516007a35f38a80965c..c1cbab21c377601c8ebafdc3a22fd2136aeb3ee3 100644 (file)
--- a/nominatim/clicmd/setup.py
+++ b/nominatim/clicmd/setup.py
@@ -58,8 +58,10 @@ 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")
+                            help="Do not attempt to load any additional data from the internet")
         group3 = parser.add_argument_group('Expert options')
         group3.add_argument('--ignore-errors', action='store_true',
                            help='Continue import even when errors in SQL are present')
@@ -103,7 +105,18 @@ class SetupAll:
             if refresh.import_wikipedia_articles(args.config.get_libpq_dsn(),
                                                  data_path) > 0:
                 LOG.error('Wikipedia importance dump file not found. '
-                          'Will be using default importances.')
+                          'Calculating importance values of locations will not \
+                            use Wikipedia importance data.')
+
+            LOG.warning('Importing OSM views GeoTIFF data')
+            data_path = Path(args.project_dir)
+            with connect(args.config.get_libpq_dsn()) as conn:
+                if refresh.import_osm_views_geotiff(conn, data_path) == 1:
+                    LOG.error('OSM views GeoTIFF file not found. '
+                          'Calculating importance values of locations will not use OSM views data.')
+                elif refresh.import_osm_views_geotiff(conn, data_path) == 2:
+                    LOG.error('PostGIS version number is less than 3. '
+                          'Calculating importance values of locations will not use OSM views data.')
 
         if args.continue_at is None or args.continue_at == 'load-data':
             LOG.warning('Initialise tables')