X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/a849f3c9ec6b5db193bdce5930ebec69b55545d4..2dafc4cf4fc46ea4be293a458d565fbff645ac28:/nominatim/clicmd/refresh.py?ds=sidebyside diff --git a/nominatim/clicmd/refresh.py b/nominatim/clicmd/refresh.py index dce28d98..ea605ea0 100644 --- a/nominatim/clicmd/refresh.py +++ b/nominatim/clicmd/refresh.py @@ -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('--secondary-importance', action='store_true', + help='Update secondary importance raster data') group.add_argument('--importance', action='store_true', help='Recompute place importances (expensive!)') group.add_argument('--website', action='store_true', @@ -83,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 @@ -115,6 +117,20 @@ class UpdateRefresh: with connect(args.config.get_libpq_dsn()) as conn: refresh.load_address_levels_from_config(conn, args.config) + # Attention: must come BEFORE functions + if args.secondary_importance: + with connect(args.config.get_libpq_dsn()) as conn: + # If the table did not exist before, then the importance code + # needs to be enabled. + if not conn.table_exists('secondary_importance'): + args.functions = True + + LOG.warning('Import secondary importance raster data from %s', args.project_dir) + if refresh.import_secondary_importance(args.config.get_libpq_dsn(), + args.project_dir) > 0: + LOG.fatal('FATAL: Cannot update sendary importance raster data') + return 1 + if args.functions: LOG.warning('Create functions') with connect(args.config.get_libpq_dsn()) as conn: