Merge branch '3-common-popup-body'

administrative.json

@@ -24,6 +24,6 @@
     },
     "feature": {
         "description": "{{ tagTrans('admin_level', tags.admin_level) }}",
-        "body": "{{ tagTrans('admin_level', tags.admin_level) }}\n<br/>\n{{ keyTrans('admin_level') }}: {{ tags.admin_level }}"
+        "body": "{{ keyTrans('admin_level') }}: {{ tags.admin_level }}"
     }
 }

agriculture.json

@@ -19,7 +19,6 @@
         "13": "(\nnode[landuse~\"^(allotments|farm|farmland|farmyard|greenhouse_horticulture|orchard|vineyard)$\"];\nway[landuse~\"^(allotments|farm|farmland|farmyard|greenhouse_horticulture|orchard|vineyard)$\"];\nrelation[landuse~\"^(allotments|farm|farmland|farmyard|greenhouse_horticulture|orchard|vineyard)$\"];\n)"
     },
     "feature": {
-        "description": "{{ tagTrans('landuse', tags.landuse) }}",
-        "body": "{{ tagTrans('landuse', tags.landuse) }}"
+        "description": "{{ tagTrans('landuse', tags.landuse) }}"
     }
 }

car_amenities.json

@@ -19,7 +19,6 @@
     "feature": {
         "pre": "{% set key = 'amenity' %}\n{% set value = tags.amenity %}",
         "description": "{{ tagTrans(key, value) }}",
-        "body": "{{ tagTrans(key, value) }}",
         "markerSign": "{{ const[value] }}"
     },
     "const": {

children.json

@@ -1,14 +1,14 @@
 {
+    "type": "overpass",
     "name": {
         "de": "Einrichtungen für Kinder",
         "en": "Children amenities"
     },
-    "type": "overpass",
-    "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,
+    "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];);"
+    },
     "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' %}{{ 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 %}",
         "description": "{% 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 %}"
     }
 }

commonBody.html

