improve

children.json

@@ -1,110 +1,116 @@
 {
-    "type": "overpass",
-    "name": {
-        "de": "Einrichtungen für Kinder",
-        "en": "Children amenities",
-        "fr": "Équipements pour enfants",
-        "pt-br": "Equipamentos Infantis"
+  "type": "overpass",
+  "name": {
+    "de": "Einrichtungen für Kinder",
+    "en": "Children amenities",
+    "fr": "Équipements pour enfants",
+    "pt-br": "Equipamentos Infantis"
+  },
+  "query": {
+    "15": [
+      "(",
+      "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];",
+      ");"
+    ],
+    "17": [
+      "(",
+      "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];",
+      "node[playground];",
+      "way[playground];",
+      "relation[playground];",
+      ");"
+    ]
+  },
+  "feature": {
+    "pre": [
+      "{% if tags.leisure %}",
+      "  {% set key = 'leisure' %}",
+      "  {% set value = tags.leisure %}",
+      "{% elseif tags.kids_area %}",
+      "  {% set key = 'kids_area' %}",
+      "  {% set value = tags.kids_area %}",
+      "{% elseif tags.shop  %}",
+      "  {% set key = 'shop' %}",
+      "  {% set value = tags.shop %}",
+      "{% elseif tags.playground  %}",
+      "  {% set key = 'playground' %}",
+      "  {% set value = tags.playground %}",
+      "{% else %}",
+      "  {% set key = 'amenity' %}",
+      "  {% set value = tags.amenity %}",
+      "{% endif %}",
+      "",
+      "{% set type_data = const[concat(key, '=', value)] || const['default'] %}"
+    ],
+    "title": "{{ keyTrans(key) }}: {{localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) | default(localizedTag(tags, 'ref')) | default(tagTrans(key, value)) }}",
+    "markerSign": "{{ type_data.sign|raw }}",
+    "priority": "{{ type_data.priority }}",
+    "style": {
+      "fillColor": "{% if tags.playground!='' %}#3388ff{% else %}#1dc140{% endif %}"
+    }
+  },
+  "info": [
+    "<table>",
+    "{% for value, data in const %}",
+    "  <tr>",
+    "    <td>{{ markerCircle({})|raw }}<div class='sign'>{{ data.sign|raw }}</div></td>",
+    "    <td>{{ tagTrans(value|split('=')[0], value|split('=')[1]) }}</td>",
+    "  </tr>",
+    "{% endfor %}",
+    "</table>"
+  ],
+  "const": {
+    "leisure=playground": {
+      "priority": 10,
+      "sign": "⛹"
     },
-    "query": {
-        "15": [
-            "(",
-            "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];",
-            "node[playground];",
-            "way[playground];",
-            "relation[playground];",
-            ");"
-        ]
+    "leisure=summer_camp": {
+      "priority": 10,
+      "sign": "🏕"
     },
-    "feature": {
-        "pre": [
-            "{% if tags.leisure %}",
-            "  {% set key = 'leisure' %}",
-            "  {% set value = tags.leisure %}",
-            "{% elseif tags.kids_area %}",
-            "  {% set key = 'kids_area' %}",
-            "  {% set value = tags.kids_area %}",
-            "{% elseif tags.shop  %}",
-            "  {% set key = 'shop' %}",
-            "  {% set value = tags.shop %}",
-            "{% elseif tags.playground  %}",
-            "  {% set key = 'playground' %}",
-            "  {% set value = tags.playground %}",
-            "{% else %}",
-            "  {% set key = 'amenity' %}",
-            "  {% set value = tags.amenity %}",
-            "{% endif %}"
-        ],
-        "title": "{{ keyTrans(key) }}: {{localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) | default(localizedTag(tags, 'ref')) | default(tagTrans(key, value)) }}",
-        "description": [
-            "{{key}}: {{value}}",
-            "{% if tags.leisure=='playground' %}",
-            "{{ tagTrans('leisure', 'playground') }}",
-            "{% elseif tags.leisure=='summer_camp'%}",
-            "{{ tagTrans('leisure', 'summer_camp') }}",
-            "{% elseif tags.leisure=='indoor_play' %}",
-            "{{ tagTrans('leisure', 'indoor_play') }}",
-            "{% elseif tags.kids_area %}",
-            "{{ keyTrans('kids_area') }}",
-            "{% elseif tags.shop=='baby_goods' or tags.shop=='toys' %}",
-            "{{ keyTrans('shop') }}: {{ tagTrans('shop', tags.shop) }}",
-            "{% elseif tags.amenity=='toilets' and tags.diaper %}",
-            "{{ tagTrans('amenity', 'toilets') }} with diaper changing table",
-            "{% endif %}"
-        ],
-        "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' %}",
-            "<i class=\"fa fa-shopping-cart\"></i>",
-            "{% elseif tags.amenity=='toilets' and tags.diaper %}",
-            "🚽🚼",
-            "{% endif %}"
-        ],
-        "style": {
-            "fillColor": "{% if tags.playground!='' %}#3388ff{% else %}#1dc140{% endif %}"
-        }
+    "leisure=indoor_play": {
+      "priority": 8,
+      "sign": "🏠"
     },
-    "info": [
-        "<table>",
-        "  <tr>",
-        "    <td>{{ markerCircle({})|raw }}<div class='sign'>⛹</div></td>",
-        "    <td>{{ tagTrans('leisure', 'playground') }}</td>",
-        "  </tr>",
-        "  <tr>",
-        "    <td>{{ markerCircle({})|raw }}<div class='sign'>🏠</div></td>",
-        "    <td>{{ tagTrans('leisure', 'indoor_play') }}</td>",
-        "  </tr>",
-        "  <tr>",
-        "    <td>{{ markerCircle({})|raw }}<div class='sign'>🏕</div></td>",
-        "    <td>{{ tagTrans('leisure', 'summer_camp') }}</td>",
-        "  </tr>",
-        "  <tr>",
-        "    <td>{{ markerCircle({})|raw }}<div class='sign'>🏠</div></td>",
-        "    <td>{{ keyTrans('kids_area') }}</td>",
-        "  </tr>",
-        "  <tr>",
-        "    <td>{{ markerCircle({})|raw }}<div class='sign'><i class=\"fa fa-shopping-cart\"></i></div></td>",
-        "    <td>{{ keyTrans('shop') }}: {{ tagTransList('shop', 'baby_goods;toys') }}</td>",
-        "  </tr>",
-        "  <tr>",
-        "    <td>{{ markerCircle({})|raw }}<div class='sign'>🚽🚼</div></td>",
-        "    <td>{{ tagTrans('amenity', 'toilets') }} with diaper changing table</td>",
-        "  </tr>",
-        "</table>"
-    ]
+    "shop=baby_goods": {
+      "priority": 8,
+      "sign": "<i class=\"fa fa-shopping-cart\"></i>"
+    },
+    "shop=toys": {
+      "priority": 8,
+      "sign": "<i class=\"fa fa-shopping-cart\"></i>"
+    },
+    "amenity=toilets": {
+      "priority": 6,
+      "sign": "🚽🚼"
+    },
+    "playground=swing": {
+      "priority": 4,
+      "sign": ""
+    },
+    "default=yes": {
+      "priority": 0,
+      "sign": ""
+    }
+  }
 }