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

More cleanup

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-10-19 12:58:53 +02:00
parent 2c480eb9d8
commit 4a7cce762e
12 changed files with 366 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Models/ThemeConfig/Json/LayoutConfigJson.ts
View file

@ -118,18 +118,6 @@ export interface LayoutConfigJson {
* Default: overpassMaxZoom + 1 * Default: overpassMaxZoom + 1
*/ */
osmApiTileSize?: number osmApiTileSize?: number
/**
* A tagrendering depicts how to show some tags or how to show a question for it.
*
* These tagrenderings are applied to _all_ the loaded layers and are a way to reuse tagrenderings.
* Note that if multiple themes are loaded (e.g. via the personal theme)
* that these roamingRenderings are applied to the layers of the OTHER themes too!
*
* In order to prevent them to do too much damage, all the overpass-tags of the layers are taken and combined as OR.
* These tag renderings will only show up if the object matches this filter.
*/
roamingRenderings?: (TagRenderingConfigJson | string)[],
/** /**
* An override applied on all layers of the theme. * An override applied on all layers of the theme.

5
Models/ThemeConfig/Json/TagRenderingConfigJson.ts
View file

@ -170,9 +170,4 @@ export interface TagRenderingConfigJson {
}[] }[]
/**
* If set to true, this tagRendering will escape the current layer and attach itself to all the other layers too.
* However, it will _only_ be shown if it matches the overpass-tags of the layer it was originally defined in.
*/
roaming?: boolean
} }

5
assets/layers/bike_shop/bike_shop.json
View file

@ -744,6 +744,11 @@
] ]
}, },
"iconOverlays": [ "iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
},
{ {
"if": "opening_hours~*", "if": "opening_hours~*",
"then": "isOpen", "then": "isOpen",

39
assets/themes/buurtnatuur/buurtnatuur.json
View file

@ -124,6 +124,19 @@
"nl": "Voeg een ontbrekend, erkend natuurreservaat toe, bv. een gebied dat beheerd wordt door het ANB of natuurpunt" "nl": "Voeg een ontbrekend, erkend natuurreservaat toe, bv. een gebied dat beheerd wordt door het ANB of natuurpunt"
} }
} }
],
"mapRendering": [
{
"icon": {
"render": "circle:#ffffff;./assets/themes/buurtnatuur/nature_reserve.svg"
},
"iconSize": {
"render": "50,50,center"
},
"location": [
"point"
]
}
] ]
}, },
{ {
@ -222,6 +235,19 @@
"nl": "Voeg een ontbrekend park toe" "nl": "Voeg een ontbrekend park toe"
} }
} }
],
"mapRendering": [
{
"icon": {
"render": "circle:#ffffff;./assets/themes/buurtnatuur/park.svg"
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
] ]
}, },
{ {
@ -339,6 +365,19 @@
"nl": "Voeg een ontbrekend bos toe aan de kaart" "nl": "Voeg een ontbrekend bos toe aan de kaart"
} }
} }
],
"mapRendering": [
{
"icon": {
"render": "circle:#ffffff;./assets/themes/buurtnatuur/forest.svg"
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
] ]
}, },
"viewpoint" "viewpoint"

39
assets/themes/campersite/campersite.json
View file

@ -676,7 +676,31 @@
} }
} }
], ],
"wayHandling": 2 "wayHandling": 2,
"mapRendering": [
{
"icon": {
"render": "circle:white;./assets/themes/campersite/caravan.svg",
"mappings": [
{
"if": {
"and": [
"fee=no"
]
},
"then": "circle:white;./assets/themes/campersite/caravan_green.svg"
}
]
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point",
"centroid"
]
}
]
}, },
{ {
"id": "dumpstations", "id": "dumpstations",
@ -1075,6 +1099,19 @@
"de": "Fügen Sie eine neue sanitäre Entsorgungsstation hinzu. Hier können Camper Abwasser oder chemischen Toilettenabfälle entsorgen. Oft gibt es auch Trinkwasser und Strom." "de": "Fügen Sie eine neue sanitäre Entsorgungsstation hinzu. Hier können Camper Abwasser oder chemischen Toilettenabfälle entsorgen. Oft gibt es auch Trinkwasser und Strom."
} }
} }
],
"mapRendering": [
{
"icon": {
"render": "circle:white;./assets/themes/campersite/sanitary_dump_station.svg"
},
"iconSize": {
"render": "32,32,center"
},
"location": [
"point"
]
}
] ]
} }
], ],

