hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-12 05:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Initial implementation of GeoTIFF import functionality

Browse Source
This commit is contained in:
Tareq Al-Ahdal
2022-07-06 08:16:41 +02:00
committed by Sarah Hoffmann
parent 3381a92d92
commit c85b74497b
9 changed files with 78 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nominatim/clicmd/refresh.py
View File

@@ -63,6 +63,8 @@ class UpdateRefresh:
help='Update the PL/pgSQL functions in the database')
group.add_argument('--wiki-data', action='store_true',
help='Update Wikipedia/data importance numbers')
group.add_argument('--osm-views', action='store_true',
help='Update OSM views/data importance numbers')
group.add_argument('--importance', action='store_true',
help='Recompute place importances (expensive!)')
group.add_argument('--website', action='store_true',
@@ -130,6 +132,15 @@ 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)
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
# Attention: importance MUST come after wiki data import.
if args.importance:

14
nominatim/clicmd/setup.py
View File

@@ -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,15 @@ 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')
database_import.import_osm_views_geotiff()
data_path = Path(args.config.OSM_VIEWS_DATA_PATH or args.project_dir)
if refresh.import_osm_views_geotiff(args.config.get_libpq_dsn(),
data_path) > 0:
LOG.error('OSM views GeoTIFF file not found. '
'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')