@@ -0,0 +1,118 @@
+<ul>
+{% set address = tagsPrefix(tags, 'addr:') %}
+{% if address %}
+<li class='hasSymbol'>
+  <i class="fa fa-map-marker" aria-hidden="true"></i>
+  <span class='key'>{{ keyTrans('addr') }}:</span>
+  <span class='value'>
+    {{ attribute(tags, 'addr:street') }}
+    {{ attribute(tags, 'addr:housenumber') }},
+    {{ attribute(tags, 'addr:postcode') }}
+    {{ attribute(tags, 'addr:city') }}
+  </span>
+</li>
+{% endif %}
+
+{% if tags.website %}
+<li class='hasSymbol'>
+  <i class="fa fa-globe" aria-hidden="true"></i>
+  <span class='key'>{{ keyTrans('website') }}:</span>
+  <span class='value'>
+    <a target='_blank' href='{{ tags.website }}'>{{ tags.website }}</a>
+  </span>
+</li>
+{% endif %}
+
+{% if attribute(tags, 'contact:website') %}
+<li class='hasSymbol'>
+  <i class="fa fa-globe" aria-hidden="true"></i>
+  <span class='key'>{{ keyTrans('website') }}:</span>
+  <span class='value'>
+    <a target='_blank' href='{{ attribute(tags, 'contact:website') }}'>{{ attribute(tags, 'contact:website') }}</a>
+  </span>
+</li>
+{% endif %}
+
+{% if tags.phone %}
+<li class='hasSymbol'>
+  <i class="fa fa-phone" aria-hidden="true"></i>
+  <span class='key'>{{ keyTrans('phone') }}:</span>
+  <span class='value'>
+    <a target='_blank' href='tel:{{ tags.phone }}'>{{ tags.phone }}</a>
+  </span>
+</li>
+{% endif %}
+
+{% if attribute(tags, 'contact:phone') %}
+<li class='hasSymbol'>
+  <i class="fa fa-phone" aria-hidden="true"></i>
+  <span class='key'>{{ keyTrans('phone') }}:</span>
+  <span class='value'>
+    <a target='_blank' href='tel:{{ attribute(tags, 'contact:phone') }}'>{{ attribute(tags, 'contact:phone') }}</a>
+  </span>
+</li>
+{% endif %}
+
+{% if attribute(tags, 'contact:email') or tags.email %}
+<li class='hasSymbol'>
+  <i class="fa fa-user-circle" aria-hidden="true"></i>
+  <span class='key'>{{ keyTrans('contact') }}:</span>
+  <span class='value'>
+
+  {% if attribute(tags, 'contact:email') %}
+    <a target='_blank' href='mailto:{{ attribute(tags, 'contact:email') }}'>
+      <i class="fa fa-envelope" aria-hidden="true"></i>
+    </a>
+  {% endif %}
+
+  {% if attribute(tags, 'email') %}
+    <a target='_blank' href='mailto:{{ attribute(tags, 'email') }}'>
+      <i class="fa fa-envelope" aria-hidden="true"></i>
+    </a>
+  {% endif %}
+
+  </span>
+</li>
+{% endif %}
+
+{% if tags.opening_hours %}
+<li class='hasSymbol'>
+  <i class="fa fa-clock-o" aria-hidden="true"></i>
+  <span class='key'>{{ keyTrans('opening_hours') }}:</span>
+  <span class='value'>
+    {{ tags.opening_hours }}
+  </span>
+</li>
+{% endif %}
+
+{% set payment = tagsPrefix(tags, 'payment:') %}
+{% if payment %}
+<li class='hasSymbol'>
+  <i class="fa fa-money" aria-hidden="true"></i>
+  <span class='key'>{{ keyTrans('payment') }}:</span>
+  <span class='value'>
+    {% for k, tag in payment %}
+    {% if tags[tag] == 'no' %}<s>{{ k }}</s> {% else %}{{ k }} {% endif %}
+    {% endfor %}
+  </span>
+</li>
+{% endif %}
+
+{% if attribute(tags, 'wheelchair') %}
+<li class='hasSymbol'>
+  <i class="fa fa-info-circle" aria-hidden="true"></i>
+  <span class='key'>{{ trans('facilities') }}:</span>
+  <span class='value'>
+
+  {% if attribute(tags, 'wheelchair') %}
+    <i class="fa fa-wheelchair-alt {{ tags.wheelchair }}" aria-hidden="true" title='{{ keyTrans('wheelchair') }}: {{ tagTrans('wheelchair', tags.wheelchair) }}'></i>
+
+    {% if attribute(tags, 'toilets:wheelchair') %}
+      (<span class='{{ attribute(tags, 'toilets:wheelchair') }}' title='{{ keyTrans('toilets:wheelchair') }}: {{ tagTrans('toilets:wheelchair', attribute(tags, 'toilets:wheelchair')) }}'>&#128701;</span>)
+    {% endif %}
+  {% endif %}
+  </span>
+</li>
+{% endif %}
+
+</ul>

communication.json

@@ -1,4 +1,5 @@
 {
+    "type": "overpass",
     "name": {
         "ast": "Comunicaciones",
         "ca": "Comunicacions",
@@ -16,16 +17,14 @@
         "ru": "Услуги связи",
         "uk": "Телекомунікації"
     },
-    "type": "overpass",
     "query": {
         "13": "(node[amenity~'^(post_office|internet_cafe)$'];way[amenity~'^(post_office|internet_cafe)$'];relation[amenity~'^(post_office|internet_cafe)$'];);",
         "16": "(node[amenity~'^(post_office|internet_cafe|post_box|telephone)$'];way[amenity~'^(post_office|internet_cafe)$'];relation[amenity~'^(post_office|internet_cafe)$'];);"
     },
-    "minZoom": 13,
     "feature": {
         "title": "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) |default(tagTrans('amenity', tags.amenity)) }}",
         "markerSign": "{% if tags.amenity=='post_office' %}🏤{% elseif tags.amenity=='post_box'%}📮{% elseif tags.amenity=='internet_cafe' %}💻{% elseif tags.amenity=='telephone' %}✆{% endif %}",
-        "body": "{{ tagTrans('amenity', tags.amenity) }}<br/>{% if tags.operator %}{{ keyTrans('operator') }}: {{ localizedTag(tags, 'operator') }}<br/>{% endif %}",
+        "body": "{% if tags.operator %}{{ keyTrans('operator') }}: {{ localizedTag(tags, 'operator') }}<br/>{% endif %}",
         "description": "{{ tagTrans('amenity', tags.amenity) }}"
     }
 }

construction.json

@@ -16,7 +16,6 @@
     },
     "feature": {
         "pre": "{% if tags.highway == 'construction' %}\n{% set key = 'highway' %}\n{% set value = tags.highway %}\n{% else %}\n{% set key = 'landuse' %}\n{% set value = tags.landuse %}\n{% endif %}",
-        "description": "{{ tagTrans(key, value) }}",
-        "body": "{{ tagTrans(key, value) }}"
+        "description": "{{ tagTrans(key, value) }}"
     }
 }

culture.json

