hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2889 from lonvia/fix-interpolation-updates

Browse Source 
Drop illegal values for addr:interpolation on update
This commit is contained in:
Sarah Hoffmann
2022-11-18 18:51:11 +01:00
committed by GitHub
parent 52456230cc c9ff7d2130
commit b310c86c55
3 changed files with 77 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,27 +84,35 @@ CREATE OR REPLACE FUNCTION reinsert_interpolation(way_id BIGINT, addr HSTORE,
DECLARE DECLARE
existing BIGINT[]; existing BIGINT[];
BEGIN BEGIN
-- Get the existing entry from the interpolation table. IF addr is NULL OR NOT addr ? 'interpolation'
SELECT array_agg(place_id) INTO existing OR NOT (addr->'interpolation' in ('odd', 'even', 'all')
FROM location_property_osmline WHERE osm_id = way_id; or addr->'interpolation' similar to '[1-9]')
THEN
IF existing IS NULL or array_length(existing, 1) = 0 THEN -- the new interpolation is illegal, simply remove existing entries
INSERT INTO location_property_osmline (osm_id, address, linegeo) DELETE FROM location_property_osmline WHERE osm_id = way_id;
VALUES (way_id, addr, geom);
ELSE ELSE
-- Update the interpolation table: -- Get the existing entry from the interpolation table.
-- The first entry gets the original data, all other entries SELECT array_agg(place_id) INTO existing
-- are removed and will be recreated on indexing. FROM location_property_osmline WHERE osm_id = way_id;
-- (An interpolation can be split up, if it has more than 2 address nodes)
UPDATE location_property_osmline IF existing IS NULL or array_length(existing, 1) = 0 THEN
SET address = addr, INSERT INTO location_property_osmline (osm_id, address, linegeo)
linegeo = geom, VALUES (way_id, addr, geom);
startnumber = null, ELSE
indexed_status = 1 -- Update the interpolation table:
WHERE place_id = existing[1]; -- The first entry gets the original data, all other entries
IF array_length(existing, 1) > 1 THEN -- are removed and will be recreated on indexing.
DELETE FROM location_property_osmline -- (An interpolation can be split up, if it has more than 2 address nodes)
WHERE place_id = any(existing[2:]); UPDATE location_property_osmline
SET address = addr,
linegeo = geom,
startnumber = null,
indexed_status = 1
WHERE place_id = existing[1];
IF array_length(existing, 1) > 1 THEN
DELETE FROM location_property_osmline
WHERE place_id = any(existing[2:]);
END IF;
END IF; END IF;
END IF; END IF;

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