hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3957 from jayaddison/issue-2714/linked-places-default-language

Browse Source 
Indexing: add default-language placename from linked places
This commit is contained in:
Sarah Hoffmann
2026-02-11 15:08:18 +01:00
committed by GitHub
parent b995803c66 e62811cf97
commit fed64cda5a
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib-sql/functions/placex_triggers.sql
View File

@@ -29,6 +29,7 @@ DECLARE
location RECORD; location RECORD;
result prepare_update_info; result prepare_update_info;
extra_names HSTORE; extra_names HSTORE;
default_language VARCHAR(10);
BEGIN BEGIN
IF not p.address ? '_inherited' THEN IF not p.address ? '_inherited' THEN
result.address := p.address; result.address := p.address;
@@ -85,6 +86,13 @@ BEGIN
IF location.name is not NULL THEN IF location.name is not NULL THEN
{% if debug %}RAISE WARNING 'Names original: %, location: %', result.name, location.name;{% endif %} {% if debug %}RAISE WARNING 'Names original: %, location: %', result.name, location.name;{% endif %}
-- Add the linked-place (e.g. city) name as a searchable placename in the default language (if any)
default_language := get_country_language_code(location.country_code);
IF default_language is not NULL AND NOT location.name ? ('name:' || default_language) THEN
location.name := location.name || hstore('name:' || default_language, location.name->'name');
END IF;
-- Add all names from the place nodes that deviate from the name -- Add all names from the place nodes that deviate from the name
-- in the relation with the prefix '_place_'. Deviation means that -- in the relation with the prefix '_place_'. Deviation means that
-- either the value is different or a given key is missing completely -- either the value is different or a given key is missing completely

3
test/bdd/features/db/import/linking.feature
View File

@@ -297,9 +297,8 @@ Feature: Linking of places
| R1 | LabelPlace | | R1 | LabelPlace |
@skip
Scenario: Linked places expand default language names Scenario: Linked places expand default language names
Given the grid Given the grid with origin CO
| 1 | | 2 | | 1 | | 2 |
| | 9 | | | | 9 | |
| 4 | | 3 | | 4 | | 3 |