mirror of
https://github.com/osm-search/Nominatim.git
synced 2026-03-11 13:24:07 +00:00
ignore admin boundary ways for countries and states
Countries and states are mapped world-wide as relations by now. Fixes #543 and #1291.
This commit is contained in:
@@ -853,6 +853,9 @@ BEGIN
|
|||||||
END IF;
|
END IF;
|
||||||
ELSEIF NEW.class = 'boundary' AND NOT is_area THEN
|
ELSEIF NEW.class = 'boundary' AND NOT is_area THEN
|
||||||
return NULL;
|
return NULL;
|
||||||
|
ELSEIF NEW.class = 'boundary' AND NEW.type = 'administrative'
|
||||||
|
AND NEW.admin_level <= 4 AND NEW.osm_type = 'W' THEN
|
||||||
|
return NULL;
|
||||||
ELSEIF NEW.class = 'railway' AND NEW.type in ('rail') THEN
|
ELSEIF NEW.class = 'railway' AND NEW.type in ('rail') THEN
|
||||||
return NULL;
|
return NULL;
|
||||||
ELSEIF NEW.osm_type = 'N' AND NEW.class = 'highway' THEN
|
ELSEIF NEW.osm_type = 'N' AND NEW.class = 'highway' THEN
|
||||||
|
|||||||
@@ -293,3 +293,22 @@ Feature: Import into placex
|
|||||||
| R6 | 4 | 0 |
|
| R6 | 4 | 0 |
|
||||||
| W3 | 30 | 30 |
|
| W3 | 30 | 30 |
|
||||||
|
|
||||||
|
Scenario: boundary ways for countries and states are ignored
|
||||||
|
Given the named places
|
||||||
|
| osm | class | type | admin | geometry |
|
||||||
|
| W4 | boundary | administrative | 2 | poly-area:0.1 |
|
||||||
|
| R4 | boundary | administrative | 2 | poly-area:0.1 |
|
||||||
|
| W5 | boundary | administrative | 3 | poly-area:0.1 |
|
||||||
|
| R5 | boundary | administrative | 3 | poly-area:0.1 |
|
||||||
|
| W6 | boundary | administrative | 4 | poly-area:0.1 |
|
||||||
|
| R6 | boundary | administrative | 4 | poly-area:0.1 |
|
||||||
|
| W7 | boundary | administrative | 5 | poly-area:0.1 |
|
||||||
|
| R7 | boundary | administrative | 5 | poly-area:0.1 |
|
||||||
|
When importing
|
||||||
|
Then placex contains exactly
|
||||||
|
| object |
|
||||||
|
| R4 |
|
||||||
|
| R5 |
|
||||||
|
| R6 |
|
||||||
|
| W7 |
|
||||||
|
| R7 |
|
||||||
|
|||||||
Reference in New Issue
Block a user