X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/bc7f6209d83dcc161f093ce9907991facabb3491..a7a920a9a5b55bf4290b184f05898a8589c95b40:/nominatim/tools/refresh.py diff --git a/nominatim/tools/refresh.py b/nominatim/tools/refresh.py index 9c5b7b08..a200ee13 100644 --- a/nominatim/tools/refresh.py +++ b/nominatim/tools/refresh.py @@ -8,6 +8,8 @@ Functions for bringing auxiliary data in the database up-to-date. """ from typing import MutableSequence, Tuple, Any, Type, Mapping, Sequence, List, cast +import csv +import gzip import logging from textwrap import dedent from pathlib import Path @@ -15,10 +17,10 @@ from pathlib import Path from psycopg2 import sql as pysql from nominatim.config import Configuration -from nominatim.db.connection import Connection -from nominatim.db.utils import execute_file +from nominatim.db.connection import Connection, connect +from nominatim.db.utils import execute_file, CopyBuffer from nominatim.db.sql_preprocessor import SQLPreprocessor -from nominatim.version import version_str +from nominatim.version import NOMINATIM_VERSION LOG = logging.getLogger() @@ -120,33 +122,121 @@ PHP_CONST_DEFS = ( ('Search_NameOnlySearchFrequencyThreshold', 'SEARCH_NAME_ONLY_THRESHOLD', str), ('Use_US_Tiger_Data', 'USE_US_TIGER_DATA', bool), ('MapIcon_URL', 'MAPICON_URL', str), + ('Search_WithinCountries', 'SEARCH_WITHIN_COUNTRIES', bool), ) def import_wikipedia_articles(dsn: str, data_path: Path, ignore_errors: bool = False) -> int: """ Replaces the wikipedia importance tables with new data. The import is run in a single transaction so that the new data - is replace seemlessly. + is replace seamlessly. Returns 0 if all was well and 1 if the importance file could not be found. Throws an exception if there was an error reading the file. """ - datafile = data_path / 'wikimedia-importance.sql.gz' + if import_importance_csv(dsn, data_path / 'wikimedia-importance.csv.gz') == 0 \ + or import_importance_sql(dsn, data_path / 'wikimedia-importance.sql.gz', + ignore_errors) == 0: + return 0 - if not datafile.exists(): + return 1 + + +def import_importance_csv(dsn: str, data_file: Path) -> int: + """ Replace wikipedia importance table with data from a + single CSV file. + + The file must be a gzipped CSV and have the following columns: + language, title, importance, wikidata_id + + Other columns may be present but will be ignored. + """ + if not data_file.exists(): + return 1 + + # Only import the first occurance of a wikidata ID. + # This keeps indexes and table small. + wd_done = set() + + with connect(dsn) as conn: + with conn.cursor() as cur: + cur.drop_table('wikipedia_article') + cur.drop_table('wikipedia_redirect') + cur.drop_table('wikimedia_importance') + cur.execute("""CREATE TABLE wikimedia_importance ( + language TEXT NOT NULL, + title TEXT NOT NULL, + importance double precision NOT NULL, + wikidata TEXT + ) """) + + with gzip.open(str(data_file), 'rt') as fd, CopyBuffer() as buf: + for row in csv.DictReader(fd, delimiter='\t', quotechar='|'): + wd_id = int(row['wikidata_id'][1:]) + buf.add(row['language'], row['title'], row['importance'], + None if wd_id in wd_done else row['wikidata_id']) + wd_done.add(wd_id) + + if buf.size() > 10000000: + with conn.cursor() as cur: + buf.copy_out(cur, 'wikimedia_importance', + columns=['language', 'title', 'importance', + 'wikidata']) + + with conn.cursor() as cur: + buf.copy_out(cur, 'wikimedia_importance', + columns=['language', 'title', 'importance', 'wikidata']) + + with conn.cursor() as cur: + cur.execute("""CREATE INDEX IF NOT EXISTS idx_wikimedia_importance_title + ON wikimedia_importance (title)""") + cur.execute("""CREATE INDEX IF NOT EXISTS idx_wikimedia_importance_wikidata + ON wikimedia_importance (wikidata) + WHERE wikidata is not null""") + + conn.commit() + + return 0 + + +def import_importance_sql(dsn: str, data_file: Path, ignore_errors: bool) -> int: + """ Replace wikipedia importance table with data from an SQL file. + """ + if not data_file.exists(): return 1 pre_code = """BEGIN; DROP TABLE IF EXISTS "wikipedia_article"; - DROP TABLE IF EXISTS "wikipedia_redirect" + DROP TABLE IF EXISTS "wikipedia_redirect"; + DROP TABLE IF EXISTS "wikipedia_importance"; """ post_code = "COMMIT" - execute_file(dsn, datafile, ignore_errors=ignore_errors, + execute_file(dsn, data_file, ignore_errors=ignore_errors, pre_code=pre_code, post_code=post_code) return 0 +def import_secondary_importance(dsn: str, data_path: Path, ignore_errors: bool = False) -> int: + """ Replaces the secondary importance raster data table with new data. + + Returns 0 if all was well and 1 if the raster SQL file could not + be found. Throws an exception if there was an error reading the file. + """ + datafile = data_path / 'secondary_importance.sql.gz' + if not datafile.exists(): + return 1 + + with connect(dsn) as conn: + postgis_version = conn.postgis_version_tuple() + if postgis_version[0] < 3: + LOG.error('PostGIS version is too old for using OSM raster data.') + return 2 + + execute_file(dsn, datafile, ignore_errors=ignore_errors) + + return 0 + def recompute_importance(conn: Connection) -> None: """ Recompute wikipedia links and importance for all entries in placex. This is a long-running operations that must not be executed in @@ -157,7 +247,7 @@ def recompute_importance(conn: Connection) -> None: cur.execute(""" UPDATE placex SET (wikipedia, importance) = (SELECT wikipedia, importance - FROM compute_importance(extratags, country_code, osm_type, osm_id)) + FROM compute_importance(extratags, country_code, rank_search, centroid)) """) cur.execute(""" UPDATE placex s SET wikipedia = d.wikipedia, importance = d.importance @@ -193,34 +283,41 @@ def _quote_php_variable(var_type: Type[Any], config: Configuration, def setup_website(basedir: Path, config: Configuration, conn: Connection) -> None: """ Create the website script stubs. """ + if config.lib_dir.php is None: + LOG.info("Python frontend does not require website setup. Skipping.") + return + if not basedir.exists(): LOG.info('Creating website directory.') basedir.mkdir() - template = dedent(f"""\ + assert config.project_dir is not None + basedata = dedent(f"""\