Adapt to new overpass-layer version

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' %}&#9977;{% elseif tags.leisure=='summer_camp'%}&#127957;{% elseif tags.leisure=='indoor_play' or tags.kids_area %}&#127968;{% elseif tags.shop=='baby_goods' or tags.shop=='toys' %}<i class=\"fa fa-shopping-cart\"></i>{% elseif tags.amenity=='toilets' and tags.diaper %}&#128701;&#128700;{% 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' %}&#9977;{% elseif tags.leisure=='summer_camp'%}&#127957;{% elseif tags.leisure=='indoor_play' or tags.kids_area %}&#127968;{% elseif tags.shop=='baby_goods' or tags.shop=='toys' %}<i class=\"fa fa-shopping-cart\"></i>{% elseif tags.amenity=='toilets' and tags.diaper %}&#128701;&#128700;{% 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 %}"
+    }
 }

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 }}<br/>Cuisine: {{ tags.cuisine|default('unknown') }}"
+    "feature": {
+        "markerSign": "{% if tags.amenity=='bar' %}&#127864;{% elseif tags.amenity=='biergarten'%}&#127867;{% elseif tags.amenity=='cafe' %}&#9749;{% elseif tags.amenity=='fast_food' %}&#127828;{% elseif tags.amenity=='ice_cream' %}&#127848;{% elseif tags.amenity=='pub' %}&#127866;{% else %}&#127860;{% endif %}",
+        "body": "{{ tags.amenity }}<br/>Cuisine: {{ tags.cuisine|default('unknown') }}"
+    }
 }

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
+        }
+    }
 }

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: '&#128700;', bag: 'fa-shopping-bag', bakery: 'fa-birthday-cake', beverages: 'fa-beer', boutique: '&#128090;', butcher: 'fa-cutlery', cheese: 'fa-cutlery', chocolate: 'fa-cutlery', clothes: '&#128090;', coffee: 'ia-coffee', confectionery: 'fa-birthday-cake', convenience: 'fa-shopping-basket', deli: 'fa-cutlery', dairy: 'fa-cutlery', department_store: 'fa-building', fabric: '&#128090;', farm: 'fa-cutlery', fashion: '&#128090;', general: 'fa-shopping-bag', greengrocer: 'fa-cutlery', hairdresser: '&#128113;', ice_cream: '&#127848;', jewelry: '&#128141;', kiosk: 'fa-newspaper-o', leather: '&#128090;', mall: 'fa-building', pasta: 'fa-cutlery', pastry: 'fa-birthday-cake', seafood: 'fa-cutlery', sewing: '&#128090;', shoes: '&#128095;', spices: 'fa-cutlery', supermarket: 'fa-shopping-cart', tailor: '&#128090;', tea: 'fa-coffee', watches: '&#8986;' }[tags.shop]|default('fa-shopping-bag') %}{% if c|slice(0, 3) == 'fa-' %}<i class=\"fa {{ c }}\"></i>{% 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: '&#128700;', bag: 'fa-shopping-bag', bakery: 'fa-birthday-cake', beverages: 'fa-beer', boutique: '&#128090;', butcher: 'fa-cutlery', cheese: 'fa-cutlery', chocolate: 'fa-cutlery', clothes: '&#128090;', coffee: 'ia-coffee', confectionery: 'fa-birthday-cake', convenience: 'fa-shopping-basket', deli: 'fa-cutlery', dairy: 'fa-cutlery', department_store: 'fa-building', fabric: '&#128090;', farm: 'fa-cutlery', fashion: '&#128090;', general: 'fa-shopping-bag', greengrocer: 'fa-cutlery', hairdresser: '&#128113;', ice_cream: '&#127848;', jewelry: '&#128141;', kiosk: 'fa-newspaper-o', leather: '&#128090;', mall: 'fa-building', pasta: 'fa-cutlery', pastry: 'fa-birthday-cake', seafood: 'fa-cutlery', sewing: '&#128090;', shoes: '&#128095;', spices: 'fa-cutlery', supermarket: 'fa-shopping-cart', tailor: '&#128090;', tea: 'fa-coffee', watches: '&#8986;' }[tags.shop]|default('fa-shopping-bag') %}{% if c|slice(0, 3) == 'fa-' %}<i class=\"fa {{ c }}\"></i>{% else %}{{ c|raw }}{% endif %}",
+        "__": "need better icons for: bakery, butcher, cheese, ice_cream, ",
+        "__": "no icons for: brewing_supplies, charity, second_hand, variety_store"
+    }
 }

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 ]
+        }
+    }
 }