84
assets/themes/climbing/climbing.json
View file

@ -215,7 +215,27 @@
} }
} }
], ],
"wayHandling": 1 "wayHandling": 1,
"mapRendering": [
{
"icon": {
"render": "./assets/themes/climbing/club.svg"
},
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
}
],
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
]
}, },
{ {
"id": "climbing_gym", "id": "climbing_gym",
@ -313,7 +333,27 @@
"iconSize": { "iconSize": {
"render": "40,40,center" "render": "40,40,center"
}, },
"wayHandling": 1 "wayHandling": 1,
"mapRendering": [
{
"icon": {
"render": "./assets/themes/climbing/climbing_gym.svg"
},
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
}
],
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
]
}, },
{ {
"id": "climbing_route", "id": "climbing_route",
@ -532,7 +572,21 @@
] ]
} }
], ],
"wayHandling": 2 "wayHandling": 2,
"mapRendering": [
{
"icon": {
"render": "circle:white;./assets/themes/climbing/climbing_route.svg"
},
"iconSize": {
"render": "28,28,center"
},
"location": [
"point",
"centroid"
]
}
]
}, },
{ {
"id": "climbing", "id": "climbing",
@ -801,6 +855,20 @@
"_difficulty_hist=JSON.parse(feat.properties._contained_climbing_routes_properties ?? '[]').map(p => p['climbing:grade:french'])", "_difficulty_hist=JSON.parse(feat.properties._contained_climbing_routes_properties ?? '[]').map(p => p['climbing:grade:french'])",
"_length_hist=JSON.parse(feat.properties._contained_climbing_routes_properties ?? '[]').map(p => p['climbing:length'])", "_length_hist=JSON.parse(feat.properties._contained_climbing_routes_properties ?? '[]').map(p => p['climbing:length'])",
"_contained_climbing_routes_count=JSON.parse(feat.properties._contained_climbing_routes_properties ?? '[]').length" "_contained_climbing_routes_count=JSON.parse(feat.properties._contained_climbing_routes_properties ?? '[]').length"
],
"mapRendering": [
{
"icon": {
"render": "./assets/themes/climbing/climbing_no_rope.svg"
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point",
"centroid"
]
}
] ]
}, },
{ {
@ -930,7 +998,15 @@
"color": { "color": {
"render": "#ddff55AA" "render": "#ddff55AA"
}, },
"wayHandling": 0 "wayHandling": 0,
"mapRendering": [
{
"icon": "./assets/themes/climbing/climbing_unknown.svg",
"location": [
"point"
]
}
]
} }
], ],
"overrideAll": { "overrideAll": {

24
assets/themes/cyclestreets/cyclestreets.json
View file

@ -84,6 +84,14 @@
"width": "10", "width": "10",
"tagRenderings": [ "tagRenderings": [
"images" "images"
],
"mapRendering": [
{
"icon": "./assets/themes/cyclestreets/F111.svg",
"location": [
"point"
]
}
] ]
}, },
{ {
@ -136,6 +144,14 @@
"width": "5", "width": "5",
"tagRenderings": [ "tagRenderings": [
"images" "images"
],
"mapRendering": [
{
"icon": "./assets/themes/cyclestreets/F113.svg",
"location": [
"point"
]
}
] ]
}, },
{ {
@ -201,6 +217,14 @@
}, },
"tagRenderings": [ "tagRenderings": [
"images" "images"
],
"mapRendering": [
{
"icon": "./assets/svg/pencil.svg",
"location": [
"point"
]
}
] ]
} }
], ],

73
assets/themes/facadegardens/facadegardens.json
View file

