safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

fix merging of linked names into unnamed boundaries

Browse Source 
The NULL value of the boundaries' name field was erasing all
content when used in SQL operations.
This commit is contained in:
Sarah Hoffmann
2023-06-30 22:14:11 +02:00
parent b45f761227
commit a873f260cf
2 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,12 +88,18 @@ BEGIN
-- Add all names from the place nodes that deviate from the name
-- in the relation with the prefix '_place_'. Deviation means that
-- either the value is different or a given key is missing completely
SELECT hstore(array_agg('_place_' || key), array_agg(value)) INTO extra_names
FROM each(location.name - result.name);
{% if debug %}RAISE WARNING 'Extra names: %', extra_names;{% endif %}
IF result.name is null THEN
SELECT hstore(array_agg('_place_' || key), array_agg(value))
INTO result.name
FROM each(location.name);
ELSE
SELECT hstore(array_agg('_place_' || key), array_agg(value)) INTO extra_names
FROM each(location.name - result.name);
{% if debug %}RAISE WARNING 'Extra names: %', extra_names;{% endif %}
IF extra_names is not null THEN
result.name := result.name || extra_names;
IF extra_names is not null THEN
result.name := result.name || extra_names;
END IF;
END IF;
{% if debug %}RAISE WARNING 'Final names: %', result.name;{% endif %}

20
test/bdd/db/import/linking.feature
View File

@@ -290,3 +290,23 @@ Feature: Linking of places
| R1 | 'linked_place' : 'city', 'wikidata': 'Q1234' |
| R2 | 'wikidata': 'Q1234' |
Scenario: Boundaries without names inherit names from linked places
Given the 0.05 grid
| 1 | | 2 |
| | 9 | |
| 4 | | 3 |
Given the places
| osm | class | type | extra+wikidata | admin | geometry |
| R1 | boundary | administrative | 34 | 8 | (1,2,3,4,1) |
And the places
| osm | class | type | name+name |
| N9 | place | city | LabelPlace |
And the relations
| id | members |
| 1 | N9:label |
When importing
Then placex contains
| object | name+_place_name |
| R1 | LabelPlace |