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

Merge develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-10-10 23:54:34 +02:00
commit b4b72a0995
15 changed files with 336 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

3
assets/layers/cycleways_and_roads/cycleways_and_roads.json
View file

@ -27,9 +27,6 @@
]
}
},
"calculatedTags": [
"_comfort_score=feat.score('https://raw.githubusercontent.com/pietervdvn/AspectedRouting/master/Examples/bicycle/aspects/bicycle.comfort.json')"
],
"title": {
"render": {
"en": "Cycleways",

2
assets/themes/speelplekken/speelplekken.json
View file

@ -152,7 +152,7 @@
]
},
"geoJson": "https://pietervdvn.github.io/speelplekken_cache/speelplekken_{layer}_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 11,
"geoJsonZoomLevel": 14,
"isOsmCache": true
},
"title": {

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

@ -80,8 +80,7 @@
{
"id": "uk_addresses_import_button",
"render": "{import_button(ref:inspireid=$inspireid, Add this address, ./assets/themes/uk_addresses/housenumber_add.svg)}"
},
"all_tags"
}
],
"calculatedTags": [
"_embedding_object=feat.overlapWith('addresses')[0]?.feat?.properties ?? null",
@ -122,16 +121,10 @@
}
},
"calculatedTags": [
"_closest_3_street_names=feat.properties['addr:street'] === undefined ? feat.closestn('named_streets',3, 'name').map(f => ({name: f.feat.properties.name, distance: Math.round(1000*f.distance), id: f.id})) : []",
"_closest_street:0:name=JSON.parse(feat.properties._closest_3_street_names)[0]?.name",
"_closest_street:1:name=JSON.parse(feat.properties._closest_3_street_names)[1]?.name",
"_closest_street:2:name=JSON.parse(feat.properties._closest_3_street_names)[2]?.name",
"_closest_street:0:distance=JSON.parse(feat.properties._closest_3_street_names)[0]?.distance",
"_closest_street:1:distance=JSON.parse(feat.properties._closest_3_street_names)[1]?.distance",
"_closest_street:2:distance=JSON.parse(feat.properties._closest_3_street_names)[2]?.distance",
"_closest_street:0:id=JSON.parse(feat.properties._closest_3_street_names)[0]?.id",
"_closest_street:1:id=JSON.parse(feat.properties._closest_3_street_names)[1]?.id",
"_closest_street:2:id=JSON.parse(feat.properties._closest_3_street_names)[2]?.id"
"_closest_3_street_names=feat.closestn('named_streets',3, 'name').map(f => f.feat.properties.name)",
"_closest_street:0:name=JSON.parse(feat.properties._closest_3_street_names)[0]",
"_closest_street:1:name=JSON.parse(feat.properties._closest_3_street_names)[1]",
"_closest_street:2:name=JSON.parse(feat.properties._closest_3_street_names)[2]"
],
"title": {
"render": {
@ -157,7 +150,8 @@
"en": "What is the number of this house?"
},
"freeform": {
"key": "addr:housenumber"
"key": "addr:housenumber",
"addExtraTags": "nohousenumber="
},
"mappings": [
{
@ -186,17 +180,17 @@
"mappings": [
{
"if": "addr:street:={_closest_street:0:name}",
"then": "Located in <b>{_closest_street:0:name}</b> (~{_closest_street:0:distance}m away)",
"then": "Located in <b>{_closest_street:0:name}</b>",
"hideInAnswer": "_closest_street:0:name="
},
{
"if": "addr:street:={_closest_street:1:name}",
"then": "Located in <b>{_closest_street:1:name}</b> (~{_closest_street:1:distance}m away)",
"then": "Located in <b>{_closest_street:1:name}</b>",
"hideInAnswer": "_closest_street:1:name="
},
{
"if": "addr:street:={_closest_street:2:name}",
"then": "Located in <b>{_closest_street:2:name}</b> (~{_closest_street:2:distance}m away)",
"then": "Located in <b>{_closest_street:2:name}</b>",
"hideInAnswer": "_closest_street:2:name="
}
],
@ -254,7 +248,6 @@
},
{
"id": "named_streets",
"name": "Named streets",
"minzoom": 18,
"source": {
"osmTags": {
@ -264,16 +257,11 @@
]
}
},
"title": {
"render": {
"en": "{name}"
}
},
"color": {
"render": "#ccc"
},
"width": {
"render": "3"
"render": "0"
}
}
],