@ -454,7 +454,78 @@
} }
} }
], ],
"wayHandling": 1 "wayHandling": 1,
"mapRendering": [
{
"icon": {
"render": "circle:white;./assets/themes/facadegardens/geveltuin.svg",
"mappings": [
{
"if": {
"and": [
"direct_sunlight=yes"
]
},
"then": "circle:white;./assets/themes/facadegardens/zon.svg"
},
{
"if": {
"and": [
"direct_sunlight=partial"
]
},
"then": "circle:white;./assets/themes/facadegardens/halfzon.svg"
},
{
"if": {
"and": [
"direct_sunlight=no"
]
},
"then": "circle:white;./assets/themes/facadegardens/schaduw.svg"
}
]
},
"iconOverlays": [
{
"if": "plant~.*vine.*",
"then": "circle:white;./assets/themes/facadegardens/klimplant.svg",
"badge": true
},
{
"if": "plant~.*groundcover.*",
"then": "circle:white;./assets/themes/facadegardens/bodembedekker.svg",
"badge": true
},
{
"if": "edible=true",
"then": "circle:white;./assets/themes/facadegardens/eetbaar.svg",
"badge": true
},
{
"if": "rain_barel=yes",
"then": "circle:white;./assets/themes/facadegardens/gevelton.svg",
"badge": true
},
{
"if": "plant~.*shrub.*",
"then": "circle:white;./assets/themes/facadegardens/struik.svg",
"badge": true
},
{
"if": "plant~.*flower.*",
"then": "circle:white;./assets/themes/facadegardens/bloei.svg",
"badge": true
}
],
"iconSize": {
"render": "50,50,center"
},
"location": [
"point"
]
}
]
} }
] ]
} }

26
assets/themes/fruit_trees/fruit_trees.json
View file

@ -68,6 +68,19 @@
"nl": "Voeg een boomgaard toe (als punt - omtrek nog te tekenen)" "nl": "Voeg een boomgaard toe (als punt - omtrek nog te tekenen)"
} }
} }
],
"mapRendering": [
{
"icon": {
"render": "./assets/themes/buurtnatuur/forest.svg"
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
] ]
}, },
{ {
@ -170,6 +183,19 @@
"nl": "Voeg hier een boom toe" "nl": "Voeg hier een boom toe"
} }
} }
],
"mapRendering": [
{
"icon": {
"render": "./assets/themes/fruit_trees/fruit_tree.svg"
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
] ]
} }
] ]

21
assets/themes/grb.json
View file

@ -197,7 +197,26 @@
"render": "#00f" "render": "#00f"
}, },
"wayHandling": 2, "wayHandling": 2,
"presets": [] "presets": [],
"mapRendering": [
{
"label": {
"mappings": [
{
"if": "addr:housenumber~*",
"then": "<div style='background-color: white; font: large; width: 1.5em; height: 1.5em; border-radius: 100%'>{addr:housenumber}</div>"
}
]
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point",
"centroid"
]
}
]
} }
], ],
"hideFromOverview": true, "hideFromOverview": true,

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

@ -32,8 +32,8 @@
"enablePdfDownload": true, "enablePdfDownload": true,
"enableDownload": true, "enableDownload": true,
"hideFromOverview": true, "hideFromOverview": true,
"#": "Disable clustering for this theme",
"clustering": { "clustering": {
"#": "Disable clustering for this theme",
"maxZoom": 0 "maxZoom": 0
}, },
"layers": [ "layers": [

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

@ -108,6 +108,29 @@
} }
] ]
} }
],
"mapRendering": [
{
"icon": {
"render": "./assets/themes/uk_addresses/housenumber_unknown.svg",
"mappings": [
{
"if": "_embedding_object:id~*",
"then": "./assets/themes/uk_addresses/housenumber_unknown_small.svg"
},
{
"if": "_imported=yes",
"then": "./assets/themes/uk_addresses/housenumber_unknown_small.svg"
}
]
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
] ]
}, },
{ {
@ -254,7 +277,36 @@
"then": "#ff0" "then": "#ff0"
} }
] ]
} },
"mapRendering": [
{
"icon": {
"render": "./assets/themes/uk_addresses/housenumber_ok.svg",
"mappings": [
{
"if": {
"or": [
{
"and": [
"addr:housenumber=",
"nohousenumber!=yes"
]
},
"addr:street="
]
},
"then": "./assets/themes/uk_addresses/housenumber_unknown.svg"
}
]
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
]
}, },
{ {
"id": "named_streets", "id": "named_streets",
@ -272,7 +324,14 @@
}, },
"width": { "width": {
"render": "0" "render": "0"
} },
"mapRendering": [
{
"location": [
"point"
]
}
]
} }
] ]
} }