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

Rendering bug fixes, add 'get' to the ExtraFunctions, filtering in the GRB theme

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-10-28 03:15:36 +02:00
parent 10d9f18110
commit c74989e88d
9 changed files with 318 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

102
assets/themes/grb_import/grb.json
View file

@ -20,6 +20,9 @@
"startZoom": 14,
"widenFactor": 2,
"socialImage": "",
"clustering": {
"maxZoom": 15
},
"layers": [
{
"id": "OSM-buildings",
@ -28,7 +31,7 @@
"osmTags": "building~*",
"maxCacheAge": 0
},
"minzoom": 18,
"minzoom": 16,
"mapRendering": [
{
"width": {
@ -277,7 +280,7 @@
{
"location": [
"point",
"center"
"centroid"
],
"label": {
"mappings": [
@ -311,17 +314,46 @@
"geoJsonZoomLevel": 18,
"maxCacheAge": 0
},
"minzoom": 19,
"minzoom": 16,
"name": "CRAB-addressen",
"title": "CRAB-adres",
"mapRendering": [
{
"location": "point",
"location": ["point"],
"icon": "circle:#bb3322",
"iconSize": "15,15,center"
}
],
"calculatedTags": [
"_embedded_in=feat.overlapWith('OSM-buildings').filter(f => f.feat.properties['addr:housenumber'] !== undefined)[0]?.feat?.properties ",
"_embedding_nr=feat.get('_embedded_in')['addr:housenumber']",
"_embedding_street=feat.get('_embedded_in')['addr:street']"
],
"isShown": {
"render": "yes",
"mappings": [
{
"if": {
"and":["_embedding_nr:={HUISNR}","_embedding_street:={STRAATNM}"]
},
"then": "no"
}
]
},
"tagRenderings": [
{
"id": "render_crab",
"render": "Volgens het CRAB ligt hier <b>{STRAATNM}</b> {HUISNR} (label: {HNRLABEL})"
},
{
"id": "render_embedded",
"render": "Het omliggende object met addres heeft <b>{_embedding_street}</b> {_embedding_nr}",
"condition": {
"and": ["_embedding_street~*","_embedding_nr~*"]
}
},
"all_tags",
{
"id": "import-button",
@ -334,7 +366,7 @@
"name": {
"nl": "Fixmes op gebouwen"
},
"minzoom": 12,
"minzoom": 16,
"source": {
"maxCacheAge": 0,
"osmTags": {
@ -490,7 +522,7 @@
{
"location": [
"point",
"center"
"centroid"
],
"iconSize": {
"render": "40,40,center"
@ -512,12 +544,66 @@
"render": "#00f"
}
}
]
},
{
"id": "GRB",
"source": {
"geoJson": "https://betadata.grbosm.site/grb?bbox={x_min},{y_min},{x_max},{y_max}",
"geoJsonZoomLevel": 18,
"mercatorCrs": true,
"maxCacheAge": 0
},
"name": "GRB geometries",
"title": "GRB outline",
"minzoom": 16,
"calculatedTags": [
"_overlaps_with=feat.overlapWith('OSM-buildings').filter(f => f.overlap > 1 && feat.properties._surface - f.overlap < 5)[0] ?? null",
"_osm_obj:source:ref=JSON.parse(feat.properties._overlaps_with)?.feat?.properties['source:geometry:ref']",
"_osm_obj:source:date=JSON.parse(feat.properties._overlaps_with)?.feat?.properties['source:geometry:date'].replace(/\\//g, '-')",
"_imported_osm_object_found= feat.properties['_osm_obj:source:ref'] == feat.properties['source:geometry:entity'] + '/' + feat.properties['source:geometry:oidn']",
"_grb_date=feat.properties['source:geometry:date'].replace(/\\//g,'-')",
"_imported_osm_still_fresh= feat.properties['_osm_obj:source:date'] == feat.properties._grb_date"
],
"presets": []
"tagRenderings": [
"all_tags"
],
"isShown": {
"render": "yes",
"mappings": [
{
"if": {
"and": [
"_imported_osm_object_found=true",
"_imported_osm_still_fresh=true"
]
},
"then": "no"
}
]
},
"mapRendering": [
{
"color": {
"render": "#00a",
"mappings": [
{
"if": {
"and": [
"_imported_osm_object_found=true",
"_imported_osm_still_fresh=true"
]
},
"then": "#0f0"
}
]
}
}
]
}
],
"hideFromOverview": true,
"defaultBackgroundId": "AGIVFlandersGRB",
"overpassMaxZoom": 18,
"overpassMaxZoom": 15,
"osmApiTileSize": 17
}

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

@ -57,9 +57,13 @@
},
"minzoom": 13,
"minzoomVisible": 0,
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/nature_reserve.svg"
}
"mapRendering": [
{
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/nature_reserve.svg"
}
}
]
}
},
{
@ -77,9 +81,13 @@
"isOsmCache": "duplicate"
},
"minzoom": 1,
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/nature_reserve.svg"
},
"mapRendering": [
{
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/nature_reserve.svg"
}
}
],
"presets": []
}
},
@ -96,9 +104,13 @@
"isOsmCache": true
},
"minzoom": 1,
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/information.svg"
}
"mapRendering": [
{
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/information.svg"
}
}
]
}
},
{
@ -115,19 +127,23 @@
"isOsmCache": true
},
"minzoom": 10,
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/trail.svg",
"mappings": [
{
"if": "wheelchair=yes",
"then": "circle:#FE6F32;./assets/themes/natuurpunt/walk_wheelchair.svg"
},
{
"if": "pushchair=yes",
"then": "circle:#FE6F32;./assets/themes/natuurpunt/pushchair.svg"
"mapRendering": [
{
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/trail.svg",
"mappings": [
{
"if": "wheelchair=yes",
"then": "circle:#FE6F32;./assets/themes/natuurpunt/walk_wheelchair.svg"
},
{
"if": "pushchair=yes",
"then": "circle:#FE6F32;./assets/themes/natuurpunt/pushchair.svg"
}
]
}
]
}
}
]
}
},
{
@ -139,19 +155,23 @@
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/toilets.svg",
"mappings": [
{
"if": "wheelchair=yes",
"then": "circle:#FE6F32;./assets/themes/natuurpunt/wheelchair.svg"
},
{
"if": "toilets:position=urinals",
"then": "circle:#FE6F32;./assets/themes/natuurpunt/urinal.svg"
"mapRendering": [
{
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/toilets.svg",
"mappings": [
{
"if": "wheelchair=yes",
"then": "circle:#FE6F32;./assets/themes/natuurpunt/wheelchair.svg"
},
{
"if": "toilets:position=urinals",
"then": "circle:#FE6F32;./assets/themes/natuurpunt/urinal.svg"
}
]
}
]
}
}
]
}
},
{
@ -163,10 +183,14 @@
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/birdhide.svg",
"mappings": null
}
"mapRendering": [
{
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/birdhide.svg",
"mappings": null
}
}
]
}
},
{
@ -178,9 +202,13 @@
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/picnic_table.svg"
}
"mapRendering": [
{
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/picnic_table.svg"
}
}
]
}
},
{
@ -192,34 +220,42 @@
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/drips.svg"
}
"mapRendering": [
{
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/drips.svg"
}
}
]
}
},
{
"builtin": "parking",
"override": {
"minzoom": "16",
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/parking.svg",
"mappings": [
{
"if": "amenity=bicycle_parking",
"then": "circle:#FE6F32;./assets/themes/natuurpunt/parkingbike.svg"
}
]
},
"iconOverlays": [
"mapRendering": [
{
"if": "amenity=motorcycle_parking",
"then": "circle:#335D9F;./assets/themes/natuurpunt/parkingmotor.svg",
"badge": true
},
{
"if": "capacity:disabled=yes",
"then": "circle:#335D9F;./assets/themes/natuurpunt/parkingwheels.svg",
"badge": true
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/parking.svg",
"mappings": [
{
"if": "amenity=bicycle_parking",
"then": "circle:#FE6F32;./assets/themes/natuurpunt/parkingbike.svg"
}
]
},
"iconOverlays": [
{
"if": "amenity=motorcycle_parking",
"then": "circle:#335D9F;./assets/themes/natuurpunt/parkingmotor.svg",
"badge": true
},
{
"if": "capacity:disabled=yes",
"then": "circle:#335D9F;./assets/themes/natuurpunt/parkingwheels.svg",
"badge": true
}
]
}
]
}
@ -233,9 +269,13 @@
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/information_board.svg"
}
"mapRendering": [
{
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/information_board.svg"
}
}
]
}
},
{
@ -247,9 +287,13 @@
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/bench.svg"
}
"mapRendering": [
{
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/bench.svg"
}
}
]
}
},
{
@ -261,9 +305,13 @@
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/watermill.svg"
}
"mapRendering": [
{
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/watermill.svg"
}
}
]
}
}
],

22
assets/themes/uk_addresses/uk_addresses.json
View file

@ -251,12 +251,11 @@
}
]
},
"width": {
"render": "8"
},
"iconSize": {
"render": "40,40,center"
},
}
}, {
"color": {
"render": "#00f",
"mappings": [
@ -275,6 +274,9 @@
"then": "#ff0"
}
]
},
"width": {
"render": "8"
}
}
]
@ -290,17 +292,7 @@
]
}
},
"mapRendering": [
{
"location": "point",
"color": {
"render": "#ccc"
},
"width": {
"render": "0"
}
}
]
"mapRendering": []
}
],
"enableShareScreen": false,