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

boundary address ranks must not go above 25

Browse Source 
Fixes #1914.
This commit is contained in:
Sarah Hoffmann
2020-08-09 11:23:46 +02:00
parent 7429a33818
commit fb8bb30144
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/functions/placex_triggers.sql
View File

@@ -592,7 +592,11 @@ BEGIN
IF NEW.class = 'boundary' and NEW.type = 'administrative' THEN
parent_address_level := get_parent_address_level(NEW.geometry, NEW.admin_level);
IF parent_address_level >= NEW.rank_address THEN
NEW.rank_address := parent_address_level + 2;
IF parent_address_level >= 24 THEN
NEW.rank_address := 25;
ELSE
NEW.rank_address := parent_address_level + 2;
END IF;
END IF;
ELSE
parent_address_level := 3;
@@ -836,7 +840,8 @@ BEGIN
SELECT address_rank INTO place_address_level
FROM compute_place_rank(NEW.country_code, 'A', 'place',
NEW.extratags->'place', 0::SMALLINT, False, null);
IF place_address_level > parent_address_level THEN
IF place_address_level > parent_address_level and
place_address_level < 26 THEN
NEW.rank_address := place_address_level;
END IF;
END IF;

12
test/bdd/db/import/rank_computation.feature
View File

@@ -101,3 +101,15 @@ Feature: Rank assignment
| R21 | 16 | 18 |
| R22 | 16 | 20 |
Scenario: Admin levels must not be larger than 25
Given the named places
| osm | class | type | admin | extra+place | geometry |
| R20 | boundary | administrative | 6 | neighbourhood | (0 0, 0 2, 2 2, 2 0, 0 0) |
| R21 | boundary | administrative | 7 | | (0 0, 0 1, 1 1, 1 0, 0 0) |
| R22 | boundary | administrative | 8 | | (0 0, 0 0.5, 0.5 0.5, 0.5 0, 0 0) |
When importing
Then placex contains
| object | rank_search | rank_address |
| R20 | 12 | 22 |
| R21 | 14 | 24 |
| R22 | 16 | 25 |