car_maxspeed/railway-maxspeed: show speed (w/o unit) as label

- natsort refs
- remove duplicate refs
- split&trim refs from way

administrative.json

@@ -8,9 +8,11 @@
         "en": "Administrative Areas",
         "et": "Administratiivalad",
         "fr": "Zones administratives",
-        "hu": "Adminisztratív határok",
+        "hu": "Közigazgatási határok",
         "it": "Suddivisioni amministrative",
         "nl": "Administratieve gebieden",
+        "pt": "Regiões administrativas",
+        "pt-br": "Divisão político-administrativa",
         "ro": "Zona administrativa",
         "ru": "Административные границы"
     },

agriculture.json

@@ -12,6 +12,8 @@
         "it": "Agricoltura",
         "ja": "農業",
         "nl": "Landbouw",
+        "pt": "Agricultura",
+        "pt-br": "Agricultura",
         "ro": "Agricultura",
         "ru": "Сельское хозяйство"
     },
@@ -25,6 +27,15 @@
         ]
     },
     "feature": {
-        "description": "{{ tagTrans('landuse', tags.landuse) }}"
+        "description": "{{ tagTrans('landuse', tags.landuse) }}",
+        "priority": [
+            "{% if tags.landuse == 'farmyard' %}",
+            "0",
+            "{% elseif tags.landuse == 'allotments' %}",
+            "1",
+            "{% else %}",
+            "2",
+            "{% endif %}"
+        ]
     }
 }

alternative_amenities.json

@@ -5,9 +5,11 @@
         "de": "Einrichtungen",
         "en": "Amenities",
         "fr": "Équipement",
+        "hu": "Létesítmények",
         "it": "Infrastrutture",
         "ja": "生活環境",
         "nl": "Voorzieningen",
+        "pt-br": "Equipamentos",
         "ru": "Полезные места",
         "uk": "Amenities"
     }

alternative_routes.json

@@ -5,9 +5,12 @@
         "de": "(ausgeschilderte) Routen",
         "en": "Routes",
         "fr": "Routes",
+        "hu": "Útvonalak",
         "it": "Itinerari segnalati",
         "ja": "ルート",
         "nl": "Alternatieve routes",
+        "pt": "Rotas",
+        "pt-br": "Rotas",
         "ru": "Маршруты",
         "uk": "Маршрути"
     }

buildings.json

@@ -3,7 +3,10 @@
     "name": {
         "de": "Gebäude",
         "en": "Buildings",
-        "fr": "Bâtiments"
+        "fr": "Bâtiments",
+        "hu": "Épületek",
+        "pt": "Edifícios",
+        "pt-br": "Edificações"
     },
     "query": {
         "16": [

car_amenities.json

@@ -5,10 +5,12 @@
         "cs": "Občasnká vybavenost",
         "de": "Einrichtungen",
         "en": "Amenities",
-        "fr": "Infrastructures routières",
+        "fr": "Équipements auto",
+        "hu": "Létesítmények",
         "it": "Infrastrutture",
         "ja": "生活環境",
         "nl": "Voorzieningen",
+        "pt-br": "Equipamentos",
         "ru": "Обслуживание транспорта",
         "uk": "Amenities"
     },
@@ -18,6 +20,8 @@
             "node[amenity~\"^(car_rental|car_sharing|fuel)$\"];",
             "way[amenity~\"^(car_rental|car_sharing|fuel)$\"];",
             "relation[amenity~\"^(car_rental|car_sharing|fuel)$\"];",
+            "node[amenity~\"^(charging_station)$\"][car!=\"no\"];",
+            "node[amenity~\"^(charging_station)$\"][motorcycle!=\"no\"];",
             ")"
         ],
         "16": [
@@ -40,7 +44,7 @@
         "car_rental": "R",
         "car_sharing": "S",
         "car_wash": "🚿",
-        "charging_station": "🔌 ",
+        "charging_station": "🔌",
         "fuel": "⛽",
         "parking": "🅿",
         "motorcycle_parking": "🅿"

car_furniture.json

@@ -4,11 +4,14 @@
         "cs": "Pouliční přislušenství",
         "de": "Straßenausstattung",
         "en": "Street Furniture",
-        "fr": "Infrastrucutures résidentielles",
+        "fr": "Fournitures automobiles",
+        "hu": "Jelzőtáblák",
         "it": "Dotazioni stradali",
         "ja": "街路設置公共物",
         "nl": "Straatmeubilair",
         "pl": "Elementy drogowe",
+        "pt": "Mobiliário urbano",
+        "pt-br": "Mobiliário urbano",
         "ru": "Элементы дороги",
         "uk": "Street Furniture"
     }

car_maxspeed.json

@@ -3,7 +3,10 @@
     "name": {
         "de": "Höchstgeschwindigkeiten",
         "en": "Maxspeed",
-        "fr": "Limites de vitesse"
+        "fr": "Limites de vitesse",
+        "hu": "Sebességkorlátozás",
+        "pt": "Velocidade máxima",
+        "pt-br": "Velocidade máxima"
     },
     "query": {
         "11": "way[highway~\"^(motorway|trunk)$\"];",
@@ -54,7 +57,10 @@
         "listMarkerSymbol": "line",
         "style": {
             "width": "3",
-            "color": "{{ color }}"
+            "color": "{{ color }}",
+            "text": "{{ maxspeed }}           ",
+            "textRepeat": "1",
+            "textFontWeight": "bold"
         }
     },
     "const": {

car_routes.json

@@ -0,0 +1,65 @@
+{
+    "type": "overpass",
+    "name": {
+        "en": "Car routes",
+        "hu": "Főútvonalak",
+        "pt-br": "Rotas rodoviárias"
+    },
+    "query": {
+        "10": "relation[type=route][route=road]"
+    },
+    "members": true,
+    "feature": {
+        "pre": "{% set color = '#' ~ tags.network|default('')|md5|slice(0, 6) %}",
+        "description": "{% if tags.network %}{{ tagTrans('network', tags.network) }}{% endif %}",
+        "title": "{% if tags.ref and tags.name %}{{ tags.ref }} - {{ tags.name }}{% elseif tags.ref %}{{ tags.ref }}{% elseif tags.name %}{{ tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}",
+        "listMarkerSymbol": "{{ markerLine({ 'width': 4, 'color': color })|raw }}",
+        "markerSymbol": "",
+        "styles": ""
+    },
+    "memberFeature": {
+        "pre": [
+            "{% set refs = [] %}",
+            "{% set color = '#d41d8c' %}",
+            "{% if tags.ref %}",
+            "  {% for ref in tags.ref|split(';') %}",
+            "    {% set refs = refs|merge([ ref|trim ]) %}",
+            "  {% endfor %}",
+            "{% endif %}",
+            "",
+            "{% for master in masters %}",
+            "  {% if master.tags.network %}",
+            "    {% set color = '#' ~ master.tags.network|md5|slice(0, 6) %}",
+            "  {% endif %}",
+            "  {% if master.tags.ref %}",
+            "    {% set refs = refs|merge([ master.tags.ref ]) %}",
+            "  {% endif %}",
+            "{% endfor %}",
+            "",
+            "{% set refs = refs|unique|natsort({ insensitive: true }) %}"
+        ],
+        "body": [
+            "<h4>Routes</h4>",
+            "<ul>",
+            "{% for master in masters %}",
+            "  {% set _color = '#' ~ master.tags.operator|default('')|md5|slice(0, 6) %}",
+            "  <li data-object=\"{{ master.id }}\" style='list-style: none;'>",
+            "    <span class='markerParent'><div class='marker'>{{ markerLine({ width: 4, color: _color })|raw }}</div></span>",
+            "    <span class='title'>{% if master.tags.ref and master.tags.name %}{{ master.tags.ref }} - {{ master.tags.name|default(master.tags.ref) }}{% elseif master.tags.ref %}{{ master.tags.ref }}{% elseif master.tags.name %}{{ master.tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}</span>",
+            "    <span class='description'>{{ tagTrans('network', master.tags.network) }}</span>",
+            "  </li>",
+            "{% endfor %}",
+            "</ul>"
+        ],
+        "listExclude": "1",
+        "style": {
+            "color": "{{ color }}",
+            "width": 4,
+            "opacity": 1,
+            "text": "{{ refs|join(' · ') }}             ",
+            "textRepeat": "1",
+            "textOffset": "12",
+            "textFontWeight": "bold"
+        }
+    }
+}

children.json

@@ -3,7 +3,9 @@
     "name": {
         "de": "Einrichtungen für Kinder",
         "en": "Children amenities",
-        "fr": "Équipements pour enfants"
+        "fr": "Équipements pour enfants",
+        "hu": "Gyermekek",
+        "pt-br": "Equipamentos infantis"
     },
     "query": {
         "15": [

communication.json

@@ -13,6 +13,8 @@
         "it": "Communicazioni",
         "ja": "交流",
         "nl": "Communicatie",
+        "pt": "Comunicação",
+        "pt-br": "Comunicação",
         "ro": "Comunicatii",
         "ru": "Услуги связи",
         "uk": "Телекомунікації"

construction.json

@@ -5,10 +5,13 @@
         "cs": "Staveniště",
         "de": "Baustellen",
         "en": "Construction Sites",
-        "fr": "Zones industrielles",
+        "fr": "Constructions",
+        "hu": "Építési terület",
         "it": "Cantieri",
         "ja": "工事中",
         "nl": "Bouwterrein",
+        "pt": "Locais de construção",
+        "pt-br": "Terrenos vazios e obras",
         "ru": "Места строительства"
     },
     "query": {

craft.json

@@ -0,0 +1,77 @@
+{
+    "type": "overpass",
+    "name": {
+        "de": "Handwerk",
+        "en": "Craft",
+        "fr": "Artisanat",
+        "hu": "Műhelyek",
+        "pt": "Artesanato",
+        "pt-br": "Ofícios"
+    },
+    "query": {
+        "15": "(node[craft];way[craft];relation[craft];);"
+    },
+    "feature": {
+        "description": "{{ tagTransList('craft', tags.craft) }}",
+        "markerSign": "{% set craft0 = tags.craft|split(';')[0] %}{% if const.crafts[craft0] %}{% set v = const.crafts[craft0] %}{% else %}{% set v = const.default %}{% endif %}{% if v|slice(0, 3) == 'fa-' %}<i class=\"fa {{ v }}\"></i>{% else %}{{ v|raw }}{% endif %}"
+    },
+    "const": {
+        "default": "",
+        "crafts": {
+            "bakery": "fa-birthday-cake",
+            "beekeeper": "🐝",
+            "blacksmith": "🔨",
+            "boatbuilder": "⛵",
+            "bookbinder": "📕",
+            "brewery": "fa-beer",
+            "builder": "🚧",
+            "carpenter": "",
+            "carpet_layer": "",
+            "caterer": "fa-birthday-cake",
+            "chimney_sweeper": "",
+            "clockmaker": "⌚",
+            "confectionery": "",
+            "distillery": "🍷",
+            "dressmaker": "&#128090;",
+            "electrician": "🔌",
+            "floorer": "",
+            "gardener": "⚘",
+            "glaziery": "",
+            "handicraft": "",
+            "hvac": "",
+            "insulation": "",
+            "jeweller": "💍",
+            "key_cutter": "🔑",
+            "locksmith": "🔑",
+            "metal_construction": "",
+            "optician": "👓",
+            "painter": "🖌",
+            "parquet_layer": "",
+            "photographer": "📷",
+            "photographic_laboratory": "📷",
+            "piano_tuner": "",
+            "plasterer": "",
+            "plumber": "",
+            "pottery": "",
+            "rigger": "",
+            "roofer": "",
+            "saddler": "🐎",
+            "sailmaker": "⛵",
+            "sawmill": "",
+            "scaffolder": "",
+            "sculptor": "",
+            "shoemaker": "👞",
+            "stand_builder": "",
+            "stonemason": "",
+            "sun_protection": "",
+            "tailor": "&#128090;",
+            "tiler": "",
+            "tinsmith": "",
+            "turner": "",
+            "upholsterer": "",
+            "watchmaker": "⌚",
+            "window_construction": "",
+            "winery": "🍷"
+        }
+    }
+}

culture.json

@@ -15,6 +15,8 @@
         "ja": "文化",
         "nl": "Cultuur",
         "pl": "Kultura",
+        "pt": "Cultura",
+        "pt-br": "Cultura",
         "ro": "Cultura",
         "ru": "Культура",
         "uk": "Культура "

culture_religion.json

@@ -6,15 +6,17 @@
         "cs": "Kultura",
         "de": "Kultur und Religion",
         "el": "Πολιτισμός",
-        "en": "Culture",
+        "en": "Culture and Religion",
         "es": "Cultura y religión",
         "et": "Kultuur ja religioon",
-        "fr": "Culture",
-        "hu": "Kultúra",
+        "fr": "Culture et Religion",
+        "hu": "Kultúra és vallás",
         "it": "Cultura",
         "ja": "文化",
         "nl": "Cultuur",
         "pl": "Kultura",
+        "pt": "Cultura e religião",
+        "pt-br": "Cultura",
         "ro": "Cultura",
         "ru": "Культура",
         "uk": "Культура "
@@ -26,6 +28,9 @@
         {
             "id": "historic"
         },
+        {
+            "id": "memorial"
+        },
         {
             "id": "religion"
         },

cycle_amenities.json

@@ -3,7 +3,9 @@
     "name": {
         "de": "Einrichtungen",
         "en": "Amenities",
-        "fr": "Équipements"
+        "fr": "Équipements vélo",
+        "hu": "Kerékpáros létesítmények",
+        "pt-br": "Equipamentos"
     },
     "query": {
         "13": [
@@ -11,6 +13,7 @@
             "node[amenity~\"^(bicycle_rental)$\"];",
             "way[amenity~\"^(bicycle_rental)$\"];",
             "relation[amenity~\"^(bicycle_rental)$\"];",
+            "node[amenity~\"^(charging_station)$\"][bicycle!=\"no\"];",
             "node[shop~\"^(bicycle)$\"];",
             "way[shop~\"^(bicycle)$\"];",
             "relation[shop~\"^(bicycle)$\"];",
@@ -21,6 +24,7 @@
             "node[amenity~\"^(bicycle_.*|compressed_air)$\"];",
             "way[amenity~\"^(bicycle_.*|compressed_air)$\"];",
             "relation[amenity~\"^(bicycle_.*|compressed_air)$\"];",
+            "node[amenity~\"^(charging_station)$\"][bicycle!=\"no\"];",
             "node[shop~\"^(bicycle)$\"];",
             "way[shop~\"^(bicycle)$\"];",
             "relation[shop~\"^(bicycle)$\"];",
@@ -56,7 +60,13 @@
             "",
             "{% if tags.capacity %}({{ tags.capacity }}){% endif %}"
         ],
-        "description": "{{ tagTrans(key, value) }}",
+        "description": [
+            "{% if tags.amenity == 'vending_machine' %}",
+            "{{ tagTransList('amenity=vending_machine vending', value) }}",
+            "{% else %}",
+            "{{ tagTrans(key, value) }}",
+            "{% endif %}"
+        ],
         "body": [
             "{% if tags.capacity %}",
             "  {{ keyTrans('capacity') }}: {{ tags.capacity }}",
@@ -121,6 +131,10 @@
         "amenity=compressed_air": {
             "sign": "A",
             "priority": 2
+        },
+        "amenity=charging_station": {
+            "sign": "🔌",
+            "priority": 2
         }
     }
 }

cycle_routes.json

@@ -3,7 +3,10 @@
     "name": {
         "de": "Radrouten",
         "en": "Cycle Routes",
-        "fr": "Itinéraires vélo"
+        "fr": "Itinéraires vélo",
+        "hu": "Kerékpáros útvonalak",
+        "pt": "Ciclovias",
+        "pt-br": "Ciclorrotas"
     },
     "query": {
         "6": "relation[type=route][route=bicycle][network~'^(icn)$']",
@@ -11,12 +14,93 @@
         "12": "relation[type=route][route=bicycle][network~'^(icn|ncn|rcn)$']",
         "15": "relation[type=route][route=bicycle]"
     },
+    "members": true,
     "feature": {
-        "priority": "{% if tags.network=='icn' %}0{% elseif tags.network=='ncn' %}1{% elseif tags.network=='rcn' %}2{% else %}3{% endif %}",
+        "priority": "{{ const[tags.network].priority|default(4) }}",
+        "description": "{{ tagTrans('network', tags.network) }}",
+        "listMarkerSymbol": "{{ markerLine({ 'width': 4, 'color': const[tags.network].color|default(const[''].color) })|raw }}",
+        "title": "{% if tags.ref and tags.name %}{{ tags.ref }} - {{ tags.name }}{% elseif tags.ref %}{{ tags.ref }}{% elseif tags.name %}{{ tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}",
+        "styles": "",
+        "markerSymbol": ""
+    },
+    "memberFeature": {
+        "pre": [
+            "{% set priority = 4 %}",
+            "{% set network = '' %}",
+            "{% set refs = [] %}",
+            "",
+            "{% for master in masters %}",
+            "  {% set _p = const[master.tags.network].priority|default(4) %}",
+            "  {% if _p < priority %}",
+            "    {% set priority = _p %}",
+            "    {% set network = master.tags.network %}",
+            "  {% endif %}",
+            "  {% if master.tags.ref %}",
+            "    {% set refs = refs|merge([ master.tags.ref ]) %}",
+            "  {% endif %}",
+            "{% endfor %}"
+        ],
+        "title": "",
+        "body": [
+            "<h4>Routes</h4>",
+            "<ul class='overpass-layer-list'>",
+            "{% for master in masters %}",
+            "  <li data-object=\"{{ master.id }}\">",
+            "    <span class='markerParent'><div class='marker'>{{ markerLine({ width: 4, color: const[master.tags.network].color|default(const[''].color) })|raw }}</div></span>",
+            "    <span class='title'>{% if master.tags.ref and master.tags.name %}{{ master.tags.ref }} - {{ master.tags.name|default(master.tags.ref) }}{% elseif master.tags.ref %}{{ master.tags.ref }}{% elseif master.tags.name %}{{ master.tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}</span>",
+            "    <span class='description'>{{ tagTrans('network', master.tags.network) }}</span>",
+            "  </li>",
+            "{% endfor %}",
+            "</ul>"
+        ],
+        "listExclude": "1",
         "style": {
+            "color": "{{ const[network].color }}",
             "width": 4,
-            "color": "{% if tags.network=='icn' %}#ff0000{% elseif tags.network=='ncn' %}#ff007f{% elseif tags.network=='rcn' %}#7f00ff{% else %}#0000ff{% endif %}",
-            "opacity": 1
+            "opacity": 1,
+            "text": "{{ refs|join(' · ') }}             ",
+            "textRepeat": "1",
+            "textOffset": "12",
+            "textFontWeight": "bold"
+        }
+    },
+    "const": {
+        "icn": {
+            "color": "#ff0000",
+            "priority": 0,
+            "zoom": 6
+        },
+        "ncn": {
+            "color": "#ff00ba",
+            "priority": 1,
+            "zoom": 9
+        },
+        "rcn": {
+            "color": "#ba00ff",
+            "priority": 2,
+            "zoom": 12
+        },
+        "lcn": {
+            "color": "#0000ff",
+            "priority": 3,
+            "zoom": 15
+        },
+        "": {
+            "color": "#007fff",
+            "priority": 4,
+            "zoom": 15
         }
-    }
+    },
+    "info": [
+        "<table>",
+        "{% for value, data in const %}",
+        "{% if data.zoom <= map.zoom %}",
+        "  <tr>",
+        "    <td>{{ markerLine({ 'width': 4, color: data.color })|raw }}</td>",
+        "    <td>{% if value %}{{ tagTrans('network', value) }}{% else %}{{ trans('unknown') }}{% endif %}</td>",
+        "  </tr>",
+        "{% endif %}",
+        "{% endfor %}",
+        "</table>"
+    ]
 }

detailsBody.html

@@ -93,8 +93,11 @@
   <i class="fa fa-money" aria-hidden="true"></i>
   <span class='key'>{{ keyTrans('payment') }}:</span>
   <span class='value'>
+    {% set i = 0 %}
     {% for k, tag in payment %}
-    {% if tags[tag] == 'no' %}<s>{{ k }}</s> {% else %}{{ k }} {% endif %}
+    {%- if i > 0 %},{% endif %}
+    <span title="{{ tagTrans(k, tags[tag]) }}">{% if tags[tag] == 'no' %}<s>{{ keyTrans(tag, { default: k }) }}</s>{% else %}{{ keyTrans(tag, { default: k }) }}{% endif -%}</span>
+    {% set i = i + 1 -%}
     {% endfor %}
   </span>
 </li>

education.json

@@ -7,11 +7,14 @@
         "el": "Υπηρεσίες Εκπαίδευσης",
         "en": "Educational Services",
         "et": "Haridusteenused",
-        "fr": "Services éducatifs",
+        "fr": "Éducation",
+        "hu": "Oktatás",
         "it": "Istruzione",
         "ja": "教育サービス",
         "nl": "Onderwijs",
         "pl": "Edukacyjne",
+        "pt": "Educação",
+        "pt-br": "Educação",
         "ro": "Servicii educatie",
         "ru": "Образование",
         "uk": "Освіта"

emergency.json

@@ -10,9 +10,12 @@
         "es": "Servicios de emergencia",
         "et": "Hädaabi teenused",
         "fr": "Services d'urgence",
+        "hu": "Vészhelyzet",
         "it": "Servizi d'emergenza",
         "ja": "緊急サービス",
         "nl": "Hulpdiensten",
+        "pt": "Emergência",
+        "pt-br": "Emergência",
         "ro": "Servicii urgenta",
         "ru": "Экстренные службы",
         "uk": "Швидка допомога"
@@ -27,16 +30,27 @@
         ],
         "13": [
             "(",
-            "node[amenity~\"^(fire_station|hospital|police|emergency_phone)$\"];",
-            "way[amenity~\"^(fire_station|hospital|police|emergency_phone)$\"];",
-            "relation[amenity~\"^(fire_station|hospital|police|emergency_phone)$\"];",
+            "node[amenity~\"^(fire_station|hospital|police)$\"];",
+            "way[amenity~\"^(fire_station|hospital|police)$\"];",
+            "relation[amenity~\"^(fire_station|hospital|police)$\"];",
+            "node[emergency~\"^(phone)$\"];",
             ")"
         ]
     },
     "feature": {
-        "description": "{{ tagTrans('amenity', tags.amenity) }}",
+        "pre": [
+            "{% if tags.amenity in [ 'fire_station', 'hospital', 'police' ] %}",
+            "{% set key = 'amenity' %}",
+            "{% set value = tags.amenity %}",
+            "{% elseif tags.emergency %}",
+            "{% set key = 'emergency' %}",
+            "{% set value = tags.emergency %}",
+            "{% endif %}",
+            "{% set kv = key ~ \"=\" ~ value %}"
+        ],
+        "description": "{{ tagTrans(key, value) }}",
         "markerSign": [
-            "{% set data = const[tags.amenity] %}",
+            "{% set data = const[kv] %}",
             "{% if data %}",
             "{{ data.sign }}",
             "{% endif %}"
@@ -48,26 +62,26 @@
         "{% if data.zoom <= map.zoom %}",
         "  <tr>",
         "    <td>{{ markerCircle({})|raw }}<div class='sign'>{{ data.sign }}</div></td>",
-        "    <td>{{ tagTrans('amenity', value) }}</td>",
+        "    <td>{{ tagTrans(value|split('=')[0], value|split('=')[1]) }}</td>",
         "  </tr>",
         "{% endif %}",
         "{% endfor %}",
         "</table>"
     ],
     "const": {
-        "fire_station": {
+        "amenity=fire_station": {
             "zoom": "11",
             "sign": "🔥"
         },
-        "hospital": {
+        "amenity=hospital": {
             "zoom": "11",
             "sign": "🏥"
         },
-        "police": {
+        "amenity=police": {
             "zoom": "13",
             "sign": "👮"
         },
-        "emergency_phone": {
+        "emergency=phone": {
             "zoom": "13",
             "sign": "📞"
         }

financial.json

@@ -7,10 +7,13 @@
         "el": "Χρήμα",
         "en": "Financial",
         "fr": "Finance",
+        "hu": "Pénzügyek",
         "it": "Finanze",
         "ja": "金融",
         "nl": "Financieel",
         "pl": "Finasowe",
+        "pt": "Finanças",
+        "pt-br": "Finanças",
         "ro": "Financiar",
         "ru": "Финансы",
         "uk": "Фінанси"
@@ -20,14 +23,14 @@
             "(",
             "node[amenity~\"^(bank)$\"];",
             "way[amenity~\"^(bank)$\"];",
-            "relation[amenity~\"^(bank)$\"]",
+            "relation[amenity~\"^(bank)$\"];",
             ")"
         ],
         "15": [
             "(",
             "node[amenity~\"^(bank|bureau_de_change|atm)$\"];",
             "way[amenity~\"^(bank|bureau_de_change|atm)$\"];",
-            "relation[amenity~\"^(bank|bureau_de_change|atm)$\"]",
+            "relation[amenity~\"^(bank|bureau_de_change|atm)$\"];",
             ")"
         ]
     },

gastro-smoking.json

@@ -0,0 +1,70 @@
+{
+    "type": "overpass",
+    "name": {
+        "de": "Rauchfreie Gastronomie",
+        "en": "Smokefree Gastronomy",
+        "fr": "Restauration sans tabac",
+        "hu": "Nem dohányzó vendéglátóhelyek",
+        "pt": "Restauração livre de tabaco",
+        "pt-br": "Gastronomia sem fumo"
+    },
+    "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": {
+        "pre": [
+            "{% if tags.smoking == 'yes' or tags.smoking == 'dedicated' %}",
+            "  {% set smoking_color='red' %}",
+            "  {% set smoking_icon='🚬' %}",
+            "{% elseif tags.smoking == 'separated' or tags.smoking == 'isolated' %}",
+            "  {% set smoking_color='#ffdf00' %}",
+            "  {% set smoking_icon='🚬' %}",
+            "{% elseif tags.smoking == 'no' or tags.smoking == 'outside' or tags.smokefree == 'yes' %}",
+            "  {% set smoking_color='#00ff00' %}",
+            "  {% set smoking_icon='🚭' %}",
+            "{% else %}",
+            "  {% set smoking_color='white' %}",
+            "  {% set smoking_icon='' %}",
+            "{% endif %}"
+        ],
+        "description": "{{ tagTrans('amenity', tags.amenity) }}",
+        "body": [
+            "<ul>",
+            "  <li class='hasSymbol'>",
+            "   <i class=\"fa fa-cutlery\" aria-hidden=\"true\"></i>",
+            "   <span class='key'>{{ keyTrans('cuisine') }}:</span>",
+            "   <span class='value'>{{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}</span>",
+            "  </li>",
+            "  <li class='hasSymbol'>",
+            "    <span class='symbol'>🚬</span>",
+            "    <span class='key'>{{ keyTrans('smoking') }}:</span>",
+            "    <span class='value'>{% if tags.smoking %}{{ tagTrans('smoking', tags.smoking) }}{% else %}{{ trans('unknown') }}{% endif %}</span>",
+            "  </li>",
+            "</ul>"
+        ],
+        "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 %}",
+        "markerSymbol": "{{ markerPointer({\"fillColor\": smoking_color })|raw }}",
+        "listMarkerSymbol": "{{ markerCircle({\"fillColor\": smoking_color })|raw }}"
+    },
+    "info": [
+        "{{ keyTrans('smoking') }}:",
+        "<table>",
+        "  <tr>",
+        "    <td>{{ markerCircle({ \"fillColor\": \"#00ff00\" })|raw }}</td>",
+        "    <td>{{ tagTrans('smoking', 'no') }}, {{ tagTrans('smoking', 'outside') }}</td>",
+        "  </tr>",
+        "  <tr>",
+        "    <td>{{ markerCircle({ \"fillColor\": \"#ffdf00\" })|raw }}</td>",
+        "    <td>{{ tagTrans('smoking', 'separated') }}, {{ tagTrans('smoking', 'isolated') }}</td>",
+        "  </tr>",
+        "  <tr>",
+        "    <td>{{ markerCircle({ \"fillColor\": \"red\" })|raw }}</td>",
+        "    <td>{{ tagTrans('smoking', 'yes') }}, {{ tagTrans('smoking', 'dedicated') }}</td>",
+        "  </tr>",
+        "  <tr>",
+        "    <td>{{ markerCircle({ \"fillColor\": \"white\" })|raw }}</td>",
+        "    <td>{{ trans('unknown') }}</td>",
+        "  </tr>",
+        "</table>"
+    ]
+}

gastro.json

@@ -6,12 +6,14 @@
         "de": "Gastronomie",
         "el": "Γαστρονομία",
         "en": "Gastronomy",
-        "fr": "Gastronomie",
-        "hu": "Gasztronómia",
+        "fr": "Restauration",
+        "hu": "Vendéglátás",
         "it": "Gastronomia",
         "ja": "食べ物",
         "nl": "Gastronomie",
         "pl": "Gastronomia",
+        "pt": "Restauração",
+        "pt-br": "Gastronomia",
         "ro": "Gastronomie",
         "ru": "Общепит",
         "uk": "Гастрономія"
@@ -28,6 +30,18 @@
             "   <span class='key'>{{ keyTrans('cuisine') }}:</span>",
             "   <span class='value'>{{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}</span>",
             "  </li>",
+            "  {% set diets = tagsPrefix(tags, 'diet:') %}",
+            "  {% if diets %}",
+            "    <li class='hasSymbol'>",
+            "     <i class=\"fa fa-cutlery\" aria-hidden=\"true\"></i>",
+            "     <span class='key'>{{ keyTrans('diet') }}:</span>",
+            "     <span class='value'>",
+            "     {% for kv, k in diets %}",
+            "       {% set v = tags[k] %}",
+            "       <span title='{{ k ~ '=' ~ v }}' style='white-space: nowrap; margin-right: 0.5em;'>{% if v == 'no' %}✘ {% elseif v == 'only' %}❗{% else %}✔{% endif %}{{ keyTrans(k) }}</span>",
+            "     {% endfor %}",
+            "    </span></li>",
+            "  {% endif %}",
             "</ul>"
         ],
         "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 %}"

health.json

@@ -7,10 +7,13 @@
         "el": "Υγεία",
         "en": "Health",
         "fr": "Santé",
+        "hu": "Egészségügy",
         "it": "Sanità",
         "ja": "健康",
         "nl": "Gezondheid",
         "pl": "Zdrowie",
+        "pt": "Saúde",
+        "pt-br": "Saúde e assistência",
         "ro": "Sanatate",
         "ru": "Медицина",
         "uk": "Здоров'я"
@@ -58,31 +61,32 @@
             "{{ tagTransList('healthcare:speciality', attribute(tags, 'healthcare:speciality')) }}",
             "{% endif %}"
         ],
-        "markerSign": "{{ const[value]|raw }}"
+        "markerSign": "{{ const[key ~ '=' ~ value]|raw }}"
     },
     "info": [
         "<table>",
         "{% for value, sign in const %}",
         "  <tr>",
         "    <td>{{ markerCircle({})|raw }}<div class='sign'>{{ sign|raw }}</div></td>",
-        "    <td>{{ tagTrans('amenity', value) }}</td>",
+        "    <td>{{ tagTrans(value|split('=')[0], value|split('=')[1]) }}</td>",
         "  </tr>",
         "{% endfor %}",
         "</table>"
     ],
     "const": {
-        "baby_hatch": "🚼",
-        "blood_bank": "<img src='maki:blood-bank'>",
-        "blood_donation": "<img src='maki:blood-bank'>",
-        "clinic": "🏥",
-        "defibrillator": "<img src='maki:defibrillator'>",
-        "dentist": "<img src='maki:dentist'>",
-        "doctor": "<img src='maki:doctor'>",
-        "doctors": "<img src='maki:doctor'>",
-        "hospital": "🏥",
-        "nursing_home": "",
-        "pharmacy": "<img src='maki:pharmacy'>",
-        "social_facility": "",
-        "veterinary": "<img src='maki:veterinary'>"
+        "amenity=baby_hatch": "🚼",
+        "healthcare=blood_bank": "<img src='maki:blood-bank'>",
+        "healthcare=blood_donation": "<img src='maki:blood-bank'>",
+        "healthcare=clinic": "🏥",
+        "emergency=defibrillator": "<img src='maki:defibrillator'>",
+        "healthcare=dentist": "<img src='maki:dentist'>",
+        "healthcare=doctor": "<img src='maki:doctor'>",
+        "amenity=doctors": "<img src='maki:doctor'>",
+        "amenity=hospital": "🏥",
+        "healthcare=hospital": "🏥",
+        "amenity=nursing_home": "",
+        "amenity=pharmacy": "<img src='maki:pharmacy'>",
+        "amenity=social_facility": "",
+        "amenity=veterinary": "<img src='maki:veterinary'>"
     }
 }

hiking_routes.json

@@ -2,7 +2,11 @@
     "type": "overpass",
     "name": {
         "de": "Wanderrouten",
-        "en": "Hiking routes"
+        "en": "Hiking routes",
+        "fr": "Itinéraires pédestres",
+        "hu": "Turistautak",
+        "pt": "Rotas de caminhada",
+        "pt-br": "Rotas de caminhada"
     },
     "query": {
         "10": "relation[type=route][route=hiking][network~\"^(iwn)$\"]",
@@ -10,27 +14,92 @@
         "12": "relation[type=route][route=hiking][network~\"^(iwn|nwn|rwn)$\"]",
         "14": "relation[type=route][route=hiking]"
     },
+    "members": true,
     "feature": {
-        "description": "{{ tagTrans('network', tags.network) }}",
-        "priority": [
-            "{% set network_data = const[tags.network] %}",
-            "{% if network_data %}",
-            "{{ network_data.priority }}",
-            "{% endif %}"
-        ]
+        "priority": "{{ const[tags.network].priority|default(4) }}",
+        "description": "{% if tags.network %}{{ tagTrans('network', tags.network) }}{% endif %}",
+        "listMarkerSymbol": "{{ markerLine({ 'width': 4, 'color': const[tags.network|default('')].color|default(const[''].color) })|raw }}",
+        "title": "{% if tags.ref and tags.name %}{{ tags.ref }} - {{ tags.name }}{% elseif tags.ref %}{{ tags.ref }}{% elseif tags.name %}{{ tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}",
+        "styles": "",
+        "markerSymbol": ""
+    },
+    "memberFeature": {
+        "pre": [
+            "{% set priority = 4 %}",
+            "{% set network = '' %}",
+            "{% set refs = [] %}",
+            "",
+            "{% for master in masters %}",
+            "  {% set _p = const[master.tags.network].priority|default(4) %}",
+            "  {% if _p < priority %}",
+            "    {% set priority = _p %}",
+            "    {% set network = master.tags.network %}",
+            "  {% endif %}",
+            "  {% if master.tags.ref %}",
+            "    {% set refs = refs|merge([ master.tags.ref ]) %}",
+            "  {% endif %}",
+            "{% endfor %}"
+        ],
+        "body": [
+            "<h4>Routes</h4>",
+            "<ul class='overpass-layer-list'>",
+            "{% for master in masters %}",
+            "  <li data-object=\"{{ master.id }}\">",
+            "    <span class='markerParent'><div class='marker'>{{ markerLine({ width: 4, color: const[master.tags.network].color|default(const[''].color) })|raw }}</div></span>",
+            "    <span class='title'>{% if master.tags.ref and master.tags.name %}{{ master.tags.ref }} - {{ master.tags.name|default(master.tags.ref) }}{% elseif master.tags.ref %}{{ master.tags.ref }}{% elseif master.tags.name %}{{ master.tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}</span>",
+            "    <span class='description'>{{ tagTrans('network', master.tags.network) }}</span>",
+            "  </li>",
+            "{% endfor %}",
+            "</ul>"
+        ],
+        "listExclude": "1",
+        "style": {
+            "color": "{{ const[network].color }}",
+            "width": 4,
+            "opacity": 1,
+            "text": "{{ refs|join(' · ') }}             ",
+            "textRepeat": "1",
+            "textOffset": "12",
+            "textFontWeight": "bold"
+        }
     },
     "const": {
         "iwn": {
-            "priority": 1
+            "color": "#ff0000",
+            "priority": 0,
+            "zoom": 10
         },
         "nwn": {
-            "priority": 2
+            "color": "#ff00ba",
+            "priority": 1,
+            "zoom": 11
         },
         "rwn": {
-            "priority": 3
+            "color": "#ba00ff",
+            "priority": 2,
+            "zoom": 12
         },
         "lwn": {
-            "priority": 4
+            "color": "#0000ff",
+            "priority": 3,
+            "zoom": 14
+        },
+        "": {
+            "color": "#007fff",
+            "priority": 4,
+            "zoom": 14
         }
-    }
+    },
+    "info": [
+        "<table>",
+        "{% for value, data in const %}",
+        "{% if data.zoom <= map.zoom %}",
+        "  <tr>",
+        "    <td>{{ markerLine({ 'width': 4, color: data.color })|raw }}</td>",
+        "    <td>{% if value %}{{ tagTrans('network', value) }}{% else %}{{ trans('unknown') }}{% endif %}</td>",
+        "  </tr>",
+        "{% endif %}",
+        "{% endfor %}",
+        "</table>"
+    ]
 }

historic.json

@@ -8,11 +8,13 @@
         "en": "Historic",
         "et": "Ajalooline",
         "fr": "Histoire",
-        "hu": "Historikus",
+        "hu": "Történelmi objektumok",
         "it": "Storia",
         "ja": "記念",
         "nl": "Historisch",
         "pl": "Miejsca Historyczne",
+        "pt": "Histórico",
+        "pt-br": "Histórico",
         "ro": "Istoric",
         "ru": "Историческое",
         "uk": "Історія"
@@ -20,16 +22,16 @@
     "query": {
         "11": [
             "(",
-            "node[historic~\"^(castle|archaeological_site|battlefield|monument)$\"];",
-            "way[historic~\"^(castle|archaeological_site|battlefield|monument)$\"];",
-            "relation[historic~\"^(castle|archaeological_site|battlefield|monument)$\"];",
+            "node[historic~\"^(castle|archaeological_site|battlefield)$\"];",
+            "way[historic~\"^(castle|archaeological_site|battlefield)$\"];",
+            "relation[historic~\"^(castle|archaeological_site|battlefield)$\"];",
             ")"
         ],
         "14": [
             "(",
-            "node[historic];",
-            "way[historic];",
-            "relation[historic];",
+            "node[historic][historic!~\"^(memorial|monument|wayside_cross|wayside_shrine)$\"];",
+            "way[historic][historic!~\"^(memorial|monument|wayside_cross|wayside_shrine)$\"];",
+            "relation[historic][historic!~\"^(memorial|monument|wayside_cross|wayside_shrine)$\"];",
             ")"
         ]
     },
@@ -71,14 +73,6 @@
         "aircraft": {
             "sign": "<img src='maki:airport'>",
             "zoom": 14
-        },
-        "memorial": {
-            "sign": "<img src='maki:monument?size=11'>",
-            "zoom": 14
-        },
-        "monument": {
-            "sign": "<img src='maki:monument?size=15'>",
-            "zoom": 11
         }
     }
-}
+}

index.json

@@ -14,14 +14,16 @@
                 "es": "Ocio, deporte y compras",
                 "et": "Vaba aeg, sport ja ostmine",
                 "fr": "Loisirs",
-                "hu": "Szabadidő",
+                "hu": "Szabadidő, sport és vásárlás",
                 "it": "Tempo libero, sport e shopping",
                 "ja": "レジャー",
                 "nl": "Vrije tijd, Sport en Winkelen",
                 "pl": "Wypoczynek, Sport i Zakupy",
                 "ro": "Timp liber, Sport si Cumparaturi",
                 "ru": "Досуг",
-                "uk": "Дозвілля"
+                "uk": "Дозвілля",
+                "pt-br": "Lazer, esportes e compras",
+                "pt": "Lazer, desporto e compras"
             },
             "subCategories": [
                 {
@@ -30,6 +32,9 @@
                 {
                     "id": "shop"
                 },
+                {
+                    "id": "craft"
+                },
                 {
                     "id": "leisure"
                 },
@@ -38,6 +43,9 @@
                 },
                 {
                     "id": "children"
+                },
+                {
+                    "id": "outdoor"
                 }
             ]
         },
@@ -54,14 +62,16 @@
                 "es": "Servicios",
                 "et": "Teenused",
                 "fr": "Services",
-                "hu": "Szolgáltatás",
+                "hu": "Szolgáltatások",
                 "it": "Servizi",
                 "ja": "サービス",
                 "nl": "Dienstverlening",
                 "pl": "Usługi",
                 "ro": "Servicii",
                 "ru": "Услуги",
-                "uk": "Послуги"
+                "uk": "Послуги",
+                "pt-br": "Prestação de serviços",
+                "pt": "Serviços"
             },
             "subCategories": [
                 {
@@ -108,7 +118,9 @@
                 "pl": "Transport",
                 "ro": "Transport",
                 "ru": "Транспорт",
-                "uk": "Транспорт"
+                "uk": "Транспорт",
+                "pt-br": "Mobilidade",
+                "pt": "Transportes"
             },
             "subCategories": [
                 {
@@ -117,7 +129,10 @@
                     "name": {
                         "de": "Zu Fuß gehen",