osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-12-28 23:42:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1934 from lonvia/fix-deletion-of-large-highway-areas

Browse Source 
Do not block deletion of large highway areas
This commit is contained in:
Sarah Hoffmann 2020-08-28 10:08:42 +02:00 committed by GitHub
commit 76b307f42a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/functions/place_triggers.sql
View File

@ -262,7 +262,7 @@ BEGIN
-- deleting large polygons can have a massive effect on the system - require manual intervention to let them through -- deleting large polygons can have a massive effect on the system - require manual intervention to let them through
IF st_area(OLD.geometry) > 2 and st_isvalid(OLD.geometry) THEN IF st_area(OLD.geometry) > 2 and st_isvalid(OLD.geometry) THEN
SELECT bool_or(not (rank_address = 0 or rank_address > 26)) as ranked FROM placex WHERE osm_type = OLD.osm_type and osm_id = OLD.osm_id and class = OLD.class and type = OLD.type INTO has_rank; SELECT bool_or(not (rank_address = 0 or rank_address > 25)) as ranked FROM placex WHERE osm_type = OLD.osm_type and osm_id = OLD.osm_id and class = OLD.class and type = OLD.type INTO has_rank;
IF has_rank THEN IF has_rank THEN
insert into import_polygon_delete (osm_type, osm_id, class, type) values (OLD.osm_type,OLD.osm_id,OLD.class,OLD.type); insert into import_polygon_delete (osm_type, osm_id, class, type) values (OLD.osm_type,OLD.osm_id,OLD.class,OLD.type);
RETURN NULL; RETURN NULL;

5
test/bdd/db/update/simple.feature
View File

@ -31,14 +31,17 @@ Feature: Update of simple objects
| osm | class | type | geometry | | osm | class | type | geometry |
| W1 | place | house | poly-area:5.0 | | W1 | place | house | poly-area:5.0 |
| R1 | boundary | national_park | poly-area:5.0 | | R1 | boundary | national_park | poly-area:5.0 |
| R2 | highway | residential | poly-area:5.0 |
When importing When importing
Then placex contains Then placex contains
| object | rank_address | | object | rank_address |
| R1 | 30 | | R1 | 30 |
| R2 | 26 |
| W1 | 30 | | W1 | 30 |
When marking for delete R1,W1 When marking for delete R1,R2,W1
Then placex has no entry for W1 Then placex has no entry for W1
Then placex has no entry for R1 Then placex has no entry for R1
Then placex has no entry for R2
Scenario: type mutation Scenario: type mutation
Given the places Given the places