diff --git a/children.json b/children.json index 4bf56be82..70e1eee1c 100644 --- a/children.json +++ b/children.json @@ -2,6 +2,8 @@ "type": "category", "query": "(node[leisure~'^(playground|summer_camp|indoor_play)$'];way[leisure~'^(playground|summer_camp|indoor_play)$'];relation[leisure~'^(playground|summer_camp|indoor_play)$'];node[shop~'^(baby_goods|toys)$'];way[shop~'^(baby_goods|toys)$'];relation[shop~'^(baby_goods|toys)$'];node[amenity=toilets][diaper];way[amenity=toilets][diaper];relation[amenity=toilets][diaper];node[kids_area];way[kids_area];relation[kids_area];);", "minZoom": 15, - "markerSign": "{% if tags.leisure=='playground' %}⛹{% elseif tags.leisure=='summer_camp'%}🏕{% elseif tags.leisure=='indoor_play' or tags.kids_area %}🏠{% elseif tags.shop=='baby_goods' or tags.shop=='toys' %}{% elseif tags.amenity=='toilets' and tags.diaper %}🚽🚼{% endif %}", - "featureBody": "{% if tags.leisure=='playground' %}playground{% elseif tags.leisure=='summer_camp'%}summer_camp{% elseif tags.leisure=='indoor_play' %}indoor_play{% elseif tags.kids_area %}kids_area{% elseif tags.shop=='baby_goods' or tags.shop=='toys' %}shop for {{ tags.shop }}{% elseif tags.amenity=='toilets' and tags.diaper %}toilets with diaper changing table{% endif %}" + "feature": { + "markerSign": "{% if tags.leisure=='playground' %}⛹{% elseif tags.leisure=='summer_camp'%}🏕{% elseif tags.leisure=='indoor_play' or tags.kids_area %}🏠{% elseif tags.shop=='baby_goods' or tags.shop=='toys' %}{% elseif tags.amenity=='toilets' and tags.diaper %}🚽🚼{% endif %}", + "body": "{% if tags.leisure=='playground' %}playground{% elseif tags.leisure=='summer_camp'%}summer_camp{% elseif tags.leisure=='indoor_play' %}indoor_play{% elseif tags.kids_area %}kids_area{% elseif tags.shop=='baby_goods' or tags.shop=='toys' %}shop for {{ tags.shop }}{% elseif tags.amenity=='toilets' and tags.diaper %}toilets with diaper changing table{% endif %}" + } } diff --git a/gastro.json b/gastro.json index 8db801695..1ae686849 100644 --- a/gastro.json +++ b/gastro.json @@ -2,6 +2,8 @@ "type": "category", "query": "(node[amenity~'^(bar|biergarten|cafe|fast_food|ice_cream|pub|restaurant)$'];way[amenity~'^(bar|biergarten|cafe|fast_food|ice_cream|pub|restaurant)$'];relation[amenity~'^(bar|biergarten|cafe|fast_food|ice_cream|pub|restaurant)$'];);", "minZoom": 16, - "markerSign": "{% if tags.amenity=='bar' %}🍸{% elseif tags.amenity=='biergarten'%}🍻{% elseif tags.amenity=='cafe' %}☕{% elseif tags.amenity=='fast_food' %}🍔{% elseif tags.amenity=='ice_cream' %}🍨{% elseif tags.amenity=='pub' %}🍺{% else %}🍴{% endif %}", - "featureBody": "{{ tags.amenity }}
Cuisine: {{ tags.cuisine|default('unknown') }}" + "feature": { + "markerSign": "{% if tags.amenity=='bar' %}🍸{% elseif tags.amenity=='biergarten'%}🍻{% elseif tags.amenity=='cafe' %}☕{% elseif tags.amenity=='fast_food' %}🍔{% elseif tags.amenity=='ice_cream' %}🍨{% elseif tags.amenity=='pub' %}🍺{% else %}🍴{% endif %}", + "body": "{{ tags.amenity }}
Cuisine: {{ tags.cuisine|default('unknown') }}" + } } diff --git a/parks.json b/parks.json index 4526a04a8..9bd59774f 100644 --- a/parks.json +++ b/parks.json @@ -1,11 +1,13 @@ { "type": "category", "query": "(way[leisure=park];relation[leisure=park];)", - "style": { - "color": "green", - "fillColor": "green", - "fillOpacity": 0.2, - "weight": 2 - }, - "minZoom": 14 + "minZoom": 14, + "feature": { + "style": { + "color": "green", + "fillColor": "green", + "fillOpacity": 0.2, + "weight": 2 + } + } } diff --git a/shop.json b/shop.json index ca81f8044..8104cd2fd 100644 --- a/shop.json +++ b/shop.json @@ -2,8 +2,10 @@ "type": "category", "query": "(node[shop];way[shop];relation[shop];);", "minZoom": 16, - "markerSign": "{% set c = { alcohol: 'fa-beer', baby_goods: '🚼', bag: 'fa-shopping-bag', bakery: 'fa-birthday-cake', beverages: 'fa-beer', boutique: '👚', butcher: 'fa-cutlery', cheese: 'fa-cutlery', chocolate: 'fa-cutlery', clothes: '👚', coffee: 'ia-coffee', confectionery: 'fa-birthday-cake', convenience: 'fa-shopping-basket', deli: 'fa-cutlery', dairy: 'fa-cutlery', department_store: 'fa-building', fabric: '👚', farm: 'fa-cutlery', fashion: '👚', general: 'fa-shopping-bag', greengrocer: 'fa-cutlery', hairdresser: '👱', ice_cream: '🍨', jewelry: '💍', kiosk: 'fa-newspaper-o', leather: '👚', mall: 'fa-building', pasta: 'fa-cutlery', pastry: 'fa-birthday-cake', seafood: 'fa-cutlery', sewing: '👚', shoes: '👟', spices: 'fa-cutlery', supermarket: 'fa-shopping-cart', tailor: '👚', tea: 'fa-coffee', watches: '⌚' }[tags.shop]|default('fa-shopping-bag') %}{% if c|slice(0, 3) == 'fa-' %}{% else %}{{ c|raw }}{% endif %}", - "__": "need better icons for: bakery, butcher, cheese, ice_cream, ", - "__": "no icons for: brewing_supplies, charity, second_hand, variety_store", - "featureBody": "{{ tags.shop }}" + "feature": { + "body": "{{ tags.shop }}", + "markerSign": "{% set c = { alcohol: 'fa-beer', baby_goods: '🚼', bag: 'fa-shopping-bag', bakery: 'fa-birthday-cake', beverages: 'fa-beer', boutique: '👚', butcher: 'fa-cutlery', cheese: 'fa-cutlery', chocolate: 'fa-cutlery', clothes: '👚', coffee: 'ia-coffee', confectionery: 'fa-birthday-cake', convenience: 'fa-shopping-basket', deli: 'fa-cutlery', dairy: 'fa-cutlery', department_store: 'fa-building', fabric: '👚', farm: 'fa-cutlery', fashion: '👚', general: 'fa-shopping-bag', greengrocer: 'fa-cutlery', hairdresser: '👱', ice_cream: '🍨', jewelry: '💍', kiosk: 'fa-newspaper-o', leather: '👚', mall: 'fa-building', pasta: 'fa-cutlery', pastry: 'fa-birthday-cake', seafood: 'fa-cutlery', sewing: '👚', shoes: '👟', spices: 'fa-cutlery', supermarket: 'fa-shopping-cart', tailor: '👚', tea: 'fa-coffee', watches: '⌚' }[tags.shop]|default('fa-shopping-bag') %}{% if c|slice(0, 3) == 'fa-' %}{% else %}{{ c|raw }}{% endif %}", + "__": "need better icons for: bakery, butcher, cheese, ice_cream, ", + "__": "no icons for: brewing_supplies, charity, second_hand, variety_store" + } } diff --git a/trees.json b/trees.json index ab8e367cd..b6b4c5bd5 100644 --- a/trees.json +++ b/trees.json @@ -1,19 +1,21 @@ { "type": "category", "query": "node[natural=tree];", - "style": { - "nodeFeature": "CircleMarker", - "color": "red", - "fillColor": "red", - "fillOpacity": 0.1, - "weight": 1, - "radius": 6 - }, - "marker": { - "iconUrl": "img/map_pointer.png", - "iconSize": [ 25, 42 ], - "iconAnchor": [ 13, 42 ] - }, "minZoom": 17, - "featureTitle": "{{ tags.species|default('Tree') }}" + "feature": { + "title": "{{ tags.species|default('Tree') }}", + "style": { + "nodeFeature": "CircleMarker", + "color": "red", + "fillColor": "red", + "fillOpacity": 0.1, + "weight": 1, + "radius": 6 + }, + "marker": { + "iconUrl": "img/map_pointer.png", + "iconSize": [ 25, 42 ], + "iconAnchor": [ 13, 42 ] + } + } }