added subcommand to clean deleted relations for issue # 2444

[nominatim.git] / nominatim / tools / database_import.py

diff --git a/nominatim/tools/database_import.py b/nominatim/tools/database_import.py
index 20883b96ce0289bb2c2c28b6210695ee51759057..cb620d41fb8f31126fe69a622bf14130e38494d1 100644 (file)
--- a/nominatim/tools/database_import.py
+++ b/nominatim/tools/database_import.py
@@ -75,7 +75,11 @@ def setup_database_skeleton(dsn: str, rouser: Optional[str] = None) -> None:
         with conn.cursor() as cur:
             cur.execute('CREATE EXTENSION IF NOT EXISTS hstore')
             cur.execute('CREATE EXTENSION IF NOT EXISTS postgis')
-            cur.execute('CREATE EXTENSION IF NOT EXISTS postgis_raster')
+
+            postgis_version = conn.postgis_version_tuple()
+            if postgis_version[0] >= 3:
+                cur.execute('CREATE EXTENSION IF NOT EXISTS postgis_raster')
+
         conn.commit()
 
         _require_version('PostGIS',
@@ -247,8 +251,3 @@ def create_search_indices(conn: Connection, config: Configuration,
 
     sql.run_parallel_sql_file(config.get_libpq_dsn(),
                               'indices.sql', min(8, threads), drop=drop)
-
-
-def import_osm_views_geotiff():
-    """Import OSM views GeoTIFF file"""
-    subprocess.run("raster2pgsql -s 4326 -I -C -t 100x100 -e osmviews.tiff public.osmviews | psql nominatim", shell=True, check=True)