Merge pull request #2068 from lonvia/fix-reverse-only

Do not create POI search terms in reverse-only mode
This commit is contained in:
Sarah Hoffmann
2020-11-24 08:22:48 +01:00
committed by GitHub
2 changed files with 9 additions and 3 deletions

View File

@@ -97,3 +97,9 @@ jobs:
php ./utils/update.php --init-updates
php ./utils/update.php --import-osmosis
working-directory: build
- name: Run reverse-only import
run : |
dropdb nominatim
php ./utils/setup.php --osm-file ../monaco-latest.osm.pbf --reverse-only --all
working-directory: build

View File

@@ -814,8 +814,8 @@ BEGIN
END IF;
IF array_length(name_vector, 1) is not NULL
OR inherited_address is not NULL OR NEW.address is not NULL
IF not %REVERSE-ONLY% AND (array_length(name_vector, 1) is not NULL
OR inherited_address is not NULL OR NEW.address is not NULL)
THEN
SELECT * INTO name_vector, nameaddress_vector
FROM create_poi_search_terms(NEW.place_id,
@@ -824,7 +824,7 @@ BEGIN
NEW.country_code, NEW.housenumber,
name_vector, NEW.centroid);
IF not %REVERSE-ONLY% AND array_length(name_vector, 1) is not NULL THEN
IF array_length(name_vector, 1) is not NULL THEN
INSERT INTO search_name (place_id, search_rank, address_rank,
importance, country_code, name_vector,
nameaddress_vector, centroid)