@@ -25,7 +25,6 @@
     "feature": {
         "pre": "{% if tags.amenity in [ 'arts_centre', 'cinema', 'community_centre', 'fountain', 'studio', 'theatre' ] %}\n{% set key = 'amenity' %}\n{% set value = tags.amenity %}\n{% elseif tags.tourism %}\n{% set key = 'tourism' %}\n{% set value = tags.tourism %}\n{% endif %}",
         "description": "{{ tagTrans(key, value) }}",
-        "body": "{{ tagTrans(key, value) }}",
         "markerSign": "{{ const[value] }}"
     },
     "const": {

cycle_amenities.json

@@ -11,7 +11,7 @@
     "feature": {
         "pre": "{% if tags.shop in [ 'bicycle' ] %}\n  {% set key = 'shop' %}\n  {% set value = tags.shop %}\n{% elseif attribute(tags, \"monitoring:bicycle\") %}\n  {% set key = 'man_made' %}\n  {% set value = 'monitoring_station' %}\n{% elseif tags.vending in [ 'bicycle_tube' ] %}\n  {% set key = 'vending' %}\n  {% set value = tags.vending %}\n{% else %}\n  {% set key = 'amenity' %}\n  {% set value = tags.amenity %}\n{% endif %}\n\n{% set constIndex = (key ~ \"=\" ~ value) %}",
         "description": "{{ tagTrans(key, value) }}",
-        "body": "{{ tagTrans(key, value) }}\n\n{% if tags.capacity %}\n  <br/>\n  {{ keyTrans('capacity') }}: {{ tags.capacity }}\n{% endif %}",
+        "body": "{% if tags.capacity %}\n  {{ keyTrans('capacity') }}: {{ tags.capacity }}\n{% endif %}",
         "markerSign": "{{ const[constIndex] }}",
         "title": "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) | default(localizedTag(tags, 'ref')) | default(trans('unnamed')) }}\n\n{% if tags.capacity %}({{ tags.capacity }}){% endif %}"
     },

detailsBody.html

@@ -0,0 +1,133 @@
+<ul>
+{% set address = tagsPrefix(tags, 'addr:') %}
+{% if address %}
+<li class='hasSymbol'>
+  <i class="fa fa-map-marker" aria-hidden="true"></i>
+  <span class='key'>{{ keyTrans('addr') }}:</span>
+  <span class='value'>
+    {{ attribute(tags, 'addr:street') }}
+    {{ attribute(tags, 'addr:housenumber') }},
+    {{ attribute(tags, 'addr:postcode') }}
+    {{ attribute(tags, 'addr:city') }}
+  </span>
+</li>
+{% endif %}
+
+{% if tags.website %}
+<li class='hasSymbol'>
+  <i class="fa fa-globe" aria-hidden="true"></i>
+  <span class='key'>{{ keyTrans('website') }}:</span>
+  <span class='value'>
+    <a target='_blank' href='{{ tags.website }}'>{{ tags.website }}</a>
+  </span>
+</li>
+{% endif %}
+
+{% if attribute(tags, 'contact:website') %}
+<li class='hasSymbol'>
+  <i class="fa fa-globe" aria-hidden="true"></i>
+  <span class='key'>{{ keyTrans('website') }}:</span>
+  <span class='value'>
+    <a target='_blank' href='{{ attribute(tags, 'contact:website') }}'>{{ attribute(tags, 'contact:website') }}</a>
+  </span>
+</li>
+{% endif %}
+
+{% if tags.phone %}
+<li class='hasSymbol'>
+  <i class="fa fa-phone" aria-hidden="true"></i>
+  <span class='key'>{{ keyTrans('phone') }}:</span>
+  <span class='value'>
+    <a target='_blank' href='tel:{{ tags.phone }}'>{{ tags.phone }}</a>
+  </span>
+</li>
+{% endif %}
+
+{% if attribute(tags, 'contact:phone') %}
+<li class='hasSymbol'>
+  <i class="fa fa-phone" aria-hidden="true"></i>
+  <span class='key'>{{ keyTrans('phone') }}:</span>
+  <span class='value'>
+    <a target='_blank' href='tel:{{ attribute(tags, 'contact:phone') }}'>{{ attribute(tags, 'contact:phone') }}</a>
+  </span>
+</li>
+{% endif %}
+
+{% if attribute(tags, 'contact:email') %}
+<li class='hasSymbol'>
+  <i class="fa fa-envelope" aria-hidden="true"></i>
+  <span class='key'>{{ keyTrans('email') }}:</span>
+  <span class='value'>
+    <a target='_blank' href='mailto:{{ attribute(tags, 'contact:email') }}'>
+    {{ attribute(tags, 'contact:email') }}
+    </a>
+  </span>
+</li>
+{% endif %}
+
+{% if attribute(tags, 'email') %}
+<li class='hasSymbol'>
+  <i class="fa fa-envelope" aria-hidden="true"></i>
+  <span class='key'>{{ keyTrans('email') }}:</span>
+  <span class='value'>
+    <a target='_blank' href='mailto:{{ attribute(tags, 'email') }}'>
+    {{ attribute(tags, 'email') }}
+    </a>
+  </span>
+</li>
+{% endif %}
+
+{% if tags.opening_hours %}
+<li class='hasSymbol'>
+  <i class="fa fa-clock-o" aria-hidden="true"></i>
+  <span class='key'>{{ keyTrans('opening_hours') }}:</span>
+  <span class='value'>
+    {{ tags.opening_hours }}
+  </span>
+</li>
+{% endif %}
+
+{% set payment = tagsPrefix(tags, 'payment:') %}
+{% if payment %}
+<li class='hasSymbol'>
+  <i class="fa fa-money" aria-hidden="true"></i>
+  <span class='key'>{{ keyTrans('payment') }}:</span>
+  <span class='value'>
+    {% for k, tag in payment %}
+    {% if tags[tag] == 'no' %}<s>{{ k }}</s> {% else %}{{ k }} {% endif %}
+    {% endfor %}
+  </span>
+</li>
+{% endif %}
+
+{% if attribute(tags, 'wheelchair') %}
+<li class='hasSymbol'>
+  <i class="fa fa-info-circle" aria-hidden="true"></i>
+  <span class='key'>{{ trans('facilities') }}:</span>
+  <span class='value'>
+  
+  <ul>
+  {% if attribute(tags, 'wheelchair') %}
+    <li class='hasSymbol'>
+      <i class="fa fa-wheelchair-alt {{ tags.wheelchair }}" aria-hidden="true"></i>
+      <span class='key'>{{ keyTrans('wheelchair') }}:</span>
+      <span class='value'>
+      {{ tagTrans('wheelchair', tags.wheelchair) }}
+      <ul>
+      {% if attribute(tags, 'toilets:wheelchair') %}
+        <li class='hasSymbol'>
+          <span class='{{ attribute(tags, 'toilets:wheelchair') }} symbol'>&#128701;</span>
+          <span class='key'>{{ keyTrans('toilets:wheelchair') }}:</span>
+          <span class='value'>{{ tagTrans('toilets:wheelchair', attribute(tags, 'toilets:wheelchair')) }}</span>
+        </li>
+      {% endif %}
+      </ul>
+      </span>
+    </li>
+  {% endif %}
+  </ul>
+  </span>
+</li>
+{% endif %}
+
+</ul>

education.json

@@ -1,4 +1,5 @@
 {
+    "type": "overpass",
     "name": {
         "ast": "Servicios educativos",
         "cs": "Vzdělávací služby",
@@ -15,16 +16,14 @@
         "ru": "Образование",
         "uk": "Освіта"
     },
-    "type": "overpass",
     "query": {
         "11": "(node[amenity~'^(college|university|library)$'];way[amenity~'^(college|university|library)$'];relation[amenity~'^(college|university|library)$'];)",
         "14": "(node[amenity~'^(college|university|library|school|kindergarten|language_school)$'];way[amenity~'^(college|university|library|school|kindergarten|language_school)$'];relation[amenity~'^(college|university|library|school|kindergarten|language_school)$'];)",
         "16": "(node[amenity~'^(college|university|library|school|kindergarten|public_bookcase)$'];way[amenity~'^(college|university|library|school|kindergarten|public_bookcase)$'];relation[amenity~'^(college|university|library|school|kindergarten|public_bookcase)$'];)"
     },
-    "minZoom": 11,
     "feature": {
         "markerSign": "{% if tags.amenity == 'university' or tags.amenity == 'college' %}🎓{% elseif tags.amenity == 'library' %}🕮{% elseif tags.amenity == 'school' or tags.amenity == 'language_school' %}🏫{% elseif tags.amenity == 'kindergarten' %}⛹{% elseif tags.amenity == 'public_bookcase' %}📚{% endif %}",
-        "body": "{{ tagTrans('amenity', tags.amenity) }}<br/>{% if tags.operator %}{{ keyTrans('operator') }}: {{ tags.operator }}<br/>{% endif %}",
+        "body": "{% if tags.operator %}{{ keyTrans('operator') }}: {{ tags.operator }}<br/>{% endif %}",
         "description": "{{ tagTrans('amenity', tags.amenity) }}",
         "priority": "{% if tags.amenity == 'university' %}0{% elseif tags.amenity == 'college' %}1{% elseif tags.amenity == 'library' %}2{% elseif tags.amenity == 'school' or tags.amenity == 'language_school' %}3{% elseif tags.amenity == 'kindergarten' %}4{% elseif tags.amenity == 'public_bookcase' %}5{% endif %}"
     }

emergency.json

@@ -23,7 +23,6 @@
     },
     "feature": {
         "description": "{{ tagTrans('amenity', tags.amenity) }}",
-        "body": "{{ tagTrans('amenity', tags.amenity) }}",
         "markerSign": "{% set data = const[tags.amenity] %}\n{% if data %}\n{{ data.sign }}\n{% endif %}"
     },
     "const": {

financial.json

@@ -21,7 +21,6 @@
     },
     "feature": {
         "description": "{{ tagTrans('amenity', tags.amenity) }}",
-        "body": "{{ tagTrans('amenity', tags.amenity) }}",
         "markerSign": "{{ const[tags.amenity] }}"
     },
     "const": {

gastro.json

@@ -1,4 +1,5 @@
 {
+    "type": "overpass",
     "name": {
         "ast": "Gastronomía",
         "cs": "Stravování",
@@ -15,12 +16,12 @@
         "ru": "Общепит",
         "uk": "Гастрономія"
     },
-    "type": "overpass",
-    "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,
+    "query": {
+        "16": "(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)$'];);"
+    },
     "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": "{{ tagTrans('amenity', tags.amenity) }}<br/>{{ keyTrans('cuisine') }}: {{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}",
+        "body": "<ul>\n  <li class='hasSymbol'>\n   <i class=\"fa fa-cutlery\" aria-hidden=\"true\"></i>\n   <span class='key'>{{ keyTrans('cuisine') }}:</span>\n   <span class='value'>{{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}</span>\n  </li>\n</ul>",
         "description": "{{ tagTrans('amenity', tags.amenity) }}"
     }
 }

health.json

@@ -21,7 +21,6 @@
     },
     "feature": {
         "description": "{{ tagTrans('amenity', tags.amenity) }}",
-        "body": "{{ tagTrans('amenity', tags.amenity) }}",
         "markerSign": "{{ const[tags.amenity] }}"
     },
     "const": {

hiking_routes.json

@@ -12,7 +12,6 @@
     },
     "feature": {
         "description": "{{ tagTrans('network', tags.network) }}",
-        "body": "{{ tagTrans('network', tags.network) }}",
         "priority": "{% set network_data = const[tags.network] %}\n{% if network_data %}\n{{ network_data.priority }}\n{% endif %}"
     },
     "const": {

historic.json

@@ -23,7 +23,6 @@
     },
     "feature": {
         "description": "{{ tagTransList('historic', tags.historic) }}",
-        "body": "{{ tagTransList('historic', tags.historic) }}",
         "markerSign": "{{ const[tags.historic] }}"
     },
     "const": {

leisure.json

@@ -1,4 +1,5 @@
 {
+    "type": "overpass",
     "name": {
         "ast": "Recréu",
         "cs": "Volný čas",
@@ -13,20 +14,17 @@
         "ru": "Досуг",
         "uk": "Дозвілля"
     },
-    "type": "overpass",
     "query": {
         "14": "(way[leisure~'^(park|common)$'];relation[leisure='^(park|common)$'];)",
         "16": "(node[amenity~'^(bench|swimming_pool)$'];way[leisure~'^(park|common|nature_reserve|swimming_pool)$'];relation[leisure='^(park|common|nature_reserve|swimming_pool)$'];)"
     },
-    "minZoom": 14,
     "feature": {
         "style": {
             "color": "green",
             "fillColor": "green",
-            "fillOpacity": 0.2,
-            "weight": 2
+            "fillOpacity": "0.2",
+            "weight": "2"
         },
-        "body": "{% if tags.leisure %}{{ tagTrans('leisure', tags.leisure ) }}{% elseif tags.amenity %}{{ tagTrans('amenity', tags.amenity ) }}{% endif %}",
         "description": "{% if tags.leisure %}{{ tagTrans('leisure', tags.leisure ) }}{% elseif tags.amenity %}{{ tagTrans('amenity', tags.amenity ) }}{% endif %}"
     }
 }

military.json

@@ -20,7 +20,6 @@
     },
     "feature": {
         "pre": "{% if tags.military %}\n  {% set key = 'military' %}\n  {% set value = tags.military %}\n{% else %}\n  {% set key = 'landuse' %}\n  {% set value = tags.landuse %}\n{% endif %}",
-        "description": "{{ tagTrans(key, value) }}",
-        "body": "{{ tagTrans(key, value) }}"
+        "description": "{{ tagTrans(key, value) }}"
     }
 }

