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

Merge pull request #3174 from lonvia/osm2pgsql-update-fix

Browse Source 
Be more precise on what is deleted on updates
This commit is contained in:
Sarah Hoffmann
2023-08-25 21:26:23 +02:00
committed by GitHub
parent d5b6042118 c5f5ab5363
commit f3809a52e8
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib-sql/functions/place_triggers.sql
View File

@@ -37,7 +37,7 @@ BEGIN
-- Remove the place from the list of places to be deleted -- Remove the place from the list of places to be deleted
DELETE FROM place_to_be_deleted pdel DELETE FROM place_to_be_deleted pdel
WHERE pdel.osm_type = NEW.osm_type and pdel.osm_id = NEW.osm_id WHERE pdel.osm_type = NEW.osm_type and pdel.osm_id = NEW.osm_id
and pdel.class = NEW.class; and pdel.class = NEW.class and pdel.type = NEW.type;
-- Have we already done this place? -- Have we already done this place?
SELECT * INTO existing SELECT * INTO existing

23
test/bdd/osm2pgsql/update/tags.feature
View File

@@ -488,3 +488,26 @@ Feature: Tag evaluation
Then placex contains exactly Then placex contains exactly
| object | type | admin_level | | object | type | admin_level |
| R10:boundary | informal | 4 | | R10:boundary | informal | 4 |
Scenario: Main tag and geometry is changed
When loading osm data
"""
n1 x40 y40
n2 x40.0001 y40
n3 x40.0001 y40.0001
n4 x40 y40.0001
w5 Tbuilding=house,name=Foo Nn1,n2,n3,n4,n1
"""
Then place contains exactly
| object | type |
| W5:building | house |
When updating osm data
"""
n1 x39.999 y40
w5 Tbuilding=terrace,name=Bar Nn1,n2,n3,n4,n1
"""
Then place contains exactly
| object | type |
| W5:building | terrace |