Mannivu/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Remove erronous deletions, revert bench icon, add sanity check to delete config

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-08-05 16:20:25 +02:00
parent c3d5e4f1ec
commit 1f84e5fb3a
3 changed files with 23 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Customizations/JSON/DeleteConfig.ts
View file

@ -40,6 +40,10 @@ export default class DeleteConfig {
this.softDeletionTags = FromJSON.Tag(json.softDeletionTags,`${context}.softDeletionTags`)
}
if(json["hardDeletionTags"] !== undefined){
throw `You probably meant 'softDeletionTags' instead of 'hardDeletionTags' (at ${context})`
}
this.neededChangesets = json.neededChangesets
}

17
assets/layers/bench/bench.svg
View file

@ -1 +1,16 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 23.18 10.85"><defs><style>.cls-1{fill:#fff;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M20.29,10.85h1.28V6.77h1.61V5.65H21.23v-1h.93V3.1h-.93V1.85h.93V0H1V1.85H2V3.1H1V4.63H2v1H0V6.77H1.61v4.08H2.89V6.77h17.4Zm-17.63-9H20.52V3.1H2.66Zm0,3.8v-1H20.52v1Z"/></g></g></svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg version="1.1" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg">
<path d="m128 64c0 35.346-28.654 64-64 64-35.346 0-64-28.654-64-64 0-35.346 28.654-64 64-64 35.346 0 64 28.654 64 64" fill="#9bbe55" stroke-width=".2"/>
<path d="m20.021 39.998c-2.2408 0-4.0449 1.8041-4.0449 4.0449v15.91c0 2.2408 1.8042 4.045 4.0449 4.045h11.955v8h-16v8h16v16h8v-16h48v16h8v-16h16v-8h-16v-8h11.955c2.2408 0 4.0449-1.8042 4.0449-4.045v-15.91c0-2.2408-1.8041-4.0449-4.0449-4.0449zm19.955 24h48v8h-48z" fill-opacity=".2" style="paint-order:normal"/>
<g transform="translate(717 144)">
<path d="m-685.02-84.002h8v32h-8z" fill="#666" style="paint-order:normal"/>
<path d="m-629.02-84.002h8v32h-8z" fill="#666" style="paint-order:normal"/>
<path d="m-696.98-108h87.911c2.2408 0 4.0447 1.804 4.0447 4.0447v15.911c0 2.2408-1.804 4.0447-4.0447 4.0447h-87.911c-2.2408 0-4.0447-1.8039-4.0447-4.0447v-15.911c0-2.2408 1.804-4.0447 4.0447-4.0447z" fill="#ae8862" style="paint-order:normal"/>
<path d="m-693.02-104h80v4h-80z" fill="#896847" style="paint-order:normal"/>
<path d="m-701.02-72.002h96v4h-96z" fill="#896847" style="paint-order:normal"/>
<path d="m-693.02-92.002h80v4h-80z" fill="#896847" style="paint-order:normal"/>
<path d="m-677.02-96.002a4 4 0 0 1-4 4 4 4 0 0 1-4-4 4 4 0 0 1 4-4 4 4 0 0 1 4 4" fill="#666" style="paint-order:normal"/>
<path d="m-621.02-96.002a4 4 0 0 1-4 4 4 4 0 0 1-4-4 4 4 0 0 1 4-4 4 4 0 0 1 4 4" fill="#666" style="paint-order:normal"/>
<path d="m-701.02-76.002h96v4h-96z" fill="#ae8862" style="paint-order:normal"/>
</g>
</svg>
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 391 B

After

Width:  |  Height:  |  Size: 1.6 KiB

Before After
Before After

89
assets/themes/natuurpunt/natuurpunt.json
View file

@ -47,14 +47,6 @@
"minzoomVisible": 0,
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/nature_reserve.svg"
},
"deletion": {
"hardDeletionTags": {
"and": [
"leisure=nature_reserve",
"boundary=protected_area"
]
}
}
}
},
@ -74,14 +66,6 @@
"minzoom": 1,
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/nature_reserve.svg"
},
"deletion": {
"hardDeletionTags": {
"and": [
"leisure=nature_reserve",
"boundary=protected_area"
]
}
}
}
},
@ -100,14 +84,6 @@
"minzoom": 1,
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/information.svg"
},
"deletion": {
"hardDeletionTags": {
"and": [
"information=visitor_centre",
"information=office"
]
}
}
}
},
@ -137,15 +113,6 @@
"then": "circle:#FE6F32;./assets/themes/natuurpunt/pushchair.svg"
}
]
},
"deletion": {
"hardDeletionTags": {
"and": [
"route=hiking",
"route=bycicle",
"route=horse"
]
}
}
}
},
@ -170,9 +137,6 @@
"then": "circle:#FE6F32;./assets/themes/natuurpunt/urinal.svg"
}
]
},
"deletion": {
"hardDeletionTags": "amenity=toilets"
}
}
},
@ -188,33 +152,7 @@
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/birdhide.svg",
"mappings": null
},
"deletion": [
{
"if": "leisure=bird_hide",
"then": {
"hardDeletionTags": "leisure=bird_hide"
}
},
{
"if": {
"or": [
"building=yes",
"shelter=yes",
"amenity=shelter"
]
},
"then": {
"hardDeletionTags": {
"and": [
"building=yes",
"shelter=yes",
"amenity=shelter"
]
}
}
}
]
}
},
{
@ -228,9 +166,6 @@
},
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/picnic_table.svg"
},
"deletion": {
"hardDeletionTags": "leisure=picnic_table"
}
}
},
@ -245,9 +180,6 @@
},
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/drips.svg"
},
"deletion": {
"hardDeletionTags": "amenity=drinking_water"
}
}
},
@ -275,17 +207,8 @@
"then": "circle:#335D9F;./assets/themes/natuurpunt/parkingwheels.svg",
"badge": true
}
],
"deletion": {
"hardDeletionTags": {
"and": [
"amenity=parking",
"amenity=motorcycle_parking",
"amenity=bicycle_parking"
]
}
}
}
},
{
"builtin": "information_board",
@ -298,9 +221,6 @@
},
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/information_board.svg"
},
"deletion": {
"hardDeletionTags": "information=board"
}
}
},
@ -315,9 +235,6 @@
},
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/bench.svg"
},
"deletion": {
"hardDeletionTags": "amenity=bench"
}
}
},
@ -332,12 +249,8 @@
},
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/watermill.svg"
},
"deletion": {
"hardDeletionTags": "man_made=watermill"
}
}
}
],
"roamingRenderings": []
]
}