natural.json

@@ -21,7 +21,6 @@
     },
     "feature": {
         "title": "{{ localizedTag(tags, 'name') | default(trans('unnamed')) }}\n{% if tags.natural == 'peak' and tags.ele %}({{ tags.ele }}m){% endif %}",
-        "description": "{{ tagTrans('natural', tags.natural) }}",
-        "body": "{{ tagTrans('natural', tags.natural) }}"
+        "description": "{{ tagTrans('natural', tags.natural) }}"
     }
 }

places.json

@@ -1,4 +1,5 @@
 {
+    "type": "overpass",
     "name": {
         "ast": "Llugares",
         "cs": "Sídla",
@@ -16,7 +17,6 @@
         "ru": "Места",
         "uk": "Місцевість"
     },
-    "type": "overpass",
     "query": {
         "0": "node[place~'^(continent)$']",
         "4": "node[place~'^(continent|country)$']",
@@ -27,10 +27,9 @@
         "15": "node[place~'^(city|region|town|village|suburb|hamlet|quarter)$']",
         "16": "(node[place~'^(region|town|village|suburb|hamlet|quarter|islet|isolated_dwelling|neighbourhood|farm)$'];way[place~'^(isolated_dwelling|neighbourhood|farm)$'];relation[place~'^(isolated_dwelling|neighbourhood|farm)$'];);"
     },
-    "minZoom": 0,
     "feature": {
         "title": "{% set loc_name = localizedTag(tags, 'name') %}{{ loc_name }}{% if loc_name != tags.name %} ({{ tags.name }}){% endif %}",
-        "body": "{{ tagTrans('place', tags.place) }}\n{% if tags.population %}<br/>{{ keyTrans('population') }}: {{ tags.population }}{% endif %} \n",
+        "body": "{% if tags.population %}{{ keyTrans('population') }}: {{ tags.population }}{% endif %} \n",
         "description": "{{ tagTrans('place', tags.place) }}",
         "priority": "{% set priorities = { 'continent': 0, 'country': 1, 'state': 2, 'region': 3, 'city': 4, 'town': 5, 'village': 6, 'suburb': 7, 'hamlet': 8, 'quarter': 9, neighbourhood: 10, 'isolated_dwelling': 11, 'farm': 12 } %}{{ priorities[tags.place] }}"
     }

power.json

@@ -1,4 +1,5 @@
 {
+    "type": "overpass",
     "name": {
         "ast": "Enerxía",
         "cs": "Elektřina",
@@ -13,18 +14,17 @@
         "ro": "Energie",
         "ru": "Энергетика"
     },
-    "type": "overpass",
     "query": {
         "11": "(node[power~'^(plant)$'];way[power~'^(plant|line)$'];relation[power~'^(plant)$'];)",
         "13": "(node[power~'^(plant|generator|substation)$'];way[power~'^(plant|line|generator|substation)$'];relation[power~'^(plant|generator|substation)$'];)",
         "15": "(node[power~'^(plant|generator|substation|transformer|tower)$'];way[power~'^(plant|line|generator|substation|transformer|minor_line)$'];relation[power~'^(plant|generator|substation|transformer)$'];)",
         "16": "(node[power];way[power];relation[power];)"
     },
-    "minZoom": 11,
     "feature": {
-        "markerSign": "",
-        "body": "{{ tagTrans('power', tags.power) }}\n{% set x='generator:source' %}{% if tags[x] %}<br/>{{ keyTrans('generator:source') }}: {{ tagTransList('generator:source', tags[x]) }}{% endif %}\n{% set x='generator:method' %}{% if tags[x] %}<br/>{{ keyTrans('generator:method') }}: {{ tagTransList('generator:method', tags[x]) }}{% endif %}\n{% set x='generator:type' %}{% if tags[x] %}<br/>{{ tagTransList('generator:type') }}: {{ tagTrans('generator:type', tags[x]) }}{% endif %}",
+        "markerSign": null,
+        "body": "{% set x='generator:source' %}{% if tags[x] %}<br/>{{ keyTrans('generator:source') }}: {{ tagTransList('generator:source', tags[x]) }}{% endif %}\n{% set x='generator:method' %}{% if tags[x] %}<br/>{{ keyTrans('generator:method') }}: {{ tagTransList('generator:method', tags[x]) }}{% endif %}\n{% set x='generator:type' %}{% if tags[x] %}<br/>{{ tagTransList('generator:type') }}: {{ tagTrans('generator:type', tags[x]) }}{% endif %}",
         "description": "{{ tagTrans('power', tags.power) }}{% set x='generator:source' %}{% if tags[x] %}, {{ tagTransList('generator:source', tags[x]) }}{% endif %}",
-        "priority": "{% if tags.power == 'plant' %}0{% elseif tags.power == 'generator' or tags.power == 'line' %}1{% elseif tags.power == 'substation' %}2{% else %}3{% endif %}"
+        "priority": "{% if tags.power == 'plant' %}0{% elseif tags.power == 'generator' or tags.power == 'line' %}1{% elseif tags.power == 'substation' %}2{% else %}3{% endif %}",
+        "popupDescription": "{{ tagTrans('power', tags.power) }}"
     }
 }

pt_amenities.json

@@ -18,7 +18,6 @@
     "feature": {
         "pre": "{% if tags.railway == 'subway_entrance' %}\n  {% set key = 'railway' %}\n  {% set value = tags.railway %}\n{% else %}\n  {% set key = 'amenity' %}\n  {% set value = tags.amenity %}\n{% endif %}",
         "description": "{{ tagTrans(key, value) }}",
-        "body": "{{ tagTrans(key, value) }}",
         "markerSign": "{{ const[value] }}"
     },
     "const": {

pt_stops.json

@@ -21,7 +21,6 @@
     },
     "feature": {
         "pre": "{% if tags.amenity in [ 'ferry_terminal', 'bus_station' ] %}\n  {% set key = 'amenity' %}\n  {% set value = tags.amenity %}\n{% elseif tags.railway == 'platform' or tags.highway == 'platform' or tags.public_transport == 'platform' %}\n  {% set key = 'public_transport' %}\n  {% set value = 'platform' %}\n{% else %}\n  {% set key = 'public_transport' %}\n  {% set value = 'stop_position' %}\n{% endif %}",
-        "description": "{{ tagTrans(key, value) }}",
-        "body": "{{ tagTrans(key, value) }}"
+        "description": "{{ tagTrans(key, value) }}"
     }
 }

