simplify use of secondary importance

The values in the raster are already normalized between 0 and 2**16,
so a simple conversion to [0, 1] will do.

Check for existance of secondary_importance table statically when
creating the SQL function. For that to work importance tables need
to be created before the functions.
This commit is contained in:
Sarah Hoffmann
2022-09-27 22:12:48 +02:00
parent 3185fad918
commit abf349fb0d
4 changed files with 34 additions and 69 deletions

View File

@@ -96,8 +96,6 @@ class SetupAll:
drop=args.no_updates,
ignore_errors=args.ignore_errors)
self._setup_tables(args.config, args.reverse_only)
LOG.warning('Importing wikipedia importance data')
data_path = Path(args.config.WIKIPEDIA_DATA_PATH or args.project_dir)
if refresh.import_wikipedia_articles(args.config.get_libpq_dsn(),
@@ -112,6 +110,8 @@ class SetupAll:
LOG.error('Secondary importance file not imported. '
'Falling back to default ranking.')
self._setup_tables(args.config, args.reverse_only)
if args.continue_at is None or args.continue_at == 'load-data':
LOG.warning('Initialise tables')
with connect(args.config.get_libpq_dsn()) as conn: