X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/ac467c7a2d8cfdcf23f979644e9620f4189ec7ec..0ab0f0ea44c2e93043f00e90c2935f7e742ed9e4:/nominatim/clicmd/setup.py diff --git a/nominatim/clicmd/setup.py b/nominatim/clicmd/setup.py index c1cbab21..c870fb17 100644 --- a/nominatim/clicmd/setup.py +++ b/nominatim/clicmd/setup.py @@ -105,18 +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. ' - 'Calculating importance values of locations will not \ - use Wikipedia importance data.') + '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.') + 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.') if args.continue_at is None or args.continue_at == 'load-data': LOG.warning('Initialise tables')