public.json

@@ -1,4 +1,5 @@
 {
+    "type": "overpass",
     "name": {
         "ast": "Serviciu Públicu",
         "cs": "Veřejné služby",
@@ -14,16 +15,14 @@
         "ru": "Общественные места",
         "uk": "Громадські місця"
     },
-    "type": "overpass",
     "query": {
         "12": "(node[amenity~'^(court_house|embassy|public_building|townhall)$'];way[amenity~'^(court_house|embassy|public_building|townhall)$'];relation[amenity~'^(court_house|embassy|public_building|townhall)$'];node[amenity=recycling][recyling_type=centre];way[amenity=recycling][recyling_type=centre];relation[amenity=recycling][recyling_type=centre];);",
         "16": "(node[amenity~'^(court_house|embassy|public_building|townhall|clock|drinking_water|recycling)$'];way[amenity~'^(court_house|embassy|public_building|townhall|recycling)$'];relation[amenity~'^(court_house|embassy|public_building|townhall|recycling)$'];node[drinking_water]);"
     },
-    "minZoom": 12,
     "feature": {
         "title": "{{ tags.name|default(tags.operator)|default(tagTrans('amenity', tags.amenity)) }}",
         "markerSign": "{% if tags.amenity=='post_office' %}🏤{% elseif tags.amenity=='post_box'%}📮{% elseif tags.amenity=='internet_cafe' %}💻{% elseif tags.amenity=='telephone' %}✆{% endif %}",
-        "body": "{{ tagTrans('amenity', tags.amenity) }}<br/>{% if tags.operator %}{{ keyTrans('operator') }}: {{ tags.operator }}<br/>{% endif %}",
+        "body": "{% if tags.operator %}{{ keyTrans('operator') }}: {{ tags.operator }}<br/>{% endif %}",
         "description": "{{ tagTrans('amenity', tags.amenity) }}"
     }
 }

