Enhanced the implementation of OSM views GeoTIFF import functionality

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

diff --git a/nominatim/clicmd/refresh.py b/nominatim/clicmd/refresh.py
index 6f307a65ae159cc2ac841588c2cf81b89435ac83..8838a740aced4a7e2f059501bf58fba68c012858 100644 (file)
--- a/nominatim/clicmd/refresh.py
+++ b/nominatim/clicmd/refresh.py
@@ -85,7 +85,7 @@ class UpdateRefresh:
                            help='Enable debug warning statements in functions')
 
 
-    def run(self, args: NominatimArgs) -> int: #pylint: disable=too-many-branches
+    def run(self, args: NominatimArgs) -> int: #pylint: disable=too-many-branches, too-many-statements
         from ..tools import refresh, postcodes
         from ..indexer.indexer import Indexer
 
@@ -132,15 +132,17 @@ class UpdateRefresh:
                                                  data_path) > 0:
                 LOG.fatal('FATAL: Wikipedia importance dump file not found')
                 return 1
-        
+
         if args.osm_views:
-            data_path = Path(args.config.OSM_VIEWS_DATA_PATH
-                             or args.project_dir)
+            data_path = Path(args.project_dir)
             LOG.warning('Import OSM views GeoTIFF data from %s', data_path)
-            if refresh.import_osm_views_geotiff(args.config.get_libpq_dsn(),
-                                                 data_path) > 0:
-                LOG.fatal('FATAL: OSM views GeoTIFF file not found')
-                return 1
+            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.
         if args.importance: