hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-12 05:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

drop illegal values for addr:interpolation on update

Browse Source
This commit is contained in:
Sarah Hoffmann
2022-11-18 17:26:56 +01:00
parent 05863ae5ca
commit 3d9c33192b
3 changed files with 77 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,6 +82,13 @@ CREATE OR REPLACE FUNCTION reinsert_interpolation(way_id BIGINT, addr HSTORE,
DECLARE DECLARE
existing BIGINT[]; existing BIGINT[];
BEGIN BEGIN
IF addr is NULL OR NOT addr ? 'interpolation'
OR NOT (addr->'interpolation' in ('odd', 'even', 'all')
or addr->'interpolation' similar to '[1-9]')
THEN
-- the new interpolation is illegal, simply remove existing entries
DELETE FROM location_property_osmline WHERE osm_id = way_id;
ELSE
-- Get the existing entry from the interpolation table. -- Get the existing entry from the interpolation table.
SELECT array_agg(place_id) INTO existing SELECT array_agg(place_id) INTO existing
FROM location_property_osmline WHERE osm_id = way_id; FROM location_property_osmline WHERE osm_id = way_id;
@@ -105,6 +112,7 @@ BEGIN
WHERE place_id = any(existing[2:]); WHERE place_id = any(existing[2:]);
END IF; END IF;
END IF; END IF;
END IF;
RETURN 1; RETURN 1;
END; END;

23
test/bdd/db/import/interpolation.feature
View File

@@ -433,3 +433,26 @@ Feature: Import of address interpolations
And W10 expands to interpolation And W10 expands to interpolation
| start | end | parent_place_id | | start | end | parent_place_id |
| 12 | 14 | W2 | | 12 | 14 | W2 |
Scenario Outline: Bad interpolation values are ignored
Given the grid with origin 1,1
| 1 | | 9 | | 2 |
Given the places
| osm | class | type | housenr |
| N1 | place | house | 2 |
| N2 | place | house | 6 |
And the places
| osm | class | type | addr+interpolation | geometry |
| W1 | place | houses | <value> | 1,2 |
And the ways
| id | nodes |
| 1 | 1,2 |
When importing
Then W1 expands to no interpolation
Examples:
| value |
| foo |
| x |
| 12-2 |

26
test/bdd/db/update/interpolation.feature
View File

@@ -391,3 +391,29 @@ Feature: Update of address interpolations
| parent_place_id | start | end | | parent_place_id | start | end |
| W1 | 4 | 6 | | W1 | 4 | 6 |
Scenario: Legal interpolation type changed to illegal one
Given the grid
| 1 | | 2 |
| 3 | | 4 |
And the places
| osm | class | type | name | geometry |
| W1 | highway | unclassified | Cloud Street | 1, 2 |
And the ways
| id | nodes |
| 2 | 3,4 |
And the places
| osm | class | type | addr+interpolation | geometry |
| W2 | place | houses | even | 3,4 |
And the places
| osm | class | type | housenr |
| N3 | place | house | 2 |
| N4 | place | house | 6 |
When importing
Then W2 expands to interpolation
| parent_place_id | start | end |
| W1 | 4 | 4 |
When updating places
| osm | class | type | addr+interpolation | geometry |
| W2 | place | houses | 12-2 | 3,4 |
Then W2 expands to no interpolation