railway.json

@@ -36,7 +36,7 @@
         },
         "styles": "{% if tags.railway == 'narrow_gauge' %}default,casing{% else %}default{% endif %}",
         "markerSign": "",
-        "body": "{{ tagTrans('railway', tags.railway) }}<br/>\n{% if tags.operator %}{{ keyTrans('operator') }}: {{ localizedTag(tags, 'operator') }}<br>{% endif %}\n{% if tags.usage %}{{ keyTrans('usage') }}: {{ tagTrans('usage', tags.usage)|default(trans('unknown')) }}<br/>{% endif %}\n{% if tags.service %}{{ keyTrans('service') }}: {{ tagTrans('service', tags.service ) }}<br/>{% endif %}\n{{ keyTrans('gauge') }}: {{ tags.gauge|default(trans('unknown')) }}<br/>\n{% if tags.electrified == 'no' %}{{ keyTrans('electrified') }}: {{ tagTrans('electrified', 'no') }}{% elseif tags.electrified %}{{ keyTrans('electrified') }}: {{ tagTrans('electrified', tags.electrified) }}, {{ keyTrans('voltage') }}: {{ tags.voltage|default(trans('unknown')) }}, {{ keyTrans('frequency') }}: {{ tags.frequency|default(trans('unknown')) }}<br/>{% endif %}\n",
+        "body": "{% if tags.operator %}{{ keyTrans('operator') }}: {{ localizedTag(tags, 'operator') }}<br>{% endif %}\n{% if tags.usage %}{{ keyTrans('usage') }}: {{ tagTrans('usage', tags.usage)|default(trans('unknown')) }}<br/>{% endif %}\n{% if tags.service %}{{ keyTrans('service') }}: {{ tagTrans('service', tags.service ) }}<br/>{% endif %}\n{{ keyTrans('gauge') }}: {{ tags.gauge|default(trans('unknown')) }}<br/>\n{% if tags.electrified == 'no' %}{{ keyTrans('electrified') }}: {{ tagTrans('electrified', 'no') }}{% elseif tags.electrified %}{{ keyTrans('electrified') }}: {{ tagTrans('electrified', tags.electrified) }}, {{ keyTrans('voltage') }}: {{ tags.voltage|default(trans('unknown')) }}, {{ keyTrans('frequency') }}: {{ tags.frequency|default(trans('unknown')) }}<br/>{% endif %}\n",
         "description": "{{ tagTrans('railway', tags.railway) }}",
         "priority": "{% if tags.railway == 'station' %}0{% elseif tags.railway in [ 'halt', 'tram_stop' ] %}1{% else %}5{% endif %}",
         "title": "{% if tags.ref %}{{ localizedTag(tags, 'ref') }} - {% endif %}{{ localizedTag(tags, 'name')|default(localizedTag(tags, 'operator'))|default(trans('unnamed')) }}"

