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

Remove unresolved merge conflict

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-07-18 16:23:18 +02:00
parent e37ada0b20
commit 0ea3239933
1 changed files with 0 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
assets/themes/onwheels/onwheels.json
View file

@ -32,11 +32,6 @@
"walls_and_buildings" "walls_and_buildings"
], ],
"overrideAll": { "overrideAll": {
<<<<<<< HEAD
"minZoom": "15",
"mapRendering": [
{
=======
"+calculatedTags": [ "+calculatedTags": [
"_poi_walls_and_buildings_entrance_properties=feat.closestn('walls_and_buildings', 1, undefined, 1000).map(w => ({id: w.feat.properties.id, width: w.feat.properties['_entrance:width']}))[0]", "_poi_walls_and_buildings_entrance_properties=feat.closestn('walls_and_buildings', 1, undefined, 1000).map(w => ({id: w.feat.properties.id, width: w.feat.properties['_entrance:width']}))[0]",
"_poi_entrance:width=JSON.parse(feat.properties._poi_walls_and_buildings_entrance_properties)?.width" "_poi_entrance:width=JSON.parse(feat.properties._poi_walls_and_buildings_entrance_properties)?.width"
@ -68,7 +63,6 @@
"minzoom": "15", "minzoom": "15",
"mapRendering": [ "mapRendering": [
{ {
>>>>>>> develop
"label": null "label": null
} }
] ]