religion.json

@@ -22,7 +22,8 @@
     "feature": {
         "pre": "{% if tags.landuse == 'cemetery' %}\n{% set key = 'landuse' %}\n{% set value = tags.landuse %}\n{% else %}\n{% set key = 'amenity' %}\n{% set value = tags.amenity %}\n{% endif %}",
         "description": "{{ tagTrans(key, value) }}{% if tags.religion %}: {{ tagTransList('religion', tags.religion) }}{% endif %}",
-        "body": "{{ tagTrans(key, value) }}\n{% if tags.religion %}\n  <br/>\n  {{ keyTrans('religion') }}: {{ tagTransList('religion', tags.religion) }}\n{% endif %}\n{% if tags.denomination %}\n  <br/>\n  {{ keyTrans('denomination') }}: {{ tagTransList('denomination', tags.denomination) }}\n{% endif %}",
-        "markerSign": "{% if tags.religion == 'christian' %}✝\n{% elseif tags.religion == 'muslim' %}☪\n{% elseif tags.religion == 'buddhist' %}☸\n{% elseif tags.religion == 'hindu' %}ॐ\n{% elseif tags.religion == 'jewish' %}✡\n{% elseif tags.religion == 'pagan' %}☆\n{% endif %}"
+        "body": "{% if tags.religion %}\n  {{ keyTrans('religion') }}: {{ tagTransList('religion', tags.religion) }}\n{% endif %}\n{% if tags.denomination %}\n  <br/>\n  {{ keyTrans('denomination') }}: {{ tagTransList('denomination', tags.denomination) }}\n{% endif %}",
+        "markerSign": "{% if tags.religion == 'christian' %}✝\n{% elseif tags.religion == 'muslim' %}☪\n{% elseif tags.religion == 'buddhist' %}☸\n{% elseif tags.religion == 'hindu' %}ॐ\n{% elseif tags.religion == 'jewish' %}✡\n{% elseif tags.religion == 'pagan' %}☆\n{% endif %}",
+        "popupDescription": "{{ tagTrans(key, value) }}"
     }
 }

residential.json

@@ -21,7 +21,6 @@
         "15": "(\nnode[landuse~\"^(residential|allotments)$\"];\nway[landuse~\"^(residential|allotments)$\"];\nrelation[landuse~\"^(residential|allotments)$\"];\n)"
     },
     "feature": {
-        "description": "{{ tagTrans('landuse', tags.landuse) }}",
-        "body": "{{ tagTrans('landuse', tags.landuse) }}"
+        "description": "{{ tagTrans('landuse', tags.landuse) }}"
     }
 }

resources.json

@@ -15,7 +15,6 @@
     },
     "feature": {
         "pre": "{% if tags.landuse in [ 'quarry', 'salt_pond' ] %}\n  {% set key = 'landuse' %}\n  {% set value = tags.landuse %}\n{% else %}\n  {% set key = 'man_made' %}\n  {% set value = tags.man_made %}\n{% endif %}",
-        "description": "{{ tagTrans(key, value) }}",
-        "body": "{{ tagTrans(key, value) }}"
+        "description": "{{ tagTrans(key, value) }}"
     }
 }

shop.json

@@ -1,4 +1,5 @@
 {
+    "type": "overpass",
     "name": {
         "ast": "Compres",
         "cs": "Obchody",
@@ -16,18 +17,14 @@
         "ru": "Покупки",
         "uk": "Торгівля"
     },
-    "type": "overpass",
     "query": {
         "14": "(node[shop~'^(mall|department_store)$'];way[shop~'^(mall|department_store)$'];relation[shop~'^(mall|department_store)$'];);",
         "16": "(node[shop];way[shop];relation[shop];);"
     },
-    "minZoom": 14,
     "feature": {
         "pre": "{% set shop0 = tags.shop|split(';')[0] %}{% set current = const.default %}{% for v in const.shops %}{% if shop0 in v.types %}{% set current = v %}{% endif %}{% endfor %}",
-        "body": "{{ tagTransList('shop', tags.shop) }}",
         "description": "{{ tagTransList('shop', tags.shop) }}",
-        "markerSign": "{% set c = current.sign %}{% if c|slice(0, 3) == 'fa-' %}<i class=\"fa {{ c }}\"></i>{% else %}{{ c|raw }}{% endif %}",
-        "__": "no icons for: brewing_supplies, charity, second_hand, variety_store"
+        "markerSign": "{% set c = current.sign %}{% if c|slice(0, 3) == 'fa-' %}<i class=\"fa {{ c }}\"></i>{% else %}{{ c|raw }}{% endif %}"
     },
     "const": {
         "default": {

sport.json

@@ -19,7 +19,6 @@
     },
     "feature": {
         "description": "{{ tagTransList('sport', tags.sport) }}",
-        "body": "{{ tagTransList('sport', tags.sport) }}",
         "markerSign": "{% set firstSport = tags.sport|split(';')[0] %}\n{{ const[firstSport] }}",
         "title": "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) |default(tagTransList('sport', tags.sport)) }}"
     },

tourism_attractions.json

@@ -22,7 +22,6 @@
     },
     "feature": {
         "description": "{{ tagTrans('tourism', tags.tourism) }}",
-        "body": "{{ tagTrans('tourism', tags.tourism) }}",
         "markerSign": "{{ const[tags.tourism] }}"
     },
     "const": {

tourism_services.json

@@ -22,7 +22,6 @@
     },
     "feature": {
         "description": "{{ tagTrans('tourism', tags.tourism) }}",
-        "body": "{{ tagTrans('tourism', tags.tourism) }}",
         "markerSign": "{{ const[tags.tourism] }}"
     },
     "const": {

walk_amenities.json

@@ -11,7 +11,6 @@
     "feature": {
         "pre": "{% if tags.information %}\n  {% set key = 'information' %}\n  {% set value = tags.information %}\n{% elseif tags.amenity in [ 'bench', 'shelter' ] %}\n  {% set key = 'amenity' %}\n  {% set value = tags.amenity %}\n{% elseif tags.man_made in [ 'cairn' ] %}\n  {% set key = 'man_made' %}\n  {% set value = tags.man_made %}\n{% elseif tags.tourism in [ 'viewpoint'] %}\n  {% set key = 'tourism' %}\n  {% set value = tags.tourism %}\n{% else %}\n  {% set key = 'highway' %}\n  {% set value = tags.highway %}\n{% endif %}\n\n{% set type_data = const[value] %}",
         "description": "{{ tagTrans(key, value) }}",
-        "body": "{{ tagTrans(key, value) }}",
         "title": "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) | default(localizedTag(tags, 'ref')) | default(tagTrans(key, value)) }}",
         "markerSign": "{{ type_data.sign|raw }}",
         "priority": "{{ type_data.priority }}"

waste.json

@@ -18,6 +18,6 @@
     "feature": {
         "pre": "{% if tags.landuse == 'landfill' %}\n  {% set key = 'landuse' %}\n  {% set value = tags.landuse %}\n{% elseif tags.man_made == 'wastewater_plant' %}\n  {% set key = 'man_made' %}\n  {% set value = tags.man_made %}\n{% elseif tags.amenity == 'recycling' %}\n  {% set key = 'amenity' %}\n  {% set value = tags.amenity %}\n{% endif %}",
         "description": "{{ tagTrans(key, value) }}",
-        "body": "{{ tagTrans(key, value) }}\n{% if tags.recycling_type %}\n<br/>\n{{ keyTrans('recycling_type') }}: {{ tagTrans('recycling_type', tags.recycling_type) }}\n{% endif %}"
+        "body": "{% if tags.recycling_type %}\n{{ keyTrans('recycling_type') }}: {{ tagTrans('recycling_type', tags.recycling_type) }}\n{% endif %}"
     }
 }