railway-electrification: improve colors; set preferences via const

(e.g. railway=rail, ...)

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-entrances.json

@@ -0,0 +1,27 @@
+{
+    "type": "overpass",
+    "name": {
+        "de": "Eingänge",
+        "en": "Entrances",
+        "fr": "Entrées",
+        "pt-br": "Acessos"
+    },
+    "query": {
+        "16": [
+            "(",
+            "  node[entrance];",
+            "  node[building=entrance];",
+            ")"
+        ]
+    },
+    "feature": {
+        "description": [
+            "{% if tags.entrance == 'yes' or (not tags.entrance and tags.building == 'entrance') %}",
+            "{{ keyTrans('entrance') }}",
+            "{% else %}",
+            "{{ tagTrans('entrance', tags.entrance) }}",
+            "{% endif %}"
+        ],
+        "styles": ""
+    }
+}

buildings-figure-ground.json

@@ -0,0 +1,40 @@
+{
+    "type": "overpass",
+    "name": {
+        "de": "Schwarzplan",
+        "en": "Figure-ground diagram",
+        "fr": "Empreintes",
+        "pt-br": "Cheios e vazios"
+    },
+    "query": {
+        "16": [
+            "(",
+            "  way[building];",
+            "  relation[building];",
+            ")"
+        ]
+    },
+    "feature": {
+        "markerSymbol": "",
+        "listMarkerSymbol": "{{ markerPolygon({fillColor: \"#000000\", fillOpacity: 1 })|raw }}",
+        "priority": [
+            "{% set p = 100 %}",
+            "{% if tags.name %}{% set p = p - 10 %}{% endif %}",
+            "{% if tags.amenity %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.historic %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.culture %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.highway %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.railway %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.aeroway %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.amenity %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.tourism %}{% set p = p - 1 %}{% endif %}",
+            "{{ p }}"
+        ],
+        "style": {
+            "width": "0",
+            "color": "#000000",
+            "fillColor": "#000000",
+            "fillOpacity": "1"
+        }
+    }
+}

buildings-height.json

@@ -0,0 +1,112 @@
+{
+    "type": "overpass",
+    "name": {
+        "de": "Gebäudehöhen",
+        "en": "Building height",
+        "fr": "Hauteur",
+        "pt-br": "Altura"
+    },
+    "query": {
+        "16": [
+            "(",
+            "  way[building];",
+            "  relation[building];",
+            ")"
+        ]
+    },
+    "feature": {
+        "pre": [
+            "{% if tags.height is defined %}",
+            "{% set approxHeight = tags.height %}",
+            "{% set m = tags.height|matches('(.*)\\s*(m|ft)$') %}",
+            "{% if m and m[2] == 'm' %}{% set approxHeight = m[1] %}{% endif %}",
+            "{% if m and m[2] == 'ft' %}{% set approxHeight = m[1] / 3.2808 %}{% endif %}",
+            "{% elseif attribute(tags, 'building:levels') is defined %}",
+            "{% set approxHeight = attribute(tags, 'building:levels') * 3.5 %}",
+            "{% endif %}",
+            "",
+            "{% if approxHeight <= 50 %}",
+            "{% set color = colorInterpolate(['green', 'red'], approxHeight / 50) %}",
+            "{% elseif approxHeight %}",
+            "{% set color = colorInterpolate(['red', 'yellow'], (approxHeight - 50) / 250) %} ",
+            "{% else %}",
+            "{% set color = '#7f7f7f' %}",
+            "{% endif %}"
+        ],
+        "description": [
+            "{% if tags.height is defined %}",
+            "  {% if tags.height|matches('(m|ft)$') %}{{ tags.height -}}",
+            "  {% else %}{{ tags.height }}&nbsp;m",
+            "  {%- endif -%}",
+            "{% endif -%}",
+            "",
+            "{%- if attribute(tags, 'building:levels') is defined -%}",
+            "{%- if tags.height is defined %}, {% endif %}",
+            "{{ attribute(tags, 'building:levels') }} {{ keyTrans('building:levels') }}",
+            "{% endif %}"
+        ],
+        "markerSymbol": null,
+        "listMarkerSymbol": "{{ markerPolygon({\"fillColor\": color, \"fillOpacity\": 0.8, \"width\": 1, \"color\": \"#000000\" })|raw }}",
+        "priority": "{{ (approxHeight|default(0)) * -1 }}",
+        "style": {
+            "width": "1",
+            "color": "#000000",
+            "fillColor": "{{ color }}",
+            "fillOpacity": "1"
+        }
+    },
+    "info": [
+        "<div style='display: inline-block'>",
+        "{{ tagTrans('height') }}",
+        "<table>",
+        "  <tr>",
+        "    <td>{{ markerPolygon(evaluate({ \"building\": \"yes\" }))|raw }}</td>",
+        "    <td colspan>{{ trans('unknown') }}</td>",
+        "  </tr>",
+        "{% for i in range(0, 50, 10) %}",
+        "  <tr>",
+        "    <td>{{ markerPolygon(evaluate({ \"building\": \"yes\", \"height\": i }))|raw }}</td>",
+        "    <td>{{ i }}m</td>",
+        "  </tr>",
+        "{% endfor %}",
+        "{% for i in range(100, 250, 50) %}",
+        "  <tr>",
+        "    <td>{{ markerPolygon(evaluate({ \"building\": \"yes\", \"height\": i }))|raw }}</td>",
+        "    <td>{{ i }}m</td>",
+        "  </tr>",
+        "{% endfor %}",
+        "  <tr>",
+        "    <td>{{ markerPolygon(evaluate({ \"building\": \"yes\", \"height\": \"300\" }))|raw }}</td>",
+        "    <td>≥300m</td>",
+        "  </tr>",
+        "</table>",
+        "</div>",
+        "",
+        "<div style='display: inline-block'>",
+        "{{ tagTrans('building:levels') }}",
+        "<table>",
+        "  <tr>",
+        "    <td>{{ markerPolygon(evaluate({ \"building\": \"yes\" }))|raw }}</td>",
+        "    <td colspan>{{ trans('unknown') }}</td>",
+        "  </tr>",
+        "{% for i in range(0, 12, 3) %}",
+        "  <tr>",
+        "    <td>{{ markerPolygon(evaluate({ \"building\": \"yes\", \"building:levels\": i }))|raw }}</td>",
+        "    <td>{{ i }}</td>",
+        "  </tr>",
+        "{% endfor %}",
+        "{% for i in range(15, 84, 15) %}",
+        "  <tr>",
+        "    <td>{{ markerPolygon(evaluate({ \"building\": \"yes\", \"building:levels\": i }))|raw }}</td>",
+        "    <td>{{ i }}</td>",
+        "  </tr>",
+        "{% endfor %}",
+        "  <tr>",
+        "    <td>{{ markerPolygon(evaluate({ \"building\": \"yes\", \"building:levels\": \"85\" }))|raw }}</td>",
+        "    <td>≥85</td>",
+        "  </tr>",
+        "</table>",
+        "",
+        "</div>"
+    ]
+}

buildings-start_date.json

@@ -0,0 +1,145 @@
+{
+    "type": "overpass",
+    "name": {
+        "de": "Gebäudealter",
+        "en": "Building age",
+        "fr": "Date de construction",
+        "pt-br": "Idade"
+    },
+    "query": {
+        "16": [
+            "(",
+            "  way[building];",
+            "  relation[building];",
+            ")"
+        ]
+    },
+    "feature": {
+        "pre": [
+            "{% set start_date = tags.start_date %}",
+            "{% if attribute(tags, 'building:start_date') %}{% set start_date = attribute(tags, 'building:start_date') %}{% endif %}",
+            "{# Deprecated tags #}",
+            "{% if not start_date and attribute(tags, 'building:age') %}{% set start_date = attribute(tags, 'building:age') %}{% endif %}",
+            "{% if not start_date and attribute(tags, 'building:year_built') %}{% set start_date = attribute(tags, 'building:year_built') %}{% endif %}",
+            "{% if not start_date and attribute(tags, 'building:buildyear') %}{% set start_date = attribute(tags, 'building:buildyear') %}{% endif %}",
+            "{% if not start_date and attribute(tags, 'year_built') %}{% set start_date = attribute(tags, 'year_built') %}{% endif %}",
+            "{% if not start_date and attribute(tags, 'building:year') %}{% set start_date = attribute(tags, 'building:year') %}{% endif %}",
+            "",
+            "{% if start_date %}",
+            "  {# equalize tagging mistakes - need to add QA messages #}",
+            "  {# convert 1910-1911 to 1910..1911 #}{% set m = start_date|matches('^(\\d{4})-(\\d{4})$') %}{% if m %}{% set start_date = m[1] ~ '..' ~ m[2] %}{% endif %}",
+            "  {# convert 191* to 1910s #}{% set m = start_date|matches('^(\\d{3})\\*$') %}{% if m %}{% set start_date = m[1] ~ '0s' %}{% endif %}",
+            "",
+            "",
+            "  {% set value = start_date|osmParseDate %}",
+            "  {% if value and value[0] and value[1] %}",
+            "    {% set value = (value[1] - value[0]) / 2 + value[0] %}",
+            "  {% elseif value and value[0] %}",
+            "    {% set value = value[0] %}",
+            "  {% elseif value and value[1] %}",
+            "    {% set value = value[1] %}",
+            "  {% else %}",
+            "    {% set value = 'error' %}",
+            "  {% endif %}",
+            "",
+            "  {% if value == 'error' %}",
+            "    {% set color = '#ff0000' %}",
+            "  {% elseif value < 1500 %}",
+            "    {% set color = '#0000ff' %}",
+            "  {% elseif value < 1900 %}",
+            "    {% set color = colorInterpolate([ '#0000ff', '#ff00ff' ], (value - 1500.0) / 400) %}",
+            "  {% elseif value < 2000 %}",
+            "    {% set color = colorInterpolate([ '#ff00ff', '#ffff00' ], (value - 1900.0) / 100) %}",
+            "  {% else %}",
+            "    {% set color = colorInterpolate([ '#ffff00', '#00ff00' ], (value - 2000.0) / 50) %}",
+            "  {% endif %}",
+            "{% else %}",
+            "{% set color = '#7f7f7f' %}",
+            "{% endif %}"
+        ],
+        "description": [
+            "{% if start_date %}",
+            "{{ start_date|osmFormatDate({ format: 'short' }) }}",
+            "{% else %}",
+            "{{ trans('unknown') }}",
+            "{% endif %}"
+        ],
+        "popupDescription": [
+            "{% if start_date %}",
+            "{{ start_date|osmFormatDate }}",
+            "{% else %}",
+            "{{ trans('unknown') }}",
+            "{% endif %}"
+        ],
+        "markerSymbol": null,
+        "listMarkerSymbol": "{{ markerPolygon({ \"fillColor\": color, \"fillOpacity\": 0.8, \"width\": 1, \"color\": \"#000000\" })|raw }}",
+        "priority": [
+            "{% set p = 100 %}",
+            "{% if start_date %}{% set p = p - 20 %}{% endif %}",
+            "{% if tags.name %}{% set p = p - 10 %}{% endif %}",
+            "{% if tags.amenity %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.historic %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.culture %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.highway %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.railway %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.aeroway %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.amenity %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.tourism %}{% set p = p - 1 %}{% endif %}",
+            "{{ p }}"
+        ],
+        "style": {
+            "width": "1",
+            "color": "#000000",
+            "fillColor": "{{ color }}",
+            "fillOpacity": "0.8"
+        }
+    },
+    "info": [
+        "<table>",
+        "  <tr>",
+        "    <td>{{ markerPolygon(evaluate({ \"building\": \"yes\", \"start_date\": \"1400\" }))|raw }}</td>",
+        "    <td>&lt;1500</td>",
+        "  </tr>",
+        "  <tr>",
+        "    <td>{{ markerPolygon(evaluate({ \"building\": \"yes\", \"start_date\": \"1500\" }))|raw }}</td>",
+        "    <td>1500</td>",
+        "  </tr>",
+        "  <tr>",
+        "    <td>{{ markerPolygon(evaluate({ \"building\": \"yes\", \"start_date\": \"1600\" }))|raw }}</td>",
+        "    <td>1600</td>",
+        "  </tr>",
+        "  <tr>",
+        "    <td>{{ markerPolygon(evaluate({ \"building\": \"yes\", \"start_date\": \"1700\" }))|raw }}</td>",
+        "    <td>1700</td>",
+        "  </tr>",
+        "  <tr>",
+        "    <td>{{ markerPolygon(evaluate({ \"building\": \"yes\", \"start_date\": \"1800\" }))|raw }}</td>",
+        "    <td>1800</td>",
+        "  </tr>",
+        "  <tr>",
+        "    <td>{{ markerPolygon(evaluate({ \"building\": \"yes\", \"start_date\": \"1900\" }))|raw }}</td>",
+        "    <td>1900</td>",
+        "  </tr>",
+        "  <tr>",
+        "    <td>{{ markerPolygon(evaluate({ \"building\": \"yes\", \"start_date\": \"1950\" }))|raw }}</td>",
+        "    <td>1950</td>",
+        "  </tr>",
+        "  <tr>",
+        "    <td>{{ markerPolygon(evaluate({ \"building\": \"yes\", \"start_date\": \"2000\" }))|raw }}</td>",
+        "    <td>2000</td>",
+        "  </tr>",
+        "  <tr>",
+        "    <td>{{ markerPolygon(evaluate({ \"building\": \"yes\", \"start_date\": \"2020\" }))|raw }}</td>",
+        "    <td>2020</td>",
+        "  </tr>",
+        "  <tr>",
+        "    <td>{{ markerPolygon(evaluate({ \"building\": \"yes\", \"start_date\": \"xxx\" }))|raw }}</td>",
+        "    <td>{{ repoTrans('date format not understood') }}</td>",
+        "  </tr>",
+        "  <tr>",
+        "    <td>{{ markerPolygon(evaluate({ \"building\": \"yes\" }))|raw }}</td>",
+        "    <td>{{ trans('unknown') }}</td>",
+        "  </tr>",
+        "</table>"
+    ]
+}

buildings-type.json

@@ -0,0 +1,243 @@
+{
+    "type": "overpass",
+    "name": {
+        "de": "Gebäudearten",
+        "en": "Building types",
+        "fr": "Type",
+        "pt-br": "Tipologias"
+    },
+    "query": {
+        "16": "nwr[building][building!=no];"
+    },
+    "feature": {
+        "pre": [
+            "{% set type = tags.building|split(';')[0] %}",
+            "{% if tags.military %}{% set type = 'military' %}{% endif %}",
+            "{% set color = const.other.color %}",
+            "{% for cat, data in const %}",
+            "  {% if type in data.types %}",
+            "    {% set color = data.color %}",
+            "  {% endif %}",
+            "{% endfor %}"
+        ],
+        "description": [
+            "{% if tags.building == 'yes' and tags.military %}",
+            "{{ tagTrans('building', 'military') }}",
+            "{% elseif tags.building == 'yes' %}",
+            "{{ keyTrans('building') }}",
+            "{% else %}",
+            "{{ tagTransList('building', tags.building) }}",
+            "{% endif %}",
+            "{% if tags.building == 'construction' and tags.construction %}",
+            "({{ tagTransList('building', tags.construction) }})",
+            "{% endif %}",
+            "{% if tags.building in  [ 'yes', 'military' ] and tags.military %}",
+            "({{ tagTransList('military', tags.military) }})",
+            "{% endif %}"
+        ],
+        "markerSymbol": "",
+        "listMarkerSymbol": "{{ markerPolygon({\"fillColor\": color, \"fillOpacity\": 0.8, \"width\": 1, \"color\": \"#000000\" })|raw }}",
+        "priority": [
+            "{% set p = 100 %}",
+            "{% if tags.name %}{% set p = p - 10 %}{% endif %}",
+            "{% if tags.amenity %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.historic %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.culture %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.highway %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.railway %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.aeroway %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.amenity %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.tourism %}{% set p = p - 1 %}{% endif %}",
+            "{{ p }}"
+        ],
+        "style": {
+            "width": "1",
+            "color": "#000000",
+            "fillColor": "{{ color }}",
+            "fillOpacity": "0.8"
+        }
+    },
+    "info": [
+        "<table>",
+        "{% for cat, data in const %}",
+        "  <tr>",
+        "    <td valign='top'>{{ markerPolygon({ \"fillColor\": data.color, \"fillOpacity\": \"0.8\", \"width\": 1, \"color\": \"#000000\" })|raw }}</td>",
+        "    <td onclick='this.classList.toggle(\"infoShowDetails\")'><b>{{ trans(data.name) }}</b><span class='details'>:",
+        "      {% for i, type in data.types %}<span title='building={{ type }}'>{% if i > 0 %}, {% endif %}{{ tagTrans('building', type) }}</span>{% endfor %}",
+        "      </span>",
+        "<span class='summary'><i class=\"fa fa-info-circle\" aria-hidden=\"true\"></i></span>",
+        "    </td>",
+        "  </tr>",
+        "{% endfor %}",
+        "</table>"
+    ],
+    "const": {
+        "residential": {
+            "name": "tag:building=residential",
+            "color": "#25a000",
+            "types": [
+                "house",
+                "apartments",
+                "block",
+                "flats",
+                "farm",
+                "detached",
+                "dormitory",
+                "terrace",
+                "houseboat",
+                "bungalow",
+                "static_caravan",
+                "residential",
+                "semidetached_house",
+                "ger",
+                "trullo"
+            ]
+        },
+        "tourism": {
+            "name": "tag:tourism",
+            "color": "#814ce2",
+            "types": [
+                "hotel",
+                "ruins",
+                "conservatory"
+            ]
+        },
+        "commercial": {
+            "name": "tag:building=commercial",
+            "color": "#ec5bcf",
+            "types": [
+                "commercial",
+                "office",
+                "industrial",
+                "retail",
+                "supermarket",
+                "warehouse",
+                "kiosk",
+                "mall",
+                "shop"
+            ]
+        },
+        "religious": {
+            "name": "tag:building=religious",
+            "color": "#af29cc",
+            "types": [
+                "religious",
+                "cathedral",
+                "chapel",
+                "church",
+                "mosque",
+                "temple",
+                "synagogue",
+                "shrine",
+                "monastery"
+            ]
+        },
+        "amenity": {
+            "name": "tag:amenity",
+            "color": "#2935cc",
+            "types": [
+                "kindergarten",
+                "civic",
+                "government",
+                "hospital",
+                "school",
+                "university",
+                "grandstand",
+                "public",
+                "toilets",
+                "college"
+            ]
+        },
+        "agriculture": {
+            "name": "tag:building=agriculture",
+            "color": "#92e934",
+            "types": [
+                "bakehouse",
+                "barn",
+                "cowshed",
+                "farm_auxiliary",
+                "greenhouse",
+                "stable",
+                "sty",
+                "kitchen",
+                "slurry_tank",
+                "silo"
+            ]
+        },
+        "industrial": {
+            "name": "tag:landuse=industrial",
+            "color": "#e2da1b",
+            "types": [
+                "construction",
+                "garbage_shed",
+                "transformer_tower",
+                "service",
+                "water_tower",
+                "industrial",
+                "warehouse",
+                "storage_tank"
+            ]
+        },
+        "transportation": {
+            "name": "tag:building=transportation",
+            "color": "#1bb5e2",
+            "types": [
+                "carport",
+                "garage",
+                "garages",
+                "bridge",
+                "hangar",
+                "parking",
+                "train_station",
+                "transportation"
+            ]
+        },
+        "sport": {
+            "name": "tag:sport",
+            "color": "#e21b66",
+            "types": [
+                "pavilion",
+                "riding_hall",
+                "stadium",
+                "sports_hall"
+            ]
+        },
+        "roof": {
+            "name": "tag:building=roof",
+            "color": "#afafaf7f",
+            "types": [
+                "roof"
+            ]
+        },
+        "shelter": {
+            "name": "tag:amenity=shelter",
+            "color": "#cc8725",
+            "types": [
+                "cabin",
+                "hut",
+                "shed"
+            ]
+        },
+        "military": {
+            "name": "tag:building=military",
+            "color": "#4a7300",
+            "types": [
+                "bunker",
+                "military"
+            ]
+        },
+        "unspecified": {
+            "name": "tag:building=generic",
+            "color": "#7f7f7f",
+            "types": [
+                "yes",
+                "generic"
+            ]
+        },
+        "other": {
+            "name": "other",
+            "color": "#ff0000",
+            "types": []
+        }
+    }
+}

buildings.json

@@ -1,37 +1,28 @@
 {
-    "type": "overpass",
+    "type": "index",
     "name": {
         "de": "Gebäude",
         "en": "Buildings",
-        "fr": "Bâtiments"
+        "fr": "Bâtiments",
+        "hu": "Épületek",
+        "pt": "Edifícios",
+        "pt-br": "Edificações"
     },
-    "query": {
+    "subCategories": [
-        "16": [
+        {
-            "(",
+            "id": "buildings-type"
-            "  way[building];",
+        },
-            "  relation[building];",
+        {
-            ")"
+            "id": "buildings-figure-ground"
-        ]
+        },
-    },
+        {
-    "feature": {
+            "id": "buildings-height"
-        "markerSymbol": null,
+        },
-        "priority": [
+        {
-            "{% set p = 100 %}",
+            "id": "buildings-start_date"
-            "{% if tags.name %}{% set p = p - 10 %}{% endif %}",
+        },
-            "{% if tags.amenity %}{% set p = p - 1 %}{% endif %}",
+        {
-            "{% if tags.historic %}{% set p = p - 1 %}{% endif %}",
+            "id": "buildings-entrances"
-            "{% if tags.culture %}{% set p = p - 1 %}{% endif %}",
-            "{% if tags.highway %}{% set p = p - 1 %}{% endif %}",
-            "{% if tags.railway %}{% set p = p - 1 %}{% endif %}",
-            "{% if tags.aeroway %}{% set p = p - 1 %}{% endif %}",
-            "{% if tags.amenity %}{% set p = p - 1 %}{% endif %}",
-            "{% if tags.tourism %}{% set p = p - 1 %}{% endif %}",
-            "{{ p }}"
-        ],
-        "style": {
-            "width": "1",
-            "color": "#000000",
-            "fillColor": "#000000"
         }
-    }
+    ]
 }

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)$\"];",
@@ -13,36 +16,67 @@
     },
     "feature": {
         "pre": [
-            "{% if tags.maxspeed is not defined %}",
             "{% set maxspeedKmh = null %}",
             "{% set maxspeed = null %}",
             "{% set unit = null %}",
-            "{% else %}",
             "",
-            "{% if tags.maxspeed|matches(\"^[0-9]+$\") %}",
+            "{% if tags.maxspeed is defined %}",
-            "{% set maxspeedKmh = tags.maxspeed %}",
+            "  {% if tags.maxspeed|matches(\"^[0-9]+$\") %}",
-            "{% set maxspeed = tags.maxspeed %}",
+            "    {% set maxspeedKmh = tags.maxspeed %}",
-            "{% set unit = \"km/h\" %}",
+            "    {% set maxspeed = tags.maxspeed %}",
+            "    {% set unit = \"km/h\" %}",
+            "  {% elseif tags.maxspeed|matches( \"(^[0-9]+) mph$\") %}",
+            "    {% set m = tags.maxspeed|matches(\"(^[0-9]+) mph$\") %}",
+            "    {% set maxspeedKmh = m[1] * 1.60934 %}",
+            "    {% set maxspeed = m[1] %}",
+            "    {% set unit = \"mph\" %}",
+            "  {% endif %}",
             "{% endif %}",
             "",
-            "",
+            "{% if attribute(tags, 'maxspeed:forward') is defined %}",
-            "{% set m = tags.maxspeed|matches(\"(^[0-9]+) mph$\") %}",
+            "  {% if attribute(tags, 'maxspeed:forward')|matches(\"^[0-9]+$\") %}",
-            "{% if m %}",
+            "    {% set maxspeedFKmh = attribute(tags, 'maxspeed:forward') %}",
-            "{% set maxspeedKmh = m[1] * 1.60934 %}",
+            "    {% set maxspeedF = attribute(tags, 'maxspeed:forward') %}",
-            "{% set maxspeed = m[1] %}",
+            "    {% set unit = \"km/h\" %}",
-            "{% set unit = \"mph\" %}",
+            "  {% elseif attribute(tags, 'maxspeed:forward')|matches(\"^[0-9]+ mph$\") %}",
+            "    {% set m = attribute(tags, 'maxspeed:forward')|matches(\"(^[0-9]+) mph$\") %}",
+            "    {% set maxspeedFKmh = m[1] * 1.60934 %}",
+            "    {% set maxspeedF = m[1] %}",
+            "    {% set unit = \"mph\" %}",
+            "  {% endif %}",
             "{% endif %}",
             "",
+            "{% if attribute(tags, 'maxspeed:backward') is defined %}",
+            "  {% if attribute(tags, 'maxspeed:backward')|matches(\"^[0-9]+$\") %}",
+            "    {% set maxspeedBKmh = attribute(tags, 'maxspeed:backward') %}",
+            "    {% set maxspeedB = attribute(tags, 'maxspeed:backward') %}",
+            "    {% set unit = \"km/h\" %}",
+            "  {% elseif attribute(tags, 'maxspeed:backward')|matches(\"^[0-9]+ mph$\") %}",
+            "    {% set m = attribute(tags, 'maxspeed:backward')|matches(\"(^[0-9]+) mph$\") %}",
+            "    {% set maxspeedBKmh = m[1] * 1.60934 %}",
+            "    {% set maxspeedB = m[1] %}",
+            "    {% set unit = \"mph\" %}",
+            "  {% endif %}",
             "{% endif %}",
             "",
             "{% if not maxspeedKmh %}",
             "{% set color = \"#404040\" %}",
             "{% else %}",
             "{% set color = colorInterpolate(const.colorMap, (maxspeedKmh - const.offsetColorSpeed) / const.highestColorSpeed) %}",
+            "{% endif %}",
+            "",
+            "{% if maxspeedFKmh %}",
+            "{% set colorF = colorInterpolate(const.colorMap, (maxspeedFKmh - const.offsetColorSpeed) / const.highestColorSpeed) %}",
+            "{% endif %}",
+            "",
+            "{% if maxspeedBKmh %}",
+            "{% set colorB = colorInterpolate(const.colorMap, (maxspeedBKmh - const.offsetColorSpeed) / const.highestColorSpeed) %}",
             "{% endif %}"
         ],
         "description": [
-            "{% if maxspeed %}",
+            "{% if maxspeedF or maxspeedB %}",
+            "<span style='color: {{ colorB }}'>{{ maxspeedB|default(trans('unknown')) }}</span> / <span style='color: {{ colorF }}'>{{ maxspeedF|default(trans('unknown')) }}</span> {{ unit }}",
+            "{% elseif maxspeed %}",
             "<span style='color: {{ color }}'>{{ maxspeed }} {{ unit }}</span>",
             "{% elseif tags.maxspeed %}",
             "{{ tags.maxspeed }}",
@@ -50,11 +84,32 @@
             "{{ trans('unknown') }}",
             "{% endif %}"
         ],
-        "markerSymbol": null,
+        "markerSymbol": "",
         "listMarkerSymbol": "line",
+        "styles": "{% if maxspeedB or maxspeedF %}left,right,default{% else %}default{% endif %}",
         "style": {
-            "width": "3",
+            "width": "{% if maxspeedB or maxspeedF %}0{% else %}4{% endif %}",
-            "color": "{{ color }}"
+            "color": "{{ color }}",
+            "text": [
+                "{% if maxspeedB or maxspeedF %}",
+                "  {% if maxspeedB %}🡸 {{ maxspeedB }} {% endif %}|{% if maxspeedF %} {{ maxspeedF }} 🡺{% endif %}       ",
+                "{% else %}",
+                "  {{ maxspeed }}         ",
+                "{% endif %}"
+            ],
+            "textRepeat": "1",
+            "textOffset": "4",
+            "textFontWeight": "bold"
+        },
+        "style:left": {
+            "width": "2",
+            "color": "{{ colorB|default('#404040') }}",
+            "offset": "-1"
+        },
+        "style:right": {
+            "width": "2",
+            "color": "{{ colorF|default('#404040') }}",
+            "offset": "1"
         }
     },
     "const": {

car_routes.json

@@ -0,0 +1,66 @@
+{
+    "type": "overpass",
+    "name": {
+        "en": "Car routes",
+        "fr": "Itinéraires auto",
+        "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": [
@@ -35,7 +37,7 @@
             "{% 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",
+            "{{ tagTrans('amenity', 'toilets diaper=yes') }}",
             "{% endif %}"
         ],
         "markerSign": [
@@ -76,8 +78,44 @@
         "  </tr>",
         "  <tr>",
         "    <td>{{ markerCircle({})|raw }}<div class='sign'>🚽🚼</div></td>",
-        "    <td>{{ tagTrans('amenity', 'toilets') }} with diaper changing table</td>",
+        "    <td>{{ tagTrans('amenity', 'toilets diaper=yes') }}</td>",
         "  </tr>",
         "</table>"
-    ]
+    ],
+    "filter": {
+        "type": {
+            "name": "{{ trans('filter:type') }}",
+            "type": "select",
+            "values": {
+                "playground": {
+                    "name": "{{ tagTrans('leisure', 'playground') }}",
+                    "query": "nwr[leisure=playground]"
+                },
+                "indoor_play": {
+                    "name": "{{ tagTrans('leisure', 'indoor_play') }}",
+                    "query": "nwr[leisure=indoor_play]"
+                },
+                "summer_camp": {
+                    "name": "{{ tagTrans('leisure', 'summer_camp') }}",
+                    "query": "nwr[leisure=summer_camp]"
+                },
+                "kids_area": {
+                    "name": "{{ keyTrans('kids_area') }}",
+                    "query": "nwr[kids_area]"
+                },
+                "shop_baby_goods": {
+                    "name": "{{ tagTrans('shop', 'baby_goods') }}",
+                    "query": "nwr[shop=baby_goods]"
+                },
+                "shop_toys": {
+                    "name": "{{ tagTrans('shop', 'toys') }}",
+                    "query": "nwr[shop=toys]"
+                },
+                "toilets": {
+                    "name": "{{ tagTrans('amenity', 'toilets diaper=yes') }}",
+                    "query": "nwr[amenity=toilets][diaper]"
+                }
+            }
+        }
+    }
 }

coal.json

@@ -0,0 +1,44 @@
+{
+    "type": "overpass",
+    "name": {
+        "de": "Kohle",
+        "en": "Coal",
+        "fr": "Charbon",
+        "hu": "Kőszén",
+        "pt-br": "Carvão"
+    },
+    "query": {
+        "11": [
+            "(",
+            "node[landuse~\"^(quarry)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+            "way[landuse~\"^(quarry)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+            "relation[landuse~\"^(quarry)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+            "node[man_made~\"^(mineshaft)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+            "way[man_made~\"^(mineshaft)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+            "way[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(coal)(|;.*)$\"];",
+            "relation[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(coal)(|;.*)$\"];",
+            "node[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(coal)(|;.*)$\"];",
+            "way[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(coal)(|;.*)$\"];",
+            "relation[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(coal)(|;.*)$\"];",
+            ")"
+        ]
+    },
+    "feature": {
+        "description": [
+            "{% if tags.man_made == 'pipeline' %}",
+            "{{ tagTrans('man_made', 'pipeline') }} ({{ tagTrans('substance', tags.substance) }})",
+            "{% elseif tags.man_made %}",
+            "{{ tagTrans('man_made', tags.man_made) }}",
+            "{% elseif tags.power == 'plant' %}",
+            "{{ tagTrans('power', 'plant') }} {% if attribute(tags, 'generator:source') %}({{ tagTransList('generator:source', attribute(tags, 'generator:source')) }}){% endif %}",
+            "{% elseif tags.power == 'generator' %}",
+            "{{ tagTrans('power', 'generator') }} {% if attribute(tags, 'generator:source') %}({{ tagTransList('generator:source', attribute(tags, 'generator:source')) }}){% endif %}",
+            "{% elseif tags.landuse == 'quarry' %}",
+            "{{ tagTrans('landuse', tags.landuse) }} {% if tags.resource %}({{ tagTrans('resource', tags.resource) }}){% endif %}",
+            "{% elseif tags.landuse == 'industrial' %}",
+            "{{ tagTrans('landuse', tags.landuse) }} ({{ tagTrans('industrial', tags.industrial) }})",
+            "{% endif %}"
+        ],
+        "markerSymbol": null
+    }
+}

communication.json

@@ -13,6 +13,8 @@
         "it": "Communicazioni",
         "ja": "交流",
         "nl": "Communicatie",
+        "pt": "Comunicação",
+        "pt-br": "Comunicação",
         "ro": "Comunicatii",
         "ru": "Услуги связи",
         "uk": "Телекомунікації"
@@ -23,21 +25,38 @@
             "node[amenity~'^(post_office|internet_cafe)$'];",
             "way[amenity~'^(post_office|internet_cafe)$'];",
             "relation[amenity~'^(post_office|internet_cafe)$'];",
+            "nwr[office~\"^(telecommunication|it|newspaper|publisher|advertising_agency)$\"];",
             ");"
         ],
         "16": [
             "(node[amenity~'^(post_office|internet_cafe|post_box|telephone)$'];",
             "way[amenity~'^(post_office|internet_cafe)$'];",
             "relation[amenity~'^(post_office|internet_cafe)$'];",
+            "nwr[office~\"^(telecommunication|it|newspaper|publisher|advertising_agency)$\"];",
             ");"
         ]
     },
     "feature": {
+        "pre": [
+            "{% if tags.amenity %}",
+            "  {% set key = 'amenity' %}",
+            "  {% set value = tags.amenity %}",
+            "{% else %}",
+            "  {% set key = 'office' %}",
+            "  {% set value = tags.office %}",
+            "{% endif %}"
+        ],
         "title": "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) |default(tagTrans('amenity', tags.amenity)) }}",
-        "description": "{{ tagTrans('amenity', tags.amenity) }}",
+        "description": [
+            "{% if key == 'office' %}",
+            "  {{ keyTrans('office') }} ({{ tagTrans('office', tags.office) }})",
+            "{% else %}",
+            "  {{ tagTrans(key, value) }}",
+            "{% endif %}"
+        ],
         "body": "{% if tags.operator %}{{ keyTrans('operator') }}: {{ localizedTag(tags, 'operator') }}<br/>{% endif %}",
         "markerSign": [
-            "{% set data = const[tags.amenity] %}",
+            "{% set data = const[key ~ '=' ~ value] %}",
             "{% if data %}",
             "{{ data.sign|raw }}",
             "{% endif %}"
@@ -45,32 +64,79 @@
     },
     "info": [
         "<table>",
-        "{% for value, data in const %}",
+        "{% for kv, data in const %}",
         "{% if data.zoom <= map.zoom %}",
         "  <tr>",
         "    <td>{{ markerCircle({})|raw }}<div class='sign'>{{ data.sign|raw }}</div></td>",
-        "    <td>{{ tagTrans('amenity', value) }}</td>",
+        "    <td>",
+        "      {% if kv|split('=')[0] == 'office' %}",
+        "        {{ keyTrans('office') }}",
+        "        ({{ tagTrans('office', kv|split('=')[1]) }})",
+        "      {% else %}",
+        "        {{ tagTrans(kv|split('=')[0], kv|split('=')[1]) }}",
+        "      {% endif %}",
+        "    </td>",
         "  </tr>",
         "{% endif %}",
         "{% endfor %}",
         "</table>"
     ],
     "const": {
-        "post_office": {
+        "amenity=post_office": {
             "sign": "<img src='maki:post?size=15'>",
             "zoom": 13
         },
-        "post_box": {
+        "amenity=post_box": {
             "sign": "<img src='maki:post?size=11'>",
             "zoom": 16
         },
-        "internet_cafe": {
+        "amenity=internet_cafe": {
             "sign": "<i class='fa fa-laptop' aria-hidden='true'></i>",
             "zoom": 13
         },
-        "telephone": {
+        "office=telecommunication": {
+            "sign": "<i class='fas fa-mobile-alt'></i>",
+            "zoom": 13
+        },
+        "office=it": {
+            "sign": "<i class='fas fa-desktop'></i>",
+            "zoom": 13
+        },
+        "office=newspaper": {
+            "sign": "<i class='fas fa-newspaper'></i>",
+            "zoom": 13
+        },
+        "office=publisher": {
+            "sign": "<i class='fas fa-book'></i>",
+            "zoom": 13
+        },
+        "office=advertising_agency": {
+            "sign": "<i class='fas fa-sign'></i>",
+            "zoom": 13
+        },
+        "office=public_relations": {
+            "sign": "<i class='fas fa-sign'></i>",
+            "zoom": 13
+        },
+        "office=audiovisual_production": {
+            "sign": "<i class='fas fa-film'></i>",
+            "zoom": 13
+        },
+        "office=film_production": {
+            "sign": "<i class='fas fa-film'></i>",
+            "zoom": 13
+        },
+        "amenity=telephone": {
             "sign": "<img src='maki:telephone'>",
             "zoom": 16
         }
+    },
+    "filter": {
+        "type": {
+            "name": "{{ trans('filter:type') }}",
+            "show_default": "true",
+            "type": "select",
+            "values": "{% for k, v in const %}<option value=\"{{ k }}\" query=\"nwr[{{ k }}]\" minzoom=\"{{ v.zoom }}\">{{ tagTrans(k) }}</option>{% endfor %}"
+        }
     }
 }

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,85 @@
+{
+    "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": "🍷"
+        }
+    },
+    "filter": {
+        "craft": {
+            "name": "{{ trans('filter:type') }}",
+            "type": "select",
+            "show_default": "true",
+            "values": "{% set list = [] %}{% for t, v in const.crafts %}<option value=\"{{ t }}\">{% set list = list|merge([ t ]) %}{{ tagTrans('craft', t) }}</option>{% endfor %}<option value='other' query='nwr[craft][craft!~\"^({{ list|join('|') }})$\"]'>{{ trans('other') }}</option>"
+        }
+    }
+}

culture.json

@@ -15,6 +15,8 @@
         "ja": "文化",
         "nl": "Cultuur",
         "pl": "Kultura",
+        "pt": "Cultura",
+        "pt-br": "Cultura",
         "ro": "Cultura",
         "ru": "Культура",
         "uk": "Культура "
@@ -28,6 +30,7 @@
             "node[tourism~\"^(artwork|gallery|museum|theme_park)$\"];",
             "way[tourism~\"^(artwork|gallery|museum|theme_park)$\"];",
             "relation[tourism~\"^(artwork|gallery|museum|theme_park)$\"];",
+            "nwr[shop~\"^(art)$\"];",
             ")"
         ]
     },
@@ -39,31 +42,94 @@
             "{% elseif tags.tourism %}",
             "{% set key = 'tourism' %}",
             "{% set value = tags.tourism %}",
+            "{% elseif tags.shop %}",
+            "{% set key = 'shop' %}",
+            "{% set value = tags.shop %}",
             "{% endif %}"
         ],
-        "description": "{{ tagTrans(key, value) }}",
+        "description": [
-        "markerSign": "{{ attribute(const, key ~ '=' ~ value) }}"
+            "{% if key == 'shop' %}",
+            "  {{ keyTrans(key) }} ({{ tagTrans(key, value) }})",
+            "{% else %}",
+            "  {{ tagTrans(key, value) }}",
+            "{% endif %}",
+            "",
+            "{% if tags.tourism == 'museum' and tags.museum %}",
+            "({{ tagTrans('museum', tags.museum) }})",
+            "{% endif %}",
+            "{% if tags.amenity == 'theatre' and attribute(tags, 'theatre:genre') %}",
+            "({{ tagTrans('theatre:genre', attribute(tags, 'theatre:genre')) }})",
+            "{% endif %}",
+            "{% if tags.amenity == 'community_centre' and tags.community_centre %}",
+            "({{ tagTrans('community_centre', tags.community_centre) }})",
+            "{% endif %}"
+        ],
+        "body": [
+            "<ul>",
+            "{% if tags.inscription %}",
+            "  <li class='hasSymbol'>",
+            "   <i class=\"fa fa-pencil-alt\" aria-hidden=\"true\"></i>",
+            "   <span class='key'>{{ keyTrans('inscription') }}:</span>",
+            "   <span class='value'>{{ localizedTag(tags, 'inscription') }}</span>",
+            "  </li>",
+            "{% elseif attribute(tags, 'inscription:url') %}",
+            "  <li class='hasSymbol'>",
+            "   <i class=\"fa fa-pencil-alt\" aria-hidden=\"true\"></i>",
+            "   <span class='key'><a href=\"{{ attribute(tags, 'inscription:url') }}\">{{ keyTrans('inscription') }}</a></span>",
+            "  </li>",
+            "{% endif %}",
+            "",
+            "{% if tags.artist_name %}",
+            "  <li class='hasSymbol'>",
+            "   <i class=\"fa fa-palette\" aria-hidden=\"true\"></i>",
+            "   <span class='key'>{{ keyTrans('artist_name') }}:</span>",
+            "   <span class='value'>{{ enumerate(tags.artist_name) }}</span>",
+            "  </li>",
+            "{% endif %}",
+            "",
+            "{% if tags.material %}",
+            "  <li class='hasSymbol'>",
+            "   <img data-src=\"maki:warehouse\">",
+            "   <span class='key'>{{ keyTrans('material') }}:</span>",
+            "   <span class='value'>{{ tagTransList('material', tags.material) }}</span>",
+            "  </li>",
+            "{% endif %}",
+            "",
+            "</ul>"
+        ],
+        "markerSign": "{{ attribute(const, key ~ '=' ~ value)|raw }}"
     },
     "const": {
         "amenity=arts_centre": "🎨",
         "amenity=cinema": "🎦",
-        "amenity=community_centre": "",
+        "amenity=community_centre": "<i class=\"fas fa-users\" aria-hidden=\"true\"></i>",
         "amenity=fountain": "⛲",
-        "amenity=studio": "",
+        "amenity=studio": "<i class=\"fas fa-microphone\"></i>",
         "amenity=theatre": "🎭",
         "tourism=artwork": "🎨 ",
         "tourism=gallery": "🖼",
         "tourism=museum": "🏛 ",
-        "tourism=theme_park": ""
+        "tourism=theme_park": "<img data-src='maki:amusement-park'>",
+        "shop=art": "<i class=\"fa fa-shopping-cart\"></i>"
     },
     "info": [
         "<table>",
         "{% for value, sign in const %}",
         "  <tr>",
-        "    <td>{{ markerCircle({})|raw }}<div class='sign'>{{ sign }}</div></td>",
+        "    <td>{{ markerCircle({})|raw }}<div class='sign'>{{ sign|raw }}</div></td>",
         "    <td>{{ tagTrans(value|split('=')[0], value|split('=')[1]) }}</td>",
         "  </tr>",
         "{% endfor %}",
         "</table>"
-    ]
+    ],
+    "filter": {
+        "type": {
+            "name": "{{ trans('filter:type') }}",
+            "show_default": "true",
+            "query": "nwr[{{ value }}]",
+            "type": "select",
+            "values": "{% for k, v in const %}<option value=\"{{ k }}\">{{ trans('tag:' ~ k) }}</option>{% endfor %}<option value=\"other\" query=\"nwr[amenity=fountain]\">{{ trans('other') }}</option>",
+            "valueName": "{{ trans('tag:' ~ value) }}"
+        }
+    }
 }

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",
+        "fr": "Culture et religion",
-        "hu": "Kultúra",
+        "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,159 @@
         "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 %}",
+        "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 %}",
+        "description": "{{ tagTrans('network', tags.network) }}",
+        "markerSymbol": "",
+        "listMarkerSymbol": "{{ markerLine({ 'width': 4, 'color': const[tags.network].color|default(const[''].color) })|raw }}",
+        "priority": "{{ const[tags.network].priority|default(4) }}",
+        "styles": "",
+        "style:hover": {
+            "width": "0"
+        },
+        "style:selected": {
+            "width": "0"
+        }
+    },
+    "memberFeature": {
+        "pre": [
+            "{% set priority = 4 %}",
+            "{% set network = '' %}",
+            "{% set refs = [] %}",
+            "{% set dirForward = false %}",
+            "{% set dirBackward = false %}",
+            "{% set hover = false %}",
+            "{% set selected = false %}",
+            "",
+            "{% 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 %}",
+            "  {% if master.role == 'forward' %}{% set dirForward = true %}",
+            "  {% elseif master.role == 'backward' %}{% set dirBackward = true %}",
+            "  {% else %}{% set dirForward = true %}{% set dirBackward = true %}",
+            "  {% endif %}",
+            "  {% if master.flags.hover %}{% set hover = master.role|default('both') %}{% endif %}",
+            "  {% if master.flags.selected %}{% set selected = master.role|default('both') %}{% 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",
+        "styles": "default{% if hover %},hover{% endif %}{% if selected %},selected{% endif %}",
         "style": {
-            "width": 4,
+            "width": "4",
-            "color": "{% if tags.network=='icn' %}#ff0000{% elseif tags.network=='ncn' %}#ff007f{% elseif tags.network=='rcn' %}#7f00ff{% else %}#0000ff{% endif %}",
+            "color": "{{ const[network].color }}",
-            "opacity": 1
+            "opacity": "1",
+            "lineCap": "{% if not dirForward or not dirBackward %}butt{% else %}round{% endif %}",
+            "dashArray": "{% if not dirForward or not dirBackward %}27,8{% endif %}",
+            "dashOffset": "{% if dirBackward %}28{% else %}0{% endif %}",
+            "noClip": "{% if not dirForward or not dirBackward %}true{% else %}false{% endif %}",
+            "text": "{{ refs|join(' · ') }}             ",
+            "textRepeat": "1",
+            "textOffset": "12",
+            "pattern": "{% if dirForward and dirBackward %}{% else %}arrowHead{% endif %}",
+            "pattern-offset": "{% if dirBackward %}4{% else %}30.5{% endif %}",
+            "pattern-repeat": "35",
+            "pattern-polygon": "true",
+            "pattern-pixelSize": "9",
+            "pattern-angleCorrection": "{% if dirBackward %}180{% else %}0{% endif %}",
+            "pattern-path-width": "0",
+            "pattern-path-color": "{{ const[network].color }}",
+            "pattern-path-fillOpacity": "1",
+            "textFontWeight": "bold"
+        },
+        "style:hover": {
+            "pane": "hover",
+            "width": "4",
+            "color": "black",
+            "lineCap": "{% if hover == 'forward' or hover == 'backward' %}butt{% else %}round{% endif %}",
+            "dashArray": "{% if hover == 'forward' or hover == 'backward' %}27,8{% endif %}",
+            "dashOffset": "{% if hover == 'backward' %}28{% else %}0{% endif %}",
+            "noClip": "{% if hover == 'forward' or hover == 'backward' %}true{% else %}false{% endif %}",
+            "pattern": "{% if hover == 'forward' or hover == 'backward' %}arrowHead{% endif %}",
+            "pattern-offset": "{% if hover == 'backward' %}4{% else %}30.5{% endif %}",
+            "pattern-repeat": "35",
+            "pattern-polygon": "true",
+            "pattern-pixelSize": "9",
+            "pattern-angleCorrection": "{% if hover == 'backward' %}180{% else %}0{% endif %}",
+            "pattern-path-width": "0",
+            "pattern-path-color": "black",
+            "pattern-path-fillOpacity": "1"
+        },
+        "style:selected": {
+            "pane": "selected",
+            "width": "4",
+            "color": "#3f3f3f",
+            "lineCap": "{% if selected == 'forward' or selected == 'backward' %}butt{% else %}round{% endif %}",
+            "dashArray": "{% if selected == 'forward' or selected == 'backward' %}27,8{% endif %}",
+            "dashOffset": "{% if selected == 'backward' %}28{% else %}0{% endif %}",
+            "noClip": "{% if selected == 'forward' or selected == 'backward' %}true{% else %}false{% endif %}",
+            "pattern": "{% if selected == 'forward' or selected == 'backward' %}arrowHead{% endif %}",
+            "pattern-offset": "{% if selected == 'backward' %}4{% else %}30.5{% endif %}",
+            "pattern-repeat": "35",
+            "pattern-polygon": "true",
+            "pattern-pixelSize": "9",
+            "pattern-angleCorrection": "{% if selected == 'backward' %}180{% else %}0{% endif %}",
+            "pattern-path-width": "0",
+            "pattern-path-color": "#3f3f3f",
+            "pattern-path-fillOpacity": "1"
         }
-    }
+    },
+    "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

@@ -1,4 +1,12 @@
 <ul>
+{% set hasDescription = tagsPrefix(tags, 'description:') %}
+{% if tags.description or hasDescription %}
+<li class='hasSymbol'>
+  <i class="fa fa-info" aria-hidden="true"></i>
+  <span class='value'>{{ localizedTag(tags, 'description')|default(attribute(tags, 'description:' ~ hasDescription|keys[0])) }}</span>
+</li>
+{% endif %}
+
 {% set address = tagsPrefix(tags, 'addr:') %}
 {% if address %}
 <li class='hasSymbol'>
@@ -93,8 +101,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>
@@ -130,4 +141,20 @@
 </li>
 {% endif %}
 
+{% if tags.start_date %}
+  <li class='hasSymbol'>
+   <i class="fa fa-clock-o" aria-hidden="true"></i>
+   <span class='key'>{{ keyTrans('start_date') }}:</span>
+   <span class='value'>{{ tags.start_date|osmFormatDate }}</span>
+  </li>
+{% endif %}
+
+{% if tags.opening_date %}
+  <li class='hasSymbol'>
+   <i class="fa fa-clock-o" aria-hidden="true"></i>
+   <span class='key'>{{ keyTrans('opening_date') }}:</span>
+   <span class='value'>{{ tags.opening_date|osmFormatDate }}</span>
+  </li>
+{% endif %}
+
 </ul>

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": "Освіта"
@@ -26,30 +29,37 @@
         ],
         "14": [
             "(",
-            "node[amenity~'^(college|university|library|school|kindergarten|language_school)$'];",
+            "nwr[amenity~'^(college|university|library|school|kindergarten|language_school)$'];",
-            "way[amenity~'^(college|university|library|school|kindergarten|language_school)$'];",
+            "nwr[office~\"^(educational_institution|research)$\"];",
-            "relation[amenity~'^(college|university|library|school|kindergarten|language_school)$'];",
             ")"
         ],
         "16": [
             "(",
-            "node[amenity~'^(college|university|library|school|kindergarten|public_bookcase)$'];",
+            "nwr[amenity~'^(college|university|library|school|kindergarten|language_school|public_bookcase)$'];",
-            "way[amenity~'^(college|university|library|school|kindergarten|public_bookcase)$'];",
+            "nwr[office~\"^(educational_institution|research)$\"];",
-            "relation[amenity~'^(college|university|library|school|kindergarten|public_bookcase)$'];",
             ")"
         ]
     },
     "feature": {
-        "description": "{{ tagTrans('amenity', tags.amenity) }}",
+        "pre": [
+            "{% if tags.office == 'educational_institution' or tags.office == 'research' %}",
+            "  {% set key = 'office' %}",
+            "  {% set value = tags.office %}",
+            "{% else %}",
+            "  {% set key = 'amenity' %}",
+            "  {% set value = tags.amenity %}",
+            "{% endif %}"
+        ],
+        "description": "{{ tagTrans(key, value) }}",
         "body": "{% if tags.operator %}{{ keyTrans('operator') }}: {{ tags.operator }}<br/>{% endif %}",
         "markerSign": [
-            "{% set data = const[tags.amenity] %}",
+            "{% set data = const[key ~ '=' ~ value] %}",
             "{% if data %}",
-            "{{ data.sign }}",
+            "{{ data.sign|raw }}",
             "{% endif %}"
         ],
         "priority": [
-            "{% set data = const[tags.amenity] %}",
+            "{% set data = const[key ~ '=' ~ value] %}",
             "{% if data %}",
             "{{ data.priority }}",
             "{% endif %}"
@@ -57,51 +67,71 @@
     },
     "info": [
         "<table>",
-        "{% for value, data in const %}",
+        "{% for kv, data in const %}",
         "{% if data.zoom <= map.zoom %}",
         "  <tr>",
-        "    <td>{{ markerCircle({})|raw }}<div class='sign'>{{ data.sign }}</div></td>",
+        "    <td>{{ markerCircle({})|raw }}<div class='sign'>{{ data.sign|raw }}</div></td>",
-        "    <td>{{ tagTrans('amenity', value) }}</td>",
+        "    <td>",
+        "      {{ tagTrans(kv|split('=')[0], kv|split('=')[1]) }}",
+        "    </td>",
         "  </tr>",
         "{% endif %}",
         "{% endfor %}",
         "</table>"
     ],
     "const": {
-        "university": {
+        "amenity=university": {
             "priority": 0,
             "sign": "🎓",
             "zoom": 11
         },
-        "college": {
+        "amenity=college": {
             "priority": 1,
             "sign": "🎓",
             "zoom": 11
         },
-        "library": {
+        "amenity=library": {
             "priority": 2,
             "sign": "🕮",
             "zoom": 11
         },
-        "school": {
+        "amenity=school": {
             "priority": 3,
             "sign": "🏫",
             "zoom": 14
         },
-        "language_school": {
+        "amenity=language_school": {
             "priority": 3,
             "sign": "🏫",
             "zoom": 14
         },
-        "kindergarten": {
+        "amenity=kindergarten": {
             "priority": 4,
             "sign": "⛹",
             "zoom": 14
         },
-        "public_bookcase": {
+        "amenity=public_bookcase": {
             "priority": 5,
             "sign": "📚",
             "zoom": 16
+        },
+        "office=educational_institution": {
+            "priority": 3,
+            "sign": "🏢",
+            "zoom": 14
+        },
+        "office=research": {
+            "priority": 3,
+            "sign": "<i class='fas fa-vials'></i>",
+            "zoom": 14
+        }
+    },
+    "filter": {
+        "type": {
+            "name": "{{ trans('filter:type') }}",
+            "show_default": "true",
+            "type": "select",
+            "values": "{% for k, v in const %}<option value=\"{{ k }}\" query=\"nwr[{{ k }}]\" minzoom=\"{{ v.zoom }}\">{{ tagTrans(k) }}</option>{% endfor %}"
         }
     }
 }

power.json → electric_power.json

@@ -3,14 +3,16 @@
     "name": {
         "ast": "Enerxía",
         "cs": "Elektřina",
-        "de": "Energie",
+        "de": "Elektrischer Strom",
-        "en": "Power",
+        "en": "Electric Power",
         "et": "Elekter",
-        "fr": "Énergie",
+        "fr": "Production/transport électrique",
         "hu": "Áramellátás",
         "it": "Energia",
         "ja": "電力",
         "nl": "Stroomvoorziening",
+        "pt": "Eletricidade",
+        "pt-br": "Energia elétrica",
         "ro": "Energie",
         "ru": "Энергетика"
     },

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,49 +30,100 @@
         ],
         "13": [
             "(",
-            "node[amenity~\"^(fire_station|hospital|police|emergency_phone)$\"];",
+            "node[amenity~\"^(fire_station|hospital|police)$\"];",
-            "way[amenity~\"^(fire_station|hospital|police|emergency_phone)$\"];",
+            "way[amenity~\"^(fire_station|hospital|police)$\"];",
-            "relation[amenity~\"^(fire_station|hospital|police|emergency_phone)$\"];",
+            "relation[amenity~\"^(fire_station|hospital|police)$\"];",
+            "node[emergency~\"^(phone)$\"];",
+            "node[highway=emergency_access_point];",
             ")"
         ]
     },
     "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 %}",
+            "{% elseif tags.highway == 'emergency_access_point' %}",
+            "{% set key = 'highway' %}",
+            "{% set value = tags.highway %}",
+            "{% endif %}",
+            "{% set kv = key ~ \"=\" ~ value %}"
+        ],
+        "description": "{{ tagTrans(key, value) }}",
         "markerSign": [
-            "{% set data = const[tags.amenity] %}",
+            "{% set data = const[kv] %}",
             "{% if data %}",
-            "{{ data.sign }}",
+            "{{ data.sign|raw }}",
             "{% endif %}"
-        ]
+        ],
+        "markerSymbol": "{{ markerPointer({ fillColor: data.background|default('#f27f6a') })|raw }}",
+        "listMarkerSymbol": "{{ markerCircle({ fillColor: data.background|default('#f27f6a') })|raw }}"
     },
     "info": [
         "<table>",
         "{% for value, data in const %}",
         "{% if data.zoom <= map.zoom %}",
         "  <tr>",
-        "    <td>{{ markerCircle({})|raw }}<div class='sign'>{{ data.sign }}</div></td>",
+        "    <td>{{ markerCircle({ fillColor: data.background|default('#f27f6a') })|raw }}<div class='sign'>{{ data.sign|raw }}</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": "📞"
+        },
+        "highway=emergency_access_point": {
+            "zoom": "13",
+            "sign": "<img data-src='maki:hospital?fill=white'>",
+            "background": "#009262"
+        }
+    },
+    "filter": {
+        "type": {
+            "name": "{{ trans('filter:type') }}",
+            "type": "select",
+            "show_default": "true",
+            "values": {
+                "fire_station": {
+                    "name": "{{ tagTrans('amenity', 'fire_station') }}",
+                    "query": "nwr[amenity=fire_station]"
+                },
+                "hospital": {
+                    "name": "{{ tagTrans('amenity', 'hospital') }}",
+                    "query": "nwr[amenity=hospital]"
+                },
+                "police": {
+                    "name": "{{ tagTrans('amenity', 'police') }}",
+                    "query": "nwr[amenity=police]"
+                },
+                "emergency_phone": {
+                    "name": "{{ tagTrans('emergency', 'phone') }}",
+                    "query": "node[emergency=phone]"
+                },
+                "emergency_access_point": {
+                    "name": "{{ tagTrans('highway', 'emergency_access_point') }}",
+                    "query": "node[highway=emergency_access_point]"
+                }
+            }
         }
     }
 }

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,45 +23,91 @@
             "(",
             "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)$\"];",
+            "node[office~\"^(financial|accountant|insurance|tax|tax_advisor)$\"];",
+            "way[office~\"^(financial|accountant|insurance|tax|tax_advisor)$\"];",
+            "relation[office~\"^(financial|accountant|insurance|tax|tax_advisor)$\"];",
             ")"
         ]
     },
     "feature": {
-        "description": "{{ tagTrans('amenity', tags.amenity) }}",
+        "pre": [
-        "markerSign": "{{ const[tags.amenity].sign|raw }}"
+            "{% if tags.amenity %}",
+            "  {% set key = 'amenity' %}",
+            "  {% set value = tags.amenity %}",
+            "{% else %}",
+            "  {% set key = 'office' %}",
+            "  {% set value = tags.office %}",
+            "{% endif %}"
+        ],
+        "description": "{{ tagTrans(key, value) }}",
+        "markerSign": "{{ const[key ~ '=' ~ value].sign|raw }}"
     },
     "info": [
         "<table>",
-        "{% for value, data in const %}",
+        "{% for kv, data in const %}",
         "{% if data.zoom <= map.zoom %}",
         "  <tr>",
         "    <td>{{ markerCircle({})|raw }}<div class='sign'>{{ data.sign|raw }}</div></td>",
-        "    <td>{{ tagTrans('amenity', value) }}</td>",
+        "    <td>",
+        "      {{ tagTrans(kv|split('=')[0], kv|split('=')[1]) }}",
+        "    </td>",
         "  </tr>",
         "{% endif %}",
         "{% endfor %}",
         "</table>"
     ],
     "const": {
-        "atm": {
+        "amenity=atm": {
-            "sign": "<img src='maki:bank?size=11'>",
+            "sign": "<img data-src='maki:bank?size=11'>",
             "zoom": 15
         },
-        "bank": {
+        "amenity=bank": {
-            "sign": "<img src='maki:building'>",
+            "sign": "<img data-src='maki:building'>",
             "zoom": 14
         },
-        "bureau_de_change": {
+        "amenity=bureau_de_change": {
             "sign": "⇄",
             "zoom": 15
+        },
+        "office=financial": {
+            "sign": "<i class=\"fas fa-coins\"></i>",
+            "zoom": 15
+        },
+        "office=accountant": {
+            "sign": "<i class=\"fas fa-book\"></i>",
+            "zoom": 15
+        },
+        "office=insurance": {
+            "sign": "<i class=\"fas fa-file-signature\"></i>",
+            "zoom": 15
+        },
+        "office=tax": {
+            "sign": "%",
+            "zoom": 15
+        },
+        "office=tax_advisor": {
+            "sign": "<span style='color: green'>%</span>",
+            "zoom": 15
+        },
+        "office=cooperative": {
+            "sign": "<i class=\"fas fa-piggy-bank\"></i>",
+            "zoom": 15
+        }
+    },
+    "filter": {
+        "type": {
+            "name": "{{ trans('filter:type') }}",
+            "show_default": "true",
+            "type": "select",
+            "values": "{% for k, v in const %}<option value=\"{{ k }}\" query=\"nwr[{{ k }}]\" minzoom=\"{{ v.zoom }}\">{{ tagTrans(k) }}</option>{% endfor %}"
         }
     }
 }

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,18 +6,20 @@
         "de": "Gastronomie",
         "el": "Γαστρονομία",
         "en": "Gastronomy",
-        "fr": "Gastronomie",
+        "fr": "Restauration",
-        "hu": "Gasztronómia",
+        "hu": "Vendéglátás",
         "it": "Gastronomia",
         "ja": "食べ物",
         "nl": "Gastronomie",
         "pl": "Gastronomia",
+        "pt": "Restauração",
+        "pt-br": "Gastronomia",
         "ro": "Gastronomie",
         "ru": "Общепит",
         "uk": "Гастрономія"
     },
     "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)$'];);"
+        "16": "(node[amenity~'^(bar|biergarten|cafe|fast_food|food_court|ice_cream|pub|restaurant)$'];way[amenity~'^(bar|biergarten|cafe|fast_food|food_court|ice_cream|pub|restaurant)$'];relation[amenity~'^(bar|biergarten|cafe|fast_food|food_court|ice_cream|pub|restaurant)$'];);"
     },
     "feature": {
         "description": "{{ tagTrans('amenity', tags.amenity) }}",
@@ -28,8 +30,87 @@
             "   <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 %}"
+    },
+    "filter": {
+        "amenity": {
+            "name": "{{ trans('filter:type') }}",
+            "type": "select",
+            "show_default": "true",
+            "values": [
+              "bar",
+              "biergarten",
+              "cafe",
+              "fast_food",
+              "food_court",
+              "ice_cream",
+              "pub",
+              "restaurant"
+            ],
+            "valueName": "{{ tagTrans('amenity', value) }}",
+            "op": "="
+        },
+        "cuisine_food": {
+            "name": "{{ keyTrans('cuisine/food') }}",
+            "type": "select",
+            "key": "cuisine",
+            "values": [ "barbecue", "burger", "casserole", "chicken", "couscous", "curry", "fish", "fish_and_chips", "fried_food", "friture", "gyros", "kebab", "noodle", "pasta", "pizza", "sandwich", "sausage", "seafood", "soup", "steak_house", "sub", "sushi", "tapas", "wings" ],
+            "valueName": "{{ tagTrans('cuisine', value) }}",
+            "op": "has"
+        },
+        "cuisine_dessert": {
+            "name": "{{ keyTrans('cuisine/dessert') }}",
+            "type": "select",
+            "key": "cuisine",
+            "values": [ "bagel", "biscuit", "bougatsa", "cake", "coffee_shop", "cookie", "crepe", "dessert", "donut", "empanada", "frozen_yogurt", "gingerbread", "ice_cream", "chimney_cake", "langos", "pancake", "pastry", "petit_four", "pie", "pogacha", "poppy_seed_roll", "profiterole", "punch_cake", "savory_pancakes", "strudel", "teahouse", "waffle" ],
+            "valueName": "{{ tagTrans('cuisine', value) }}",
+            "op": "has"
+        },
+        "cuisine_ethnicity": {
+            "name": "{{ keyTrans('cuisine/ethnicity') }}",
+            "type": "select",
+            "key": "cuisine",
+            "values": [ "afghan", "african", "american", "arab", "argentinian", "asian", "australian", "baiana", "balkan", "basque", "bavarian", "belarusan", "bolivian", "brazilian", "cantonese", "capixaba", "caribbean", "chinese", "croatian", "czech", "danish", "french", "gaucho", "german", "greek", "hawaiian", "hunan", "hungarian", "indian", "international", "iranian", "italian", "japanese", "jewish", "korean", "kyo_ryouri", "latin_american", "lebanese", "malagasy", "mediterranean", "mexican", "mineira", "new_mexican", "okinawa_ryori", "pakistani", "peruvian", "polish", "portuguese", "regional", "rhenish", "russian", "shandong", "sichuan", "spanish", "texan", "tex-mex", "thai", "turkish", "vietnamese", "westphalian" ],
+            "valueName": "{{ tagTrans('cuisine', value) }}",
+            "op": "has"
+        },
+        "diet": {
+            "name": "{{ keyTrans('diet') }}",
+            "type": "select",
+            "values": {
+               "*": {
+                 "name": "{{ repoTrans('Objects with diet information') }}",
+                 "query": "nwr[~\"^diet:\"~\".\"]"
+               },
+               "diet:vegan": {},
+               "diet:vegetarian": {},
+               "diet:pescetarian": {},
+               "diet:lacto_vegetarian": {},
+               "diet:ovo_vegetarian": {},
+               "diet:fruitarian": {},
+               "diet:raw": {},
+               "diet:gluten_free": {},
+               "diet:dairy_free": {},
+               "diet:lactose_free": {},
+               "diet:halal": {},
+               "diet:kosher": {}
+            },
+            "valueName": "{{ keyTrans(value) }}",
+            "op": "has_key_value"
+        }
     }
 }

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": "Здоров'я"
@@ -45,44 +48,209 @@
             "  {% set value = tags.emergency %}",
             "{% elseif tags.healthcare %}",
             "  {% set key = 'healthcare' %}",
-            "  {% set value = tags.healthcare %}",
+            "  {% set value = tags.healthcare|split(';')[0] %}",
             "{% else %}",
             "  {% set key = 'amenity' %}",
             "  {% set value = tags.amenity %}",
-            "{% endif %}"
+            "{% endif %}",
+            "{% set kv = key ~ '=' ~ value %}",
+            "{% set found = { sign: '' } %}",
+            "{% for data in const %}",
+            "  {% if kv in data.types %}{% set found = data %}{% endif %}",
+            "{% endfor %}"
         ],
         "description": [
-            "{{ tagTrans(key, value) }}",
+            "{{ tagTransList(key, attribute(tags, key)) }}",
             "{% if attribute(tags, 'healthcare:speciality') %}",
             "-",
             "{{ tagTransList('healthcare:speciality', attribute(tags, 'healthcare:speciality')) }}",
             "{% endif %}"
         ],
-        "markerSign": "{{ const[value]|raw }}"
+        "markerSign": "{{ found.sign|raw }}"
     },
     "info": [
         "<table>",
-        "{% for value, sign in const %}",
+        "{% for data in const %}",
         "  <tr>",
-        "    <td>{{ markerCircle({})|raw }}<div class='sign'>{{ sign|raw }}</div></td>",
+        "    <td>{{ markerCircle({})|raw }}<div class='sign'>{{ data.sign|raw }}</div></td>",
-        "    <td>{{ tagTrans('amenity', value) }}</td>",
+        "    <td>{{ tagTrans(data.types[0]|split('=')[0], data.types[0]|split('=')[1]) }}</td>",
         "  </tr>",
         "{% endfor %}",
         "</table>"
     ],
-    "const": {
+    "const": [
-        "baby_hatch": "🚼",
+        {
-        "blood_bank": "<img src='maki:blood-bank'>",
+            "types": [
-        "blood_donation": "<img src='maki:blood-bank'>",
+                "amenity=hospital",
-        "clinic": "🏥",
+                "healthcare=hospital"
-        "defibrillator": "<img src='maki:defibrillator'>",
+            ],
-        "dentist": "<img src='maki:dentist'>",
+            "sign": "<i class=\"fas fa-hospital-alt\"></i>"
-        "doctor": "<img src='maki:doctor'>",
+        },
-        "doctors": "<img src='maki:doctor'>",
+        {
-        "hospital": "🏥",
+            "types": [
-        "nursing_home": "",
+                "healthcare=clinic"
-        "pharmacy": "<img src='maki:pharmacy'>",
+            ],
-        "social_facility": "",
+            "sign": "<i class=\"fas fa-hospital\"></i>"
-        "veterinary": "<img src='maki:veterinary'>"
+        },
+        {
+            "types": [
+                "healthcare=centre"
+            ],
+            "sign": "<i class=\"far fa-hospital\"></i>"
+        },
+        {
+            "types": [
+                "healthcare=doctor",
+                "amenity=doctors"
+            ],
+            "sign": "<img data-src='maki:doctor'>"
+        },
+        {
+            "types": [
+                "amenity=pharmacy",
+                "healthcare=pharmacy"
+            ],
+            "sign": "<img data-src='maki:pharmacy'>"
+        },
+        {
+            "types": [
+                "emergency=defibrillator"
+            ],
+            "sign": "<img data-src='maki:defibrillator'>"
+        },
+        {
+            "types": [
+                "healthcare=dentist",
+                "amenity=dentist"
+            ],
+            "sign": "<img data-src='maki:dentist'>"
+        },
+        {
+            "types": [
+                "amenity=baby_hatch"
+            ],
+            "sign": "🚼"
+        },
+        {
+            "types": [
+                "healthcare=blood_bank"
+            ],
+            "sign": "<img data-src='maki:blood-bank'>"
+        },
+        {
+            "types": [
+                "healthcare=blood_donation"
+            ],
+            "sign": "<img data-src='maki:blood-bank'>"
+        },
+        {
+            "types": [
+                "amenity=nursing_home"
+            ]
+        },
+        {
+            "types": [
+                "amenity=social_facility"
+            ],
+            "sign": "<i class=\"fas fa-users\"></i>"
+        },
+        {
+            "types": [
+                "amenity=veterinary"
+            ],
+            "sign": "<img data-src='maki:veterinary'>"
+        },
+        {
+            "types": [
+                "healthcare=physiotherapist"
+            ],
+            "sign": "<i class=\"fas fa-user-injured\"></i>"
+        },
+        {
+            "types": [
+                "healthcare=psychotherapist"
+            ],
+            "sign": "<i class=\"fas fa-couch\"></i>"
+        },
+        {
+            "types": [
+                "healthcare=alternative"
+            ],
+            "sign": ""
+        },
+        {
+            "types": [
+                "healthcare=audiologist"
+            ],
+            "sign": "<i class=\"fas fa-headphones-alt\"></i>"
+        },
+        {
+            "types": [
+                "healthcare=birthing_center"
+            ],
+            "sign": "<i class=\"fas fa-baby\"></i>"
+        },
+        {
+            "types": [
+                "healthcare=dialysis"
+            ],
+            "sign": ""
+        },
+        {
+            "types": [
+                "healthcare=laboratory"
+            ],
+            "sign": "<i class=\"fas fa-vials\"></i>"
+        },
+        {
+            "types": [
+                "healthcare=midwife"
+            ],
+            "sign": ""
+        },
+        {
+            "types": [
+                "healthcare=nutrition_counseling"
+            ],
+            "sign": "<i class=\"fas fa-carrot\"></i>"
+        },
+        {
+            "types": [
+                "healthcare=occupational_therapist"
+            ],
+            "sign": ""
+        },
+        {
+            "types": [
+                "healthcare=optometrist"
+            ],
+            "sign": "<i class=\"fas fa-eye\"></i>"
+        },
+        {
+            "types": [
+                "healthcare=podiatrist"
+            ],
+            "sign": ""
+        },
+        {
+            "types": [
+                "healthcare=rehabilitation"
+            ],
+            "sign": "<i class=\"fas fa-crutch\"></i>"
+        },
+        {
+            "types": [
+                "healthcare=speech_therapist"
+            ],
+            "sign": ""
+        }
+    ],
+    "filter": {
+        "type": {
+            "name": "{{ trans('filter:type') }}",
+            "show_default": "true",
+            "type": "select",
+            "values": "{% for data in const %}<option value=\"{{ data.types[0] }}\" query=\"({% for t in data.types %}nwr[{{ t }}];{% endfor %})\" minzoom=\"{{ data.zoom }}\">{{ tagTrans(data.types[0]) }}</option>{% endfor %}"
+        }
     }
 }

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": "{{ const[tags.network].priority|default(4) }}",
-        "priority": [
+        "description": "{% if tags.network %}{{ tagTrans('network', tags.network) }}{% endif %}",
-            "{% set network_data = const[tags.network] %}",
+        "listMarkerSymbol": "{{ markerLine({ 'width': 4, 'color': const[tags.network|default('')].color|default(const[''].color) })|raw }}",
-            "{% if network_data %}",
+        "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 %}",
-            "{{ network_data.priority }}",
+        "styles": "",
-            "{% endif %}"
+        "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,22 +22,81 @@
     "query": {
         "11": [
             "(",
-            "node[historic~\"^(castle|archaeological_site|battlefield|monument)$\"];",
+            "node[historic~\"^(castle|archaeological_site|battlefield)$\"];",
-            "way[historic~\"^(castle|archaeological_site|battlefield|monument)$\"];",
+            "way[historic~\"^(castle|archaeological_site|battlefield)$\"];",
-            "relation[historic~\"^(castle|archaeological_site|battlefield|monument)$\"];",
+            "relation[historic~\"^(castle|archaeological_site|battlefield)$\"];",
             ")"
         ],
         "14": [
             "(",
-            "node[historic];",
+            "node[historic][historic!~\"^(memorial|monument|wayside_cross|wayside_shrine|wayside_chapel)$\"];",
-            "way[historic];",
+            "way[historic][historic!~\"^(memorial|monument|wayside_cross|wayside_shrine|wayside_chapel)$\"];",
-            "relation[historic];",
+            "relation[historic][historic!~\"^(memorial|monument|wayside_cross|wayside_shrine|wayside_chapel)$\"];",
+            "node[memorial~\"^(flood_mark|high_water_mark)$\"];",
+            "node[\"memorial:type\"~\"^(flood_mark|high_water_mark)$\"];",
+            "node[flood_mark];",
             ")"
         ]
     },
     "feature": {
-        "description": "{{ tagTransList('historic', tags.historic) }}",
+        "description": [
-        "markerSign": "{{ const[tags.historic].sign|raw }}"
+            "{% set historic = tags.historic %}",
+            "{% if attribute(tags, 'memorial') == 'high_water_mark' or attribute(tags, 'memorial:type') == 'high_water_mark' or attribute(tags, 'memorial') == 'flood_mark' or attribute(tags, 'memorial:type') == 'flood_mark' or tags.historic == 'highwater_mark' or (tags.historic != 'flood_mark' and tags.flood_mark) %}",
+            "{{ tagTrans('historic', 'flood_mark') }}",
+            "{{ debug(id ~ ': Deprecated tagging. Please use historic=flood_mark.') }}",
+            "{% set historic = 'flood_mark' %}",
+            "{% else %}",
+            "{{ tagTransList('historic', tags.historic) }}",
+            "{% endif %}",
+            "",
+            "{% if tags.flood_mark and tags.flood_mark != 'yes' %}({{ tagTrans('flood_mark', tags.flood_mark) }}){% endif %}"
+        ],
+        "body": [
+            "<ul>",
+            "{% if tags.inscription %}",
+            "  <li class='hasSymbol'>",
+            "   <i class=\"fa fa-pencil-alt\" aria-hidden=\"true\"></i>",
+            "   <span class='key'>{{ keyTrans('inscription') }}:</span>",
+            "   <span class='value'>{{ localizedTag(tags, 'inscription') }}</span>",
+            "  </li>",
+            "{% elseif attribute(tags, 'inscription:url') %}",
+            "  <li class='hasSymbol'>",
+            "   <i class=\"fa fa-pencil-alt\" aria-hidden=\"true\"></i>",
+            "   <span class='key'><a href=\"{{ attribute(tags, 'inscription:url') }}\">{{ keyTrans('inscription') }}</a></span>",
+            "  </li>",
+            "{% endif %}",
+            "",
+            "{% if attribute(tags, 'historic:civilization') %}",
+            "  <li class='hasSymbol'>",
+            "   <i class=\"fa fa-users\" aria-hidden=\"true\"></i>",
+            "   <span class='key'>{{ keyTrans('historic:civilization') }}:</span>",
+            "   <span class='value'>{{ tagTrans('historic:civilization', attribute(tags, 'historic:civilization')) }}</span>",
+            "  </li>",
+            "{% endif %}",
+            "",
+            "{% if attribute(tags, 'memorial:conflict') %}",
+            "  <li class='hasSymbol'>",
+            "   <i class=\"fa fa-bolt\" aria-hidden=\"true\"></i>",
+            "   <span class='key'>{{ keyTrans('memorial:conflict') }}:</span>",
+            "   <span class='value'>{{ tagTransList('memorial:conflict', attribute(tags, 'memorial:conflict')) }}</span>",
+            "  </li>",
+            "{% endif %}",
+            "",
+            "{% if tags.flood_date %}",
+            "  <li class='hasSymbol'>",
+            "   <i class=\"fas fa-calendar-alt\"></i>",
+            "   <span class='key'>{{ keyTrans('flood_date') }}:</span>",
+            "   <span class='value'>",
+            "     {% set flood_dates = [] %}",
+            "     {% for d in tags.flood_date|split(';') %}",
+            "       {% set flood_dates = flood_dates|merge([ d|trim|osmFormatDate ]) %}",
+            "     {% endfor %}",
+            "     {{ flood_dates|enumerate }}",
+            "   </span>",
+            "  </li>",
+            "{% endif %}"
+        ],
+        "markerSign": "{{ const[historic].sign|raw }}"
     },
     "info": [
         "<table>",
@@ -57,28 +118,79 @@
     ],
     "const": {
         "archaeological_site": {
-            "sign": "",
+            "sign": "<i class=\"fas fa-archway\"></i>",
             "zoom": 11
         },
         "battlefield": {
-            "sign": "",
+            "sign": "⚔️",
             "zoom": 11
         },
         "castle": {
-            "sign": "<img src='maki:castle'>",
+            "sign": "<img data-src='maki:castle'>",
             "zoom": 11
         },
+        "building": {
+            "sign": "<img data-src='maki:building'>",
+            "zoom": 14
+        },
         "aircraft": {
-            "sign": "<img src='maki:airport'>",
+            "sign": "<img data-src='maki:airport'>",
             "zoom": 14
         },
-        "memorial": {
+        "ruins": {
-            "sign": "<img src='maki:monument?size=11'>",
+            "sign": "<img data-src='temaki:ruins'>",
             "zoom": 14
         },
-        "monument": {
+        "flood_mark": {
-            "sign": "<img src='maki:monument?size=15'>",
+            "sign": "<i class=\"fas fa-water\"></i>",
-            "zoom": 11
+            "zoom": 14,
+            "query": "(node[historic][memorial~\"^(flood_mark|high_water_mark)$\"];node[historic][\"memorial:type\"~\"^(flood_mark|high_water_mark)$\"];node[historic~\"^(highwater_mark|flood_mark)$\"];)"
+        }
+    },
+    "filter": {
+        "type": {
+            "key": "historic",
+            "show_default": "true",
+            "name": "{{ trans('filter:type') }}",
+            "type": "select",
+            "values": "{% set list = [] %}{% for t, v in const %}<option value=\"{{ t }}\" {% if const[t].query %}query='{{ const[t].query }}'{% endif %}>{% set list = list|merge([ t ]) %}{{ tagTrans('historic', t) }}</option>{% endfor %}<option value='other' query='nwr[historic][historic!~\"^({{ list|join('|') }})$\"]'>{{ trans('other') }}</option>",
+            "valueName": "{{ tagTrans('historic', value) }}"
+        },
+        "conflict": {
+            "key": "memorial:conflict",
+            "op": "has",
+            "name": "{{ keyTrans('memorial:conflict') }}",
+            "type": "select",
+            "values": [
+                "WW1",
+                "WW2"
+            ],
+            "valueName": "{{ tagTrans('memorial:conflict', value) }}"
+        },
+        "civilization": {
+            "key": "historic:civilization",
+            "op": "has",
+            "name": "{{ keyTrans('historic:civilization') }}",
+            "type": "select",
+            "values": [
+                "ancient_egyptian",
+                "ancient_greek",
+                "ancient_roman",
+                "byzantine",
+                "celtic",
+                "etruscan",
+                "imperial_chinese",
+                "korean",
+                "medieval",
+                "modern",
+                "neolithic",
+                "nuragic",
+                "ottoman",
+                "prehistoric",
+                "roman",
+                "western_roman"
+            ],
+            "valueName": "{{ tagTrans('historic:civilization', value) }}"
         }
     }
-}
+}

img/blue_plaque.svg

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15"
+   height="15"
+   viewBox="0 0 15 15"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="blue_plaque.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="35.4"
+     inkscape:cx="7.5"
+     inkscape:cy="7.5"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1366"
+     inkscape:window-height="712"
+     inkscape:window-x="0"
+     inkscape:window-y="28"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4136"
+       width="10"
+       height="14"
+       x="2.5"
+       y="0.5" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4157"
+       width="10"
+       height="9"
+       x="2.5"
+       y="3" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4157-3"
+       width="5"
+       height="14"
+       x="5"
+       y="0.5" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:2.65248108px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.4973402;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="2.9953218"
+       y="6.4278626"
+       id="text4520"
+       transform="scale(0.99468037,1.0053481)"><tspan
+         sodipodi:role="line"
+         id="tspan4518"
+         x="2.9953218"
+         y="6.4278626"
+         style="stroke-width:0.4973402">Ab Cde</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:1.60000002px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="2.2923846"
+       y="9.1671877"
+       id="text4524"><tspan
+         sodipodi:role="line"
+         id="tspan4522"
+         x="2.2923846"
+         y="9.1671877">Lorem ipsum</tspan></text>
+  </g>
+</svg>

img/plaque.svg

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15"
+   height="15"
+   viewBox="0 0 15 15"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="plaque.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="35.4"
+     inkscape:cx="7.5"
+     inkscape:cy="7.5"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1366"
+     inkscape:window-height="712"
+     inkscape:window-x="0"
+     inkscape:window-y="28"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4136"
+       width="10"
+       height="14"
+       x="2.5"
+       y="0.5" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4157"
+       width="10"
+       height="9"
+       x="2.5"
+       y="3" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4157-3"
+       width="5"
+       height="14"
+       x="5"
+       y="0.5" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:2.65248108px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.4973402;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="2.9953218"
+       y="6.4278626"
+       id="text4520"
+       transform="scale(0.99468037,1.0053481)"><tspan
+         sodipodi:role="line"
+         id="tspan4518"
+         x="2.9953218"
+         y="6.4278626"
+         style="stroke-width:0.4973402">Ab Cde</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:1.60000002px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="2.2923846"
+       y="9.1671877"
+       id="text4524"><tspan
+         sodipodi:role="line"
+         id="tspan4522"
+         x="2.2923846"
+         y="9.1671877">Lorem ipsum</tspan></text>
+  </g>
+</svg>

index.json

@@ -13,15 +13,17 @@
                 "en": "Leisure, Sport and Shopping",
                 "es": "Ocio, deporte y compras",
                 "et": "Vaba aeg, sport ja ostmine",
-                "fr": "Loisirs",
+                "fr": "Vie quotidienne, loisirs et sports",
-                "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,12 @@
                 },
                 {
                     "id": "children"
+                },
+                {
+                    "id": "outdoor"
+                },
+                {
+                    "id": "swimming_bathing"
                 }
             ]
         },
@@ -54,14 +65,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": [
                 {
@@ -76,14 +89,23 @@
                 {
                     "id": "communication"
                 },
+                {
+                    "id": "office"
+                },
                 {
                     "id": "financial"
                 },
+                {
+                    "id": "law"
+                },
                 {
                     "id": "public"
                 },
                 {
                     "id": "tourism_services"
+                },
+                {
+                    "id": "organisations"
                 }
             ]
         },
@@ -108,7 +130,9 @@
                 "pl": "Transport",
                 "ro": "Transport",
                 "ru": "Транспорт",
-                "uk": "Транспорт"
+                "uk": "Транспорт",
+                "pt-br": "Mobilidade",
+                "pt": "Transportes"
             },
             "subCategories": [
                 {
@@ -117,7 +141,10 @@
                     "name": {
                         "de": "Zu Fuß gehen",
                         "en": "Walking",
-                        "fr": "Marche à pied"
+                        "fr": "Marche à pied",
+                        "pt-br": "Pedestre",
+                        "pt": "Pedestre",
+                        "hu": "Gyalogos közlekedés"
                     },
                     "subCategories": [
                         {
@@ -134,7 +161,10 @@
                     "name": {
                         "de": "Radfahren",
                         "en": "Cycling",
-                        "fr": "Cyclisme"
+                        "fr": "Cyclisme",
+                        "pt-br": "Ciclismo",
+                        "pt": "Ciclismo",
+                        "hu": "Kerékpáros közlekedés"
                     },
                     "subCategories": [
                         {
@@ -163,17 +193,16 @@
                         "pl": "Transport Publiczny",
                         "ro": "Transport public",
                         "ru": "Общественный транспорт",
-                        "uk": "Громадський транспорт"
+                        "uk": "Громадський транспорт",
+                        "pt-br": "Transporte público",
+                        "pt": "Transportes públicos"
                     },
                     "subCategories": [
                         {
                             "id": "pt_amenities"
                         },
                         {
-                            "id": "pt_stops"
+                            "id": "pt"
-                        },
-                        {
-                            "id": "pt_routes"
                         }
                     ]
                 },
@@ -192,7 +221,10 @@
                         "pl": "Transport Indywidualny",
                         "ro": "Trafic individual",
                         "ru": "Частный транспорт",
-                        "uk": "Приватний транспорт"
+                        "uk": "Приватний транспорт",
+                        "pt-br": "Tráfego individual",
+                        "pt": "Transporte individual",
+                        "hu": "Autós közlekedés"
                     },
                     "subCategories": [
                         {
@@ -200,6 +232,9 @@
                         },
                         {
                             "id": "car_maxspeed"
+                        },
+                        {
+                            "id": "car_routes"
                         }
                     ]
                 }
@@ -211,7 +246,10 @@
             "name": {
                 "de": "Infrastruktur",
                 "en": "Infrastructure",
-                "fr": "Infrastructures"
+                "fr": "Infrastructures",
+                "pt-br": "Infraestrutura",
+                "pt": "Infraestrutura",
+                "hu": "Infrastruktúra"
             },
             "subCategories": [
                 {
@@ -224,7 +262,32 @@
                     "id": "military"
                 },
                 {
-                    "id": "power"
+                    "id": "energy",
+                    "type": "index",
+                    "name": {
+                        "en": "Energy",
+                        "de": "Energie",
+                        "pt-br": "Energia",
+                        "fr": "Énergie",
+                        "hu": "Energiaellátás"
+                    },
+                    "subCategories": [
+                        {
+                            "id": "electric_power"
+                        },
+                        {
+                            "id": "power_routes"
+                        },
+                        {
+                            "id": "coal"
+                        },
+                        {
+                            "id": "oil_gas"
+                        },
+                        {
+                            "id": "renewables"
+                        }
+                    ]
                 },
                 {
                     "id": "railway",
@@ -240,7 +303,9 @@
                         "it": "Ferrovie",
                         "ja": "鉄道",
                         "nl": "Spoorwegen",
-                        "ru": "Железные дороги"
+                        "ru": "Железные дороги",
+                        "pt-br": "Ferrovia",
+                        "pt": "Linhas ferroviárias"
                     },
                     "subCategories": [
                         {
@@ -248,6 +313,15 @@
                         },
                         {
                             "id": "railway-electrification"
+                        },
+                        {
+                            "id": "railway-maxspeed"
+                        },
+                        {
+                            "id": "railway-gauge"
+                        },
+                        {
+                            "id": "railway-routes"
                         }
                     ]
                 },
@@ -273,14 +347,27 @@
             "type": "index",
             "name": {
                 "en": "Special",
-                "de": "Spezial"
+                "de": "Spezial",
+                "pt-br": "Especial",
+                "fr": "Catégories spéciales",
+                "pt": "Especial",
+                "hu": "Speciális"
             },
             "subCategories": [
+                {
+                    "id": "gastro-smoking"
+                },
                 {
                     "id": "wikipedia"
+                },
+                {
+                    "id": "xmas"
                 }
             ]
         }
     ],
-    "name": {}
+    "name": {
+        "hu": "Tartalom",
+        "pt-br": "Índice"
+    }
 }

internet.json

@@ -6,9 +6,12 @@
         "de": "Internetzugang",
         "en": "Internet access",
         "es": "Acceso a Internet",
-        "hu": "Internethozzáférés",
+        "fr": "Internet",
+        "hu": "Internetcsatlakozás",
         "ja": "インターネット接続",
         "nl": "Internettoegang",
+        "pt": "Acesso à Internet",
+        "pt-br": "Acesso à Internet",
         "ro": "Acces internet"
     }
 }

lang/ast.json

@@ -1,62 +1,94 @@
 {
+    "Objects with diet information": "",
     "category:administrative": "Divisiones Alministratives",
     "category:agriculture": "Agricultura",
     "category:alternative_amenities": "Infraestructures",
     "category:alternative_routes": "Rutes",
-    "category:buildings": null,
+    "category:buildings": "",
+    "category:buildings-entrances": "",
+    "category:buildings-figure-ground": "",
+    "category:buildings-height": "",
+    "category:buildings-start_date": "",
+    "category:buildings-type": "",
     "category:car_amenities": "Infraestructures",
     "category:car_furniture": "Acondicionamientu urbanu",
-    "category:car_maxspeed": null,
+    "category:car_maxspeed": "",
-    "category:children": null,
+    "category:car_routes": "",
+    "category:children": "",
+    "category:coal": "",
     "category:communication": "Comunicaciones",
     "category:construction": "Sitios d'obres",
+    "category:craft": "",
     "category:culture": "Cultura",
     "category:culture_religion": "Cultura",
-    "category:cycle_amenities": null,
+    "category:cycle_amenities": "",
-    "category:cycle_routes": null,
+    "category:cycle_routes": "",
     "category:education": "Servicios educativos",
+    "category:electric_power": "Enerxía",
     "category:emergency": "Servicios d'emerxencia",
+    "category:energy": "",
     "category:financial": "Dineru",
     "category:gastro": "Gastronomía",
+    "category:gastro-smoking": "",
     "category:health": "Salú",
-    "category:hiking_routes": null,
+    "category:hiking_routes": "",
     "category:historic": "Hestoria",
-    "category:index": null,
+    "category:index": "",
+    "category:infrastructure": "",
     "category:internet": "Accesu a Internet",
+    "category:law": "",
     "category:leisure": "Recréu",
+    "category:leisure_sport_shopping": "Recréu, deportes y compres",
+    "category:memorial": "",
     "category:military": "Militar",
+    "category:mtb-routes": "",
     "category:natural": "Formaciones naturales",
+    "category:office": "",
+    "category:oil_gas": "",
+    "category:organisations": "",
     "category:other": "Otres",
+    "category:outdoor": "",
     "category:phone": "Teléfonos",
     "category:places": "Llugares",
     "category:places_geo": "Llugares",
     "category:playgrounds": "Xuegos infantiles",
     "category:post": "Corréu",
-    "category:power": "Enerxía",
+    "category:power_routes": "",
+    "category:pt": "",
+    "category:pt:routes": "",
+    "category:pt:stops": "Paraes y estaciones",
     "category:pt_amenities": "Infraestructures",
-    "category:pt_routes": null,
-    "category:pt_stops": "Paraes y estaciones",
     "category:public": "Serviciu Públicu",
-    "category:railway-electrification": null,
+    "category:railway": "Ferrocarril",
-    "category:railway-infrastructure": null,
+    "category:railway-electrification": "",
+    "category:railway-gauge": "",
+    "category:railway-infrastructure": "",
+    "category:railway-maxspeed": "",
+    "category:railway-routes": "",
     "category:religion": "Relixón",
+    "category:renewables": "",
     "category:residential": "Zones residenciales",
     "category:resources": "Estraición de recursos",
+    "category:services": "Servicios",
     "category:shop": "Compres",
+    "category:special": "",
     "category:sport": "Deportes",
+    "category:swimming_bathing": "",
     "category:tourism_attractions": "Turismu",
     "category:tourism_services": "Turismu",
+    "category:transport": "Tresporte",
     "category:transport_alternative": "Alternativu (Ciclismu, senderismu, ...)",
-    "category:walk_amenities": null,
+    "category:transport_car": "Tráficu individual",
+    "category:transport_cycle": "",
+    "category:transport_pt": "Tresporte Públicu",
+    "category:transport_walk": "",
+    "category:walk_amenities": "",
     "category:waste": "Basures",
-    "category:water": null,
+    "category:water": "",
-    "category:wikipedia": null,
+    "category:wikipedia": "",
     "category:works": "Fábriques",
-    "category:cycle_infrastructure": null,
+    "category:xmas": "",
-    "category:leisure_sport_shopping": "Recréu, deportes y compres",
+    "date format not understood": "",
-    "category:railway": "Ferrocarril",
+    "outdated feature": "",
-    "category:services": "Servicios",
+    "xmas:outdated-warning": ""
-    "category:transport": "Tresporte",
-    "category:transport_car": "Tráficu individual",
-    "category:transport_pt": "Tresporte Públicu"
 }

lang/ca.json

@@ -1,58 +1,94 @@
 {
-    "category:administrative": null,
+    "Objects with diet information": "",
-    "category:agriculture": null,
+    "category:administrative": "",
-    "category:alternative_amenities": null,
+    "category:agriculture": "",
-    "category:alternative_routes": null,
+    "category:alternative_amenities": "",
-    "category:buildings": null,
+    "category:alternative_routes": "",
-    "category:car_amenities": null,
+    "category:buildings": "",
-    "category:car_furniture": null,
+    "category:buildings-entrances": "",
-    "category:car_maxspeed": null,
+    "category:buildings-figure-ground": "",
-    "category:children": null,
+    "category:buildings-height": "",
+    "category:buildings-start_date": "",
+    "category:buildings-type": "",
+    "category:car_amenities": "",
+    "category:car_furniture": "",
+    "category:car_maxspeed": "",
+    "category:car_routes": "",
+    "category:children": "",
+    "category:coal": "",
     "category:communication": "Comunicacions",
-    "category:construction": null,
+    "category:construction": "",
+    "category:craft": "",
     "category:culture": "Cultura",
     "category:culture_religion": "Cultura i religió",
-    "category:cycle_amenities": null,
+    "category:cycle_amenities": "",
-    "category:cycle_routes": null,
+    "category:cycle_routes": "",
-    "category:education": null,
+    "category:education": "",
+    "category:electric_power": "",
     "category:emergency": "Serveis d'emergència",
-    "category:financial": null,
+    "category:energy": "",
-    "category:gastro": null,
+    "category:financial": "",
-    "category:health": null,
+    "category:gastro": "",
-    "category:hiking_routes": null,
+    "category:gastro-smoking": "",
-    "category:historic": null,
+    "category:health": "",
-    "category:index": null,
+    "category:hiking_routes": "",
+    "category:historic": "",
+    "category:index": "",
+    "category:infrastructure": "",
     "category:internet": "Accés a Internet",
-    "category:leisure": null,
+    "category:law": "",
-    "category:military": null,
+    "category:leisure": "",
-    "category:natural": null,
-    "category:other": null,
-    "category:phone": null,
-    "category:places": null,
-    "category:places_geo": null,
-    "category:playgrounds": null,
-    "category:post": null,
-    "category:power": null,
-    "category:pt_amenities": null,
-    "category:pt_routes": null,
-    "category:pt_stops": null,
-    "category:public": null,
-    "category:railway-electrification": null,
-    "category:railway-infrastructure": null,
-    "category:religion": null,
-    "category:residential": null,
-    "category:resources": null,
-    "category:shop": null,
-    "category:sport": null,
-    "category:tourism_attractions": null,
-    "category:tourism_services": null,
-    "category:transport_alternative": null,
-    "category:walk_amenities": null,
-    "category:waste": null,
-    "category:water": null,
-    "category:wikipedia": null,
-    "category:works": null,
-    "category:cycle_infrastructure": null,
     "category:leisure_sport_shopping": "Oci, esport i compres",
-    "category:services": "Serveis"
+    "category:memorial": "",
+    "category:military": "",
+    "category:mtb-routes": "",
+    "category:natural": "",
+    "category:office": "",
+    "category:oil_gas": "",
+    "category:organisations": "",
+    "category:other": "",
+    "category:outdoor": "",
+    "category:phone": "",
+    "category:places": "",
+    "category:places_geo": "",
+    "category:playgrounds": "",
+    "category:post": "",
+    "category:power_routes": "",
+    "category:pt": "",
+    "category:pt:routes": "",
+    "category:pt:stops": "",
+    "category:pt_amenities": "",
+    "category:public": "",
+    "category:railway": "",
+    "category:railway-electrification": "",
+    "category:railway-gauge": "",
+    "category:railway-infrastructure": "",
+    "category:railway-maxspeed": "",
+    "category:railway-routes": "",
+    "category:religion": "",
+    "category:renewables": "",
+    "category:residential": "",
+    "category:resources": "",
+    "category:services": "Serveis",
+    "category:shop": "",
+    "category:special": "",
+    "category:sport": "",
+    "category:swimming_bathing": "",
+    "category:tourism_attractions": "",
+    "category:tourism_services": "",
+    "category:transport": "",
+    "category:transport_alternative": "",
+    "category:transport_car": "",
+    "category:transport_cycle": "",
+    "category:transport_pt": "",
+    "category:transport_walk": "",
+    "category:walk_amenities": "",
+    "category:waste": "",
+    "category:water": "",
+    "category:wikipedia": "",
+    "category:works": "",
+    "category:xmas": "",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
 }

lang/cs.json

@@ -1,62 +1,94 @@
 {
+    "Objects with diet information": "",
     "category:administrative": "Administrativní oblasti",
     "category:agriculture": "Zemědělství",
     "category:alternative_amenities": "Občanská vybavenost",
     "category:alternative_routes": "Trasy cest",
-    "category:buildings": null,
+    "category:buildings": "",
+    "category:buildings-entrances": "",
+    "category:buildings-figure-ground": "",
+    "category:buildings-height": "",
+    "category:buildings-start_date": "",
+    "category:buildings-type": "",
     "category:car_amenities": "Občasnká vybavenost",
     "category:car_furniture": "Pouliční přislušenství",
-    "category:car_maxspeed": null,
+    "category:car_maxspeed": "",
-    "category:children": null,
+    "category:car_routes": "",
+    "category:children": "",
+    "category:coal": "",
     "category:communication": "Komunikace",
     "category:construction": "Staveniště",
+    "category:craft": "",
     "category:culture": "Kultura",
     "category:culture_religion": "Kultura",
-    "category:cycle_amenities": null,
+    "category:cycle_amenities": "",
-    "category:cycle_routes": null,
+    "category:cycle_routes": "",
     "category:education": "Vzdělávací služby",
+    "category:electric_power": "Elektřina",
     "category:emergency": "Pohotovostní služby",
+    "category:energy": "",
     "category:financial": "Finanční služby",
     "category:gastro": "Stravování",
+    "category:gastro-smoking": "",
     "category:health": "Zdravotnictví",
-    "category:hiking_routes": null,
+    "category:hiking_routes": "",
     "category:historic": "Historické",
-    "category:index": null,
+    "category:index": "",
+    "category:infrastructure": "",
     "category:internet": "Přístup k internetu",
+    "category:law": "",
     "category:leisure": "Volný čas",
+    "category:leisure_sport_shopping": "Volný čas, sporty a nákupy",
+    "category:memorial": "",
     "category:military": "Vojenské",
+    "category:mtb-routes": "",
     "category:natural": "Přírodní úkazy",
+    "category:office": "",
+    "category:oil_gas": "",
+    "category:organisations": "",
     "category:other": "Jiné",
+    "category:outdoor": "",
     "category:phone": "Telefony",
     "category:places": "Sídla",
     "category:places_geo": "Sídla",
     "category:playgrounds": "Hřiště",
     "category:post": "Poštovní služby",
-    "category:power": "Elektřina",
+    "category:power_routes": "",
+    "category:pt": "",
+    "category:pt:routes": "",
+    "category:pt:stops": "Zastávky & Stanice",
     "category:pt_amenities": "Občanská vybavenost",
-    "category:pt_routes": null,
-    "category:pt_stops": "Zastávky & Stanice",
     "category:public": "Veřejné služby",
-    "category:railway-electrification": null,
+    "category:railway": "Železnice",
-    "category:railway-infrastructure": null,
+    "category:railway-electrification": "",
+    "category:railway-gauge": "",
+    "category:railway-infrastructure": "",
+    "category:railway-maxspeed": "",
+    "category:railway-routes": "",
     "category:religion": "Religion",
+    "category:renewables": "",
     "category:residential": "Obytné oblasti",
     "category:resources": "Těžba surovin",
+    "category:services": "Služby",
     "category:shop": "Obchody",
+    "category:special": "",
     "category:sport": "Sport",
+    "category:swimming_bathing": "",
     "category:tourism_attractions": "Turistika",
     "category:tourism_services": "Turistika",
+    "category:transport": "Doprava",
     "category:transport_alternative": "Alternativní (Cyklistika, Pěší turistika, ...)",
-    "category:walk_amenities": null,
+    "category:transport_car": "Individuální doprava",
+    "category:transport_cycle": "",
+    "category:transport_pt": "Veřejná doprava",
+    "category:transport_walk": "",
+    "category:walk_amenities": "",
     "category:waste": "Nakládání s odpady",
-    "category:water": null,
+    "category:water": "",
-    "category:wikipedia": null,
+    "category:wikipedia": "",
     "category:works": "Továrny",
-    "category:cycle_infrastructure": null,
+    "category:xmas": "",
-    "category:leisure_sport_shopping": "Volný čas, sporty a nákupy",
+    "date format not understood": "",
-    "category:railway": "Železnice",
+    "outdated feature": "",
-    "category:services": "Služby",
+    "xmas:outdated-warning": ""
-    "category:transport": "Doprava",
-    "category:transport_car": "Individuální doprava",
-    "category:transport_pt": "Veřejná doprava"
 }

lang/de.json

@@ -1,66 +1,94 @@
 {
+    "Objects with diet information": "Objekte mit Ernährungsinformationen",
     "category:administrative": "Administrative Gebiete",
     "category:agriculture": "Landwirtschaft",
     "category:alternative_amenities": "Einrichtungen",
     "category:alternative_routes": "(ausgeschilderte) Routen",
     "category:buildings": "Gebäude",
+    "category:buildings-entrances": "Eingänge",
+    "category:buildings-figure-ground": "Schwarzplan",
+    "category:buildings-height": "Gebäudehöhen",
+    "category:buildings-start_date": "Gebäudealter",
+    "category:buildings-type": "Gebäudearten",
     "category:car_amenities": "Einrichtungen",
     "category:car_furniture": "Straßenausstattung",
     "category:car_maxspeed": "Höchstgeschwindigkeiten",
+    "category:car_routes": "Autorouten",
     "category:children": "Einrichtungen für Kinder",
+    "category:coal": "Kohle",
     "category:communication": "Kommunikation",
     "category:construction": "Baustellen",
+    "category:craft": "Handwerk",
     "category:culture": "Kultur",
     "category:culture_religion": "Kultur und Religion",
     "category:cycle_amenities": "Einrichtungen",
     "category:cycle_routes": "Radrouten",
     "category:education": "Bildungseinrichtungen",
+    "category:electric_power": "Elektrischer Strom",
     "category:emergency": "Notfalldienste",
+    "category:energy": "Energie",
     "category:financial": "Finanzen",
     "category:gastro": "Gastronomie",
+    "category:gastro-smoking": "Rauchfreie Gastronomie",
     "category:health": "Gesundheitsdienste",
     "category:hiking_routes": "Wanderrouten",
     "category:historic": "Geschichte",
-    "category:index": null,
+    "category:index": "",
+    "category:infrastructure": "Infrastruktur",
     "category:internet": "Internetzugang",
+    "category:law": "Juristische Institutionen",
     "category:leisure": "Freizeit",
+    "category:leisure_sport_shopping": "Freizeit, Sport und Einkauf",
+    "category:memorial": "Denkmäler und Monumente",
     "category:military": "Militär",
-    "category:natural": "Geographische Objekte",
+    "category:mtb-routes": "Mointainbikerouten",
+    "category:natural": "Naturformationen",
+    "category:office": "Ämter, Dienst- und Geschäftsstellen",
+    "category:oil_gas": "Erdöl und Erdgas",
+    "category:organisations": "Organisationen",
     "category:other": "Andere",
+    "category:outdoor": "Freiluftaktivitäten",
     "category:phone": "Telekommunikation",
     "category:places": "Orte",
     "category:places_geo": "Orte",
-    "category:playgrounds": "Spielplätze",
+    "category:playgrounds": "Spielplatz",
     "category:post": "Post",
-    "category:power": "Energie",
+    "category:power_routes": "Hochspannungsverbindungen",
+    "category:pt": "ÖV Karte",
+    "category:pt:routes": "Routen",
+    "category:pt:stops": "Haltestellen",
     "category:pt_amenities": "Einrichtungen",
-    "category:pt_routes": "Routen",
-    "category:pt_stops": "Haltestellen",
     "category:public": "Öffentliche Dienste",
+    "category:railway": "Eisenbahn",
     "category:railway-electrification": "Eisenbahn Elektrifizierung",
+    "category:railway-gauge": "",
     "category:railway-infrastructure": "Eisenbahn Infrastruktur",
+    "category:railway-maxspeed": "Eisenbahn Höchstgeschwindigkeiten",
+    "category:railway-routes": "Eisenbahnrouten",
     "category:religion": "Religion",
+    "category:renewables": "Erneuerbare Energien",
     "category:residential": "Wohngebiete",
     "category:resources": "Ressourcengewinnung",
+    "category:services": "Dienste",
     "category:shop": "Einkauf",
+    "category:special": "Spezial",
     "category:sport": "Sport",
+    "category:swimming_bathing": "Schwimmen und Baden",
     "category:tourism_attractions": "Tourismus",
     "category:tourism_services": "Tourismus",
-    "category:transport_alternative": null,
+    "category:transport": "Transport",
+    "category:transport_alternative": "",
+    "category:transport_car": "Motorisierter Individualverkehr",
+    "category:transport_cycle": "Radfahren",
+    "category:transport_pt": "Öffentlicher Verkehr",
+    "category:transport_walk": "Zu Fuß gehen",
     "category:walk_amenities": "Einrichtungen",
     "category:waste": "Entsorgung",
     "category:water": "Gewässer",
     "category:wikipedia": "Wikipedia",
     "category:works": "Fabriken",
-    "category:cycle_infrastructure": "Radwege",
+    "category:xmas": "Weihnachten",
-    "category:infrastructure": "Infrastruktur",
+    "date format not understood": "Datumsformat nicht erkannt",
-    "category:leisure_sport_shopping": "Freizeit, Sport und Einkauf",
+    "outdated feature": "Informationen nicht aktuell",
-    "category:railway": "Eisenbahn",
+    "xmas:outdated-warning": "Objekt wurde nicht für die aktuelle Saison aktualisiert. Bitte prüfen und das Tag 'xmas:lastcheck' auf das aktuelle Datum setzen."
-    "category:services": "Dienste",
-    "category:special": "Spezial",
-    "category:transport": "Transport",
-    "category:transport_car": "Motorisierter Individualverkehr",
-    "category:transport_cycle": "Radfahren",
-    "category:transport_pt": "Öffentlicher Verkehr",
-    "category:transport_walk": "Zu Fuß gehen"
 }

lang/el.json

@@ -1,60 +1,94 @@
 {
+    "Objects with diet information": "",
     "category:administrative": "Διοικητικά Όρια",
     "category:agriculture": "Γεωργία",
-    "category:alternative_amenities": null,
+    "category:alternative_amenities": "",
-    "category:alternative_routes": null,
+    "category:alternative_routes": "",
-    "category:buildings": null,
+    "category:buildings": "",
-    "category:car_amenities": null,
+    "category:buildings-entrances": "",
-    "category:car_furniture": null,
+    "category:buildings-figure-ground": "",
-    "category:car_maxspeed": null,
+    "category:buildings-height": "",
-    "category:children": null,
+    "category:buildings-start_date": "",
+    "category:buildings-type": "",
+    "category:car_amenities": "",
+    "category:car_furniture": "",
+    "category:car_maxspeed": "",
+    "category:car_routes": "",
+    "category:children": "",
+    "category:coal": "",
     "category:communication": "Επικοινωνίες",
-    "category:construction": null,
+    "category:construction": "",
+    "category:craft": "",
     "category:culture": "Πολιτισμός",
     "category:culture_religion": "Πολιτισμός",
-    "category:cycle_amenities": null,
+    "category:cycle_amenities": "",
-    "category:cycle_routes": null,
+    "category:cycle_routes": "",
     "category:education": "Υπηρεσίες Εκπαίδευσης",
+    "category:electric_power": "",
     "category:emergency": "Υπηρεσίες Έκτακτης Ανάγκης",
+    "category:energy": "",
     "category:financial": "Χρήμα",
     "category:gastro": "Γαστρονομία",
+    "category:gastro-smoking": "",
     "category:health": "Υγεία",
-    "category:hiking_routes": null,
+    "category:hiking_routes": "",
     "category:historic": "Ιστορικά",
-    "category:index": null,
+    "category:index": "",
-    "category:internet": null,
+    "category:infrastructure": "",
+    "category:internet": "",
+    "category:law": "",
     "category:leisure": "Αναψυχή",
+    "category:leisure_sport_shopping": "Αναψυχή, Αθλητισμός και Αγορές",
+    "category:memorial": "",
     "category:military": "Στρατιωτικό",
+    "category:mtb-routes": "",
     "category:natural": "Φυσικοί Σχηματισμοί",
-    "category:other": null,
+    "category:office": "",
-    "category:phone": null,
+    "category:oil_gas": "",
+    "category:organisations": "",
+    "category:other": "",
+    "category:outdoor": "",
+    "category:phone": "",
     "category:places": "Μέρη",
     "category:places_geo": "Μέρη",
-    "category:playgrounds": null,
+    "category:playgrounds": "",
-    "category:post": null,
+    "category:post": "",
-    "category:power": null,
+    "category:power_routes": "",
-    "category:pt_amenities": null,
+    "category:pt": "",
-    "category:pt_routes": null,
+    "category:pt:routes": "",
-    "category:pt_stops": "Στάσεις & Σταθμοί",
+    "category:pt:stops": "Στάσεις & Σταθμοί",
+    "category:pt_amenities": "",
     "category:public": "Δημόσιες Υπηρεσίες",
-    "category:railway-electrification": null,
+    "category:railway": "",
-    "category:railway-infrastructure": null,
+    "category:railway-electrification": "",
+    "category:railway-gauge": "",
+    "category:railway-infrastructure": "",
+    "category:railway-maxspeed": "",
+    "category:railway-routes": "",
     "category:religion": "Θρησκεία",
+    "category:renewables": "",
     "category:residential": "Περιοχές Κατοικίας",
-    "category:resources": null,
+    "category:resources": "",
+    "category:services": "Υπηρεσίες",
     "category:shop": "Αγορές",
+    "category:special": "",
     "category:sport": "Άθληση",
+    "category:swimming_bathing": "",
     "category:tourism_attractions": "Τουρισμός",
     "category:tourism_services": "Τουρισμός",
-    "category:transport_alternative": "Εναλλακτικά (ποδηλασία, ορειβασία,...)",
-    "category:walk_amenities": null,
-    "category:waste": null,
-    "category:water": null,
-    "category:wikipedia": null,
-    "category:works": null,
-    "category:cycle_infrastructure": null,
-    "category:leisure_sport_shopping": "Αναψυχή, Αθλητισμός και Αγορές",
-    "category:services": "Υπηρεσίες",
     "category:transport": "Μεταφορές",
-    "category:transport_pt": "Δημόσιες Μεταφορές"
+    "category:transport_alternative": "Εναλλακτικά (ποδηλασία, ορειβασία,...)",
+    "category:transport_car": "",
+    "category:transport_cycle": "",
+    "category:transport_pt": "Δημόσιες Μεταφορές",
+    "category:transport_walk": "",
+    "category:walk_amenities": "",
+    "category:waste": "",
+    "category:water": "",
+    "category:wikipedia": "",
+    "category:works": "",
+    "category:xmas": "",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
 }

lang/en.json

@@ -1,66 +1,94 @@
 {
+    "Objects with diet information": "Objects with diet information",
     "category:administrative": "Administrative Areas",
     "category:agriculture": "Agriculture",
     "category:alternative_amenities": "Amenities",
     "category:alternative_routes": "Routes",
     "category:buildings": "Buildings",
+    "category:buildings-entrances": "Entrances",
+    "category:buildings-figure-ground": "Figure-ground diagram",
+    "category:buildings-height": "Building height",
+    "category:buildings-start_date": "Building age",
+    "category:buildings-type": "Building types",
     "category:car_amenities": "Amenities",
     "category:car_furniture": "Street Furniture",
     "category:car_maxspeed": "Maxspeed",
+    "category:car_routes": "Car routes",
     "category:children": "Children amenities",
+    "category:coal": "Coal",
     "category:communication": "Communication",
     "category:construction": "Construction Sites",
+    "category:craft": "Craft",
     "category:culture": "Culture",
-    "category:culture_religion": "Culture",
+    "category:culture_religion": "Culture and Religion",
     "category:cycle_amenities": "Amenities",
     "category:cycle_routes": "Cycle Routes",
     "category:education": "Educational Services",
+    "category:electric_power": "Electric Power",
     "category:emergency": "Emergency Services",
+    "category:energy": "Energy",
     "category:financial": "Financial",
     "category:gastro": "Gastronomy",
+    "category:gastro-smoking": "Smokefree Gastronomy",
     "category:health": "Health",
     "category:hiking_routes": "Hiking routes",
     "category:historic": "Historic",
-    "category:index": null,
+    "category:index": "",
+    "category:infrastructure": "Infrastructure",
     "category:internet": "Internet access",
+    "category:law": "Law",
     "category:leisure": "Leisure",
+    "category:leisure_sport_shopping": "Leisure, Sport and Shopping",
+    "category:memorial": "Memorials & Monuments",
     "category:military": "Military",
+    "category:mtb-routes": "Mountain bike routes",
     "category:natural": "Natural Formations",
+    "category:office": "Offices",
+    "category:oil_gas": "Petroleum and natural gas",
+    "category:organisations": "Organisations",
     "category:other": "Other",
+    "category:outdoor": "Outdoor activities",
     "category:phone": "Phone",
     "category:places": "Places",
     "category:places_geo": "Places",
     "category:playgrounds": "Playground",
     "category:post": "Post",
-    "category:power": "Power",
+    "category:power_routes": "Power routes",
+    "category:pt": "Public transport map",
+    "category:pt:routes": "Routes",
+    "category:pt:stops": "Stops & Stations",
     "category:pt_amenities": "Amenities",
-    "category:pt_routes": "Routes",
-    "category:pt_stops": "Stops & Stations",
     "category:public": "Public Services",
+    "category:railway": "Railway",
     "category:railway-electrification": "Railway electrification",
+    "category:railway-gauge": "Railway gauge",
     "category:railway-infrastructure": "Railway infrastructure",
+    "category:railway-maxspeed": "Railway Maxspeed",
+    "category:railway-routes": "Railway Routes",
     "category:religion": "Religion",
+    "category:renewables": "Renewables",
     "category:residential": "Residential Areas",
     "category:resources": "Resource Extraction",
+    "category:services": "Services",
     "category:shop": "Shopping",
+    "category:special": "Special",
     "category:sport": "Sport",
+    "category:swimming_bathing": "Swimming and bathing",
     "category:tourism_attractions": "Tourism",
     "category:tourism_services": "Tourism",
-    "category:transport_alternative": null,
+    "category:transport": "Transportation",
+    "category:transport_alternative": "",
+    "category:transport_car": "Individual Traffic",
+    "category:transport_cycle": "Cycling",
+    "category:transport_pt": "Public Transportation",
+    "category:transport_walk": "Walking",
     "category:walk_amenities": "Amenities",
     "category:waste": "Disposal",
     "category:water": "Waterbodies",
     "category:wikipedia": "Wikipedia",
     "category:works": "Works",
-    "category:cycle_infrastructure": "Cycleways",
+    "category:xmas": "Christmas",
-    "category:infrastructure": "Infrastructure",
+    "date format not understood": "",
-    "category:leisure_sport_shopping": "Leisure, Sport and Shopping",
+    "outdated feature": "",
-    "category:railway": "Railway",
+    "xmas:outdated-warning": "Feature has not been updated for the current season! Please check and set the tag 'xmas:lastcheck' to the current date."
-    "category:services": "Services",
-    "category:special": "Special",
-    "category:transport": "Transportation",
-    "category:transport_car": "Individual Traffic",
-    "category:transport_cycle": "Cycling",
-    "category:transport_pt": "Public Transportation",
-    "category:transport_walk": "Walking"
 }

lang/es.json

@@ -1,58 +1,94 @@
 {
-    "category:administrative": null,
+    "Objects with diet information": "",
-    "category:agriculture": null,
+    "category:administrative": "Áreas Administrativas",
-    "category:alternative_amenities": null,
+    "category:agriculture": "Agricultura",
-    "category:alternative_routes": null,
+    "category:alternative_amenities": "Instalaciones",
-    "category:buildings": null,
+    "category:alternative_routes": "Rutas",
-    "category:car_amenities": null,
+    "category:buildings": "Edificios",
-    "category:car_furniture": null,
+    "category:buildings-entrances": "Entradas",
-    "category:car_maxspeed": null,
+    "category:buildings-figure-ground": "Diagrama figura-fondo",
-    "category:children": null,
+    "category:buildings-height": "Altura del edificio",
-    "category:communication": null,
+    "category:buildings-start_date": "Edad del edificio",
-    "category:construction": null,
+    "category:buildings-type": "Tipos de edificio",
+    "category:car_amenities": "Instalaciones",
+    "category:car_furniture": "Mobiliario Urbano",
+    "category:car_maxspeed": "Velocidad máxima",
+    "category:car_routes": "Rutas de coche",
+    "category:children": "Atracciones para niños",
+    "category:coal": "Carbón",
+    "category:communication": "Comunicación",
+    "category:construction": "Sitios de construcción",
+    "category:craft": "Artesano",
     "category:culture": "Cultura",
     "category:culture_religion": "Cultura y religión",
-    "category:cycle_amenities": null,
+    "category:cycle_amenities": "Instalaciones",
-    "category:cycle_routes": null,
+    "category:cycle_routes": "Rutas ciclistas",
-    "category:education": null,
+    "category:education": "Servicios educativos",
+    "category:electric_power": "Energía eléctrica",
     "category:emergency": "Servicios de emergencia",
-    "category:financial": null,
+    "category:energy": "Energía",
-    "category:gastro": null,
+    "category:financial": "Financiera",
-    "category:health": null,
+    "category:gastro": "Gastronomía",
-    "category:hiking_routes": null,
+    "category:gastro-smoking": "Gastronomía libre de humo",
-    "category:historic": null,
+    "category:health": "Salud",
-    "category:index": null,
+    "category:hiking_routes": "Rutas de senderismo",
+    "category:historic": "Histórico",
+    "category:index": "Índice",
+    "category:infrastructure": "Infraestructura",
     "category:internet": "Acceso a Internet",
-    "category:leisure": null,
+    "category:law": "Ley",
-    "category:military": null,
+    "category:leisure": "Ocio",
-    "category:natural": null,
-    "category:other": null,
-    "category:phone": null,
-    "category:places": null,
-    "category:places_geo": null,
-    "category:playgrounds": null,
-    "category:post": null,
-    "category:power": null,
-    "category:pt_amenities": null,
-    "category:pt_routes": null,
-    "category:pt_stops": "Paradas y estaciones",
-    "category:public": null,
-    "category:railway-electrification": null,
-    "category:railway-infrastructure": null,
-    "category:religion": null,
-    "category:residential": null,
-    "category:resources": null,
-    "category:shop": null,
-    "category:sport": null,
-    "category:tourism_attractions": null,
-    "category:tourism_services": null,
-    "category:transport_alternative": null,
-    "category:walk_amenities": null,
-    "category:waste": null,
-    "category:water": null,
-    "category:wikipedia": null,
-    "category:works": null,
-    "category:cycle_infrastructure": null,
     "category:leisure_sport_shopping": "Ocio, deporte y compras",
-    "category:services": "Servicios"
+    "category:memorial": "Memoriales",
+    "category:military": "Militar",
+    "category:mtb-routes": "Rutas de ciclismo de montaña",
+    "category:natural": "Formaciones naturales",
+    "category:office": "Oficinas",
+    "category:oil_gas": "Petróleo y gas natural",
+    "category:organisations": "Organizaciones",
+    "category:other": "Otro",
+    "category:outdoor": "Actividades al aire libre",
+    "category:phone": "Teléfono",
+    "category:places": "Lugares",
+    "category:places_geo": "Lugares",
+    "category:playgrounds": "Parque infantil",
+    "category:post": "Correos",
+    "category:power_routes": "Rutas de energía",
+    "category:pt": "Mapa de transporte público",
+    "category:pt:routes": "Rutas",
+    "category:pt:stops": "Paradas y estaciones",
+    "category:pt_amenities": "Instalaciones",
+    "category:public": "Servicios públicos",
+    "category:railway": "Ferrocarril",
+    "category:railway-electrification": "Electrificación ferroviaria",
+    "category:railway-gauge": "",
+    "category:railway-infrastructure": "Infraestructura ferroviaria",
+    "category:railway-maxspeed": "Velocidad máxima del ferrocarril",
+    "category:railway-routes": "Rutas de ferrocarril",
+    "category:religion": "Religión",
+    "category:renewables": "Renovables",
+    "category:residential": "Áreas residenciales",
+    "category:resources": "Extracción de recursos",
+    "category:services": "Servicios",
+    "category:shop": "Compras",
+    "category:special": "Especial",
+    "category:sport": "Deportes",
+    "category:swimming_bathing": "Natación y baño",
+    "category:tourism_attractions": "Turismo",
+    "category:tourism_services": "Turismo",
+    "category:transport": "Transporte",
+    "category:transport_alternative": "Transporte alternativo",
+    "category:transport_car": "Tráfico individual",
+    "category:transport_cycle": "Ciclismo",
+    "category:transport_pt": "Transporte público",
+    "category:transport_walk": "",
+    "category:walk_amenities": "Instalaciones",
+    "category:waste": "Basura",
+    "category:water": "Cuerpos de agua",
+    "category:wikipedia": "Wikipedia",
+    "category:works": "Fábricas",
+    "category:xmas": "Navidades",
+    "date format not understood": "Formato de fecha incomprensible",
+    "outdated feature": "Característica obsoleta",
+    "xmas:outdated-warning": "¡La característica no se ha actualizado para la temporada actual! Por favor verifique y establezca la etiqueta 'xmas: lastcheck' a la fecha actual."
 }

lang/et.json

@@ -1,61 +1,94 @@
 {
+    "Objects with diet information": "",
     "category:administrative": "Administratiivalad",
     "category:agriculture": "Põllumajandus",
-    "category:alternative_amenities": null,
+    "category:alternative_amenities": "",
-    "category:alternative_routes": null,
+    "category:alternative_routes": "",
-    "category:buildings": null,
+    "category:buildings": "",
-    "category:car_amenities": null,
+    "category:buildings-entrances": "",
-    "category:car_furniture": null,
+    "category:buildings-figure-ground": "",
-    "category:car_maxspeed": null,
+    "category:buildings-height": "",
-    "category:children": null,
+    "category:buildings-start_date": "",
+    "category:buildings-type": "",
+    "category:car_amenities": "",
+    "category:car_furniture": "",
+    "category:car_maxspeed": "",
+    "category:car_routes": "",
+    "category:children": "",
+    "category:coal": "",
     "category:communication": "Kommunikatsioon",
-    "category:construction": null,
+    "category:construction": "",
+    "category:craft": "",
     "category:culture": "Kultuur",
     "category:culture_religion": "Kultuur ja religioon",
-    "category:cycle_amenities": null,
+    "category:cycle_amenities": "",
-    "category:cycle_routes": null,
+    "category:cycle_routes": "",
     "category:education": "Haridusteenused",
+    "category:electric_power": "Elekter",
     "category:emergency": "Hädaabi teenused",
-    "category:financial": null,
+    "category:energy": "",
-    "category:gastro": null,
+    "category:financial": "",
-    "category:health": null,
+    "category:gastro": "",
-    "category:hiking_routes": null,
+    "category:gastro-smoking": "",
+    "category:health": "",
+    "category:hiking_routes": "",
     "category:historic": "Ajalooline",
-    "category:index": null,
+    "category:index": "",
-    "category:internet": null,
+    "category:infrastructure": "",
-    "category:leisure": null,
+    "category:internet": "",
-    "category:military": null,
+    "category:law": "",
-    "category:natural": null,
+    "category:leisure": "",
+    "category:leisure_sport_shopping": "Vaba aeg, sport ja ostmine",
+    "category:memorial": "",
+    "category:military": "",
+    "category:mtb-routes": "",
+    "category:natural": "",
+    "category:office": "",
+    "category:oil_gas": "",
+    "category:organisations": "",
     "category:other": "Ülejäänud",
+    "category:outdoor": "",
     "category:phone": "Telefon",
     "category:places": "Kohad",
     "category:places_geo": "Kohad",
     "category:playgrounds": "Mänguväljak",
-    "category:post": null,
+    "category:post": "",
-    "category:power": "Elekter",
+    "category:power_routes": "",
-    "category:pt_amenities": null,
+    "category:pt": "",
-    "category:pt_routes": null,
+    "category:pt:routes": "",
-    "category:pt_stops": null,
+    "category:pt:stops": "",
+    "category:pt_amenities": "",
     "category:public": "Kommunaalteenused",
-    "category:railway-electrification": null,
+    "category:railway": "Raudtee",
-    "category:railway-infrastructure": null,
+    "category:railway-electrification": "",
+    "category:railway-gauge": "",
+    "category:railway-infrastructure": "",
+    "category:railway-maxspeed": "",
+    "category:railway-routes": "",
     "category:religion": "Religioon",
+    "category:renewables": "",
     "category:residential": "Elamupiirkonnad",
-    "category:resources": null,
+    "category:resources": "",
+    "category:services": "Teenused",
     "category:shop": "Ostmine",
-    "category:sport": null,
+    "category:special": "",
+    "category:sport": "",
+    "category:swimming_bathing": "",
     "category:tourism_attractions": "Turism",
     "category:tourism_services": "Turism",
-    "category:transport_alternative": "Alternatiivne (jalgrattasõit, matkamine, ...)",
-    "category:walk_amenities": null,
-    "category:waste": null,
-    "category:water": null,
-    "category:wikipedia": null,
-    "category:works": null,
-    "category:cycle_infrastructure": null,
-    "category:leisure_sport_shopping": "Vaba aeg, sport ja ostmine",
-    "category:railway": "Raudtee",
-    "category:services": "Teenused",
     "category:transport": "Transport",
-    "category:transport_pt": "Ühistransport"
+    "category:transport_alternative": "Alternatiivne (jalgrattasõit, matkamine, ...)",
+    "category:transport_car": "",
+    "category:transport_cycle": "",
+    "category:transport_pt": "Ühistransport",
+    "category:transport_walk": "",
+    "category:walk_amenities": "",
+    "category:waste": "",
+    "category:water": "",
+    "category:wikipedia": "",
+    "category:works": "",
+    "category:xmas": "",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
 }

lang/fr.json

@@ -1,66 +1,94 @@
 {
+    "Objects with diet information": "Objets avec information de régime alimentaire",
     "category:administrative": "Zones administratives",
     "category:agriculture": "Agriculture",
     "category:alternative_amenities": "Équipement",
     "category:alternative_routes": "Routes",
     "category:buildings": "Bâtiments",
-    "category:car_amenities": "Infrastructures routières",
+    "category:buildings-entrances": "Entrées",
-    "category:car_furniture": "Infrastrucutures résidentielles",
+    "category:buildings-figure-ground": "Empreintes",
+    "category:buildings-height": "Hauteur",
+    "category:buildings-start_date": "Date de construction",
+    "category:buildings-type": "Type",
+    "category:car_amenities": "Équipements auto",
+    "category:car_furniture": "Fournitures automobiles",
     "category:car_maxspeed": "Limites de vitesse",
+    "category:car_routes": "Itinéraires auto",
     "category:children": "Équipements pour enfants",
+    "category:coal": "Charbon",
     "category:communication": "Communication",
-    "category:construction": "Zones industrielles",
+    "category:construction": "Chantiers de construction",
+    "category:craft": "Artisanat",
     "category:culture": "Culture",
-    "category:culture_religion": "Culture",
+    "category:culture_religion": "Culture et religion",
-    "category:cycle_amenities": "Équipements",
+    "category:cycle_amenities": "Équipements vélo",
-    "category:cycle_infrastructure": null,
     "category:cycle_routes": "Itinéraires vélo",
-    "category:education": "Services éducatifs",
+    "category:education": "Éducation",
+    "category:electric_power": "Production/transport électrique",
     "category:emergency": "Services d'urgence",
+    "category:energy": "Énergie",
     "category:financial": "Finance",
-    "category:gastro": "Gastronomie",
+    "category:gastro": "Restauration",
+    "category:gastro-smoking": "Restauration sans tabac",
     "category:health": "Santé",
-    "category:hiking_routes": null,
+    "category:hiking_routes": "Itinéraires pédestres",
     "category:historic": "Histoire",
-    "category:index": null,
+    "category:index": "",
     "category:infrastructure": "Infrastructures",
-    "category:internet": null,
+    "category:internet": "Internet",
+    "category:law": "Services législatifs",
     "category:leisure": "Loisirs",
-    "category:leisure_sport_shopping": "Loisirs",
+    "category:leisure_sport_shopping": "Vie quotidienne, loisirs et sports",
-    "category:military": "Militaire",
+    "category:memorial": "Mémoriaux",
-    "category:natural": "Formation Naturelle",
+    "category:military": "Équipements et zones militaires",
-    "category:other": "Autre",
+    "category:mtb-routes": "Itinéraires de VTT",
-    "category:phone": null,
+    "category:natural": "Éléments naturels",
+    "category:office": "Bureaux",
+    "category:oil_gas": "Pétrole et gaz naturel",
+    "category:organisations": "Organisations",
+    "category:other": "Autres",
+    "category:outdoor": "Activités de plein air",
+    "category:phone": "Téléphone",
     "category:places": "Lieux",
     "category:places_geo": "Lieux",
     "category:playgrounds": "Jeux pour enfants",
-    "category:post": null,
+    "category:post": "",
-    "category:power": "Énergie",
+    "category:power_routes": "Réseaux électriques",
+    "category:pt": "Carte des transports publics",
+    "category:pt:routes": "Lignes",
+    "category:pt:stops": "Arrêts et stations",
     "category:pt_amenities": "Équipements",
-    "category:pt_routes": "Lignes",
+    "category:public": "Services et équipements publics",
-    "category:pt_stops": "Arrêts/Stops, Stations",
-    "category:public": "Services Publics",
     "category:railway": "Chemins de fer",
-    "category:railway-electrification": "Électrification ferroviaire",
+    "category:railway-electrification": "Puissance électrique ferroviaire",
+    "category:railway-gauge": "",
     "category:railway-infrastructure": "Infrastructure ferroviaire",
+    "category:railway-maxspeed": "Limites de vitesse",
+    "category:railway-routes": "Lignes ferroviaires",
     "category:religion": "Religion",
+    "category:renewables": "Énergies renouvelables",
     "category:residential": "Zones résidentielles",
     "category:resources": "Extraction des ressources",
     "category:services": "Services",
-    "category:shop": "Magasinage/Shopping",
+    "category:shop": "Magasins/Boutiques",
-    "category:special": null,
+    "category:special": "Catégories spéciales",
-    "category:sport": "Autres sports",
+    "category:sport": "Sports",
+    "category:swimming_bathing": "Natation, baignade et bains",
     "category:tourism_attractions": "Tourisme",
     "category:tourism_services": "Tourisme",
     "category:transport": "Transports",
-    "category:transport_alternative": "Alternatif (Cyclisme, Randonnée, ...)",
+    "category:transport_alternative": "Alternatif (cyclisme, randonnée, ...)",
     "category:transport_car": "Transport automobile",
     "category:transport_cycle": "Cyclisme",
     "category:transport_pt": "Transports publics",
     "category:transport_walk": "Marche à pied",
-    "category:walk_amenities": "Équipements",
+    "category:walk_amenities": "Équipements piétons",
-    "category:waste": "Rebuts",
+    "category:waste": "Déchets et recyclage",
     "category:water": "Hydrographie",
-    "category:wikipedia": null,
+    "category:wikipedia": "Wikipédia",
-    "category:works": "Construction"
+    "category:works": "Zones industrielles",
+    "category:xmas": "Noël",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": "Cet élément n'a pas été mis à jour pour cette saison ! Veuillez vérifier son existence et régler la valeur de \"xmas:lastcheck\" à la date actuelle."
 }

lang/gl.json

@@ -0,0 +1,94 @@
+{
+    "Objects with diet information": "",
+    "category:administrative": "Divisións administrativas",
+    "category:agriculture": "Agricultura",
+    "category:alternative_amenities": "Instalacións",
+    "category:alternative_routes": "Rotas",
+    "category:buildings": "Edificios",
+    "category:buildings-entrances": "Entradas",
+    "category:buildings-figure-ground": "Cheos e baleiros",
+    "category:buildings-height": "Altitude do edificio",
+    "category:buildings-start_date": "Idade do edificio",
+    "category:buildings-type": "Tipos de edificios",
+    "category:car_amenities": "Instalacións",
+    "category:car_furniture": "Mobiliario urbano",
+    "category:car_maxspeed": "Velocidade máxima",
+    "category:car_routes": "Rotas automobilísticas",
+    "category:children": "Instalacións infantís",
+    "category:coal": "Carbón",
+    "category:communication": "Comunicacións",
+    "category:construction": "Terreos baixo construción",
+    "category:craft": "Artesán",
+    "category:culture": "Cultura",
+    "category:culture_religion": "Cultura e relixión",
+    "category:cycle_amenities": "Instalacións",
+    "category:cycle_routes": "Rotas ciclistas",
+    "category:education": "Servizos educativos",
+    "category:electric_power": "Enerxía eléctrica",
+    "category:emergency": "Servizos de emerxencia",
+    "category:energy": "Enerxía",
+    "category:financial": "Finanzas",
+    "category:gastro": "Restauración",
+    "category:gastro-smoking": "Restauración sen fume",
+    "category:health": "Saúde",
+    "category:hiking_routes": "Rotas sendeiristas",
+    "category:historic": "Histórico",
+    "category:index": "Índice",
+    "category:infrastructure": "Infraestrutura",
+    "category:internet": "Acceso á internet",
+    "category:law": "Leis",
+    "category:leisure": "Lecer",
+    "category:leisure_sport_shopping": "Lecer, deporte e compras",
+    "category:memorial": "Memoriais",
+    "category:military": "Militar",
+    "category:mtb-routes": "Rotas de bicicleta de montaña",
+    "category:natural": "Formacións naturais",
+    "category:office": "Oficinas",
+    "category:oil_gas": "Petróleo e gas natural",
+    "category:organisations": "Organizacións",
+    "category:other": "Outros",
+    "category:outdoor": "Actividades ó ar libre",
+    "category:phone": "Teléfono",
+    "category:places": "Lugares",
+    "category:places_geo": "Lugares",
+    "category:playgrounds": "Parques infantís",
+    "category:post": "Correos",
+    "category:power_routes": "Liñas eléctricas",
+    "category:pt": "Mapa de transporte público",
+    "category:pt:routes": "Rotas",
+    "category:pt:stops": "Paraxes e estacións",
+    "category:pt_amenities": "Instalacións",
+    "category:public": "Servizos públicos",
+    "category:railway": "Ferrocarril",
+    "category:railway-electrification": "Ferrocarril electrificado",
+    "category:railway-gauge": "",
+    "category:railway-infrastructure": "Infraestrutura do ferrocarril",
+    "category:railway-maxspeed": "Velocidade máxima do ferrocarril",
+    "category:railway-routes": "Liñas de ferrocarril",
+    "category:religion": "Relixión",
+    "category:renewables": "Renovábeis",
+    "category:residential": "Zonas residenciais",
+    "category:resources": "Estracción de recursos",
+    "category:services": "Servizos",
+    "category:shop": "Compras",
+    "category:special": "Especial",
+    "category:sport": "Deporte",
+    "category:swimming_bathing": "Natación e baño",
+    "category:tourism_attractions": "Turismo",
+    "category:tourism_services": "Turismo",
+    "category:transport": "Mobilidade",
+    "category:transport_alternative": "Transporte alternativo",
+    "category:transport_car": "Tráfico individual",
+    "category:transport_cycle": "Ciclismo",
+    "category:transport_pt": "Transporte público",
+    "category:transport_walk": "Peonil",
+    "category:walk_amenities": "Instalacións",
+    "category:waste": "Lixo",
+    "category:water": "Hidrografía",
+    "category:wikipedia": "Wikipedia",
+    "category:works": "Producións",
+    "category:xmas": "Nadal",
+    "date format not understood": "Formato da data non coñecido",
+    "outdated feature": "Elemento obsoleto",
+    "xmas:outdated-warning": "O elemento non foi actualizado para a tempada actual! Por favor, verifica e define a etiqueta 'xmas:lastcheck' para a data actual."
+}

lang/hu.json

@@ -1,61 +1,94 @@
 {
-    "category:administrative": "Adminisztratív határok",
+    "Objects with diet information": "Étrend-információt tartalmazó objektumok",
+    "category:administrative": "Közigazgatási határok",
     "category:agriculture": "Mezőgazdaság",
-    "category:alternative_amenities": null,
+    "category:alternative_amenities": "Létesítmények",
-    "category:alternative_routes": null,
+    "category:alternative_routes": "Útvonalak",
-    "category:buildings": null,
+    "category:buildings": "Épületek",
-    "category:car_amenities": null,
+    "category:buildings-entrances": "Bejáratok",
-    "category:car_furniture": null,
+    "category:buildings-figure-ground": "Fekete épületalaprajzok",
-    "category:car_maxspeed": null,
+    "category:buildings-height": "Épületek magassága",
-    "category:children": null,
+    "category:buildings-start_date": "Épületek kora",
+    "category:buildings-type": "Épületek típusa",
+    "category:car_amenities": "Létesítmények",
+    "category:car_furniture": "Jelzőtáblák",
+    "category:car_maxspeed": "Sebességkorlátozás",
+    "category:car_routes": "Főútvonalak",
+    "category:children": "Gyermekek",
+    "category:coal": "Kőszén",
     "category:communication": "Kommunikácó",
-    "category:construction": null,
+    "category:construction": "Építési terület",
+    "category:craft": "Műhelyek",
     "category:culture": "Kultúra",
-    "category:culture_religion": "Kultúra",
+    "category:culture_religion": "Kultúra és vallás",
-    "category:cycle_amenities": null,
+    "category:cycle_amenities": "Kerékpáros létesítmények",
-    "category:cycle_routes": null,
+    "category:cycle_routes": "Kerékpáros útvonalak",
-    "category:education": null,
+    "category:education": "Oktatás",
-    "category:emergency": null,
+    "category:electric_power": "Áramellátás",
-    "category:financial": null,
+    "category:emergency": "Vészhelyzet",
-    "category:gastro": "Gasztronómia",
+    "category:energy": "Energiaellátás",
-    "category:health": null,
+    "category:financial": "Pénzügyek",
-    "category:hiking_routes": null,
+    "category:gastro": "Vendéglátás",
-    "category:historic": "Historikus",
+    "category:gastro-smoking": "Nem dohányzó vendéglátóhelyek",
-    "category:index": null,
+    "category:health": "Egészségügy",
-    "category:internet": "Internethozzáférés",
+    "category:hiking_routes": "Turistautak",
-    "category:leisure": null,
+    "category:historic": "Történelmi objektumok",
-    "category:military": "Katonai",
+    "category:index": "Tartalom",
+    "category:infrastructure": "Infrastruktúra",
+    "category:internet": "Internetcsatlakozás",
+    "category:law": "Jog",
+    "category:leisure": "Szabadidő",
+    "category:leisure_sport_shopping": "Szabadidő, sport és vásárlás",
+    "category:memorial": "Emlékművek",
+    "category:military": "Katonai objektumok",
+    "category:mtb-routes": "Hegyikerékpáros útvonalak",
     "category:natural": "Természeti képződmények",
+    "category:office": "Irodák, hivatalok",
+    "category:oil_gas": "Kőolaj, földgáz",
+    "category:organisations": "Szervezetek",
     "category:other": "Egyéb",
+    "category:outdoor": "Szabadtéri tevékenységek",
     "category:phone": "Telefon",
     "category:places": "Helyek",
     "category:places_geo": "Helyek",
-    "category:playgrounds": null,
+    "category:playgrounds": "Játszóterek",
     "category:post": "Posta",
-    "category:power": "Áramellátás",
+    "category:power_routes": "Távvezetékek",
-    "category:pt_amenities": null,
+    "category:pt": "Tömegközlekedési térkép",
-    "category:pt_routes": null,
+    "category:pt:routes": "Útvonalak",
-    "category:pt_stops": "Megállók és állomások",
+    "category:pt:stops": "Megállók és állomások",
-    "category:public": null,
+    "category:pt_amenities": "Létesítmények",
-    "category:railway-electrification": null,
+    "category:public": "Közszolgáltatások",
-    "category:railway-infrastructure": null,
+    "category:railway": "Vasút",
+    "category:railway-electrification": "Vasút villamosítottsága",
+    "category:railway-gauge": "Vasúti nyomtáv",
+    "category:railway-infrastructure": "Vasúti infrastruktúra",
+    "category:railway-maxspeed": "Sebességkorlátozás",
+    "category:railway-routes": "Vasútvonalak",
     "category:religion": "Vallás",
+    "category:renewables": "Megújuló energia",
     "category:residential": "Lakóövezetek",
-    "category:resources": null,
+    "category:resources": "Bányászat",
+    "category:services": "Szolgáltatások",
     "category:shop": "Vásárlás",
+    "category:special": "Speciális",
     "category:sport": "Sport",
-    "category:tourism_attractions": "Túrizmus",
+    "category:swimming_bathing": "Fürdőzés, úszás",
-    "category:tourism_services": "Túrizmus",
+    "category:tourism_attractions": "Látnivalók",
-    "category:transport_alternative": "Alternatív (Krékpár, Túra)",
+    "category:tourism_services": "Szálláshelyek, turisztikai információk",
-    "category:walk_amenities": null,
-    "category:waste": null,
-    "category:water": null,
-    "category:wikipedia": null,
-    "category:works": null,
-    "category:cycle_infrastructure": null,
-    "category:leisure_sport_shopping": "Szabadidő",
-    "category:railway": "Vasút",
-    "category:services": "Szolgáltatás",
     "category:transport": "Közlekedés",
-    "category:transport_pt": "Tömegközlekedés"
+    "category:transport_alternative": "Alternatív (Kerékpár, Túra)",
+    "category:transport_car": "Autós közlekedés",
+    "category:transport_cycle": "Kerékpáros közlekedés",
+    "category:transport_pt": "Tömegközlekedés",
+    "category:transport_walk": "Gyalogos közlekedés",
+    "category:walk_amenities": "Gyalogos létesítmények",
+    "category:waste": "Hulladék",
+    "category:water": "Vizek",
+    "category:wikipedia": "Wikipédia",
+    "category:works": "Üzemek",
+    "category:xmas": "Karácsony",
+    "date format not understood": "Felismerhetetlen dátumformátum",
+    "outdated feature": "Elavult információ",
+    "xmas:outdated-warning": "Ebben a szezonban nem frissült az objektum. Ellenőrizze, és állítsa be az <xmas:lastcheck> kulcshoz tartozó értéket a jelenlegi dátumra."
 }

lang/it.json

@@ -1,62 +1,94 @@
 {
+    "Objects with diet information": "",
     "category:administrative": "Suddivisioni amministrative",
     "category:agriculture": "Agricoltura",
     "category:alternative_amenities": "Infrastrutture",
     "category:alternative_routes": "Itinerari segnalati",
-    "category:buildings": null,
+    "category:buildings": "Edifici",
+    "category:buildings-entrances": "Ingressi",
+    "category:buildings-figure-ground": "",
+    "category:buildings-height": "Altezza dell'edificio",
+    "category:buildings-start_date": "Età dell'edificio",
+    "category:buildings-type": "Tipi di edificio",
     "category:car_amenities": "Infrastrutture",
     "category:car_furniture": "Dotazioni stradali",
-    "category:car_maxspeed": null,
+    "category:car_maxspeed": "Velocità massima",
-    "category:children": null,
+    "category:car_routes": "Tratte automobilistiche",
+    "category:children": "Luoghi per bambini",
+    "category:coal": "Carbone",
     "category:communication": "Communicazioni",
     "category:construction": "Cantieri",
+    "category:craft": "Artigianato",
     "category:culture": "Cultura",
     "category:culture_religion": "Cultura",
-    "category:cycle_amenities": null,
+    "category:cycle_amenities": "Infrastrutture",
-    "category:cycle_routes": null,
+    "category:cycle_routes": "Percorsi ciclistici",
     "category:education": "Istruzione",
+    "category:electric_power": "Energia",
     "category:emergency": "Servizi d'emergenza",
+    "category:energy": "Energia",
     "category:financial": "Finanze",
     "category:gastro": "Gastronomia",
+    "category:gastro-smoking": "Gastronomia non fumatori",
     "category:health": "Sanità",
-    "category:hiking_routes": null,
+    "category:hiking_routes": "Percorsi escursionistici",
     "category:historic": "Storia",
-    "category:index": null,
+    "category:index": "",
-    "category:internet": null,
+    "category:infrastructure": "Infrastrutture",
+    "category:internet": "Accesso a internet",
+    "category:law": "Legge",
     "category:leisure": "Tempo libero",
+    "category:leisure_sport_shopping": "Tempo libero, sport e shopping",
+    "category:memorial": "Memoriali",
     "category:military": "Militare",
+    "category:mtb-routes": "Percorsi per mountain bike",
     "category:natural": "Natura",
+    "category:office": "Uffici",
+    "category:oil_gas": "Petrolio e gas naturale",
+    "category:organisations": "Organizzazioni",
     "category:other": "Altri",
-    "category:phone": null,
+    "category:outdoor": "Attività all'aperto",
+    "category:phone": "Telefono",
     "category:places": "Luoghi",
     "category:places_geo": "Luoghi",
-    "category:playgrounds": null,
+    "category:playgrounds": "Parco giochi",
-    "category:post": null,
+    "category:post": "Posta",
-    "category:power": "Energia",
+    "category:power_routes": "Linee energetiche",
+    "category:pt": "Mappa del trasporto pubblico",
+    "category:pt:routes": "Percorsi",
+    "category:pt:stops": "Stazioni e fermate",
     "category:pt_amenities": "Infrastrutture",
-    "category:pt_routes": null,
-    "category:pt_stops": "Stazioni e fermate",
     "category:public": "Servizi pubblici",
-    "category:railway-electrification": null,
+    "category:railway": "Ferrovie",
-    "category:railway-infrastructure": null,
+    "category:railway-electrification": "Elettrificazione ferroviaria",
+    "category:railway-gauge": "",
+    "category:railway-infrastructure": "Infrastruttura ferroviaria",
+    "category:railway-maxspeed": "Velocità ferroviaria massima",
+    "category:railway-routes": "Percorsi ferroviari",
     "category:religion": "Religione",
+    "category:renewables": "Energie rinnovabili",
     "category:residential": "Aree residenziali",
-    "category:resources": "Areee estrattive",
+    "category:resources": "Aree estrattive",
+    "category:services": "Servizi",
     "category:shop": "Acquisti",
+    "category:special": "Speciali",
     "category:sport": "Sport",
+    "category:swimming_bathing": "Nuoto e balneazione",
     "category:tourism_attractions": "Turismo",
     "category:tourism_services": "Turismo",
+    "category:transport": "Trasporti",
     "category:transport_alternative": "Alternativi (bicicletta, camminate, ...)",
-    "category:walk_amenities": null,
+    "category:transport_car": "Trasporti individuali",
+    "category:transport_cycle": "",
+    "category:transport_pt": "Trasporti pubblici",
+    "category:transport_walk": "",
+    "category:walk_amenities": "",
     "category:waste": "Smaltimento",
-    "category:water": null,
+    "category:water": "",
-    "category:wikipedia": null,
+    "category:wikipedia": "",
     "category:works": "Fabbriche",
-    "category:cycle_infrastructure": null,
+    "category:xmas": "",
-    "category:leisure_sport_shopping": "Tempo libero, sport e shopping",
+    "date format not understood": "",
-    "category:railway": "Ferrovie",
+    "outdated feature": "",
-    "category:services": "Servizi",
+    "xmas:outdated-warning": ""
-    "category:transport": "Trasporti",
-    "category:transport_car": "Trasporti individuali",
-    "category:transport_pt": "Trasporti pubblici"
 }

lang/ja.json

@@ -1,62 +1,94 @@
 {
-    "category:administrative": null,
+    "Objects with diet information": "食事制限情報のあるオブジェクト",
+    "category:administrative": "行政界",
     "category:agriculture": "農業",
     "category:alternative_amenities": "生活環境",
     "category:alternative_routes": "ルート",
-    "category:buildings": null,
+    "category:buildings": "建物",
+    "category:buildings-entrances": "エントランス",
+    "category:buildings-figure-ground": "",
+    "category:buildings-height": "建物の高さ",
+    "category:buildings-start_date": "築年数",
+    "category:buildings-type": "建物の種類",
     "category:car_amenities": "生活環境",
     "category:car_furniture": "街路設置公共物",
-    "category:car_maxspeed": null,
+    "category:car_maxspeed": "最高速度",
-    "category:children": null,
+    "category:car_routes": "車のルート",
-    "category:communication": "交流",
+    "category:children": "子ども用施設",
+    "category:coal": "石炭",
+    "category:communication": "情報通信",
     "category:construction": "工事中",
+    "category:craft": "職人",
     "category:culture": "文化",
-    "category:culture_religion": "文化",
+    "category:culture_religion": "文化と宗教",
-    "category:cycle_amenities": null,
+    "category:cycle_amenities": "アメニティ",
-    "category:cycle_routes": null,
+    "category:cycle_routes": "自転車ルート",
     "category:education": "教育サービス",
+    "category:electric_power": "電力",
     "category:emergency": "緊急サービス",
+    "category:energy": "エネルギー",
     "category:financial": "金融",
     "category:gastro": "食べ物",
+    "category:gastro-smoking": "禁煙の飲食店",
     "category:health": "健康",
-    "category:hiking_routes": null,
+    "category:hiking_routes": "ハイキングルート",
-    "category:historic": "記念",
+    "category:historic": "歴史",
-    "category:index": null,
+    "category:index": "",
+    "category:infrastructure": "インフラ",
     "category:internet": "インターネット接続",
+    "category:law": "法律",
     "category:leisure": "レジャー",
+    "category:leisure_sport_shopping": "レジャー",
+    "category:memorial": "記念碑",
     "category:military": "軍事",
+    "category:mtb-routes": "マウンテンバイクのルート",
     "category:natural": "自然地層",
+    "category:office": "オフィス",
+    "category:oil_gas": "石油と天然ガス",
+    "category:organisations": "組織",
     "category:other": "その他",
+    "category:outdoor": "アウトドア活動",
     "category:phone": "電話",
     "category:places": "場所",
     "category:places_geo": "場所",
-    "category:playgrounds": null,
+    "category:playgrounds": "遊び場",
     "category:post": "郵便",
-    "category:power": "電力",
+    "category:power_routes": "電線のルート",
+    "category:pt": "公共交通地図",
+    "category:pt:routes": "ルート",
+    "category:pt:stops": "停留所と駅",
     "category:pt_amenities": "生活環境",
-    "category:pt_routes": null,
-    "category:pt_stops": "停留所と駅",
     "category:public": "公共サービス",
-    "category:railway-electrification": null,
+    "category:railway": "鉄道",
-    "category:railway-infrastructure": null,
+    "category:railway-electrification": "鉄道の電力",
+    "category:railway-gauge": "",
+    "category:railway-infrastructure": "鉄道インフラ",
+    "category:railway-maxspeed": "鉄道の最高速度",
+    "category:railway-routes": "鉄道ルート",
     "category:religion": "宗教",
+    "category:renewables": "",
     "category:residential": "住居エリア",
-    "category:resources": null,
+    "category:resources": "",
+    "category:services": "サービス",
     "category:shop": "ショッピング",
+    "category:special": "特別",
     "category:sport": "スポーツ",
+    "category:swimming_bathing": "水泳と入浴",
     "category:tourism_attractions": "観光",
     "category:tourism_services": "観光",
+    "category:transport": "輸送",
     "category:transport_alternative": "その他交通 (サイクリング、ハイキング、...)",
-    "category:walk_amenities": null,
+    "category:transport_car": "個人輸送機関",
+    "category:transport_cycle": "サイクリング",
+    "category:transport_pt": "公共輸送",
+    "category:transport_walk": "ウォーキング",
+    "category:walk_amenities": "アメニティ",
     "category:waste": "処理場",
-    "category:water": null,
+    "category:water": "水系",
-    "category:wikipedia": null,
+    "category:wikipedia": "ウィキペディア",
     "category:works": "工場",
-    "category:cycle_infrastructure": null,
+    "category:xmas": "クリスマス",
-    "category:leisure_sport_shopping": "レジャー",
+    "date format not understood": "",
-    "category:railway": "鉄道",
+    "outdated feature": "",
-    "category:services": "サービス",
+    "xmas:outdated-warning": "今のシーズンは地物が更新されていません! チェックして現在の日付に'xmas:lastcheck' タグをセットしてください。"
-    "category:transport": "輸送",
-    "category:transport_car": "個人輸送機関",
-    "category:transport_pt": "公共輸送"
 }

lang/nl.json

@@ -1,62 +1,94 @@
 {
+    "Objects with diet information": "Objecten met dieet informatie",
     "category:administrative": "Administratieve gebieden",
     "category:agriculture": "Landbouw",
     "category:alternative_amenities": "Voorzieningen",
     "category:alternative_routes": "Alternatieve routes",
-    "category:buildings": null,
+    "category:buildings": "Gebouwen",
+    "category:buildings-entrances": "Toegangen",
+    "category:buildings-figure-ground": "Plattegrond",
+    "category:buildings-height": "Bouwhoogte",
+    "category:buildings-start_date": "Ouderdom van het gebouw",
+    "category:buildings-type": "Gebouwtypes",
     "category:car_amenities": "Voorzieningen",
     "category:car_furniture": "Straatmeubilair",
-    "category:car_maxspeed": null,
+    "category:car_maxspeed": "Snelheidslimiet",
-    "category:children": null,
+    "category:car_routes": "Autoroutes",
+    "category:children": "Voorzieningen voor kinderen",
+    "category:coal": "Kolen",
     "category:communication": "Communicatie",
     "category:construction": "Bouwterrein",
+    "category:craft": "Handwerk",
     "category:culture": "Cultuur",
     "category:culture_religion": "Cultuur",
-    "category:cycle_amenities": null,
+    "category:cycle_amenities": "Voorzieningen",
-    "category:cycle_routes": null,
+    "category:cycle_routes": "Fietsroutes",
     "category:education": "Onderwijs",
+    "category:electric_power": "Stroomvoorziening",
     "category:emergency": "Hulpdiensten",
+    "category:energy": "Energie",
     "category:financial": "Financieel",
     "category:gastro": "Gastronomie",
+    "category:gastro-smoking": "Rookvrije gastronomie",
     "category:health": "Gezondheid",
-    "category:hiking_routes": null,
+    "category:hiking_routes": "Wandelroutes",
     "category:historic": "Historisch",
-    "category:index": null,
+    "category:index": "",
+    "category:infrastructure": "Infrastructuur",
     "category:internet": "Internettoegang",
+    "category:law": "Juridische diensten",
     "category:leisure": "Vrije tijd",
+    "category:leisure_sport_shopping": "Vrije tijd, Sport en Winkelen",
+    "category:memorial": "Gedenktekens",
     "category:military": "Militair",
+    "category:mtb-routes": "ATB routes",
     "category:natural": "Natuurlijke Formaties",
+    "category:office": "Kantoren",
+    "category:oil_gas": "Petroleum en aardgas",
+    "category:organisations": "Organisaties",
     "category:other": "Andere",
+    "category:outdoor": "Buitenactiviteiten",
     "category:phone": "Telefonie",
     "category:places": "Plaatsen",
     "category:places_geo": "Plaatsen",
-    "category:playgrounds": null,
+    "category:playgrounds": "Speeltuin",
     "category:post": "Post",
-    "category:power": "Stroomvoorziening",
+    "category:power_routes": "Elektriciteitsleidingen",
+    "category:pt": "Openbaar vervoer kaart",
+    "category:pt:routes": "Routes",
+    "category:pt:stops": "Haltes en Stations",
     "category:pt_amenities": "Voorzieningen",
-    "category:pt_routes": null,
-    "category:pt_stops": "Haltes en Stations",
     "category:public": "Openbare diensten",
-    "category:railway-electrification": null,
+    "category:railway": "Spoorwegen",
-    "category:railway-infrastructure": null,
+    "category:railway-electrification": "Spoorwegelektrificatie",
+    "category:railway-gauge": "",
+    "category:railway-infrastructure": "Spoorweginfrastructuur",
+    "category:railway-maxspeed": "Spoorweg snelheidslimiet",
+    "category:railway-routes": "Spoorwegroutes",
     "category:religion": "Religie",
+    "category:renewables": "Hernieuwbare energie",
     "category:residential": "Woongebieden",
     "category:resources": "Grondstoffenwinning",
+    "category:services": "Dienstverlening",
     "category:shop": "Winkelen",
+    "category:special": "Speciaal",
     "category:sport": "Sport",
+    "category:swimming_bathing": "Zwemmen en baden",
     "category:tourism_attractions": "Toerisme",
     "category:tourism_services": "Toerisme",
+    "category:transport": "Vervoer",
     "category:transport_alternative": "Alternatief (Fiets, Wandel, ...)",
-    "category:walk_amenities": null,
+    "category:transport_car": "Gemotoriseerd individueel verkeer",
+    "category:transport_cycle": "Fietsen",
+    "category:transport_pt": "Openbaar vervoer",
+    "category:transport_walk": "Wandelen",
+    "category:walk_amenities": "Voorzieningen",
     "category:waste": "Afvalverwijdering",
-    "category:water": null,
+    "category:water": "Oppervlaktewater",
-    "category:wikipedia": null,
+    "category:wikipedia": "Wikipedia",
     "category:works": "Fabrieken",
-    "category:cycle_infrastructure": null,
+    "category:xmas": "Kerstmis",
-    "category:leisure_sport_shopping": "Vrije tijd, Sport en Winkelen",
+    "date format not understood": "Datumformaat onbekend",
-    "category:railway": "Spoorwegen",
+    "outdated feature": "Achterhaalde informatie",
-    "category:services": "Dienstverlening",
+    "xmas:outdated-warning": "Object werd niet geactualiseerd voor het huidige seizoen! Controleer en zet de tag 'xmas:lastcheck' op de huidige datum alstublieft."
-    "category:transport": "Vervoer",
-    "category:transport_car": "Gemotoriseerd individueel verkeer",
-    "category:transport_pt": "Openbaar vervoer"
 }

lang/pl.json

@@ -1,61 +1,94 @@
 {
-    "category:administrative": null,
+    "Objects with diet information": "",
-    "category:agriculture": null,
+    "category:administrative": "",
-    "category:alternative_amenities": null,
+    "category:agriculture": "",
-    "category:alternative_routes": null,
+    "category:alternative_amenities": "",
-    "category:buildings": null,
+    "category:alternative_routes": "",
-    "category:car_amenities": null,
+    "category:buildings": "",
+    "category:buildings-entrances": "",
+    "category:buildings-figure-ground": "",
+    "category:buildings-height": "",
+    "category:buildings-start_date": "",
+    "category:buildings-type": "",
+    "category:car_amenities": "",
     "category:car_furniture": "Elementy drogowe",
-    "category:car_maxspeed": null,
+    "category:car_maxspeed": "",
-    "category:children": null,
+    "category:car_routes": "",
-    "category:communication": null,
+    "category:children": "",
-    "category:construction": null,
+    "category:coal": "",
+    "category:communication": "",
+    "category:construction": "",
+    "category:craft": "",
     "category:culture": "Kultura",
     "category:culture_religion": "Kultura",
-    "category:cycle_amenities": null,
+    "category:cycle_amenities": "",
-    "category:cycle_routes": null,
+    "category:cycle_routes": "",
     "category:education": "Edukacyjne",
-    "category:emergency": null,
+    "category:electric_power": "",
+    "category:emergency": "",
+    "category:energy": "",
     "category:financial": "Finasowe",
     "category:gastro": "Gastronomia",
+    "category:gastro-smoking": "",
     "category:health": "Zdrowie",
-    "category:hiking_routes": null,
+    "category:hiking_routes": "",
     "category:historic": "Miejsca Historyczne",
-    "category:index": null,
+    "category:index": "",
-    "category:internet": null,
+    "category:infrastructure": "",
-    "category:leisure": null,
+    "category:internet": "",
-    "category:military": null,
+    "category:law": "",
-    "category:natural": null,
+    "category:leisure": "",
-    "category:other": null,
+    "category:leisure_sport_shopping": "Wypoczynek, Sport i Zakupy",
-    "category:phone": null,
+    "category:memorial": "",
+    "category:military": "",
+    "category:mtb-routes": "",
+    "category:natural": "",
+    "category:office": "",
+    "category:oil_gas": "",
+    "category:organisations": "",
+    "category:other": "",
+    "category:outdoor": "",
+    "category:phone": "",
     "category:places": "Miejsca",
     "category:places_geo": "Miejsca",
-    "category:playgrounds": null,
+    "category:playgrounds": "",
-    "category:post": null,
+    "category:post": "",
-    "category:power": null,
+    "category:power_routes": "",
-    "category:pt_amenities": null,
+    "category:pt": "",
-    "category:pt_routes": null,
+    "category:pt:routes": "",
-    "category:pt_stops": "Przystanki i Stacje",
+    "category:pt:stops": "Przystanki i Stacje",
-    "category:public": null,
+    "category:pt_amenities": "",
-    "category:railway-electrification": null,
+    "category:public": "",
-    "category:railway-infrastructure": null,
+    "category:railway": "",
-    "category:religion": null,
+    "category:railway-electrification": "",
-    "category:residential": null,
+    "category:railway-gauge": "",
-    "category:resources": null,
+    "category:railway-infrastructure": "",
+    "category:railway-maxspeed": "",
+    "category:railway-routes": "",
+    "category:religion": "",
+    "category:renewables": "",
+    "category:residential": "",
+    "category:resources": "",
+    "category:services": "Usługi",
     "category:shop": "Zakupy",
-    "category:sport": null,
+    "category:special": "",
+    "category:sport": "",
+    "category:swimming_bathing": "",
     "category:tourism_attractions": "Turystyka",
     "category:tourism_services": "Turystyka",
-    "category:transport_alternative": null,
-    "category:walk_amenities": null,
-    "category:waste": null,
-    "category:water": null,
-    "category:wikipedia": null,
-    "category:works": null,
-    "category:cycle_infrastructure": null,
-    "category:leisure_sport_shopping": "Wypoczynek, Sport i Zakupy",
-    "category:services": "Usługi",
     "category:transport": "Transport",
+    "category:transport_alternative": "",
     "category:transport_car": "Transport Indywidualny",
-    "category:transport_pt": "Transport Publiczny"
+    "category:transport_cycle": "",
+    "category:transport_pt": "Transport Publiczny",
+    "category:transport_walk": "",
+    "category:walk_amenities": "",
+    "category:waste": "",
+    "category:water": "",
+    "category:wikipedia": "",
+    "category:works": "",
+    "category:xmas": "",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
 }

lang/pt-br.json

@@ -0,0 +1,94 @@
+{
+    "Objects with diet information": "Objetos com informações sobre dieta",
+    "category:administrative": "Divisão político-administrativa",
+    "category:agriculture": "Agricultura",
+    "category:alternative_amenities": "Equipamentos",
+    "category:alternative_routes": "Rotas",
+    "category:buildings": "Edificações",
+    "category:buildings-entrances": "Acessos",
+    "category:buildings-figure-ground": "Cheios e vazios",
+    "category:buildings-height": "Altura",
+    "category:buildings-start_date": "Idade",
+    "category:buildings-type": "Tipologias",
+    "category:car_amenities": "Equipamentos",
+    "category:car_furniture": "Mobiliário urbano",
+    "category:car_maxspeed": "Velocidade máxima",
+    "category:car_routes": "Rotas rodoviárias",
+    "category:children": "Equipamentos infantis",
+    "category:coal": "Carvão",
+    "category:communication": "Comunicação",
+    "category:construction": "Terrenos vazios e obras",
+    "category:craft": "Ofícios",
+    "category:culture": "Cultura",
+    "category:culture_religion": "Cultura",
+    "category:cycle_amenities": "Equipamentos",
+    "category:cycle_routes": "Ciclorrotas",
+    "category:education": "Educação",
+    "category:electric_power": "Energia elétrica",
+    "category:emergency": "Emergência",
+    "category:energy": "Energia",
+    "category:financial": "Finanças",
+    "category:gastro": "Gastronomia",
+    "category:gastro-smoking": "Gastronomia sem fumo",
+    "category:health": "Saúde e assistência",
+    "category:hiking_routes": "Rotas de caminhada",
+    "category:historic": "Histórico",
+    "category:index": "Índice",
+    "category:infrastructure": "Infraestrutura",
+    "category:internet": "Acesso à Internet",
+    "category:law": "Direito",
+    "category:leisure": "Lazer",
+    "category:leisure_sport_shopping": "Lazer, esportes e compras",
+    "category:memorial": "Memoriais e Memoriais",
+    "category:military": "Militar",
+    "category:mtb-routes": "Rotas de mountain bike",
+    "category:natural": "Formações naturais",
+    "category:office": "Escritórios e agências",
+    "category:oil_gas": "Petróleo e gás",
+    "category:organisations": "Organizações",
+    "category:other": "Outros",
+    "category:outdoor": "Atividades ao ar livre",
+    "category:phone": "Telefone",
+    "category:places": "Lugares",
+    "category:places_geo": "Lugares",
+    "category:playgrounds": "Parquinhos",
+    "category:post": "Correios",
+    "category:power_routes": "Rotas energéticas",
+    "category:pt": "Mapa de transporte público",
+    "category:pt:routes": "Rotas",
+    "category:pt:stops": "Paradas e estações",
+    "category:pt_amenities": "Equipamentos",
+    "category:public": "Utilidade pública",
+    "category:railway": "Ferrovia",
+    "category:railway-electrification": "Eletrificação ferroviária",
+    "category:railway-gauge": "Calibre ferroviário",
+    "category:railway-infrastructure": "Infraestrutura ferroviária",
+    "category:railway-maxspeed": "Velocidade máxima",
+    "category:railway-routes": "Rotas ferroviárias",
+    "category:religion": "Religião",
+    "category:renewables": "Renováveis",
+    "category:residential": "Áreas residenciais",
+    "category:resources": "Extração de recursos",
+    "category:services": "Prestação de serviços",
+    "category:shop": "Compras",
+    "category:special": "Especial",
+    "category:sport": "Esportes",
+    "category:swimming_bathing": "Natação e banho",
+    "category:tourism_attractions": "Turismo",
+    "category:tourism_services": "Serviços turísticos",
+    "category:transport": "Mobilidade",
+    "category:transport_alternative": "Transporte alternativo",
+    "category:transport_car": "Tráfego individual",
+    "category:transport_cycle": "Ciclismo",
+    "category:transport_pt": "Transporte público",
+    "category:transport_walk": "Pedestre",
+    "category:walk_amenities": "Equipamentos",
+    "category:waste": "Lixo",
+    "category:water": "Hidrografia",
+    "category:wikipedia": "Wikipédia",
+    "category:works": "Produção",
+    "category:xmas": "Natal",
+    "date format not understood": "",
+    "outdated feature": "Objeto antigo",
+    "xmas:outdated-warning": "O objeto não foi atualizado para a temporada atual! Por favor, verifique e defina a tag 'xmas:lastcheck' para a data atual."
+}

lang/pt.json

@@ -0,0 +1,94 @@
+{
+    "Objects with diet information": "",
+    "category:administrative": "Regiões administrativas",
+    "category:agriculture": "Agricultura",
+    "category:alternative_amenities": "",
+    "category:alternative_routes": "Rotas",
+    "category:buildings": "Edifícios",
+    "category:buildings-entrances": "",
+    "category:buildings-figure-ground": "",
+    "category:buildings-height": "",
+    "category:buildings-start_date": "",
+    "category:buildings-type": "",
+    "category:car_amenities": "",
+    "category:car_furniture": "Mobiliário urbano",
+    "category:car_maxspeed": "Velocidade máxima",
+    "category:car_routes": "",
+    "category:children": "",
+    "category:coal": "",
+    "category:communication": "Comunicação",
+    "category:construction": "Locais de construção",
+    "category:craft": "Artesanato",
+    "category:culture": "Cultura",
+    "category:culture_religion": "Cultura e religião",
+    "category:cycle_amenities": "",
+    "category:cycle_routes": "Ciclovias",
+    "category:education": "Educação",
+    "category:electric_power": "Eletricidade",
+    "category:emergency": "Emergência",
+    "category:energy": "",
+    "category:financial": "Finanças",
+    "category:gastro": "Restauração",
+    "category:gastro-smoking": "Restauração livre de tabaco",
+    "category:health": "Saúde",
+    "category:hiking_routes": "Rotas de caminhada",
+    "category:historic": "Histórico",
+    "category:index": "",
+    "category:infrastructure": "Infraestrutura",
+    "category:internet": "Acesso à Internet",
+    "category:law": "",
+    "category:leisure": "Lazer",
+    "category:leisure_sport_shopping": "Lazer, desporto e compras",
+    "category:memorial": "",
+    "category:military": "Militar",
+    "category:mtb-routes": "",
+    "category:natural": "Formações naturais",
+    "category:office": "",
+    "category:oil_gas": "",
+    "category:organisations": "",
+    "category:other": "Outros",
+    "category:outdoor": "",
+    "category:phone": "Telefone",
+    "category:places": "Lugares",
+    "category:places_geo": "Lugares",
+    "category:playgrounds": "Parques infantis",
+    "category:post": "Correios",
+    "category:power_routes": "",
+    "category:pt": "",
+    "category:pt:routes": "Rotas",
+    "category:pt:stops": "",
+    "category:pt_amenities": "",
+    "category:public": "Serviços públicos",
+    "category:railway": "Linhas ferroviárias",
+    "category:railway-electrification": "Eletrificação ferroviária",
+    "category:railway-gauge": "",
+    "category:railway-infrastructure": "Infraestrutura ferroviária",
+    "category:railway-maxspeed": "Velocidade máxima",
+    "category:railway-routes": "",
+    "category:religion": "Religião",
+    "category:renewables": "",
+    "category:residential": "Áreas residenciais",
+    "category:resources": "Extração de recursos",
+    "category:services": "Serviços",
+    "category:shop": "Compras",
+    "category:special": "Especial",
+    "category:sport": "Desporto",
+    "category:swimming_bathing": "",
+    "category:tourism_attractions": "Turismo",
+    "category:tourism_services": "Turismo",
+    "category:transport": "Transportes",
+    "category:transport_alternative": "",
+    "category:transport_car": "Transporte individual",
+    "category:transport_cycle": "Ciclismo",
+    "category:transport_pt": "Transportes públicos",
+    "category:transport_walk": "Pedestre",
+    "category:walk_amenities": "",
+    "category:waste": "Lixo",
+    "category:water": "Massas de água",
+    "category:wikipedia": "Wikipédia",
+    "category:works": "Fábricas",
+    "category:xmas": "",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
+}

lang/ro.json

@@ -1,61 +1,94 @@
 {
+    "Objects with diet information": "",
     "category:administrative": "Zona administrativa",
     "category:agriculture": "Agricultura",
-    "category:alternative_amenities": null,
+    "category:alternative_amenities": "",
-    "category:alternative_routes": null,
+    "category:alternative_routes": "",
-    "category:buildings": null,
+    "category:buildings": "",
-    "category:car_amenities": null,
+    "category:buildings-entrances": "",
-    "category:car_furniture": null,
+    "category:buildings-figure-ground": "",
-    "category:car_maxspeed": null,
+    "category:buildings-height": "",
-    "category:children": null,
+    "category:buildings-start_date": "",
+    "category:buildings-type": "",
+    "category:car_amenities": "",
+    "category:car_furniture": "",
+    "category:car_maxspeed": "",
+    "category:car_routes": "",
+    "category:children": "",
+    "category:coal": "",
     "category:communication": "Comunicatii",
-    "category:construction": null,
+    "category:construction": "",
+    "category:craft": "",
     "category:culture": "Cultura",
     "category:culture_religion": "Cultura",
-    "category:cycle_amenities": null,
+    "category:cycle_amenities": "",
-    "category:cycle_routes": null,
+    "category:cycle_routes": "",
     "category:education": "Servicii educatie",
+    "category:electric_power": "Energie",
     "category:emergency": "Servicii urgenta",
+    "category:energy": "",
     "category:financial": "Financiar",
     "category:gastro": "Gastronomie",
+    "category:gastro-smoking": "",
     "category:health": "Sanatate",
-    "category:hiking_routes": null,
+    "category:hiking_routes": "",
     "category:historic": "Istoric",
-    "category:index": null,
+    "category:index": "",
+    "category:infrastructure": "",
     "category:internet": "Acces internet",
+    "category:law": "",
     "category:leisure": "Timp liber",
+    "category:leisure_sport_shopping": "Timp liber, Sport si Cumparaturi",
+    "category:memorial": "",
     "category:military": "Militar",
-    "category:natural": null,
+    "category:mtb-routes": "",
+    "category:natural": "",
+    "category:office": "",
+    "category:oil_gas": "",
+    "category:organisations": "",
     "category:other": "Altele",
+    "category:outdoor": "",
     "category:phone": "Telefon",
     "category:places": "Locuri",
     "category:places_geo": "Locuri",
     "category:playgrounds": "Loc de joaca",
-    "category:post": null,
+    "category:post": "",
-    "category:power": "Energie",
+    "category:power_routes": "",
-    "category:pt_amenities": null,
+    "category:pt": "",
-    "category:pt_routes": null,
+    "category:pt:routes": "",
-    "category:pt_stops": null,
+    "category:pt:stops": "",
+    "category:pt_amenities": "",
     "category:public": "Servicii publice",
-    "category:railway-electrification": null,
+    "category:railway": "",
-    "category:railway-infrastructure": null,
+    "category:railway-electrification": "",
+    "category:railway-gauge": "",
+    "category:railway-infrastructure": "",
+    "category:railway-maxspeed": "",
+    "category:railway-routes": "",
     "category:religion": "Religie",
+    "category:renewables": "",
     "category:residential": "Zona rezidentiala",
-    "category:resources": null,
+    "category:resources": "",
+    "category:services": "Servicii",
     "category:shop": "Cumpărături",
-    "category:sport": null,
+    "category:special": "",
+    "category:sport": "",
+    "category:swimming_bathing": "",
     "category:tourism_attractions": "Turism",
     "category:tourism_services": "Turism",
-    "category:transport_alternative": "Alternativ(Bicicleta,Drumetii)",
-    "category:walk_amenities": null,
-    "category:waste": null,
-    "category:water": null,
-    "category:wikipedia": null,
-    "category:works": null,
-    "category:cycle_infrastructure": null,
-    "category:leisure_sport_shopping": "Timp liber, Sport si Cumparaturi",
-    "category:services": "Servicii",
     "category:transport": "Transport",
+    "category:transport_alternative": "Alternativ(Bicicleta,Drumetii)",
     "category:transport_car": "Trafic individual",
-    "category:transport_pt": "Transport public"
+    "category:transport_cycle": "",
+    "category:transport_pt": "Transport public",
+    "category:transport_walk": "",
+    "category:walk_amenities": "",
+    "category:waste": "",
+    "category:water": "",
+    "category:wikipedia": "",
+    "category:works": "",
+    "category:xmas": "",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
 }

lang/ru.json

@@ -1,62 +1,94 @@
 {
+    "Objects with diet information": "",
     "category:administrative": "Административные границы",
     "category:agriculture": "Сельское хозяйство",
     "category:alternative_amenities": "Полезные места",
     "category:alternative_routes": "Маршруты",
-    "category:buildings": null,
+    "category:buildings": "",
+    "category:buildings-entrances": "",
+    "category:buildings-figure-ground": "",
+    "category:buildings-height": "",
+    "category:buildings-start_date": "",
+    "category:buildings-type": "",
     "category:car_amenities": "Обслуживание транспорта",
     "category:car_furniture": "Элементы дороги",
-    "category:car_maxspeed": null,
+    "category:car_maxspeed": "",
-    "category:children": null,
+    "category:car_routes": "",
+    "category:children": "",
+    "category:coal": "",
     "category:communication": "Услуги связи",
     "category:construction": "Места строительства",
+    "category:craft": "",
     "category:culture": "Культура",
     "category:culture_religion": "Культура",
-    "category:cycle_amenities": null,
+    "category:cycle_amenities": "",
-    "category:cycle_routes": null,
+    "category:cycle_routes": "",
     "category:education": "Образование",
+    "category:electric_power": "Энергетика",
     "category:emergency": "Экстренные службы",
+    "category:energy": "",
     "category:financial": "Финансы",
     "category:gastro": "Общепит",
+    "category:gastro-smoking": "",
     "category:health": "Медицина",
-    "category:hiking_routes": null,
+    "category:hiking_routes": "",
     "category:historic": "Историческое",
-    "category:index": null,
+    "category:index": "",
-    "category:internet": null,
+    "category:infrastructure": "",
+    "category:internet": "",
+    "category:law": "",
     "category:leisure": "Досуг",
+    "category:leisure_sport_shopping": "Досуг",
+    "category:memorial": "",
     "category:military": "Вооружённые силы",
+    "category:mtb-routes": "",
     "category:natural": "Природные образования",
+    "category:office": "",
+    "category:oil_gas": "",
+    "category:organisations": "",
     "category:other": "Прочее",
-    "category:phone": null,
+    "category:outdoor": "",
+    "category:phone": "",
     "category:places": "Места",
     "category:places_geo": "Места",
-    "category:playgrounds": null,
+    "category:playgrounds": "",
-    "category:post": null,
+    "category:post": "",
-    "category:power": "Энергетика",
+    "category:power_routes": "",
+    "category:pt": "",
+    "category:pt:routes": "",
+    "category:pt:stops": "Остановки и станции",
     "category:pt_amenities": "Транспортные принадлежности",
-    "category:pt_routes": null,
-    "category:pt_stops": "Остановки и станции",
     "category:public": "Общественные места",
-    "category:railway-electrification": null,
+    "category:railway": "Железные дороги",
-    "category:railway-infrastructure": null,
+    "category:railway-electrification": "",
+    "category:railway-gauge": "",
+    "category:railway-infrastructure": "",
+    "category:railway-maxspeed": "",
+    "category:railway-routes": "",
     "category:religion": "Религия",
+    "category:renewables": "",
     "category:residential": "Жилые районы",
     "category:resources": "Добыча ресурсов",
+    "category:services": "Услуги",
     "category:shop": "Покупки",
+    "category:special": "",
     "category:sport": "Спорт",
+    "category:swimming_bathing": "",
     "category:tourism_attractions": "Туризм",
     "category:tourism_services": "Туризм",
+    "category:transport": "Транспорт",
     "category:transport_alternative": "Альтернативное передвижение (Велоспорт, Пешие прогулки, ...)",
-    "category:walk_amenities": null,
+    "category:transport_car": "Частный транспорт",
+    "category:transport_cycle": "",
+    "category:transport_pt": "Общественный транспорт",
+    "category:transport_walk": "",
+    "category:walk_amenities": "",
     "category:waste": "Переработка отходов",
-    "category:water": null,
+    "category:water": "",
-    "category:wikipedia": null,
+    "category:wikipedia": "",
     "category:works": "Промышленность",
-    "category:cycle_infrastructure": null,
+    "category:xmas": "",
-    "category:leisure_sport_shopping": "Досуг",
+    "date format not understood": "",
-    "category:railway": "Железные дороги",
+    "outdated feature": "",
-    "category:services": "Услуги",
+    "xmas:outdated-warning": ""
-    "category:transport": "Транспорт",
-    "category:transport_car": "Частный транспорт",
-    "category:transport_pt": "Общественный транспорт"
 }

lang/template.json

@@ -0,0 +1,94 @@
+{
+    "Objects with diet information": "",
+    "category:administrative": "",
+    "category:agriculture": "",
+    "category:alternative_amenities": "",
+    "category:alternative_routes": "",
+    "category:buildings": "",
+    "category:buildings-entrances": "",
+    "category:buildings-figure-ground": "",
+    "category:buildings-height": "",
+    "category:buildings-start_date": "",
+    "category:buildings-type": "",
+    "category:car_amenities": "",
+    "category:car_furniture": "",
+    "category:car_maxspeed": "",
+    "category:car_routes": "",
+    "category:children": "",
+    "category:coal": "",
+    "category:communication": "",
+    "category:construction": "",
+    "category:craft": "",
+    "category:culture": "",
+    "category:culture_religion": "",
+    "category:cycle_amenities": "",
+    "category:cycle_routes": "",
+    "category:education": "",
+    "category:electric_power": "",
+    "category:emergency": "",
+    "category:energy": "",
+    "category:financial": "",
+    "category:gastro": "",
+    "category:gastro-smoking": "",
+    "category:health": "",
+    "category:hiking_routes": "",
+    "category:historic": "",
+    "category:index": "",
+    "category:infrastructure": "",
+    "category:internet": "",
+    "category:law": "",
+    "category:leisure": "",
+    "category:leisure_sport_shopping": "",
+    "category:memorial": "",
+    "category:military": "",
+    "category:mtb-routes": "",
+    "category:natural": "",
+    "category:office": "",
+    "category:oil_gas": "",
+    "category:organisations": "",
+    "category:other": "",
+    "category:outdoor": "",
+    "category:phone": "",
+    "category:places": "",
+    "category:places_geo": "",
+    "category:playgrounds": "",
+    "category:post": "",
+    "category:power_routes": "",
+    "category:pt": "",
+    "category:pt:routes": "",
+    "category:pt:stops": "",
+    "category:pt_amenities": "",
+    "category:public": "",
+    "category:railway": "",
+    "category:railway-electrification": "",
+    "category:railway-gauge": "",
+    "category:railway-infrastructure": "",
+    "category:railway-maxspeed": "",
+    "category:railway-routes": "",
+    "category:religion": "",
+    "category:renewables": "",
+    "category:residential": "",
+    "category:resources": "",
+    "category:services": "",
+    "category:shop": "",
+    "category:special": "",
+    "category:sport": "",
+    "category:swimming_bathing": "",
+    "category:tourism_attractions": "",
+    "category:tourism_services": "",
+    "category:transport": "",
+    "category:transport_alternative": "",
+    "category:transport_car": "",
+    "category:transport_cycle": "",
+    "category:transport_pt": "",
+    "category:transport_walk": "",
+    "category:walk_amenities": "",
+    "category:waste": "",
+    "category:water": "",
+    "category:wikipedia": "",
+    "category:works": "",
+    "category:xmas": "",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
+}

lang/uk.json

@@ -1,61 +1,94 @@
 {
-    "category:administrative": null,
+    "Objects with diet information": "",
-    "category:agriculture": null,
+    "category:administrative": "",
+    "category:agriculture": "",
     "category:alternative_amenities": "Amenities",
     "category:alternative_routes": "Маршрути",
-    "category:buildings": null,
+    "category:buildings": "",
+    "category:buildings-entrances": "",
+    "category:buildings-figure-ground": "",
+    "category:buildings-height": "",
+    "category:buildings-start_date": "",
+    "category:buildings-type": "",
     "category:car_amenities": "Amenities",
     "category:car_furniture": "Street Furniture",
-    "category:car_maxspeed": null,
+    "category:car_maxspeed": "",
-    "category:children": null,
+    "category:car_routes": "",
+    "category:children": "",
+    "category:coal": "",
     "category:communication": "Телекомунікації",
-    "category:construction": null,
+    "category:construction": "",
+    "category:craft": "",
     "category:culture": "Культура ",
     "category:culture_religion": "Культура ",
-    "category:cycle_amenities": null,
+    "category:cycle_amenities": "",
-    "category:cycle_routes": null,
+    "category:cycle_routes": "",
     "category:education": "Освіта",
+    "category:electric_power": "",
     "category:emergency": "Швидка допомога",
+    "category:energy": "",
     "category:financial": "Фінанси",
     "category:gastro": "Гастрономія",
+    "category:gastro-smoking": "",
     "category:health": "Здоров'я",
-    "category:hiking_routes": null,
+    "category:hiking_routes": "",
     "category:historic": "Історія",
-    "category:index": null,
+    "category:index": "",
-    "category:internet": null,
+    "category:infrastructure": "",
+    "category:internet": "",
+    "category:law": "",
     "category:leisure": "Дозвілля",
-    "category:military": null,
+    "category:leisure_sport_shopping": "Дозвілля",
+    "category:memorial": "",
+    "category:military": "",
+    "category:mtb-routes": "",
     "category:natural": "Природне середовище",
+    "category:office": "",
+    "category:oil_gas": "",
+    "category:organisations": "",
     "category:other": "Інше",
-    "category:phone": null,
+    "category:outdoor": "",
+    "category:phone": "",
     "category:places": "Місцевість",
     "category:places_geo": "Місцевість",
     "category:playgrounds": "Дитячий майданчик",
-    "category:post": null,
+    "category:post": "",
-    "category:power": null,
+    "category:power_routes": "",
+    "category:pt": "",
+    "category:pt:routes": "",
+    "category:pt:stops": "Зупинки та станції",
     "category:pt_amenities": "Amenities",
-    "category:pt_routes": null,
-    "category:pt_stops": "Зупинки та станції",
     "category:public": "Громадські місця",
-    "category:railway-electrification": null,
+    "category:railway": "",
-    "category:railway-infrastructure": null,
+    "category:railway-electrification": "",
+    "category:railway-gauge": "",
+    "category:railway-infrastructure": "",
+    "category:railway-maxspeed": "",
+    "category:railway-routes": "",
     "category:religion": "Релігія",
+    "category:renewables": "",
     "category:residential": "Житлова зона",
-    "category:resources": null,
+    "category:resources": "",
+    "category:services": "Послуги",
     "category:shop": "Торгівля",
+    "category:special": "",
     "category:sport": "Спорт. Інше.",
+    "category:swimming_bathing": "",
     "category:tourism_attractions": "Туризм",
     "category:tourism_services": "Туризм",
-    "category:transport_alternative": "Інші (Велосипедні, піші, ...)",
-    "category:walk_amenities": null,
-    "category:waste": null,
-    "category:water": null,
-    "category:wikipedia": null,
-    "category:works": null,
-    "category:cycle_infrastructure": null,
-    "category:leisure_sport_shopping": "Дозвілля",
-    "category:services": "Послуги",
     "category:transport": "Транспорт",
+    "category:transport_alternative": "Інші (Велосипедні, піші, ...)",
     "category:transport_car": "Приватний транспорт",
-    "category:transport_pt": "Громадський транспорт"
+    "category:transport_cycle": "",
+    "category:transport_pt": "Громадський транспорт",
+    "category:transport_walk": "",
+    "category:walk_amenities": "",
+    "category:waste": "",
+    "category:water": "",
+    "category:wikipedia": "",
+    "category:works": "",
+    "category:xmas": "",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
 }

law.json

@@ -0,0 +1,69 @@
+{
+    "type": "overpass",
+    "name": {
+        "en": "Law",
+        "fr": "Services législatifs",
+        "pt-br": "Direito"
+    },
+    "query": {
+        "14": [
+            "(",
+            "node[amenity~\"^(courthouse)$\"];",
+            "way[amenity~\"^(courthouse)$\"];",
+            "relation[amenity~\"^(courthouse)$\"];",
+            "node[office~\"^(lawyer|notary)$\"];",
+            "way[office~\"^(lawyer|notary)$\"];",
+            "relation[office~\"^(lawyer|notary)$\"];",
+            ")"
+        ]
+    },
+    "feature": {
+        "pre": [
+            "{% if tags.amenity %}",
+            "  {% set key = 'amenity' %}",
+            "  {% set value = tags.amenity %}",
+            "{% else %}",
+            "  {% set key = 'office' %}",
+            "  {% set value = tags.office %}",
+            "{% endif %}"
+        ],
+        "description": "{{ tagTrans(key, value) }}",
+        "markerSign": "{{ const[key ~ '=' ~ value].sign|raw }}"
+    },
+    "info": [
+        "<table>",
+        "{% for kv, data in const %}",
+        "{% if data.zoom <= map.zoom %}",
+        "  <tr>",
+        "    <td>{{ markerCircle({})|raw }}<div class='sign'>{{ data.sign|raw }}</div></td>",
+        "    <td>",
+        "      {{ tagTrans(kv|split('=')[0], kv|split('=')[1]) }}",
+        "    </td>",
+        "  </tr>",
+        "{% endif %}",
+        "{% endfor %}",
+        "</table>"
+    ],
+    "const": {
+        "amenity=courthouse": {
+            "sign": "<i class=\"fas fa-gavel\"></i>",
+            "zoom": 14
+        },
+        "office=lawyer": {
+            "sign": "⚖",
+            "zoom": 14
+        },
+        "office=notary": {
+            "sign": "<i class=\"fas fa-file-signature\"></i>",
+            "zoom": 14
+        }
+    },
+    "filter": {
+        "type": {
+            "name": "{{ trans('filter:type') }}",
+            "show_default": "true",
+            "type": "select",
+            "values": "{% for k, v in const %}<option value=\"{{ k }}\" query=\"nwr[{{ k }}]\" minzoom=\"{{ v.zoom }}\">{{ tagTrans(k) }}</option>{% endfor %}"
+        }
+    }
+}

leisure.json

@@ -7,9 +7,12 @@
         "el": "Αναψυχή",
         "en": "Leisure",
         "fr": "Loisirs",
+        "hu": "Szabadidő",
         "it": "Tempo libero",
         "ja": "レジャー",
         "nl": "Vrije tijd",
+        "pt": "Lazer",
+        "pt-br": "Lazer",
         "ro": "Timp liber",
         "ru": "Досуг",
         "uk": "Дозвілля"

memorial.json

@@ -0,0 +1,217 @@
+{
+    "type": "overpass",
+    "query": {
+        "11": [
+            "(",
+            "node[historic~\"^(monument)$\"];",
+            "way[historic~\"^(monument)$\"];",
+            "relation[historic~\"^(monument)$\"];",
+            ")"
+        ],
+        "14": [
+            "(",
+            "node[historic~\"^(memorial|monument)$\"];",
+            "way[historic~\"^(memorial|monument)$\"];",
+            "relation[historic~\"^(memorial|monument)$\"];",
+            ")"
+        ]
+    },
+    "feature": {
+        "pre": [
+            "{% set memtype = 'yes' %}",
+            "{% if tags.memorial %}",
+            "  {% set memtype = tags.memorial %}",
+            "{% elseif attribute(tags, 'memorial:type') %}",
+            "  {% set memtype = attribute(tags, 'memorial:type') %}",
+            "{% elseif attribute(tags, 'monument') %}",
+            "  {% set memtype = attribute(tags, 'monument') %}",
+            "{% elseif attribute(tags, 'memorial_type') %}",
+            "  {% set memtype = attribute(tags, 'memorial_type') %}",
+            "{% endif %}",
+            "",
+            "{% set memgroup = memtype %}",
+            "{% for value, data in const %}",
+            "{% if memtype in data.alias %}",
+            "{% set memgroup = value %}",
+            "{% endif %}",
+            "{% endfor %}"
+        ],
+        "description": [
+            "{{ tagTrans('historic', tags.historic) }}",
+            "",
+            "{% if memtype != 'yes' %}",
+            "  ({{ tagTrans('memorial', memtype) }})",
+            "{% endif %}"
+        ],
+        "priority": [
+            "{% if tags.historic == 'monument' %}0[% else %}1{% endif %}"
+        ],
+        "body": [
+            "<ul>",
+            "{% if tags.inscription %}",
+            "  <li class='hasSymbol'>",
+            "   <i class=\"fa fa-pencil-alt\" aria-hidden=\"true\"></i>",
+            "   <span class='key'>{{ keyTrans('inscription') }}:</span>",
+            "   <span class='value'>{{ localizedTag(tags, 'inscription') }}</span>",
+            "  </li>",
+            "{% elseif attribute(tags, 'inscription:url') %}",
+            "  <li class='hasSymbol'>",
+            "   <i class=\"fa fa-pencil-alt\" aria-hidden=\"true\"></i>",
+            "   <span class='key'><a href=\"{{ attribute(tags, 'inscription:url') }}\">{{ keyTrans('inscription') }}</a></span>",
+            "  </li>",
+            "{% endif %}",
+            "",
+            "{% if attribute(tags, 'historic:civilization') %}",
+            "  <li class='hasSymbol'>",
+            "   <i class=\"fa fa-users\" aria-hidden=\"true\"></i>",
+            "   <span class='key'>{{ keyTrans('historic:civilization') }}:</span>",
+            "   <span class='value'>{{ tagTrans('historic:civilization', attribute(tags, 'historic:civilization')) }}</span>",
+            "  </li>",
+            "{% endif %}",
+            "",
+            "{% if attribute(tags, 'memorial:conflict') %}",
+            "  <li class='hasSymbol'>",
+            "   <i class=\"fa fa-bolt\" aria-hidden=\"true\"></i>",
+            "   <span class='key'>{{ keyTrans('memorial:conflict') }}:</span>",
+            "   <span class='value'>{{ tagTransList('memorial:conflict', attribute(tags, 'memorial:conflict')) }}</span>",
+            "  </li>",
+            "{% endif %}",
+            "",
+            "{% if tags.artist_name %}",
+            "  <li class='hasSymbol'>",
+            "   <i class=\"fa fa-palette\" aria-hidden=\"true\"></i>",
+            "   <span class='key'>{{ keyTrans('artist_name') }}:</span>",
+            "   <span class='value'>{{ enumerate(tags.artist_name) }}</span>",
+            "  </li>",
+            "{% endif %}",
+            "</ul>"
+        ],
+        "markerSign": "{{ const[memgroup].sign|raw }}"
+    },
+    "info": [
+        "<table>",
+        "{% for value, data in const %}",
+        "{% if data.zoom <= map.zoom %}",
+        "  <tr>",
+        "    <td>{{ markerCircle({})|raw }}<div class='sign'>{{ data.sign|raw }}</div></td>",
+        "    <td>{{ tagTrans('memorial', value) }}</td>",
+        "  </tr>",
+        "{% endif %}",
+        "{% endfor %}",
+        "{% if 14 <= map.zoom %}",
+        "  <tr>",
+        "    <td>{{ markerCircle({})|raw }}<div class='sign'></div></td>",
+        "    <td>{{ trans('other') }}</td>",
+        "  </tr>",
+        "{% endif %}",
+        "</table>"
+    ],
+    "const": {
+        "plaque": {
+            "alias": [ "plate" ],
+            "sign": "<img data-src='img/plaque.svg'>",
+            "zoom": 14
+        },
+        "blue_plaque": {
+            "sign": "<img data-src='img/blue_plaque.svg'>",
+            "zoom": 14
+        },
+        "statue": {
+            "sign": "<i class=\"fas fa-female\"></i>",
+            "zoom": 14
+        },
+        "war_memorial": {
+            "alias": [ "war_monument" ],
+            "sign": "<img data-src='maki:horse-riding'>",
+            "zoom": 14
+        },
+        "stolperstein": {
+            "sign": "",
+            "zoom": 14
+        },
+        "stone": {
+            "sign": "",
+            "zoom": 14
+        },
+        "bust": {
+            "alias": [ "person", "public_person" ],
+            "sign": "<i class=\"fas fa-user-alt\"></i>",
+            "zoom": 14
+        },
+        "stele": {
+            "sign": "",
+            "zoom": 14
+        },
+        "obelisk": {
+            "sign": "",
+            "zoom": 14
+        },
+        "sculpture": {
+            "sign": "",
+            "zoom": 14
+        },
+        "ghost_bike": {
+            "sign": "<i style=\"color: white;\" class=\"fas fa-bicycle\"></i>",
+            "zoom": 14
+        },
+        "vehicle": {
+            "alias": [ "tank" ],
+            "sign": "<i class=\"fas fa-car\"></i>",
+            "zoom": 14
+        },
+        "cross": {
+            "sign": "<i class=\"fas fa-cross\"></i>",
+            "zoom": 14
+        }
+    },
+    "filter": {
+        "type": {
+            "name": "{{ trans('filter:type') }}",
+            "show_default": "true",
+            "type": "select",
+            "values": "{% for k, v in const %}<option value='{{ k }}' query='nwr[~\"^(memorial|memorial:type|memorial_type|monument)$\"~\"^({{ k }}{% for alias in v.alias %}|{{ alias }}{% endfor %})$\"]'>{{ tagTrans('memorial', k) }}</option>{% endfor %}"
+        },
+        "size": {
+            "name": "{{ keyTrans('memorial') }} | {{ keyTrans('monument') }}",
+            "type": "radio",
+            "values": "<option value='*' query=''>{{ trans('any value') }}</option>\n<option value='memorial' query='nwr[historic=memorial]'>{{ keyTrans('memorial') }}</option>\n<option value='monument' query='nwr[historic=monument]'>{{ keyTrans('monument') }}</option>",
+            "default": "*"
+        },
+        "conflict": {
+            "key": "memorial:conflict",
+            "op": "has",
+            "name": "{{ keyTrans('memorial:conflict') }}",
+            "type": "select",
+            "values": [
+                "WW1",
+                "WW2"
+            ],
+            "valueName": "{{ tagTrans('memorial:conflict', value) }}"
+        },
+        "civilization": {
+            "key": "historic:civilization",
+            "op": "has",
+            "name": "{{ keyTrans('historic:civilization') }}",
+            "type": "select",
+            "values": [
+                "ancient_egyptian",
+                "ancient_greek",
+                "ancient_roman",
+                "byzantine",
+                "celtic",
+                "etruscan",
+                "imperial_chinese",
+                "korean",
+                "medieval",
+                "modern",
+                "neolithic",
+                "nuragic",
+                "ottoman",
+                "prehistoric",
+                "roman",
+                "western_roman"
+            ],
+            "valueName": "{{ tagTrans('historic:civilization', value) }}"
+        }
+    }
+}

military.json

@@ -6,11 +6,13 @@
         "de": "Militär",
         "el": "Στρατιωτικό",
         "en": "Military",
-        "fr": "Militaire",
+        "fr": "Équipements et zones militaires",
-        "hu": "Katonai",
+        "hu": "Katonai objektumok",
         "it": "Militare",
         "ja": "軍事",
         "nl": "Militair",
+        "pt": "Militar",
+        "pt-br": "Militar",
         "ro": "Militar",
         "ru": "Вооружённые силы"
     },

mtb-routes.json

@@ -0,0 +1,53 @@
+{
+    "type": "overpass",
+    "name": {
+        "en": "Mountain bike routes",
+        "fr": "Itinéraires de VTT",
+        "hu": "Hegyikerékpáros útvonalak",
+        "pt-br": "Rotas de mountain bike"
+    },
+    "query": {
+        "13": "relation[type=route][route=mtb]"
+    },
+    "members": true,
+    "feature": {
+        "description": "{{ tagTrans('route', 'mtb') }}",
+        "listMarkerSymbol": "{{ markerLine({ 'width': 4, 'color': '#007fff' })|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 refs = [] %}",
+            "",
+            "{% for master in masters %}",
+            "  {% 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: '#007fff' })|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('route', 'mtb') }}</span>",
+            "  </li>",
+            "{% endfor %}",
+            "</ul>"
+        ],
+        "listExclude": "1",
+        "style": {
+            "color": "#007fff",
+            "width": 4,
+            "opacity": 1,
+            "text": "{{ refs|join(' · ') }}             ",
+            "textRepeat": "1",
+            "textOffset": "12",
+            "textFontWeight": "bold"
+        }
+    }
+}

natural.json

@@ -3,35 +3,38 @@
     "name": {
         "ast": "Formaciones naturales",
         "cs": "Přírodní úkazy",
-        "de": "Geographische Objekte",
+        "de": "Naturformationen",
         "el": "Φυσικοί Σχηματισμοί",
         "en": "Natural Formations",
-        "fr": "Formation Naturelle",
+        "fr": "Éléments naturels",
         "hu": "Természeti képződmények",
         "it": "Natura",
         "ja": "自然地層",
         "nl": "Natuurlijke Formaties",
+        "pt": "Formações naturais",
+        "pt-br": "Formações naturais",
         "ru": "Природные образования",
         "uk": "Природне середовище"
     },
     "query": {
         "9": [
             "(",
-            "node[natural~\"^(peak|volcano)$\"];",
+            "node[natural~\"^(peak|volcano|valley)$\"];",
             ")"
         ],
         "13": [
             "(",
-            "node[natural~\"^(peak|volcano|wood|scrub|heath|grassland|fell|bare_rock|scree|shingle|sand|mud|water|wetland|glacier|bay|cape|beach|coastline|spring|hot_spring|geyser|valley|ridge|arete|cliff|saddle|rock|stone|sinkhole|cave_entrance)$\"];",
+            "nwr[natural~\"^(peak|volcano|wood|glacier|cape|peninsula|beach|coastline|reef|hill|valley|ridge|arete|saddle|sinkhole|cave_entrance|isthmus)$\"];",
-            "way[natural~\"^(peak|volcano|wood|scrub|heath|grassland|fell|bare_rock|scree|shingle|sand|mud|water|wetland|glacier|bay|cape|beach|coastline|spring|hot_spring|geyser|valley|ridge|arete|cliff|saddle|rock|stone|sinkhole|cave_entrance)$\"];",
-            "relation[natural~\"^(peak|volcano|wood|scrub|heath|grassland|fell|bare_rock|scree|shingle|sand|mud|water|wetland|glacier|bay|cape|beach|coastline|spring|hot_spring|geyser|valley|ridge|arete|cliff|saddle|rock|stone|sinkhole|cave_entrance)$\"];",
             ")"
         ],
         "16": [
             "(",
-            "node[natural];",
+            "nwr[natural][natural!~\"^(water|divide|bay|strait|spring|hot_spring|geyser|tree)$\"];",
-            "way[natural];",
+            ")"
-            "relation[natural];",
+        ],
+        "18": [
+            "(",
+            "nwr[natural][natural!~\"^(water|divide|bay|strait|spring|hot_spring|geyser)$\"];",
             ")"
         ]
     },
@@ -40,6 +43,243 @@
             "{{ localizedTag(tags, 'name') | default(trans('unnamed')) }}",
             "{% if tags.natural == 'peak' and tags.ele %}({{ tags.ele }}m){% endif %}"
         ],
-        "description": "{{ tagTrans('natural', tags.natural) }}"
+        "description": "{{ tagTrans('natural', tags.natural) }}",
-    }
+        "style": {
+            "color": "{{ const[tags.natural].color|default('#f2756a') }}"
+        },
+        "markerSign": "<span style='color: white'>{{ const[tags.natural].sign|raw }}</span>",
+        "markerSymbol": "{{ markerPointer({ fillColor: const[tags.natural].color|default('#f2756a') })|raw }}",
+        "listMarkerSymbol": "{{ markerCircle({ fillColor: const[tags.natural].color|default('#f2756a') })|raw }}"
+    },
+    "filter": {
+        "type": {
+            "name": "{{ trans('filter:type') }}",
+            "key": "natural",
+            "type": "select",
+            "show_default": "true",
+            "values": "{% set list = [] %}{% for k, v in const %}<option value=\"{{ k }}\">{% set list = list|merge([ k ]) %}{{ tagTrans('natural', k) }}</option>{% endfor %}<option weight='1' value='other' query='nwr[natural][natural!~\"^(|.*;)({{ list|join('|') }})(|;.*)$\"]'>{{ trans('other') }}</option>",
+            "sort": "natsort",
+            "op": "has"
+        }
+    },
+    "const": {
+        "wood": {
+            "zoom": 13,
+            "sign": "<i class='fas fa-tree'></i>",
+            "color": "darkgreen",
+            "group": "vegetation"
+        },
+        "tree_row": {
+            "zoom": 16,
+            "sign": "<i class='fas fa-tree'></i>",
+            "color": "darkgreen",
+            "group": "vegetation"
+        },
+        "tree": {
+            "zoom": 18,
+            "sign": "<i class='fas fa-tree'></i>",
+            "color": "darkgreen",
+            "group": "vegetation"
+        },
+        "scrub": {
+            "zoom": 16,
+            "sign": "",
+            "color": "green",
+            "group": "vegetation"
+        },
+        "heath": {
+            "zoom": 16,
+            "sign": "",
+            "color": "green",
+            "group": "vegetation"
+        },
+        "moor": {
+            "zoom": 13,
+            "sign": "",
+            "color": "#8aba50",
+            "group": "vegetation"
+        },
+        "grassland": {
+            "zoom": 16,
+            "sign": "",
+            "color": "#00dd24",
+            "group": "vegetation"
+        },
+        "fell": {
+            "zoom": 16,
+            "sign": "",
+            "color": "#49ba91",
+            "group": "vegetation"
+        },
+        "bare_rock": {
+            "zoom": 16,
+            "sign": "",
+            "color": "#6f6f6f",
+            "group": "vegetation"
+        },
+        "scree": {
+            "zoom": 16,
+            "sign": "",
+            "color": "#6f6f6f",
+            "group": "vegetation"
+        },
+        "shingle": {
+            "zoom": 16,
+            "sign": "",
+            "color": "#6f6f6f",
+            "group": "vegetation"
+        },
+        "sand": {
+            "zoom": 16,
+            "sign": "",
+            "color": "#f9d199",
+            "group": "vegetation"
+        },
+        "mud": {
+            "zoom": 16,
+            "sign": "<img data-src='maki:wetland?fill=white'>",
+            "color": "#988b00",
+            "group": "vegetation"
+        },
+        "wetland": {
+            "zoom": 16,
+            "sign": "<img data-src='maki:wetland?fill=white'>",
+            "color": "#00baff",
+            "group": "water"
+        },
+        "glacier": {
+            "zoom": 13,
+            "sign": "<i style='color: black;' class='fas fa-icicles'></i>",
+            "color": "white",
+            "group": "water"
+        },
+        "cape": {
+            "zoom": 13,
+            "sign": "",
+            "color": "#1d7500",
+            "group": "water"
+        },
+        "peninsula": {
+            "zoom": 13,
+            "sign": "",
+            "color": "#1d7500",
+            "group": "water"
+        },
+        "beach": {
+            "zoom": 13,
+            "sign": "<i class='fas fa-umbrella-beach'></i>",
+            "color": "#ff7f50",
+            "group": "water"
+        },
+        "coastline": {
+            "zoom": 13,
+            "sign": "",
+            "color": "blue",
+            "group": "water"
+        },
+        "reef": {
+            "zoom": 13,
+            "sign": "",
+            "color": "#005fbd",
+            "group": "water"
+        },
+        "peak": {
+            "zoom": 9,
+            "sign": "<i class='fas fa-mountain'></i>",
+            "color": "#4f4f4f",
+            "group": "landform"
+        },
+        "hill": {
+            "zoom": 13,
+            "sign": "",
+            "color": "#4f4f4f",
+            "group": "landform"
+        },
+        "volcano": {
+            "zoom": 9,
+            "sign": "",
+            "color": "#cf3a00",
+            "group": "landform"
+        },
+        "valley": {
+            "zoom": 9,
+            "sign": "",
+            "color": "#1d7500",
+            "group": "landform"
+        },
+        "river_terrace": {
+            "zoom": 16,
+            "sign": "",
+            "color": "#a0a500",
+            "group": "landform"
+        },
+        "ridge": {
+            "zoom": 13,
+            "sign": "",
+            "color": "#4f4f4f",
+            "group": "landform"
+        },
+        "arete": {
+            "zoom": 13,
+            "sign": "",
+            "color": "#4f4f4f",
+            "group": "landform"
+        },
+        "cliff": {
+            "zoom": 16,
+            "sign": "",
+            "color": "#4f4f4f",
+            "group": "landform"
+        },
+        "saddle": {
+            "zoom": 13,
+            "sign": "",
+            "color": "#4f4f4f",
+            "group": "landform"
+        },
+        "rock": {
+            "zoom": 16,
+            "sign": "",
+            "color": "#4f4f4f",
+            "group": "landform"
+        },
+        "stone": {
+            "zoom": 16,
+            "sign": "",
+            "color": "#4f4f4f",
+            "group": "landform"
+        },
+        "sinkhole": {
+            "zoom": 13,
+            "sign": "",
+            "color": "#a0a500",
+            "group": "landform"
+        },
+        "cave_entrance": {
+            "zoom": 13,
+            "sign": "",
+            "color": "#000000",
+            "group": "landform"
+        },
+        "isthmus": {
+            "zoom": 13,
+            "sign": "",
+            "color": "#1d7500",
+            "group": "landform"
+        }
+    },
+    "info": [
+        "<table>",
+        "  {% for k, data in const %}",
+        "    {% if data.zoom <= map.zoom %}",
+        "    <tr>",
+        "      <td>",
+        "        {{ markerCircle({ fillColor: data.color })|raw }}<div class='sign'>{{ data.sign|raw }}</div>",
+        "      </td>",
+        "      <td>{{ tagTrans('natural', k) }}</td>",
+        "    </tr>",
+        "    {% endif %}",
+        "  {% endfor %}",
+        "</table>"
+    ]
 }

office.json

@@ -0,0 +1,55 @@
+{
+    "type": "overpass",
+    "name": {
+        "de": "Ämter, Dienst- und Geschäftsstellen",
+        "en": "Offices",
+        "fr": "Bureaux",
+        "hu": "Irodák, hivatalok",
+        "pt-br": "Escritórios e agências"
+    },
+    "query": {
+        "14": "nwr[office]"
+    },
+    "feature": {
+        "description": [
+            "{{ tagTrans('office', tags.office) }}",
+            "{% if tags.office == 'government' and tags.government %}({{ tagTrans('government', tags.government) }}){% endif %}"
+        ],
+        "markerSign": "{{ const[tags.office]|raw }}"
+    },
+    "const": {
+        "government": "<i class='fas fa-landmark'></i>",
+        "company": "<i class='fas fa-building'></i>",
+        "estate_agent": "<i class='fas fa-home'></i>",
+        "insurance": "<i class='fas fa-file-signature'></i>",
+        "lawyer": "<i class='fas fa-gavel'></i>",
+        "educational_institution": "<i class='fas fa-school'></i>",
+        "administrative": "<i class='fas fa-landmark'></i>",
+        "telecommunication": "<i class='fas fa-phone'></i>",
+        "ngo": "<i class='fas fa-people-carry'></i>",
+        "quango": "<i class='fas fa-people-carry'></i>",
+        "association": "<i class='fas fa-people-carry'></i>",
+        "it": "<i class='fas fa-desktop'></i>",
+        "accountant": "<i class='fas fa-money-bill-alt'></i>",
+        "tax_advisor": "<i class='fas fa-money-bill-alt'></i>",
+        "employment_agency": "<i class='fas fa-user'></i>",
+        "research": "<i class='fas fa-flask'></i>",
+        "religion": "<i class='fas fa-pray'></i>",
+        "architect": "<i class='fas fa-torii-gate'></i>",
+        "financial": "<i class='fas fa-money-bill'></i>",
+        "newspaper": "<i class='fas fa-newspaper'></i>",
+        "political_party": "<i class='fas fa-flag'></i>",
+        "advertising_agency": "<i class='fas fa-ad'></i>",
+        "therapist": "<i class='fas fa-couch'></i>",
+        "travel_agent": "<i class='fas fa-plane-departure'></i>",
+        "publisher": "<i class='fas fa-book'></i>"
+    },
+    "filter": {
+        "type": {
+            "name": "{{ trans('filter:type') }}",
+            "show_default": "true",
+            "type": "select",
+            "values": "{% for k, v in const %}<option value=\"{{ k }}\" query=\"nwr[{{ k }}]\" minzoom=\"{{ v.zoom }}\">{{ tagTrans('office', k) }}</option>{% endfor %}"
+        }
+    }
+}

oil_gas.json

@@ -0,0 +1,67 @@
+{
+    "type": "overpass",
+    "name": {
+        "de": "Erdöl und Erdgas",
+        "en": "Petroleum and natural gas",
+        "fr": "Pétrole et gaz naturel",
+        "hu": "Kőolaj, földgáz",
+        "pt-br": "Petróleo e gás"
+    },
+    "query": {
+        "11": [
+            "(",
+            "way[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(oil|gas|lng|cng|multiphase)(|;.*)$\"];",
+            "relation[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(oil|gas|lng|cng|multiphase)(|;.*)$\"];",
+            "node[landuse=industrial][industrial~\"^(|.*;)(refinery)(|;.*)$\"];",
+            "way[landuse=industrial][industrial~\"^(|.*;)(refinery)(|;.*)$\"];",
+            "relation[landuse=industrial][industrial~\"^(|.*;)(refinery)(|;.*)$\"];",
+            "way[waterway=offshore_field];",
+            "relation[waterway=offshore_field];",
+            "node[man_made~\"^(offshore_platform)$\"];",
+            "way[man_made~\"^(offshore_platform)$\"];",
+            "relation[man_made~\"^(offshore_platform)$\"];",
+            "node[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(oil|gas|diesel|gasoline)(|;.*)$\"];",
+            "way[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(oil|gas|diesel|gasoline)(|;.*)$\"];",
+            "relation[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(oil|gas|diesel|gasoline)(|;.*)$\"];",
+            ")"
+        ],
+        "13": [
+            "(",
+            "way[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(oil|gas|lng|cng|multiphase)(|;.*)$\"];",
+            "relation[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(oil|gas|lng|cng|multiphase)(|;.*)$\"];",
+            "node[landuse=industrial][industrial~\"^(|.*;)(oil|gas|lng|cng|multiphase|refinery|oil_refinery)(|;.*)$\"];",
+            "way[landuse=industrial][industrial~\"^(|.*;)(oil|gas|lng|cng|multiphase|refinery|oil_refinery)(|;.*)$\"];",
+            "relation[landuse=industrial][industrial~\"^(|.*;)(oil|gas|lng|cng|multiphase|refinery|oil_refinery)(|;.*)$\"];",
+            "way[waterway=offshore_field];",
+            "relation[waterway=offshore_field];",
+            "node[man_made~\"^(petroleum_well|offshore_platform|gasometer|oil_tank|gas_cavern)$\"];",
+            "node[man_made~\"^(storage_tank)$\"][contents~\"^(oil|gas|lng|cng|multiphase)$\"];",
+            "way[man_made~\"^(petroleum_well|offshore_platform|gasometer|oil_tank|gas_cavern)$\"];",
+            "way[man_made~\"^(storage_tank)$\"][contents~\"^(oil|gas|lng|cng|multiphase)(|;.*)$\"];",
+            "relation[man_made~\"^(petroleum_well|offshore_platform|gasometer|oil_tank|gas_cavern)(|;.*)$\"];",
+            "relation[man_made~\"^(storage_tank)$\"][contents~\"^(|.*;)(oil|gas|lng|cng|multiphase)(|;.*)$\"];",
+            "node[power~\"^(plant|generator)$\"][\"generator:source\"~\"^(|.*;)(oil|gas|diesel|gasoline)(|;.*)$\"];",
+            "way[power~\"^(plant|generator)$\"][\"generator:source\"~\"^(|.*;)(oil|gas|diesel|gasoline)(|;.*)$\"];",
+            "relation[power~\"^(plant|generator)$\"][\"generator:source\"~\"^(|.*;)(oil|gas|diesel|gasoline)(|;.*)$\"];",
+            ")"
+        ]
+    },
+    "feature": {
+        "description": [
+            "{% if tags.man_made == 'pipeline' %}",
+            "{{ tagTrans('man_made', 'pipeline') }} ({{ tagTrans('substance', tags.substance) }})",
+            "{% elseif tags.man_made %}",
+            "{{ tagTrans('man_made', tags.man_made) }}",
+            "{% elseif tags.power == 'plant' %}",
+            "{{ tagTrans('power', 'plant') }} {% if attribute(tags, 'generator:source') %}({{ tagTransList('generator:source', attribute(tags, 'generator:source')) }}){% endif %}",
+            "{% elseif tags.power == 'generator' %}",
+            "{{ tagTrans('power', 'generator') }} {% if attribute(tags, 'generator:source') %}({{ tagTransList('generator:source', attribute(tags, 'generator:source')) }}){% endif %}",
+            "{% elseif tags.waterway == 'offshore_field' %}",
+            "{{ tagTrans('waterway', tags.waterway) }}",
+            "{% elseif tags.landuse == 'industrial' %}",
+            "{{ tagTrans('landuse', tags.landuse) }} ({{ tagTrans('industrial', tags.industrial) }})",
+            "{% endif %}"
+        ],
+        "markerSymbol": null
+    }
+}

organisations.json

@@ -0,0 +1,90 @@
+{
+    "type": "overpass",
+    "name": {
+        "en": "Organisations",
+        "fr": "Organisations",
+        "pt-br": "Organizações"
+    },
+    "query": {
+        "13": [
+            "(",
+            "nwr[office~\"^(ngo|quango|political_party|association|charity)$\"];",
+            ")"
+        ]
+    },
+    "feature": {
+        "pre": [
+            "{% set key = 'office' %}",
+            "{% set value = tags.office %}",
+            ""
+        ],
+        "description": "{{ tagTrans(key, value) }}",
+        "body": "{% if tags.operator %}{{ keyTrans('operator') }}: {{ tags.operator }}<br/>{% endif %}",
+        "markerSign": [
+            "{% set data = const[key ~ '=' ~ value] %}",
+            "{% if data %}",
+            "{{ data.sign|raw }}",
+            "{% endif %}"
+        ],
+        "priority": [
+            "{% set data = const[key ~ '=' ~ value] %}",
+            "{% if data %}",
+            "{{ data.priority }}",
+            "{% endif %}"
+        ]
+    },
+    "info": [
+        "<table>",
+        "{% for kv, data in const %}",
+        "{% if data.zoom <= map.zoom %}",
+        "  <tr>",
+        "    <td>{{ markerCircle({})|raw }}<div class='sign'>{{ data.sign|raw }}</div></td>",
+        "    <td>",
+        "      {{ tagTrans(kv|split('=')[0], kv|split('=')[1]) }}",
+        "    </td>",
+        "  </tr>",
+        "{% endif %}",
+        "{% endfor %}",
+        "</table>"
+    ],
+    "const": {
+        "office=ngo": {
+            "priority": 0,
+            "sign": "<i class='fas fa-users'></i>",
+            "zoom": 13
+        },
+        "office=quango": {
+            "priority": 0,
+            "sign": "<i class='fas fa-users'></i>",
+            "zoom": 13
+        },
+        "office=political_party": {
+            "priority": 0,
+            "sign": "<i class='fas fa-flag'></i>",
+            "zoom": 13
+        },
+        "office=association": {
+            "priority": 0,
+            "sign": "<i class='fas fa-people-carry'></i>",
+            "zoom": 13
+        },
+        "office=foundation": {
+            "priority": 0,
+            "sign": "<i class='fas fa-people-carry'></i>",
+            "zoom": 13
+        },
+        "office=charity": {
+            "priority": 0,
+            "sign": "<i class='fas fa-hands-helping'></i>",
+            "zoom": 13
+        }
+    },
+    "filter": {
+        "type": {
+            "name": "{{ trans('filter:type') }}",
+            "show_default": "true",
+            "type": "select",
+            "values": "{% for k, v in const %}<option value=\"{{ k }}\" query=\"nwr[{{ k }}]\" minzoom=\"{{ v.zoom }}\">{{ tagTrans(k) }}</option>{% endfor %}"
+        }
+    }
+}

other.json

@@ -5,11 +5,13 @@
         "de": "Andere",
         "en": "Other",
         "et": "Ülejäänud",
-        "fr": "Autre",
+        "fr": "Autres",
         "hu": "Egyéb",
         "it": "Altri",
         "ja": "その他",
         "nl": "Andere",
+        "pt": "Outros",
+        "pt-br": "Outros",
         "ro": "Altele",
         "ru": "Прочее",
         "uk": "Інше"

outdoor.json

@@ -0,0 +1,15 @@
+{
+    "type": "index",
+    "name": {
+        "de": "Freiluftaktivitäten",
+        "en": "Outdoor activities",
+        "fr": "Activités de plein air",
+        "hu": "Szabadtéri tevékenységek",
+        "pt-br": "Atividades ao ar livre"
+    },
+    "subCategories": [
+        {
+            "id": "mtb-routes"
+        }
+    ]
+}

phone.json

@@ -5,9 +5,12 @@
         "de": "Telekommunikation",
         "en": "Phone",
         "et": "Telefon",
+        "fr": "Téléphone",
         "hu": "Telefon",
         "ja": "電話",
         "nl": "Telefonie",
+        "pt": "Telefone",
+        "pt-br": "Telefone",
         "ro": "Telefon"
     }
 }

places.json

@@ -13,6 +13,8 @@
         "ja": "場所",
         "nl": "Plaatsen",
         "pl": "Miejsca",
+        "pt": "Lugares",
+        "pt-br": "Lugares",
         "ro": "Locuri",
         "ru": "Места",
         "uk": "Місцевість"
@@ -32,5 +34,14 @@
         "description": "{{ tagTrans('place', tags.place) }}",
         "body": "{% if tags.population %}{{ keyTrans('population') }}: {{ tags.population }}{% endif %}",
         "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] }}"
+    },
+    "filter": {
+        "name": {
+            "key": [ "name", "name:*" ],
+            "name": "{{ keyTrans('name') }}",
+            "type": "text",
+            "change_on": "keyup",
+            "op": "strsearch"
+        }
     }
 }

places_geo.json

@@ -13,6 +13,8 @@
         "ja": "場所",
         "nl": "Plaatsen",
         "pl": "Miejsca",
+        "pt": "Lugares",
+        "pt-br": "Lugares",
         "ro": "Locuri",
         "ru": "Места",
         "uk": "Місцевість"

playgrounds.json

@@ -6,6 +6,9 @@
         "en": "Playground",
         "et": "Mänguväljak",
         "fr": "Jeux pour enfants",
+        "hu": "Játszóterek",
+        "pt": "Parques infantis",
+        "pt-br": "Parquinhos",
         "ro": "Loc de joaca",
         "uk": "Дитячий майданчик"
     }

popupBody.html

@@ -1,4 +1,12 @@
 <ul>
+{% set hasDescription = tagsPrefix(tags, 'description:') %}
+{% if tags.description or hasDescription %}
+<li class='hasSymbol'>
+  <i class="fa fa-info" aria-hidden="true"></i>
+  <span class='value'>{{ localizedTag(tags, 'description')|default(attribute(tags, 'description:' ~ hasDescription|keys[0])) }}</span>
+</li>
+{% endif %}
+
 {% set address = tagsPrefix(tags, 'addr:') %}
 {% if address %}
 <li class='hasSymbol'>
@@ -91,8 +99,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>
@@ -115,4 +126,41 @@
 </li>
 {% endif %}
 
+{% set wikipedia = null %}
+{% if attribute(tags, 'wikipedia') %}
+  {% set wikipedia = tags.wikipedia|matches("^([^:]+):(.*)$") %}
+{% endif %}
+
+{% if not wikipedia %}
+  {% for k, v in tags %}
+    {% set m = k|matches("^wikipedia:(.*)$") %}
+    {% if m %}
+      {% set wikipedia = [ 0, m[1], v ] %}
+    {% endif %}
+  {% endfor %}
+{% endif %}
+
+{% if wikipedia %}
+<li class='hasSymbol'>
+  <i class="fa fa-wikipedia-w" aria-hidden="true"></i>
+  <span class='key'>{{ keyTrans('wikipedia') }}:</span>
+  <span class='value'><a href="https://{{ wikipedia[1] }}.wikipedia.org/wiki/{{ wikipedia[2]|replace({ ' ': '_' }) }}">{{ wikipedia[2] }}</a></span>
+{% endif %}
+
+{% if tags.start_date %}
+  <li class='hasSymbol'>
+   <i class="fa fa-clock-o" aria-hidden="true"></i>
+   <span class='key'>{{ keyTrans('start_date') }}:</span>
+   <span class='value'>{{ tags.start_date|osmFormatDate }}</span>
+  </li>
+{% endif %}
+
+{% if tags.opening_date %}
+  <li class='hasSymbol'>
+   <i class="fa fa-clock-o" aria-hidden="true"></i>
+   <span class='key'>{{ keyTrans('opening_date') }}:</span>
+   <span class='value'>{{ tags.opening_date|osmFormatDate }}</span>
+  </li>
+{% endif %}
+
 </ul>

post.json

@@ -6,6 +6,8 @@
         "en": "Post",
         "hu": "Posta",
         "ja": "郵便",
-        "nl": "Post"
+        "nl": "Post",
+        "pt": "Correios",
+        "pt-br": "Correios"
     }
 }

power_routes.json

@@ -0,0 +1,66 @@
+{
+    "type": "overpass",
+    "name": {
+        "en": "Power routes",
+        "fr": "Réseaux électriques",
+        "hu": "Távvezetékek",
+        "pt-br": "Rotas energéticas"
+    },
+    "query": {
+        "10": "relation[type=route][route=power]"
+    },
+    "members": true,
+    "feature": {
+        "pre": "{% set color = '#' ~ tags.operator|default('')|md5|slice(0, 6) %}",
+        "description": "{% if tags.operator %}{{ tags.operator }}{% 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.operator %}",
+            "    {% set color = '#' ~ master.tags.operator|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'>{{ master.tags.operator }}</span>",
+            "  </li>",
+            "{% endfor %}",
+            "</ul>"
+        ],
+        "listExclude": "1",
+        "style": {
+            "color": "{{ color }}",
+            "width": 4,
+            "opacity": 1,
+            "text": "{{ refs|join(' · ') }}             ",
+            "textRepeat": "1",
+            "textOffset": "12",
+            "textFontWeight": "bold"
+        }
+    }
+}

pt.json

@@ -0,0 +1,283 @@
+{
+    "type": "overpass",
+    "name": {
+        "de": "ÖV Karte",
+        "en": "Public transport map",
+        "fr": "Carte des transports publics",
+        "hu": "Tömegközlekedési térkép",
+        "pt-br": "Mapa de transporte público"
+    },
+    "query": {
+        "12": "relation[type=route][route~\"^(subway|monorail|ferry|train)$\"];",
+        "14": [
+            "(",
+            "relation[type=route][route~\"^(subway|monorail|aerialway|bus|trolleybus|ferry|train|tram)$\"];",
+            "relation[type=public_transport][public_transport=stop_area];",
+            ")"
+        ]
+    },
+    "lists": {
+        "stops": {
+            "prefix": "listStops",
+            "name": {
+                "ast": "Paraes y estaciones",
+                "cs": "Zastávky & Stanice",
+                "de": "Haltestellen",
+                "el": "Στάσεις & Σταθμοί",
+                "en": "Stops & Stations",
+                "es": "Paradas y estaciones",
+                "fr": "Arrêts/Stops, Stations",
+                "hu": "Megállók és állomások",
+                "it": "Stazioni e fermate",
+                "ja": "停留所と駅",
+                "nl": "Haltes en Stations",
+                "pl": "Przystanki i Stacje",
+                "pt-br": "Paradas e estações",
+                "ru": "Остановки и станции",
+                "uk": "Зупинки та станції"
+            }
+        },
+        "routes": {
+            "prefix": "listRoutes",
+            "name": {
+                "de": "Routen",
+                "en": "Routes",
+                "fr": "Lignes",
+                "hu": "Útvonalak",
+                "pt": "Rotas",
+                "pt-br": "Rotas"
+            }
+        }
+    },
+    "feature": {
+        "pre": "{% set isStopArea = tags.public_transport == 'stop_area' %}",
+        "title": [
+            "{% if tags.ref %}{{ tags.ref }} - {% endif %}",
+            "",
+            "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) | default(localizedTag(tags, 'ref')) | default(trans('unnamed')) }}"
+        ],
+        "description": "{{ tagTrans('route', tags.route) }}",
+        "body": [
+            "<h4>{{ repoTrans('category:pt:stops') }}</h4><ul>",
+            "{% for member in members %}",
+            "{% if member.tags.highway == 'bus_stop' or member.tags.amenity == 'bus_station' or member.tags.amenity == 'ferry_terminal' or member.tags.railway == 'tram_stop' or member.tags.railway == 'halt' or member.tags.railway == 'station' or member.tags.aerialway == 'station' or member.tags.public_transport == 'stop_position' or member.role|slice(-4) == 'stop' %}",
+            "<li data-object='{{ member.id }}' data-sublayer='member'><b>{% if member.tags %}{{ member.tags.name|default(trans('unknown')) }}{% else %}<i>{{ trans('loading') }}</i>{% endif %}</li>",
+            "{% endif %}",
+            "{% endfor %}",
+            "</ul>"
+        ],
+        "markerSymbol": "",
+        "styles": "",
+        "style:hover": {
+            "width": "0"
+        },
+        "style:selected": {
+            "width": "0"
+        },
+        "listStopsExclude": "true",
+        "listRoutesMarkerSign": "{{ const[tags.route].sign|raw }}",
+        "listRoutesMarkerSymbol": "{{ markerCircle({fillColor:const[tags.route].color})|raw }}",
+        "listRoutesExclude": "{{ isStopArea }}"
+    },
+    "members": true,
+    "memberFeature": {
+        "pre": [
+            "{% set stopName = '' %}",
+            "{% set isStop = false %}",
+            "{% set stopCount = 0 %}",
+            "{% if tags.highway == 'bus_stop' or tags.amenity == 'bus_station' or tags.amenity == 'ferry_terminal' or tags.railway == 'tram_stop' or tags.railway == 'halt' or tags.railway == 'station' or tags.aerialway == 'station' or tags.public_transport == 'stop_position' %}{% set isStop = true %}{% endif %}",
+            "{% set isWay = false %}",
+            "{% set aRoute = null %}",
+            "{% set refs = [] %}",
+            "{% set dirForward = false %}",
+            "{% set dirBackward = false %}",
+            "{% set hover = false %}",
+            "{% set selected = false %}",
+            "{% for master in masters %}",
+            "  {% if master.tags.public_transport == 'stop_area' %}",
+            "    {% set stopName = master.tags.name %}",
+            "  {% else %}",
+            "    {% if master.role|matches('^(|.*stop)$') and isStop %}",
+            "      {% set isStop = true %}",
+            "      {% set stopCount = stopCount + 1 %}",
+            "    {% elseif master.role|matches('^(|forward|backward)$') and type == 'way' %}",
+            "      {% set isWay = true %}",
+            "    {% endif %}",
+            "    {% set aRoute = master %}",
+            "",
+            "    {% if master.tags.ref %}",
+            "      {% set refs = refs|merge([ master.tags.ref ]) %}",
+            "    {% endif %}",
+            "    {% if master.dir == 'forward' %}{% set dirForward = true %}",
+            "    {% elseif master.dir == 'backward' %}{% set dirBackward = true %}",
+            "    {% else %}{% set dirForward = true %}{% set dirBackward = true %}",
+            "    {% endif %}",
+            "  {% endif %}",
+            "",
+            "  {% if master.flags.hover %}{% set hover = master.dir|default('both') %}{% endif %}",
+            "  {% if master.flags.selected %}{% set selected = master.dir|default('both') %}{% endif %}",
+            "{% endfor %}",
+            "",
+            "{% set refs = refs|unique|natsort({ insensitive: true }) %}",
+            "{% set color = const[aRoute.tags.route].color %}"
+        ],
+        "title": "{% if isStop %}{{ tags.name|default(stopName)|default(id) }}{% endif %}",
+        "body": [
+            "<h4>{{ repoTrans('category:pt:routes') }}</h4>",
+            "<ul class='overpass-layer-list'>",
+            "{% for master in masters %}",
+            "  {% if master.tags.public_transport != 'stop_area' %}",
+            "  <li data-object=\"{{ master.id }}\">",
+            "    <span class='markerParent'><div class='marker'>{{ markerCircle({fillColor:const[master.tags.route].color})|raw }}</div><div class='icon'>{{ const[master.tags.route].sign|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('route', master.tags.route) }}</span>",
+            "  </li>",
+            "  {% endif %}",
+            "{% endfor %}",
+            "</ul>"
+        ],
+        "markerSign": " ",
+        "markerSymbol": "{% if isStop and stopCount > 0 %}{% if hover or selected %}{{ markerPointer({ })|raw }}{% endif %}{% endif %}",
+        "styles": "{% if isStop and stopCount > 0 %}stop{% elseif isWay %}casing,way{% if hover %},hover{% endif %}{% if selected %},selected{% endif %}{% endif %}",
+        "style:hover": {
+            "pane": "hover",
+            "width": "4",
+            "color": "black",
+            "lineCap": "{% if hover == 'forward' or hover == 'backward' %}butt{% else %}round{% endif %}",
+            "dashArray": "{% if hover == 'forward' or hover == 'backward' %}27,8{% endif %}",
+            "dashOffset": "{% if hover == 'backward' %}28{% else %}0{% endif %}",
+            "noClip": "{% if hover == 'forward' or hover == 'backward' %}true{% else %}false{% endif %}",
+            "pattern": "{% if hover == 'forward' or hover == 'backward' %}arrowHead{% endif %}",
+            "pattern-offset": "{% if hover == 'backward' %}4{% else %}30.5{% endif %}",
+            "pattern-repeat": "35",
+            "pattern-polygon": "true",
+            "pattern-pixelSize": "9",
+            "pattern-angleCorrection": "{% if hover == 'backward' %}180{% else %}0{% endif %}",
+            "pattern-path-width": "0",
+            "pattern-path-color": "black",
+            "pattern-path-fillOpacity": "1"
+        },
+        "style:selected": {
+            "pane": "selected",
+            "width": "4",
+            "color": "#3f3f3f",
+            "lineCap": "{% if selected == 'forward' or selected == 'backward' %}butt{% else %}round{% endif %}",
+            "dashArray": "{% if selected == 'forward' or selected == 'backward' %}27,8{% endif %}",
+            "dashOffset": "{% if selected == 'backward' %}28{% else %}0{% endif %}",
+            "noClip": "{% if selected == 'forward' or selected == 'backward' %}true{% else %}false{% endif %}",
+            "pattern": "{% if selected == 'forward' or selected == 'backward' %}arrowHead{% endif %}",
+            "pattern-offset": "{% if selected == 'backward' %}4{% else %}30.5{% endif %}",
+            "pattern-repeat": "35",
+            "pattern-polygon": "true",
+            "pattern-pixelSize": "9",
+            "pattern-angleCorrection": "{% if selected == 'backward' %}180{% else %}0{% endif %}",
+            "pattern-path-width": "0",
+            "pattern-path-color": "#3f3f3f",
+            "pattern-path-fillOpacity": "1"
+        },
+        "listStopsMarkerSign": null,
+        "listStopsMarkerSymbol": "{{ markerCircle({ width: 5, color: color, fillOpacity: '1', radius: 3 })|raw }}",
+        "listStopsExclude": "{{ not isStop or stopCount == 0 }}",
+        "listStopsTitle": "{% if tags %}{{ tags.name|default(stopName)|default(trans('unknown')) }}{% else %}<li>{{ trans('loading') }}</li>{% endif %}",
+        "listStopsDescription": "{{ refs|join(' · ') }}",
+        "listRoutesExclude": "true",
+        "style:stop": {
+            "width": "4",
+            "color": "{{ color|default('#ff0000') }}",
+            "radius": "3",
+            "zIndex": "1"
+        },
+        "style:way": {
+            "width": "4",
+            "color": "{{ color|default('#ff0000') }}",
+            "opacity": "1",
+            "lineCap": "{% if not dirForward or not dirBackward %}butt{% else %}round{% endif %}",
+            "dashArray": "{% if not dirForward or not dirBackward %}27,8{% endif %}",
+            "dashOffset": "{% if dirBackward %}28{% else %}0{% endif %}",
+            "noClip": "{% if not dirForward or not dirBackward %}true{% else %}false{% endif %}",
+            "text": "{{ refs|join(' · ') }}             ",
+            "textRepeat": "1",
+            "textOffset": "12",
+            "pattern": "{% if dirForward and dirBackward %}{% else %}arrowHead{% endif %}",
+            "pattern-offset": "{% if dirBackward %}4{% else %}30.5{% endif %}",
+            "pattern-repeat": "35",
+            "pattern-polygon": "true",
+            "pattern-pixelSize": "9",
+            "pattern-angleCorrection": "{% if dirBackward %}180{% else %}0{% endif %}",
+            "pattern-path-width": "0",
+            "pattern-path-color": "{{ color|default('#ff0000') }}",
+            "pattern-path-fillOpacity": "1",
+            "textFontWeight": "bold"
+        }
+    },
+    "info": [
+        "<table>",
+        "{% for value, data in const %}",
+        "{% if data.zoom <= map.zoom %}",
+        "  <tr>",
+        "    <td>{{ markerCircle({fillColor:data.color})|raw }}<div class='sign'>{{ data.sign|raw }}</div></td>",
+        "    <td>{{ tagTrans('route', value) }}</td>",
+        "  </tr>",
+        "{% endif %}",
+        "{% endfor %}",
+        "</table>"
+    ],
+    "const": {
+        "train": {
+            "sign": "<img data-src='maki:rail?fill=#ffffff'>",
+            "zoom": 12,
+            "color": "#00007f"
+        },
+        "subway": {
+            "sign": "<img data-src='maki:rail-metro?fill=#ffffff'>",
+            "zoom": 12,
+            "color": "#0000ff"
+        },
+        "monorail": {
+            "sign": "<span style='color: #ffffff'>M</span>",
+            "zoom": 12,
+            "color": "#006f8f"
+        },
+        "tram": {
+            "sign": "<img data-src='maki:rail-light?fill=#ffffff'>",
+            "zoom": 12,
+            "color": "#7f007f"
+        },
+        "bus": {
+            "sign": "<img data-src='maki:bus?fill=#ffffff'>",
+            "zoom": 12,
+            "color": "#af0000"
+        },
+        "trolleybus": {
+            "sign": "<img data-src='maki:bus?fill=#ffffff'>",
+            "zoom": 12,
+            "color": "#af3f00"
+        },
+        "aerialway": {
+            "sign": "<img data-src='maki:aerialway?fill=#ffffff'>",
+            "zoom": 12,
+            "color": "#00aaaa"
+        },
+        "ferry": {
+            "sign": "<img data-src='maki:ferry?fill=#ffffff'>",
+            "zoom": 12,
+            "color": "#007fff"
+        }
+    },
+    "filter": {
+        "route": {
+            "type": "select",
+            "show_default": "true",
+            "valueName": "{{ tagTrans('route', value) }}",
+            "values": [
+                "aerialway",
+                "bus",
+                "ferry",
+                "subway",
+                "train",
+                "tram",
+                "trolleybus"
+            ]
+        }
+    }
+}

pt_amenities.json

@@ -6,9 +6,11 @@
         "de": "Einrichtungen",
         "en": "Amenities",
         "fr": "Équipements",
+        "hu": "Létesítmények",
         "it": "Infrastrutture",
         "ja": "生活環境",
         "nl": "Voorzieningen",
+        "pt-br": "Equipamentos",
         "ru": "Транспортные принадлежности",
         "uk": "Amenities"
     },

pt_routes.json

@@ -1,80 +0,0 @@
-{
-    "type": "overpass",
-    "name": {
-        "de": "Routen",
-        "en": "Routes",
-        "fr": "Lignes"
-    },
-    "query": {
-        "12": "relation[type=route][route~\"^(subway|monorail|ferry|train)$\"];",
-        "14": "relation[type=route][route~\"^(subway|monorail|aerialway|bus|trolleybus|ferry|train|tram)$\"];"
-    },
-    "feature": {
-        "title": [
-            "{% if tags.ref %}{{ tags.ref }} - {% endif %}",
-            "",
-            "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) | default(localizedTag(tags, 'ref')) | default(trans('unnamed')) }}"
-        ],
-        "description": "{{ tagTrans('route', tags.route) }}",
-        "listMarkerSign": "{{ const[tags.route].sign|raw }}",
-        "markerSymbol": null,
-        "listMarkerSymbol": "{{ markerCircle({fillColor:const[tags.route].color})|raw }}",
-        "style": {
-            "color": "{{ const[tags.route].color }}"
-        }
-    },
-    "info": [
-        "<table>",
-        "{% for value, data in const %}",
-        "{% if data.zoom <= map.zoom %}",
-        "  <tr>",
-        "    <td>{{ markerCircle({fillColor:data.color})|raw }}<div class='sign'>{{ data.sign|raw }}</div></td>",
-        "    <td>{{ tagTrans('route', value) }}</td>",
-        "  </tr>",
-        "{% endif %}",
-        "{% endfor %}",
-        "</table>"
-    ],
-    "const": {
-        "train": {
-            "sign": "<img src='maki:rail?fill=#ffffff'>",
-            "zoom": 12,
-            "color": "#202020"
-        },
-        "subway": {
-            "sign": "<img src='maki:rail-metro?fill=#ffffff'>",
-            "zoom": 12,
-            "color": "#00007f"
-        },
-        "monorail": {
-            "sign": "<span style='color: #ffffff'>M</span>",
-            "zoom": 12,
-            "color": "#006f8f"
-        },
-        "tram": {
-            "sign": "<img src='maki:rail-light?fill=#ffffff'>",
-            "zoom": 12,
-            "color": "#7f007f"
-        },
-        "bus": {
-            "sign": "<img src='maki:bus?fill=#ffffff'>",
-            "zoom": 12,
-            "color": "#af0000"
-        },
-        "trolleybus": {
-            "sign": "<img src='maki:bus?fill=#ffffff'>",
-            "zoom": 12,
-            "color": "#af3f00"
-        },
-        "aerialway": {
-            "sign": "<img src='maki:aerialway?fill=#ffffff'>",
-            "zoom": 12,
-            "color": "#00aaaa"
-        },
-        "ferry": {
-            "sign": "<img src='maki:ferry?fill=#ffffff'>",
-            "zoom": 12,
-            "color": "#007fff"
-        }
-    }
-}

pt_stops.json

@@ -1,47 +0,0 @@
-{
-    "type": "overpass",
-    "name": {
-        "ast": "Paraes y estaciones",
-        "cs": "Zastávky & Stanice",
-        "de": "Haltestellen",
-        "el": "Στάσεις & Σταθμοί",
-        "en": "Stops & Stations",
-        "es": "Paradas y estaciones",
-        "fr": "Arrêts/Stops, Stations",
-        "hu": "Megállók és állomások",
-        "it": "Stazioni e fermate",
-        "ja": "停留所と駅",
-        "nl": "Haltes en Stations",
-        "pl": "Przystanki i Stacje",
-        "ru": "Остановки и станции",
-        "uk": "Зупинки та станції"
-    },
-    "query": {
-        "14": [
-            "(",
-            "node[railway~\"^(station|halt|tram_stop|platform)$\"];",
-            "way[railway~\"^(station|platform)$\"];",
-            "node[highway~\"^(bus_stop|platform)$\"];",
-            "way[highway~\"^(platform)$\"];",
-            "node[public_transport~\"^(stop_position|platform)$\"];",
-            "way[public_transport~\"^(platform)$\"];",
-            "node[amenity~\"^(ferry_terminal|bus_station)$\"];",
-            ")"
-        ]
-    },
-    "feature": {
-        "pre": [
-            "{% if tags.amenity in [ 'ferry_terminal', 'bus_station' ] %}",
-            "  {% set key = 'amenity' %}",
-            "  {% set value = tags.amenity %}",
-            "{% elseif tags.railway == 'platform' or tags.highway == 'platform' or tags.public_transport == 'platform' %}",
-            "  {% set key = 'public_transport' %}",
-            "  {% set value = 'platform' %}",
-            "{% else %}",
-            "  {% set key = 'public_transport' %}",
-            "  {% set value = 'stop_position' %}",
-            "{% endif %}"
-        ],
-        "description": "{{ tagTrans(key, value) }}"
-    }
-}

public.json

@@ -7,10 +7,13 @@
         "el": "Δημόσιες Υπηρεσίες",
         "en": "Public Services",
         "et": "Kommunaalteenused",
-        "fr": "Services Publics",
+        "fr": "Services et équipements publics",
+        "hu": "Közszolgáltatások",
         "it": "Servizi pubblici",
         "ja": "公共サービス",
         "nl": "Openbare diensten",
+        "pt": "Serviços públicos",
+        "pt-br": "Utilidade pública",
         "ro": "Servicii publice",
         "ru": "Общественные места",
         "uk": "Громадські місця"
@@ -18,37 +21,51 @@
     "query": {
         "12": [
             "(",
-            "node[amenity~'^(courthouse|embassy|public_building|townhall)$'];",
+            "node[amenity~'^(embassy|public_building|townhall)$'];",
-            "way[amenity~'^(courthouse|embassy|public_building|townhall)$'];",
+            "way[amenity~'^(embassy|public_building|townhall)$'];",
-            "relation[amenity~'^(courthouse|embassy|public_building|townhall)$'];",
+            "relation[amenity~'^(embassy|public_building|townhall)$'];",
             "node[amenity=recycling][recyling_type=centre];",
             "way[amenity=recycling][recyling_type=centre];",
             "relation[amenity=recycling][recyling_type=centre];",
+            "nwr[office~\"^(government|administration)$\"];",
             ");"
         ],
         "16": [
             "(",
-            "node[amenity~'^(courthouse|embassy|public_building|townhall|clock|drinking_water|recycling|toilets)$'];",
+            "node[amenity~'^(embassy|public_building|townhall|clock|drinking_water|recycling|toilets)$'];",
-            "way[amenity~'^(courthouse|embassy|public_building|townhall|recycling|toilets)$'];",
+            "way[amenity~'^(embassy|public_building|townhall|recycling|toilets)$'];",
-            "relation[amenity~'^(courthouse|embassy|public_building|townhall|recycling|toilets)$'];",
+            "relation[amenity~'^(embassy|public_building|townhall|recycling|toilets)$'];",
             "node[drinking_water];",
+            "nwr[office~\"^(government|administration)$\"];",
             ");"
         ]
     },
     "feature": {
         "pre": [
             "{% if tags.drinking_water %}",
+            "{% set key = 'amenity' %}",
             "{% set value = 'drinking_water' %}",
-            "{% else %}",
+            "{% elseif tags.amenity %}",
+            "{% set key = 'amenity' %}",
             "{% set value = tags.amenity %}",
+            "{% elseif tags.office %}",
+            "{% set key = 'office' %}",
+            "{% set value = tags.office %}",
             "{% endif %}"
         ],
         "title": "{{ tags.name|default(tags.operator)|default(tagTrans('amenity', value)) }}",
-        "description": "{{ tagTrans('amenity', value) }}",
+        "description": [
+            "{% if key == 'office' %}",
+            "  {{ keyTrans('office') }} ({{ tagTrans('office', tags.office) }})",
+            "{% else %}",
+            "  {{ tagTrans(key, value) }}",
+            "{% endif %}"
+        ],
         "body": "{% if tags.operator %}{{ keyTrans('operator') }}: {{ tags.operator }}<br/>{% endif %}",
         "markerSign": [
-            "{% if const[value] %}",
+            "{% set kv = key ~ '=' ~ value %}",
-            "{{ const[value]|raw }}",
+            "{% if const[kv] %}",
+            "{{ const[kv]|raw }}",
             "{% endif %}"
         ]
     },
@@ -63,13 +80,22 @@
         "</table>"
     ],
     "const": {
-        "courthouse": "⚖",
+        "amenity=clock": "<i class='fa fa-clock-o' aria-hidden='true'></i>",
-        "clock": "<i class='fa fa-clock-o' aria-hidden='true'></i>",
+        "amenity=drinking_water": "<img data-src='maki:drinking-water'>",
-        "drinking_water": "<img src='maki:drinking-water'>",
+        "amenity=embassy": "<img data-src='maki:embassy'>",
-        "embassy": "<img src='maki:embassy'>",
+        "amenity=public_building": "<img data-src='maki:building'>",
-        "public_building": "<img src='maki:building'>",
+        "amenity=recycling": "<img data-src='maki:recycling'>",
-        "recycling": "<img src='maki:recycling'>",
+        "amenity=toilets": "<img data-src='maki:toilet'>",
-        "toilets": "<img src='maki:toilet'>",
+        "amenity=townhall": "<img data-src='maki:town-hall'>",
-        "townhall": "<img src='maki:town-hall'>"
+        "office=administration": "<img data-src='maki:town-hall'>",
+        "office=government": "<img data-src='maki:town-hall'>"
+    },
+    "filter": {
+        "type": {
+            "name": "{{ trans('filter:type') }}",
+            "show_default": "true",
+            "type": "select",
+            "values": "{% for k, v in const %}<option value=\"{{ k }}\" query=\"nwr[{{ k }}]\" minzoom=\"{{ v.zoom }}\">{{ tagTrans(k) }}</option>{% endfor %}"
+        }
     }
 }

railway-electrification.json

@@ -3,32 +3,41 @@
     "name": {
         "de": "Eisenbahn Elektrifizierung",
         "en": "Railway electrification",
-        "fr": "Électrification ferroviaire"
+        "fr": "Puissance électrique ferroviaire",
+        "hu": "Vasút villamosítottsága",
+        "pt": "Eletrificação ferroviária",
+        "pt-br": "Eletrificação ferroviária"
     },
     "query": {
         "11": "way[railway=rail][railway!~'^(platform|abandoned|disused|station|proposed|subway_entrance)$'][usage~'^(main|branch)$'];",
-        "14": "way[railway][railway!~'^(platform|abandoned|disused|station|proposed|subway_entrance)$'];"
+        "14": "way[railway~'^(disused|construction|funicular|light_rail|miniature|monorail|narrow_gauge|preserved|rail|subway|tram)$'];"
     },
     "feature": {
         "pre": [
             "{% if tags.electrified and tags.electrified != 'no' %}",
-            "  {% if tags.voltage < 1000 %}",
+            "  {% if not tags.voltage is defined %}",
-            "    {% set color = colorInterpolate([ '#00ff00', 'blue' ], tags.voltage / 1000) %}",
+            "    {% set color = const.colorUnknown %}",
+            "  {% elseif not tags.voltage|matches('^[0-9]+$') %}",
+            "    {% set color = const.colorIllegal %}",
+            "  {% elseif tags.voltage < const.range[1] %}",
+            "    {% set color = colorInterpolate(const.scheme|slice(0, 2), tags.voltage / const.range[1]) %}",
             "  {% else %}",
-            "    {% set color = colorInterpolate([ 'blue', 'red' ], (tags.voltage - 1000) / 24000) %}",
+            "    {% set color = colorInterpolate(const.scheme|slice(1, 2), (tags.voltage - const.range[1]) / (const.range[2] - const.range[1])) %}",
             "  {% endif %}",
+            "{% elseif tags.electrified and tags.electrified == 'no' %}",
+            "  {% set color = const.colorNone %}",
             "{% else %}",
-            "  {% set color='black' %}",
+            "  {% set color = const.colorUnknown %}",
-            "{%endif %}",
+            "{% endif %}",
             "",
             "{% if tags.service == 'yard' or tags.service == 'siding' or tags.service == 'spur' or tags.service == 'crossover' %}",
             "    {% set width=2 %}",
             "  {% else %}",
             "    {% if tags.railway == 'rail' %}",
             "      {% if tags.usage == 'main' or tags.usage == 'branch' %}",
-            "        {% set width=3 %}",
+            "        {% set width=4 %}",
             "      {% else %}",
-            "        {% set width=2.5 %}",
+            "        {% set width=3 %}",
             "      {% endif %}",
             "    {% else %}",
             "      {% set width=2 %}",
@@ -37,12 +46,12 @@
         ],
         "title": "{% if tags.ref %}{{ localizedTag(tags, 'ref') }} - {% endif %}{{ localizedTag(tags, 'name')|default(localizedTag(tags, 'operator'))|default(trans('unnamed')) }}",
         "description": [
-            "{{ tagTrans('railway', tags.railway) }} -",
+            "{{ tagTrans('railway', tags.railway) }}",
             "",
             "{% if tags.electrified == 'no' %}",
-            "  {{ trans('not electrified') }}",
+            "  - {{ tagTrans('electrified', 'no') }}",
             "{% elseif tags.electrified %}",
-            "  {{ tags.voltage|default(trans('unknown')) }}V, {{ tags.frequency|default(trans('unknown')) }}Hz",
+            "  - {{ tags.voltage|default(trans('unknown')) }}V, {{ tags.frequency|default(trans('unknown')) }}Hz",
             "{% endif %}"
         ],
         "body": [
@@ -64,8 +73,8 @@
             "opacity": "1",
             "fill": null,
             "dashArray": [
-                "{% if not tags.electrified or tags.electrified == 'no' %}",
+                "{% if not tags.electrified is defined  %}",
-                "{% elseif tags.frequency == 0 %}",
+                "{% elseif not tags.frequency is defined or tags.frequency == 0 %}",
                 "{% else %}",
                 "5,2",
                 "{% endif %}"
@@ -75,41 +84,60 @@
             "width": "{{ width }}",
             "color": "white",
             "opacity": "1",
+            "lineCap": "butt",
             "fill": null
         }
     },
     "info": [
         "<table>",
-        "  {% set color = '#000000' %}",
         "  <tr>",
-        "    <td>{{ markerLine({ 'width': 3, 'color': color })|raw }}</td>",
+        "    <td>{{ markerLine({ 'width': 3, 'color': const.colorNone })|raw }}</td>",
         "    <td>{{ trans('not electrified') }}</td>",
         "  </tr>",
-        "{% for i in range(0, 1000, 200) %}",
+        "{% for i in range(0, const.range[1], const.infoSteps[0]) %}",
-        "  {% set color = colorInterpolate([ '#00ff00', 'blue' ], i / 1000) %}",
+        "  {% set color = colorInterpolate(const.scheme|slice(0, 2), i / const.range[1]) %}",
         "  <tr>",
         "    <td>{{ markerLine({ 'width': 3, 'color': color })|raw }}</td>",
         "    <td>{{ i }}V</td>",
         "  </tr>",
         "{% endfor %}",
         "",
-        "{% for i in range(3000, 25000, 2000) %}",
+        "{% for i in range(const.range[1] + const.infoSteps[1], const.range[2], const.infoSteps[1]) %}",
-        "  {% set color = colorInterpolate([ 'blue', 'red' ], (i - 1000) / 24000) %}",
+        "  {% set color = colorInterpolate(const.scheme|slice(1, 2), (i - const.range[1]) / (const.range[2] - const.range[1])) %}",
         "  <tr>",
         "    <td>{{ markerLine({ 'width': 3, 'color': color })|raw }}</td>",
         "    <td>{{ i }}V</td>",
         "  </tr>",
         "{% endfor %}",
         "",
+        "{% set color = const.scheme[1] %}",
         "  <tr>",
         "    <td>{{ markerLine({ 'width': 3, 'color': color })|raw }}</td>",
-        "    <td>{{ trans('direct current') }}</td>",
+        "    <td>{{ trans('tag:frequency=0') }}</td>",
         "  </tr>",
         "",
         "  <tr>",
         "    <td>{{ markerLine({ 'styles': [ 'casing', 'default' ], 'style:casing': { 'width': 3, 'color': 'white' }, 'style': { 'width': '3', 'dashArray': '5,2', 'lineCap': 'butt', 'color': color } })|raw }}</td>",
-        "    <td>{{ trans('alternating current') }}</td>",
+        "    <td>{{ trans('tag:frequency>0') }}</td>",
+        "  </tr>",
+        "",
+        "  <tr>",
+        "    <td>{{ markerLine({ 'width': 3, 'color': const.colorUnknown })|raw }}</td>",
+        "    <td>{{ trans('unknown') }}</td>",
+        "  </tr>",
+        "",
+        "  <tr>",
+        "    <td>{{ markerLine({ 'width': 3, 'color': const.colorIllegal })|raw }}</td>",
+        "    <td>{{ trans('illegal value') }}</td>",
         "  </tr>",
         "</table>"
-    ]
+    ],
+    "const": {
+        "range": [ 0, 1000, 25000 ],
+        "infoSteps": [ 200, 2000 ],
+        "scheme": [ "#00ff00", "#003fff", "#af0000" ],
+        "colorNone": "orange",
+        "colorUnknown": "#404040",
+        "colorIllegal": "#ff0000"
+    }
 }

railway-gauge.json

@@ -0,0 +1,82 @@
+{
+    "type": "overpass",
+    "name": {
+        "en": "Railway gauge"
+    },
+    "query": {
+        "11": "way[railway=rail][railway!~'^(platform|abandoned|disused|station|proposed|subway_entrance)$'][usage~'^(main|branch)$'];",
+        "14": "way[railway~'^(disused|construction|funicular|light_rail|miniature|monorail|narrow_gauge|preserved|rail|subway|tram)$'];"
+    },
+    "feature": {
+        "pre": "{% set gauges = tags.gauge|split(';') %}",
+        "title": "{% if tags.ref %}{{ localizedTag(tags, 'ref') }} - {% endif %}{{ localizedTag(tags, 'name')|default(localizedTag(tags, 'operator'))|default(trans('unnamed')) }}",
+        "description": "{{ tags.gauge|default(trans('unknown'))|enumerate }}",
+        "body": [
+            "{{ tagTrans('railway', tags.railway) }}<br/>",
+            "{% if tags.operator %}{{ keyTrans('operator') }}: {{ localizedTag(tags, 'operator') }}<br>{% endif %}",
+            "{% if tags.usage %}{{ keyTrans('usage') }}: {{ tagTrans('usage', tags.usage)|default(trans('unknown')) }}<br/>{% endif %}",
+            "{% if tags.service %}{{ keyTrans('service') }}: {{ tagTrans('service', tags.service ) }}<br/>{% endif %}",
+            "{{ keyTrans('gauge') }}: {{ tags.gauge|default(trans('unknown'))|enumerate }}<br/>",
+            "{% 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 %}"
+        ],
+        "markerSymbol": null,
+        "listMarkerSymbol": "line",
+        "styles": "{% if gauges|length < 2 %}default{% else %}{% for i, v in gauges %}{% if i != 0 %},{% endif %}gauge{{ i }}{% endfor %}{% endif %}",
+        "style": {
+            "width": "3",
+            "color": "{% if tags.gauge %}{% if not tags.gauge|matches('^\\d+$') %}#ff0000{% else %}{{ colorInterpolate([ '#00ff00', '#0000ff' ], tags.gauge / 2000) }}{% endif %}{% else %}#404040{% endif %}"
+        },
+        "style:gauge0": {
+            "width": "3",
+            "lineCap": "butt",
+            "color": "{% if not gauges[0]|matches('^[0-9]+$') %}#ff0000{% else %}{{ colorInterpolate([ '#00ff00', '#0000ff' ], gauges[0] / 2000) }}{% endif %}",
+            "dashArray": "5,{{ (gauges|length - 1) * 5 }}"
+        },
+        "style:gauge1": {
+            "width": "3",
+            "lineCap": "butt",
+            "color": "{% if not gauges[1]|matches('^[0-9]+$') %}#ff0000{% else %}{{ colorInterpolate([ '#00ff00', '#0000ff' ], gauges[1] / 2000) }}{% endif %}",
+            "dashArray": "5,{{ (gauges|length - 1) * 5 }}",
+            "dashOffset": "5"
+        },
+        "style:gauge2": {
+            "width": "3",
+            "lineCap": "butt",
+            "color": "{% if not gauges[2]|matches('^\\d+$') %}#ff0000{% else %}{{ colorInterpolate([ '#00ff00', '#0000ff' ], gauges[2] / 2000) }}{% endif %}",
+            "dashArray": "5,{{ (gauges|length - 1) * 5 }}",
+            "dashOffset": "10"
+        },
+        "style:gauge3": {
+            "width": "3",
+            "lineCap": "butt",
+            "color": "{% if not gauges[3]|matches('^\\d+$') %}#ff0000{% else %}{{ colorInterpolate([ '#00ff00', '#0000ff' ], gauges[3] / 2000) }}{% endif %}",
+            "dashArray": "5,{{ (gauges|length - 1) * 5 }}",
+            "dashOffset": "15"
+        }
+    },
+    "info": [
+        "<table>",
+        "  {% set color = '#ff0000' %}",
+        "  <tr>",
+        "    <td>{{ markerLine({ 'width': 3, 'color': color })|raw }}</td>",
+        "    <td>{{ trans('illegal value') }}</td>",
+        "  </tr>",
+        "  {% set color = '#404040' %}",
+        "  <tr>",
+        "    <td>{{ markerLine({ 'width': 3, 'color': color })|raw }}</td>",
+        "    <td>{{ trans('unknown') }}</td>",
+        "  </tr>",
+        "{% for i in range(0, 1800, 250) %}",
+        "  {% set color = colorInterpolate([ '#00ff00', '#0000ff' ], i / 2000) %}",
+        "  <tr>",
+        "    <td>{{ markerLine({ 'width': 3, 'color': color })|raw }}</td>",
+        "    <td>{{ i }}mm</td>",
+        "  </tr>",
+        "{% endfor %}",
+        "  <tr>",
+        "    <td>{{ markerLine({ 'width': 3, 'color': '#0000ff' })|raw }}</td>",
+        "    <td>>2000mm</td>",
+        "  </tr>",
+        "</table>"
+    ]
+}

railway-infrastructure.json

@@ -3,7 +3,10 @@
     "name": {
         "de": "Eisenbahn Infrastruktur",
         "en": "Railway infrastructure",
-        "fr": "Infrastructure ferroviaire"
+        "fr": "Infrastructure ferroviaire",
+        "hu": "Vasúti infrastruktúra",
+        "pt": "Infraestrutura ferroviária",
+        "pt-br": "Infraestrutura ferroviária"
     },
     "query": {
         "11": "(way[railway=rail][usage~'^(main|branch)$'];node[railway~'^(station)$'];)",
@@ -12,14 +15,21 @@
     },
     "feature": {
         "title": "{% if tags.ref %}{{ localizedTag(tags, 'ref') }} - {% endif %}{{ localizedTag(tags, 'name')|default(localizedTag(tags, 'operator'))|default(trans('unnamed')) }}",
-        "description": "{{ tagTrans('railway', tags.railway) }}",
+        "description": [
+            "{{ tagTrans('railway', tags.railway) -}}",
+            "{%- if tags.usage %}",
+            ", {{ tagTrans('railway=rail usage', tags.usage) }}",
+            "{% endif -%}",
+            "{%- if tags.service %}",
+            ", {{ tagTrans('railway=rail service', tags.service) }}",
+            "{% endif -%}"
+        ],
         "body": [
             "{% if tags.operator %}{{ keyTrans('operator') }}: {{ localizedTag(tags, 'operator') }}<br>{% endif %}",
-            "{% if tags.usage %}{{ keyTrans('usage') }}: {{ tagTrans('usage', tags.usage)|default(trans('unknown')) }}<br/>{% endif %}",
+            "{% if tags.usage %}{{ keyTrans('railway=rail usage') }}: {{ tagTrans('railway=rail usage', tags.usage)|default(trans('unknown')) }}<br/>{% endif %}",
-            "{% if tags.service %}{{ keyTrans('service') }}: {{ tagTrans('service', tags.service ) }}<br/>{% endif %}",
+            "{% if tags.service %}{{ keyTrans('railway=rail service') }}: {{ tagTrans('railway=rail service', tags.service ) }}<br/>{% endif %}",
             "{{ keyTrans('gauge') }}: {{ tags.gauge|default(trans('unknown')) }}<br/>",
-            "{% 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 %}",
+            "{% 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 %}"
-            ""
         ],
         "markerSign": "{% if tags.railway in [ 'halt', 'tram_stop', 'station', 'stop', 'subway_entrance' ] %}X{% endif %}",
         "markerSymbol": [

railway-maxspeed.json

@@ -0,0 +1,166 @@
+{
+    "type": "overpass",
+    "name": {
+        "de": "Eisenbahn Höchstgeschwindigkeiten",
+        "en": "Railway Maxspeed",
+        "fr": "Limites de vitesse",
+        "hu": "Sebességkorlátozás",
+        "pt": "Velocidade máxima",
+        "pt-br": "Velocidade máxima"
+    },
+    "query": {
+        "11": "way[railway=rail][railway!~'^(platform|abandoned|disused|station|proposed|subway_entrance)$'][usage~'^(main|branch)$'];",
+        "14": "way[railway~'^(disused|construction|funicular|light_rail|miniature|monorail|narrow_gauge|preserved|rail|subway|tram)$'];"
+    },
+    "feature": {
+        "pre": [
+            "{% set maxspeedKmh = null %}",
+            "{% set maxspeed = null %}",
+            "{% set unit = null %}",
+            "",
+            "{% if tags.maxspeed is defined %}",
+            "  {% if tags.maxspeed|matches(\"^[0-9]+$\") %}",
+            "    {% set maxspeedKmh = tags.maxspeed %}",
+            "    {% set maxspeed = tags.maxspeed %}",
+            "    {% set unit = \"km/h\" %}",
+            "  {% elseif tags.maxspeed|matches( \"(^[0-9]+) mph$\") %}",
+            "    {% set m = tags.maxspeed|matches(\"(^[0-9]+) mph$\") %}",
+            "    {% set maxspeedKmh = m[1] * 1.60934 %}",
+            "    {% set maxspeed = m[1] %}",
+            "    {% set unit = \"mph\" %}",
+            "  {% endif %}",
+            "{% endif %}",
+            "",
+            "{% if attribute(tags, 'maxspeed:forward') is defined %}",
+            "  {% if attribute(tags, 'maxspeed:forward')|matches(\"^[0-9]+$\") %}",
+            "    {% set maxspeedFKmh = attribute(tags, 'maxspeed:forward') %}",
+            "    {% set maxspeedF = attribute(tags, 'maxspeed:forward') %}",
+            "    {% set unit = \"km/h\" %}",
+            "  {% elseif attribute(tags, 'maxspeed:forward')|matches(\"^[0-9]+ mph$\") %}",
+            "    {% set m = attribute(tags, 'maxspeed:forward')|matches(\"(^[0-9]+) mph$\") %}",
+            "    {% set maxspeedFKmh = m[1] * 1.60934 %}",
+            "    {% set maxspeedF = m[1] %}",
+            "    {% set unit = \"mph\" %}",
+            "  {% endif %}",
+            "{% endif %}",
+            "",
+            "{% if attribute(tags, 'maxspeed:backward') is defined %}",
+            "  {% if attribute(tags, 'maxspeed:backward')|matches(\"^[0-9]+$\") %}",
+            "    {% set maxspeedBKmh = attribute(tags, 'maxspeed:backward') %}",
+            "    {% set maxspeedB = attribute(tags, 'maxspeed:backward') %}",
+            "    {% set unit = \"km/h\" %}",
+            "  {% elseif attribute(tags, 'maxspeed:backward')|matches(\"^[0-9]+ mph$\") %}",
+            "    {% set m = attribute(tags, 'maxspeed:backward')|matches(\"(^[0-9]+) mph$\") %}",
+            "    {% set maxspeedBKmh = m[1] * 1.60934 %}",
+            "    {% set maxspeedB = m[1] %}",
+            "    {% set unit = \"mph\" %}",
+            "  {% endif %}",
+            "{% endif %}",
+            "",
+            "{% if not maxspeedKmh %}",
+            "{% set color = \"#404040\" %}",
+            "{% else %}",
+            "{% set color = colorInterpolate(const.colorMap, (maxspeedKmh - const.offsetColorSpeed) / const.highestColorSpeed) %}",
+            "{% endif %}",
+            "",
+            "{% if maxspeedFKmh %}",
+            "{% set colorF = colorInterpolate(const.colorMap, (maxspeedFKmh - const.offsetColorSpeed) / const.highestColorSpeed) %}",
+            "{% endif %}",
+            "",
+            "{% if maxspeedBKmh %}",
+            "{% set colorB = colorInterpolate(const.colorMap, (maxspeedBKmh - const.offsetColorSpeed) / const.highestColorSpeed) %}",
+            "{% endif %}"
+        ],
+        "description": [
+            "{% if maxspeedF or maxspeedB %}",
+            "<span style='color: {{ colorB }}'>{{ maxspeedB|default(trans('unknown')) }}</span> / <span style='color: {{ colorF }}'>{{ maxspeedF|default(trans('unknown')) }}</span> {{ unit }}",
+            "{% elseif maxspeed %}",
+            "<span style='color: {{ color }}'>{{ maxspeed }} {{ unit }}</span>",
+            "{% elseif tags.maxspeed %}",
+            "{{ tags.maxspeed }}",
+            "{% else %}",
+            "{{ trans('unknown') }}",
+            "{% endif %}"
+        ],
+        "markerSymbol": null,
+        "listMarkerSymbol": "line",
+        "styles": "{% if maxspeedB or maxspeedF %}left,right,default{% else %}default{% endif %}",
+        "style": {
+            "width": "{% if maxspeedB or maxspeedF %}0{% else %}4{% endif %}",
+            "color": "{{ color }}",
+            "text": [
+                "{% if maxspeedB or maxspeedF %}",
+                "  {% if maxspeedB %}🡸 {{ maxspeedB }} {% endif %}|{% if maxspeedF %} {{ maxspeedF }} 🡺{% endif %}       ",
+                "{% else %}",
+                "  {{ maxspeed }}         ",
+                "{% endif %}"
+            ],
+            "textRepeat": "1",
+            "textOffset": "4",
+            "textFontWeight": "bold"
+        },
+        "style:left": {
+            "width": "2",
+            "color": "{{ colorB|default('#404040') }}",
+            "offset": "-1"
+        },
+        "style:right": {
+            "width": "2",
+            "color": "{{ colorF|default('#404040') }}",
+            "offset": "1"
+        }
+    },
+    "const": {
+        "colorMap": [
+            "#00af00",
+            "#ff7f00",
+            "#ff0000",
+            "#af00af"
+        ],
+        "highestColorSpeed": 300,
+        "offsetColorSpeed": 20
+    },
+    "info": [
+        "<div style='display: inline-block'>",
+        "<table>",
+        "  <tr>",
+        "    <td>{{ markerLine(evaluate({}))|raw }}</td>",
+        "    <td colspan>{{ trans('unknown') }}</td>",
+        "  </tr>",
+        "{% for i in range(25, 280, 25) %}",
+        "  <tr>",
+        "    <td>{{ markerLine(evaluate({ \"maxspeed\": i }))|raw }}</td>",
+        "    <td>{{ i }}km/h</td>",
+        "  </tr>",
+        "{% endfor %}",
+        "  <tr>",
+        "    <td>{{ markerLine(evaluate({ \"maxspeed\": 300 }))|raw }}</td>",
+        "    <td>≥300km/h</td>",
+        "  </tr>",
+        "</table>",
+        "</div>",
+        "",
+        "<div style='display: inline-block'>",
+        "<table>",
+        "  <tr>",
+        "    <td>{{ markerLine(evaluate({}))|raw }}</td>",
+        "    <td colspan>{{ trans('unknown') }}</td>",
+        "  </tr>",
+        "{% for i in range(15, 150, 15) %}",
+        "  <tr>",
+        "    <td>{{ markerLine(evaluate({ \"maxspeed\": (i * 1.60934)|round }))|raw }}</td>",
+        "    <td>{{ i }}mph</td>",
+        "  </tr>",
+        "{% endfor %}",
+        "  <tr>",
+        "    <td>{{ markerLine(evaluate({ \"maxspeed\": (175 * 1.60934)|round }))|raw }}</td>",
+        "    <td>175mph</td>",
+        "  </tr>",
+        "  <tr>",
+        "    <td>{{ markerLine(evaluate({ \"maxspeed\": (200 * 1.60934)|round }))|raw }}</td>",
+        "    <td>≥200mph</td>",
+        "  </tr>",
+        "</table>",
+        "</div>"
+    ]
+}

railway-routes.json

@@ -0,0 +1,60 @@
+{
+    "type": "overpass",
+    "name": {
+        "en": "Railway Routes",
+        "fr": "Lignes ferroviaires",
+        "hu": "Vasútvonalak",
+        "pt-br": "Rotas ferroviárias"
+    },
+    "query": {
+        "12": "relation[type=route][route=railway]"
+    },
+    "members": true,
+    "feature": {
+        "pre": "{% set color = '#' ~ tags.operator|default('')|md5|slice(0, 6) %}",
+        "listMarkerSymbol": "{{ markerLine({ 'width': 4, 'color': color })|raw }}",
+        "description": "{{ tags.operator }}",
+        "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 refs = [] %}",
+            "{% set color = '#d41d8c' %}",
+            "",
+            "{% for master in masters %}",
+            "  {% if master.tags.operator %}",
+            "    {% set color = '#' ~ master.tags.operator|md5|slice(0, 6) %}",
+            "  {% endif %}",
+            "  {% if master.tags.ref %}",
+            "    {% set refs = refs|merge([ master.tags.ref ]) %}",
+            "  {% endif %}",
+            "{% endfor %}"
+        ],
+        "title": "",
+        "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'>{{ master.tags.operator }}</span>",
+            "  </li>",
+            "{% endfor %}",
+            "</ul>"
+        ],
+        "listExclude": "1",
+        "style": {
+            "color": "{{ color }}",
+            "width": 4,
+            "opacity": 1,
+            "text": "{{ refs|join(' · ') }}             ",
+            "textRepeat": "1",
+            "textOffset": "12",
+            "textFontWeight": "bold"
+        }
+    }
+}

religion.json

@@ -12,6 +12,8 @@
         "it": "Religione",
         "ja": "宗教",
         "nl": "Religie",
+        "pt": "Religião",
+        "pt-br": "Religião",
         "ro": "Religie",
         "ru": "Религия",
         "uk": "Релігія"
@@ -25,6 +27,19 @@
             "way[landuse~\"^(cemetery)$\"];",
             "relation[landuse~\"^(cemetery)$\"];",
             ")"
+        ],
+        "14": [
+            "(",
+            "node[amenity~\"^(place_of_worship|grave_yard|crematorium)$\"];",
+            "way[amenity~\"^(place_of_worship|grave_yard|crematorium)$\"];",
+            "relation[amenity~\"^(place_of_worship|grave_yard|crematorium)$\"];",
+            "way[landuse~\"^(cemetery)$\"];",
+            "relation[landuse~\"^(cemetery)$\"];",
+            "node[historic~\"^wayside_(cross|shrine|chapel)$\"];",
+            "way[historic~\"^wayside_(cross|shrine|chapel)$\"];",
+            "relation[historic~\"^wayside_(cross|shrine|chapel)$\"];",
+            "nwr[office~\"^(parish|religion)$\"];",
+            ")"
         ]
     },
     "feature": {
@@ -32,30 +47,124 @@
             "{% if tags.landuse == 'cemetery' %}",
             "{% set key = 'landuse' %}",
             "{% set value = tags.landuse %}",
+            "{% elseif tags.historic in [ 'wayside_cross', 'wayside_shrine', 'wayside_chapel' ] %}",
+            "{% set key = 'historic' %}",
+            "{% set value = tags.historic %}",
+            "{% elseif tags.office %}",
+            "{% set key = 'office' %}",
+            "{% set value = tags.office %}",
             "{% else %}",
             "{% set key = 'amenity' %}",
             "{% set value = tags.amenity %}",
             "{% endif %}"
         ],
-        "description": "{{ tagTrans(key, value) }}{% if tags.religion %}: {{ tagTransList('religion', tags.religion) }}{% endif %}",
+        "description": [
+            "{% if tags.building and tags.religion %}",
+            "  {% if isTranslated('tag:building=' ~ tags.building ~ ' religion=' ~ tags.religion) %}",
+            "    {{ trans('tag:building=' ~ tags.building ~ ' religion=' ~ tags.religion) }}",
+            "  {% elseif tags.building != 'yes' %}",
+            "    {{ trans('tag:building=' ~ tags.building) }}{% if tags.religion %}: {{ tagTransList('religion', tags.religion) }}{% endif %}",
+            "  {% else %}",
+            "    {{ tagTrans(key, value) }}: {{ tagTransList('religion', tags.religion) }}",
+            "  {% endif %}",
+            "{% else %}",
+            "  {{ tagTrans(key, value) }}{% if tags.religion %}: {{ tagTransList('religion', tags.religion) }}{% endif %}",
+            "{% endif %}"
+        ],
         "popupDescription": "{{ tagTrans(key, value) }}",
         "body": [
+            "{% if tags.building %}",
+            "  {{ keyTrans('building') }}: {{ tagTrans('building', tags.building) }}<br/>",
+            "{% endif %}",
             "{% if tags.religion %}",
-            "  {{ keyTrans('religion') }}: {{ tagTransList('religion', tags.religion) }}",
+            "  {{ keyTrans('religion') }}: {{ tagTransList('religion', tags.religion) }}<br/>",
             "{% endif %}",
             "{% if tags.denomination %}",
-            "  <br/>",
+            "  {{ keyTrans('denomination') }}: {{ tagTransList('denomination', tags.denomination) }}<br/>",
-            "  {{ keyTrans('denomination') }}: {{ tagTransList('denomination', tags.denomination) }}",
             "{% endif %}"
         ],
-        "markerSign": [
+        "markerSign": "{{ const.religion[tags.religion] }}"
-            "{% if tags.religion == 'christian' %}✝",
+    },
-            "{% elseif tags.religion == 'muslim' %}☪",
+    "const": {
-            "{% elseif tags.religion == 'buddhist' %}☸",
+        "religion": {
-            "{% elseif tags.religion == 'hindu' %}ॐ",
+            "christian": "✝",
-            "{% elseif tags.religion == 'jewish' %}✡",
+            "muslim": "☪",
-            "{% elseif tags.religion == 'pagan' %}☆",
+            "buddhist": "☸",
-            "{% endif %}"
+            "shinto": "",
-        ]
+            "hindu": "ॐ",
+            "jewish": "✡",
+            "taoist": "",
+            "sikh": "",
+            "none": "",
+            "multifaith": "",
+            "unitarian_universialist": "",
+            "spiritualist": "",
+            "jain": "",
+            "voodoo": "",
+            "confucian": "",
+            "bahai": "",
+            "caodaism": "",
+            "tenrikyo": "",
+            "vietnamese_folk": "",
+            "pagan": "☆",
+            "scientologist": "",
+            "zoroastrian": "",
+            "pentecostal": "",
+            "shamanic": ""
+        }
+    },
+    "filter": {
+        "type": {
+            "name": "{{ trans('filter:type') }}",
+            "show_default": "true",
+            "query": "nwr[{{ value }}]",
+            "type": "select",
+            "values": {
+              "place_of_worship": {
+                "name": "{{ tagTrans('amenity', 'place_of_worship') }}",
+                "query": "nwr[amenity=place_of_worship]"
+              },
+              "grave_yard": {
+                "name": "{{ tagTrans('amenity', 'grave_yard') }}",
+                "query": "nwr[amenity=grave_yard]"
+              },
+              "crematorium": {
+                "name": "{{ tagTrans('amenity', 'crematorium') }}",
+                "query": "nwr[amenity=crematorium]"
+              },
+              "cemetery": {
+                "name": "{{ tagTrans('landuse', 'cemetery') }}",
+                "query": "nwr[landuse=cemetery]"
+              },
+              "wayside_cross": {
+                "name": "{{ tagTrans('historic', 'wayside_cross') }}",
+                "query": "nwr[historic=wayside_cross]"
+              },
+              "wayside_shrine": {
+                "name": "{{ tagTrans('historic', 'wayside_shrine') }}",
+                "query": "nwr[historic=wayside_shrine]"
+              },
+              "wayside_chapel": {
+                "name": "{{ tagTrans('historic', 'wayside_chapel') }}",
+                "query": "nwr[historic=wayside_chapel]"
+              },
+              "parish": {
+                "name": "{{ tagTrans('office', 'parish') }}",
+                "query": "nwr[office=parish]"
+              },
+              "office": {
+                "name": "{{ tagTrans('office', 'religion') }}",
+                "query": "nwr[office=religion]"
+              }
+            }
+        },
+        "religion": {
+            "name": "{{ keyTrans('religion') }}",
+            "show_default": "true",
+            "type": "select",
+            "valueName": "{{ tagTrans('religion', value) }}",
+            "values": "{% set list = [] %}{% for t, v in const.religion %}<option value=\"{{ t }}\">{% set list = list|merge([ t ]) %}{{ tagTrans('religion', t) }}</option>{% endfor %}<option value='other' query='nwr[religion][religion!~\"^({{ list|join('|') }})$\"]'>{{ trans('other') }}</option>",
+            "op": "has"
+        }
     }
 }

renewables.json

@@ -0,0 +1,40 @@
+{
+    "type": "overpass",
+    "name": {
+        "de": "Erneuerbare Energien",
+        "en": "Renewables",
+        "fr": "Énergies renouvelables",
+        "hu": "Megújuló energia",
+        "pt-br": "Renováveis"
+    },
+    "query": {
+        "11": [
+            "(",
+            "node[power~\"^(plant)$\"][\"plant:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
+            "way[power~\"^(plant)$\"][\"plant:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
+            "relation[power~\"^(plant)$\"][\"plant:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
+            ")",
+            ""
+        ],
+        "15": [
+            "(",
+            "node[power~\"^(plant)$\"][\"plant:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
+            "way[power~\"^(plant)$\"][\"plant:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
+            "relation[power~\"^(plant)$\"][\"plant:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
+            "node[power~\"^(generator)$\"][\"generator:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
+            "way[power~\"^(generator)$\"][\"generator:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
+            "relation[power~\"^(generator)$\"][\"generator:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
+            ")"
+        ]
+    },
+    "feature": {
+        "description": "{{ tagTrans('power', tags.power) }}{% set x='generator:source' %}{% if tags[x] %}, {{ tagTransList('generator:source', tags[x]) }}{% endif %}",
+        "popupDescription": "{{ tagTrans('power', tags.power) }}",
+        "body": [
+            "{% set x='generator:source' %}{% if tags[x] %}<br/>{{ keyTrans('generator:source') }}: {{ tagTransList('generator:source', tags[x]) }}{% endif %}",
+            "{% set x='generator:method' %}{% if tags[x] %}<br/>{{ keyTrans('generator:method') }}: {{ tagTransList('generator:method', tags[x]) }}{% endif %}",
+            "{% set x='generator:type' %}{% if tags[x] %}<br/>{{ tagTransList('generator:type') }}: {{ tagTrans('generator:type', 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 %}"
+    }
+}

residential.json

@@ -12,6 +12,8 @@
         "it": "Aree residenziali",
         "ja": "住居エリア",
         "nl": "Woongebieden",
+        "pt": "Áreas residenciais",
+        "pt-br": "Áreas residenciais",
         "ro": "Zona rezidentiala",
         "ru": "Жилые районы",
         "uk": "Житлова зона"
@@ -33,6 +35,12 @@
         ]
     },
     "feature": {
-        "description": "{{ tagTrans('landuse', tags.landuse) }}"
+        "description": [
+            "{{ tagTrans('landuse', tags.landuse) }}",
+            "",
+            "{% if tags.residential %}",
+            "({{ tagTransList('residential', tags.residential) }})",
+            "{% endif %}"
+        ]
     }
 }

resources.json

@@ -6,8 +6,11 @@
         "de": "Ressourcengewinnung",
         "en": "Resource Extraction",
         "fr": "Extraction des ressources",
+        "hu": "Bányászat",
         "it": "Areee estrattive",
         "nl": "Grondstoffenwinning",
+        "pt": "Extração de recursos",
+        "pt-br": "Extração de recursos",
         "ru": "Добыча ресурсов"
     },
     "query": {

shop.json

@@ -7,12 +7,14 @@
         "el": "Αγορές",
         "en": "Shopping",
         "et": "Ostmine",
-        "fr": "Magasinage/Shopping",
+        "fr": "Magasins/Boutiques",
         "hu": "Vásárlás",
         "it": "Acquisti",
         "ja": "ショッピング",
         "nl": "Winkelen",
         "pl": "Zakupy",
+        "pt": "Compras",
+        "pt-br": "Compras",
         "ro": "Cumpărături",
         "ru": "Покупки",
         "uk": "Торгівля"
@@ -22,131 +24,375 @@
         "16": "(node[shop];way[shop];relation[shop];);"
     },
     "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 %}",
+        "pre": [
-        "description": "{{ tagTransList('shop', tags.shop) }}",
+            "{% set shop0 = tags.shop|split(';')[0] %}",
-        "markerSign": "{% set c = current.sign %}{% if c|slice(0, 3) == 'fa-' %}<i class=\"fa {{ c }}\"></i>{% else %}{{ c|raw }}{% endif %}"
+            "{% set current = const.default %}",
+            "{% if const.shops[shop0] %}",
+            "  {% set current = const.shops[shop0] %}",
+            "{% endif %}"
+        ],
+        "description": [
+            "{% if tags.shop == 'yes' %}",
+            "  {{ keyTrans('shop') }}",
+            "{% else %}",
+            "  {{ tagTransList('shop', tags.shop) }}",
+            "{% endif %}"
+        ],
+        "markerSign": [
+            "{% set c = current.sign %}",
+            "{% if c|slice(0, 4) == 'fas:' %}",
+            "  <i class=\"fas fa-{{ c|slice(4) }}\"></i>",
+            "{% elseif c|slice(0, 4) == 'far:' %}",
+            "  <i class=\"far fa-{{ c|slice(4) }}\"></i>",
+            "{% elseif c|slice(0, 5) == 'maki:' %}",
+            "  <img data-src=\"{{ c }}\">",
+            "{% else %}",
+            "  {{ c|raw }}",
+            "{% endif %}"
+        ],
+        "body": [
+            "<ul>",
+            "  {% if tags.clothes %}",
+            "  <li class='hasSymbol'>",
+            "    <i class=\"fas fa-tshirt\" aria-hidden=\"true\"></i>",
+            "    <span class='key'>{{ keyTrans('clothes') }}:</span>",
+            "    <span class='value'>{{ tagTransList('clothes', tags.clothes) }}</span>",
+            "  </li>",
+            "  {% endif %}",
+            "</ul>"
+        ]
     },
     "const": {
         "default": {
-            "sign": "fa-shopping-bag"
+            "sign": "fas:shopping-bag"
         },
-        "shops": [
+        "shops": {
-            {
+            "vacant": {
-                "types": [
+                "sign": "fas:times"
-                    "alcohol",
+            },
-                    "beverages"
+            "alcohol": {
-                ],
+                "sign": "fas:wine-bottle"
-                "sign": "fa-beer"
+            },
-            },
+            "wine": {
-            {
+                "sign": "fas:wine-bottle"
-                "types": [
+            },
-                    "baby_goods"
+            "beverages": {
-                ],
+                "sign": "fas:wine-bottle"
-                "sign": "&#128700;"
+            },
-            },
+            "baby_goods": {
-            {
+                "sign": "fas:baby"
-                "types": [
+            },
-                    "bag",
+            "bag": {
-                    "general"
+                "sign": "fas:shopping-bag"
-                ],
+            },
-                "sign": "fa-shopping-bag"
+            "general": {
-            },
+                "sign": "fas:shopping-bag"
-            {
+            },
-                "types": [
+            "variety_store": {
-                    "bakery",
+                "sign": "fas:shopping-bag"
-                    "confectionery",
+            },
-                    "pastry"
+            "bakery": {
-                ],
+                "sign": "fas:birthday-cake"
-                "sign": "fa-birthday-cake"
+            },
-            },
+            "confectionery": {
-            {
+                "sign": "fas:birthday-cake"
-                "types": [
+            },
-                    "boutique",
+            "pastry": {
-                    "clothes",
+                "sign": "fas:birthday-cake"
-                    "fabric",
+            },
-                    "fashion",
+            "bicycle": {
-                    "leather",
+                "sign": "fas:bicycle"
-                    "sewing",
+            },
-                    "tailor"
+            "motorcycle": {
-                ],
+                "sign": "fas:motorcycle"
+            },
+            "boutique": {
+                "sign": "&#128090;"
+            },
+            "clothes": {
+                "sign": "&#128090;"
+            },
+            "fabric": {
+                "sign": "&#128090;"
+            },
+            "fashion": {
+                "sign": "&#128090;"
+            },
+            "leather": {
+                "sign": "&#128090;"
+            },
+            "sewing": {
+                "sign": "&#128090;"
+            },
+            "tailor": {
                 "sign": "&#128090;"
             },
-            {
+            "dry_cleaning": {
-                "types": [
+                "sign": "&#128090;"
-                    "butcher",
+            },
-                    "cheese",
+            "sea_food": {
-                    "chocolate",
+                "sign": "fas:fish"
-                    "deli",
+            },
-                    "dairy",
+            "butcher": {
-                    "farm",
+                "sign": "fas:utensils"
-                    "greengrocer",
+            },
-                    "pasta",
+            "cheese": {
-                    "spices"
+                "sign": "fas:utensils"
-                ],
+            },
-                "sign": "fa-cutlery"
+            "chocolate": {
-            },
+                "sign": "fas:utensils"
-            {
+            },
-                "types": [
+            "deli": {
-                    "coffee",
+                "sign": "fas:utensils"
-                    "tea"
+            },
-                ],
+            "dairy": {
-                "sign": "fa-coffee"
+                "sign": "fas:utensils"
-            },
+            },
-            {
+            "farm": {
-                "types": [
+                "sign": "fas:utensils"
-                    "convenience"
+            },
-                ],
+            "greengrocer": {
-                "sign": "fa-shopping-basket"
+                "sign": "fas:utensils"
-            },
+            },
-            {
+            "pasta": {
-                "types": [
+                "sign": "fas:utensils"
-                    "department_store",
+            },
-                    "mall"
+            "spices": {
-                ],
+                "sign": "fas:utensils"
-                "sign": "fa-building"
+            },
-            },
+            "coffee": {
-            {
+                "sign": "fas:coffee"
-                "types": [
+            },
-                    "hairdresser"
+            "tea": {
-                ],
+                "sign": "fas:coffee"
+            },
+            "convenience": {
+                "sign": "fas:shopping-basket"
+            },
+            "department_store": {
+                "sign": "fas:building"
+            },
+            "mall": {
+                "sign": "fas:building"
+            },
+            "electronics": {
+                "sign": "fas:tv"
+            },
+            "computer": {
+                "sign": "fas:desktop"
+            },
+            "electrical": {
+                "sign": "fas:bolt"
+            },
+            "lighting": {
+                "sign": "fas:bulb"
+            },
+            "fishing": {
+                "sign": "fas:fish"
+            },
+            "toys": {
+                "sign": "fas:dice"
+            },
+            "florist": {
+                "sign": "&#127799;"
+            },
+            "garden_centre": {
+                "sign": "&#127799;"
+            },
+            "hairdresser": {
                 "sign": "&#128113;"
             },
-            {
+            "ice_cream": {
-                "types": [
+                "sign": "fas:ice-cream"
-                    "ice_cream"
+            },
-                ],
+            "jewelry": {
-                "sign": "&#127848;"
+                "sign": "fas:ring"
-            },
+            },
-            {
+            "kiosk": {
-                "types": [
+                "sign": "fas:newspaper"
-                    "jewelry"
+            },
-                ],
+            "newsagent": {
-                "sign": "&#128141;"
+                "sign": "fas:newspaper"
-            },
+            },
-            {
+            "shoes": {
-                "types": [
+                "sign": "fas:shoe-prints"
-                    "kiosk"
+            },
-                ],
+            "travel_agency": {
-                "sign": "fa-newspaper-o"
+                "sign": "&#129523;"
-            },
+            },
-            {
+            "supermarket": {
-                "types": [
+                "sign": "fas:shopping-cart"
-                    "shoes"
+            },
-                ],
+            "watches": {
-                "sign": "&#128095;"
+                "sign": "far:clock"
-            },
+            },
-            {
+            "gift": {
-                "types": [
+                "sign": "fas:gift"
-                    "supermarket"
+            },
-                ],
+            "locksmith": {
-                "sign": "fa-shopping-cart"
+                "sign": "fas:key"
-            },
+            },
-            {
+            "houseware": {
-                "types": [
+                "sign": "fas:tools"
-                    "watches"
+            },
-                ],
+            "doityourself": {
-                "sign": "&#8986;"
+                "sign": "fas:tools"
+            },
+            "hardware": {
+                "sign": "fas:tools"
+            },
+            "art": {
+                "sign": "fas:palette"
+            },
+            "stationery": {
+                "sign": "fas:pencil-ruler"
+            },
+            "funeral_directors": {
+                "sign": "maki:monument"
+            },
+            "copyshop": {
+                "sign": "fas:copy"
+            },
+            "tobacco": {
+                "sign": "fas:smoking"
+            },
+            "furniture": {
+                "sign": "fas:couch"
+            },
+            "interior_decoration": {
+                "sign": "fas:couch"
+            },
+            "car_repair": {
+                "sign": "fas:car"
+            },
+            "car": {
+                "sign": "fas:car"
+            },
+            "car_parts": {
+                "sign": "fas:car"
+            },
+            "tyres": {
+                "sign": "fas:car"
+            },
+            "beauty": {
+                "sign": ""
+            },
+            "cosmetics": {
+                "sign": ""
+            },
+            "music": {
+                "sign": "fas:guitar"
+            },
+            "optician": {
+                "sign": "fas:glasses"
+            },
+            "books": {
+                "sign": "fas:book"
+            },
+            "sports": {
+                "sign": "fas:basketball-ball"
+            },
+            "chemist": {
+                "sign": "fas:tablets"
+            },
+            "pet": {
+                "sign": "fas:paw"
+            },
+            "photo": {
+                "sign": "fas:camera"
+            },
+            "ticket": {
+                "sign": "fas:ticket-alt"
+            },
+            "outdoor": {
+                "sign": "fas:campground"
+            },
+            "massage": {
+                "sign": ""
+            },
+            "paint": {
+                "sign": "fas:paint-roller"
+            },
+            "fabric": {
+                "sign": ""
+            },
+            "trade": {
+                "sign": "fas:tools"
+            },
+            "bookmaker": {
+                "sign": "fas:money-bill-wave"
+            },
+            "kitchen": {
+                "sign": "fas:utensils"
+            },
+            "second_hand": {
+                "sign": ""
+            },
+            "lottery": {
+                "sign": "fas:money-bill-wave"
+            },
+            "pawnbroker": {
+                "sign": "fas:money-bill-wave"
+            },
+            "bed": {
+                "sign": "fas:bed"
+            },
+            "charity": {
+                "sign": "fas:hand-holding-heart"
+            },
+            "tattoo": {
+                "sign": ""
+            },
+            "mobile_phone": {
+                "sign": "fas:mobile-alt"
             }
+        },
+        "clothes": [
+            "women",
+            "men",
+            "leather",
+            "fur",
+            "underwear",
+            "children",
+            "wedding",
+            "sports",
+            "workwear",
+            "lingerie",
+            "babies",
+            "hats",
+            "fashion",
+            "suits",
+            "unisexs",
+            "traditional",
+            "costumes",
+            "bridal",
+            "oversize",
+            "swimwear",
+            "maternity",
+            "brand",
+            "military",
+            "vintage",
+            "accessories",
+            "schoolwear",
+            "motorcycle",
+            "denim"
         ]
+    },
+    "filter": {
+        "shop": {
+            "name": "{{ trans('filter:type') }}",
+            "type": "select",
+            "show_default": "true",
+            "values": "{% set list = [] %}{% for k, v in const.shops %}<option value=\"{{ k }}\">{% set list = list|merge([ k ]) %}{{ tagTrans('shop', k) }}</option>{% endfor %}<option weight='1' value='other' query='nwr[shop][shop!~\"^(|.*;)({{ list|join('|') }})(|;.*)$\"]'>{{ trans('other') }}</option>",
+            "sort": "natsort",
+            "op": "has"
+        },
+        "clothes": {
+            "name": "{{ keyTrans('clothes') }}",
+            "type": "select",
+            "values": "{% set list = [] %}<option weight='-1' value='*' query='nwr[clothes]'>{{ trans('any value') }}</option>{% for k in const.clothes %}{% set list = list|merge([ k ]) %}<option value='{{ k }}'>{{ tagTrans('clothes', k) }}</option>{% endfor %}<option weight='1' value='other' query='nwr[clothes][clothes!~\"^(|.*;)({{ list|join('|') }})(|;.*)$\"]'>{{ trans('other') }}</option>",
+            "sort": "natsort",
+            "op": "has"
+        }
     }
 }

sport.json

@@ -6,16 +6,18 @@
         "de": "Sport",
         "el": "Άθληση",
         "en": "Sport",
-        "fr": "Autres sports",
+        "fr": "Sports",
         "hu": "Sport",
         "it": "Sport",
         "ja": "スポーツ",
         "nl": "Sport",
+        "pt": "Desporto",
+        "pt-br": "Esportes",
         "ru": "Спорт",
         "uk": "Спорт. Інше."
     },
     "query": {
-        "14": "(node[sport];way[sport];relation[sport])"
+        "14": "(node[sport];way[sport];relation[sport];)"
     },
     "feature": {
         "title": "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) |default(tagTransList('sport', tags.sport)) }}",
@@ -54,7 +56,7 @@
         "motocross": "🏍",
         "motor": "🏎",
         "rugby": "🏉",
-        "rugby_leage": "🏉",
+        "rugby_league": "🏉",
         "rugby_union": "🏉",
         "running": "🏃",
         "sailing": "⛵",
@@ -66,5 +68,13 @@
         "tennis": "🎾",
         "volleyball": "🏐",
         "weightlifting": "🏋"
+    },
+    "filter": {
+        "sport": {
+            "name": "{{ keyTrans('sport') }}",
+            "type": "select",
+            "show_default": "true",
+            "values": "{% set list = [] %}{% for t, v in const %}<option value=\"{{ t }}\">{% set list = list|merge([ t ]) %}{{ tagTrans('sport', t) }}</option>{% endfor %}<option value='other' query='nwr[sport][sport!~\"^({{ list|join('|') }})$\"]'>{{ trans('other') }}</option>"
+        }
     }
 }

swimming_bathing.json

@@ -0,0 +1,151 @@
+{
+    "type": "overpass",
+    "name": {
+        "de": "Schwimmen und Baden",
+        "en": "Swimming and bathing",
+        "fr": "Natation, baignade et bains",
+        "hu": "Fürdőzés, úszás",
+        "pt-br": "Natação e banho"
+    },
+    "query": {
+        "13": [
+            "(",
+            "nwr[leisure=swimming_area];",
+            "nwr[natural~\"^(water)\"][sport~\"^(|.*;)swimming(.*|)$\"];",
+            "nwr[natural~\"^(beach)\"];",
+            "nwr[leisure~\"^(water_park|beach_resort)$\"];",
+            "nwr[leisure=sports_centre][sport~\"^(|.*;)swimming(.*|)$\"];",
+            "nwr[amenity=public_bath];",
+            "nwr[tourism=spa_resort];",
+            ")"
+        ],
+        "16": [
+            "(",
+            "nwr[leisure=swimming_area];",
+            "nwr[natural~\"^(water)\"][sport~\"^(|.*;)swimming(.*|)$\"];",
+            "nwr[natural~\"^(beach)\"];",
+            "nwr[leisure~\"^(water_park|beach_resort)$\"];",
+            "nwr[leisure=sports_centre][sport~\"^(|.*;)swimming(;.*|)$\"];",
+            "nwr[amenity~\"^(public_bath|shower)$\"];",
+            "nwr[tourism=spa_resort];",
+            "",
+            "nwr[leisure=swimming_pool][access!=private];",
+            "nwr[leisure=sauna];",
+            ")"
+        ]
+    },
+    "feature": {
+        "pre": [
+            "{% set k = null %}{% set v = null %}{% set append = null %}",
+            "{% if tags.amenity == 'public_bath' %}",
+            "  {% set k = 'amenity' %}",
+            "  {% set v = 'public_bath' %}",
+            "  {% if attribute(tags, 'bath:type') %}{% set append = tagTrans('bath:type', attribute(tags, 'bath:type')) %}{% endif %}",
+            "{% elseif tags.amenity == 'shower' %}",
+            "  {% set k = 'amenity' %}",
+            "  {% set v = 'shower' %}",
+            "{% elseif tags.tourism == 'spa_resort' %}",
+            "  {% set k = 'tourism' %}",
+            "  {% set v = tags.tourism %}",
+            "{% elseif tags.leisure == 'sauna' %}",
+            "  {% set k = 'leisure' %}",
+            "  {% set v = tags.leisure %}",
+            "  {% if tags.sauna and tags.sauna != 'yes' %}{% set append = tagTransList('sauna', tags.sauna) %}{% endif %}",
+            "{% elseif tags.leisure == 'sports_centre' %}",
+            "  {% set k = 'leisure' %}",
+            "  {% set v = tags.leisure %}",
+            "  {% set append = tagTrans('sport', 'swimming') %}",
+            "{% elseif tags.leisure %}",
+            "  {% set k = 'leisure' %}",
+            "  {% set v = tags.leisure %}",
+            "{% elseif tags.natural %}",
+            "  {% set k = 'natural' %}",
+            "  {% set v = tags.natural %}",
+            "  {% if tags.sport %}{% set append = tagTrans('sport', 'swimming') %}{% endif %}",
+            "{% endif %}"
+        ],
+        "description": [
+            "{{ tagTrans(k, v) }}",
+            "{% if append %}({{ append }}){% endif %}"
+        ],
+        "markerSign": "{{ const[k ~ '=' ~ v].sign|raw }}",
+        "priority": "{% if tags.name %}0{% else %}1{% endif %}"
+    },
+    "info": [
+        "<table>",
+        "{% for value, data in const %}",
+        "{% if data.zoom <= map.zoom %}",
+        "  <tr>",
+        "    <td>{{ markerCircle({})|raw }}<div class='sign'>{{ data.sign|raw }}</div></td>",
+        "    <td title=\"{% if data.taginfo %}{{ data.taginfo }}{% else %}{{ value }}{% endif %}\">",
+        "      {{ keyTrans(value) }}",
+        "      {% if data.append %}({{ trans(data.append) }}){% endif %}",
+        "    </td>",
+        "  </tr>",
+        "{% endif %}",
+        "{% endfor %}",
+        "</table>"
+    ],
+    "const": {
+        "leisure=swimming_area": {
+            "zoom": 13,
+            "sign": "<img data-src='maki:swimming?size=11&fill=blue'>"
+        },
+        "leisure=water_park": {
+            "zoom": 13,
+            "sign": "<img data-src='maki:swimming'>"
+        },
+        "leisure=beach_resort": {
+            "zoom": 13,
+            "sign": "<img data-src='temaki:beach'>"
+        },
+        "leisure=sports_centre": {
+            "zoom": 13,
+            "append": "tag:sport=swimming",
+            "taginfo": "leisure=swimming_area, sport=swimming",
+            "sign": "<img data-src='maki:basketball'>"
+        },
+        "natural=water": {
+            "zoom": 13,
+            "append": "tag:sport=swimming",
+            "taginfo": "natural=water, sport=swimming",
+            "sign": "<i style='color: blue' class=\"fas fa-water\"></i>"
+        },
+        "natural=beach": {
+            "zoom": 13,
+            "sign": "<img data-src='temaki:beach?fill=green'>"
+        },
+        "amenity=public_bath": {
+            "zoom": 13,
+            "taginfo": "amenity=public_bath, bath:type=*",
+            "sign": "<i class=\"fa fa-bath\" style='color: black' aria-hidden=\"true\"></i>"
+        },
+        "tourism=spa_resort": {
+            "zoom": 13,
+            "sign": "<i class=\"fa fa-bath\" style='color: blue' aria-hidden=\"true\"></i>"
+        },
+        "leisure=swimming_pool": {
+            "zoom": 16,
+            "append": "tag:access!=private",
+            "taginfo": "leisure=swimming_pool, access!=private",
+            "sign": "<i style='font-size: 80%; color: black;' class='fas fa-swimming-pool'></i>"
+        },
+        "leisure=sauna": {
+            "zoom": 16,
+            "taginfo": "leisure=sauna, sauna:type=*",
+            "sign": "<i class=\"fa fa-thermometer-full\" aria-hidden=\"true\"></i>"
+        },
+        "amenity=shower": {
+            "zoom": 16,
+            "sign": "🚿 "
+        }
+    },
+    "filter": {
+        "type": {
+            "name": "{{ trans('filter:type') }}",
+            "type": "select",
+            "show_default": "true",
+            "values": "{% for k, v in const %}<option value=\"{{ k }}\" query=\"nwr[{{ k }}]\" minzoom=\"{{ v.zoom }}\">{{ tagTrans(k) }}</option>{% endfor %}"
+        }
+    }
+}

tourism_attractions.json

@@ -8,11 +8,13 @@
         "en": "Tourism",
         "et": "Turism",
         "fr": "Tourisme",
-        "hu": "Túrizmus",
+        "hu": "Látnivalók",
         "it": "Turismo",
         "ja": "観光",
         "nl": "Toerisme",
         "pl": "Turystyka",
+        "pt": "Turismo",
+        "pt-br": "Turismo",
         "ro": "Turism",
         "ru": "Туризм",
         "uk": "Туризм"
@@ -22,7 +24,7 @@
             "(",
             "node[tourism][tourism!~\"^(alpine_hut|apartment|camp_site|caravan_site|chalet|guest_house|hostel|hotel|information|motel|wilderness_hut)$\"];",
             "way[tourism][tourism!~\"^(alpine_hut|apartment|camp_site|caravan_site|chalet|guest_house|hostel|hotel|information|motel|wilderness_hut)$\"];",
-            "relation[tourism][tourism!~\"^(alpine_hut|apartment|camp_site|caravan_site|chalet|guest_house|hostel|hotel|information|motel|wilderness_hut)$\"]",
+            "relation[tourism][tourism!~\"^(alpine_hut|apartment|camp_site|caravan_site|chalet|guest_house|hostel|hotel|information|motel|wilderness_hut)$\"];",
             ")"
         ]
     },
@@ -47,12 +49,23 @@
     "const": {
         "aquarium": "🐟",
         "artwork": "🎨 ",
-        "attraction": "<img src='maki:attraction'>",
+        "attraction": "<img data-src='maki:attraction'>",
         "gallery": "🖼",
-        "museum": "<img src='maki:museum'>",
+        "museum": "<img data-src='maki:museum'>",
-        "picnic_site": "<img src='maki:picnic-site'>",
+        "picnic_site": "<img data-src='maki:picnic-site'>",
-        "theme_park": "<img src='maki:amusement-park'>",
+        "theme_park": "<img data-src='maki:amusement-park'>",
-        "viewpoint": "<i class='fa fa-eye' aria-hidden='true'></i>",
+        "viewpoint": "<i class='fas fa-eye' aria-hidden='true'></i>",
         "zoo": "🦁"
+    },
+    "filter": {
+        "type": {
+            "name": "{{ trans('filter:type') }}",
+            "show_default": "true",
+            "query": "nwr[{{ value }}]",
+            "type": "select",
+            "key": "tourism",
+            "values": "{% set list = [] %}{% for t, v in const %}<option value=\"{{ t }}\">{% set list = list|merge([ t ]) %}{{ tagTrans('tourism', t) }}</option>{% endfor %}",
+            "op": "has"
+        }
     }
-}
+}

tourism_services.json

@@ -8,11 +8,13 @@
         "en": "Tourism",
         "et": "Turism",
         "fr": "Tourisme",
-        "hu": "Túrizmus",
+        "hu": "Szálláshelyek, turisztikai információk",
         "it": "Turismo",
         "ja": "観光",
         "nl": "Toerisme",
         "pl": "Turystyka",
+        "pt": "Turismo",
+        "pt-br": "Serviços turísticos",
         "ro": "Turism",
         "ru": "Туризм",
         "uk": "Туризм"
@@ -22,77 +24,130 @@
             "(",
             "node[tourism~\"^(alpine_hut|apartment|camp_site|caravan_site|chalet|guest_house|hostel|hotel|motel|wilderness_hut)$\"];",
             "way[tourism~\"^(alpine_hut|apartment|camp_site|caravan_site|chalet|guest_house|hostel|hotel|motel|wilderness_hut)$\"];",
-            "relation[tourism~\"^(alpine_hut|apartment|camp_site|caravan_site|chalet|guest_house|hostel|hotel|motel|wilderness_hut)$\"]",
+            "relation[tourism~\"^(alpine_hut|apartment|camp_site|caravan_site|chalet|guest_house|hostel|hotel|motel|wilderness_hut)$\"];",
+            "nwr[office~\"^(guide|tourism|tourist_accommodation|camping)$\"];",
             ")"
         ],
         "16": [
             "(",
             "node[tourism~\"^(alpine_hut|apartment|camp_site|caravan_site|chalet|guest_house|hostel|hotel|information|motel|wilderness_hut)$\"];",
             "way[tourism~\"^(alpine_hut|apartment|camp_site|caravan_site|chalet|guest_house|hostel|hotel|information|motel|wilderness_hut)$\"];",
-            "relation[tourism~\"^(alpine_hut|apartment|camp_site|caravan_site|chalet|guest_house|hostel|hotel|information|motel|wilderness_hut)$\"]",
+            "relation[tourism~\"^(alpine_hut|apartment|camp_site|caravan_site|chalet|guest_house|hostel|hotel|information|motel|wilderness_hut)$\"];",
+            "nwr[office~\"^(guide|tourism|tourist_accommodation|camping)$\"];",
             ")"
         ]
     },
     "feature": {
-        "description": "{{ tagTrans('tourism', tags.tourism) }}",
+        "pre": [
-        "markerSign": "{{ const[tags.tourism].sign|raw }}"
+            "{% if tags.tourism %}",
+            "  {% set key = 'tourism' %}",
+            "  {% set value = tags.tourism %}",
+            "{% else %}",
+            "  {% set key = 'office' %}",
+            "  {% set value = tags.office %}",
+            "{% endif %}"
+        ],
+        "description": [
+            "{% if key == 'office' %}",
+            "  {{ keyTrans('office') }} ({{ tagTrans('office', tags.office) }})",
+            "{% else %}",
+            "  {{ tagTrans(key, value) }}",
+            "{% endif %}"
+        ],
+        "markerSign": [
+            "{% set data = const[key ~ '=' ~ value] %}",
+            "{% if data %}",
+            "{{ data.sign|raw }}",
+            "{% endif %}"
+        ]
     },
     "info": [
         "<table>",
-        "{% for value, data in const %}",
+        "{% for kv, data in const %}",
         "{% if data.zoom <= map.zoom %}",
         "  <tr>",
         "    <td>{{ markerCircle({})|raw }}<div class='sign'>{{ data.sign|raw }}</div></td>",
-        "    <td>{{ tagTrans('tourism', value) }}</td>",
+        "    <td>",
+        "      {% if kv|split('=')[0] == 'office' %}",
+        "        {{ keyTrans('office') }}",
+        "        ({{ tagTrans('office', kv|split('=')[1]) }})",
+        "      {% else %}",
+        "        {{ tagTrans(kv|split('=')[0], kv|split('=')[1]) }}",
+        "      {% endif %}",
+        "    </td>",
         "  </tr>",
         "{% endif %}",
         "{% endfor %}",
         "</table>"
     ],
     "const": {
-        "alpine_hut": {
+        "tourism=alpine_hut": {
             "sign": "🛌",
             "zoom": 13
         },
-        "apartment": {
+        "tourism=apartment": {
             "sign": "🛌",
             "zoom": 13
         },
-        "camp_site": {
+        "tourism=camp_site": {
             "sign": "⛺",
             "zoom": 13
         },
-        "caravan_site": {
+        "tourism=caravan_site": {
             "sign": "⛺",
             "zoom": 13
         },
-        "chalet": {
+        "tourism=chalet": {
             "sign": "🛌",
             "zoom": 13
         },
-        "guest_house": {
+        "tourism=guest_house": {
             "sign": "🛌",
             "zoom": 13
         },
-        "hostel": {
+        "tourism=hostel": {
             "sign": "🛌",
             "zoom": 13
         },
-        "hotel": {
+        "tourism=hotel": {
             "sign": "🛌",
             "zoom": 13
         },
-        "motel": {
+        "tourism=motel": {
             "sign": "🛌",
             "zoom": 13
         },
-        "wilderness_hut": {
+        "tourism=wilderness_hut": {
             "sign": "",
             "zoom": 13
         },
-        "information": {
+        "office=tourism": {
+            "sign": "<i class=\"fas fa-info-circle\"></i>",
+            "zoom": 13
+        },
+        "office=guide": {
+            "sign": "<i class=\"fas fa-flag\"></i>",
+            "zoom": 13
+        },
+        "office=tourist_accommodation": {
+            "sign": "🛌",
+            "zoom": 13
+        },
+        "office=camping": {
+            "sign": "⛺",
+            "zoom": 13
+        },
+        "tourism=information": {
             "sign": "ℹ️",
             "zoom": 16
         }
+    },
+    "filter": {
+        "type": {
+            "name": "{{ trans('filter:type') }}",
+            "show_default": "true",
+            "type": "select",
+            "values": "{% for k, v in const %}<option value=\"{{ k }}\" query=\"nwr[{{ k }}]\" minzoom=\"{{ v.zoom }}\">{{ trans('tag:' ~ k) }}</option>{% endfor %}"
+        }
     }
 }

transport_alternative.json

@@ -4,11 +4,12 @@
         "cs": "Alternativní (Cyklistika, Pěší turistika, ...)",
         "el": "Εναλλακτικά (ποδηλασία, ορειβασία,...)",
         "et": "Alternatiivne (jalgrattasõit, matkamine, ...)",
-        "fr": "Alternatif (Cyclisme, Randonnée, ...)",
+        "fr": "Alternatif (cyclisme, randonnée, ...)",
-        "hu": "Alternatív (Krékpár, Túra)",
+        "hu": "Alternatív (Kerékpár, Túra)",
         "it": "Alternativi (bicicletta, camminate, ...)",
         "ja": "その他交通 (サイクリング、ハイキング、...)",
         "nl": "Alternatief (Fiets, Wandel, ...)",
+        "pt-br": "Transporte alternativo",
         "ro": "Alternativ(Bicicleta,Drumetii)",
         "ru": "Альтернативное передвижение (Велоспорт, Пешие прогулки, ...)",
         "uk": "Інші (Велосипедні, піші, ...)"

walk_amenities.json

@@ -3,7 +3,9 @@
     "name": {
         "de": "Einrichtungen",
         "en": "Amenities",
-        "fr": "Équipements"
+        "fr": "Équipements piétons",
+        "hu": "Gyalogos létesítmények",
+        "pt-br": "Equipamentos"
     },
     "query": {
         "13": [

waste.json

@@ -5,68 +5,80 @@
         "cs": "Nakládání s odpady",
         "de": "Entsorgung",
         "en": "Disposal",
-        "fr": "Rebuts",
+        "fr": "Déchets/Recyclage",
+        "hu": "Hulladék",
         "it": "Smaltimento",
         "ja": "処理場",
         "nl": "Afvalverwijdering",
+        "pt": "Lixo",
+        "pt-br": "Lixo",
         "ru": "Переработка отходов"
     },
     "query": {
         "13": [
             "(",
             "node[landuse=landfill];",
-            "node[man_made=wastewater_plant];",
+            "node[man_made~\"^(wastewater_plant|incinerator)$\"];",
             "node[amenity=recycling][recycling_type=centre];",
             "way[landuse=landfill];",
-            "way[man_made=wastewater_plant];",
+            "way[man_made~\"^(wastewater_plant|incinerator)$\"];",
             "way[amenity=recycling][recycling_type=centre];",
             "relation[landuse=landfill];",
-            "relation[man_made=wastewater_plant];",
+            "relation[man_made~\"^(wastewater_plant|incinerator)$\"];",
             "relation[amenity=recycling][recycling_type=centre];",
+            "nwr[amenity=waste_transfer_station];",
+            "nwr[power=generator][\"generator:source\"~\"^(.*;|)waste(;.*|)$\"];",
             ")"
         ],
         "15": [
             "(",
             "node[landuse=landfill];",
-            "node[man_made=wastewater_plant];",
+            "node[man_made~\"^(wastewater_plant|incinerator)$\"];",
-            "node[amenity=recycling];",
+            "node[amenity~\"^(recycling|waste_disposal|waste_transfer_station)$\"];",
             "way[landuse=landfill];",
-            "way[man_made=wastewater_plant];",
+            "way[man_made~\"^(wastewater_plant|incinerator)$\"];",
-            "way[amenity=recycling];",
+            "way[amenity~\"^(recycling|waste_disposal|waste_transfer_station)$\"];",
             "relation[landuse=landfill];",
-            "relation[man_made=wastewater_plant];",
+            "relation[man_made~\"^(wastewater_plant|incinerator)$\"];",
-            "relation[amenity=recycling];",
+            "relation[amenity~\"^(recycling|waste_disposal|waste_transfer_station)$\"];",
+            "nwr[power=generator][\"generator:source\"~\"^(.*;|)waste(;.*|)$\"];",
             ")"
         ],
         "18": [
             "(",
             "node[landuse=landfill];",
-            "node[man_made=wastewater_plant];",
+            "node[man_made~\"^(wastewater_plant|incinerator)$\"];",
-            "node[amenity~\"^(recycling|waste_basket)$\"];",
+            "node[amenity~\"^(recycling|waste_basket|waste_disposal|waste_transfer_station)$\"];",
             "way[landuse=landfill];",
-            "way[man_made=wastewater_plant];",
+            "way[man_made~\"^(wastewater_plant|incinerator)$\"];",
-            "way[amenity=recycling];",
+            "way[amenity~\"^(recycling|waste_basket|waste_disposal|waste_transfer_station)$\"];",
             "relation[landuse=landfill];",
-            "relation[man_made=wastewater_plant];",
+            "relation[man_made~\"^(wastewater_plant|incinerator)$\"];",
-            "relation[amenity=recycling];",
+            "relation[amenity~\"^(recycling|waste_basket|waste_disposal|waste_transfer_station)$\"];",
+            "nwr[power=generator][\"generator:source\"~\"^(.*;|)waste(;.*|)$\"];",
             ")"
         ]
     },
     "feature": {
         "pre": [
+            "{% set add = '' %}",
             "{% if tags.landuse == 'landfill' %}",
             "  {% set key = 'landuse' %}",
             "  {% set value = tags.landuse %}",
-            "{% elseif tags.man_made == 'wastewater_plant' %}",
+            "{% elseif tags.man_made in [ 'incinerator', 'wastewater_plant' ] %}",
             "  {% set key = 'man_made' %}",
             "  {% set value = tags.man_made %}",
-            "{% elseif tags.amenity == 'recycling' or tags.amenity == 'waste_basket' %}",
+            "{% elseif tags.amenity in [ 'recycling', 'waste_basket', 'waste_disposal', 'waste_transfer_station' ] %}",
             "  {% set key = 'amenity' %}",
             "  {% set value = tags.amenity %}",
+            "{% elseif tags.power == 'generator' %}",
+            "  {% set key = 'power' %}",
+            "  {% set value = tags.power %}",
+            "  {% set add = '(' ~ tagTransList('generator:source', attribute(tags, 'generator:source')) ~ ')' %}",
             "{% endif %}",
             "{% set kv = key ~ '=' ~ value %}"
         ],
-        "description": "{{ tagTrans(key, value) }}",
+        "description": "{{ tagTrans(key, value) }} {{ add }}",
         "body": [
             "{% if tags.recycling_type %}",
             "{{ keyTrans('recycling_type') }}: {{ tagTrans('recycling_type', tags.recycling_type) }}",
@@ -86,7 +98,7 @@
         "  {% set value  = kv|split('=')[1] %}",
         "  <tr>",
         "    <td>{{ markerCircle({})|raw }}<div class='sign'>{{ data.sign|raw }}</div></td>",
-        "    <td>{{ tagTrans('leisure', value) }}</td>",
+        "    <td>{{ tagTrans(key, value) }}{% if data.add %} ({{ trans(data.add) }}){% endif %}</td>",
         "  </tr>",
         "  {% endif %}",
         "{% endfor %}",
@@ -99,11 +111,28 @@
     "const": {
         "amenity=recycling": {
             "minZoom": 13,
-            "sign": "<img src='maki:recycling'>"
+            "sign": "<img data-src='maki:recycling'>"
+        },
+        "man_made=wastewater_plant": {
+            "minZoom": 13,
+            "sign": "<i class='fas fa-water'></i>"
+        },
+        "man_made=incinerator": {
+            "minZoom": 13,
+            "sign": "<i class='fas fa-burn'></i>"
+        },
+        "power=generator": {
+            "minZoom": 13,
+            "sign": "<i class='fas fa-bolt'></i>",
+            "add": "tag:generator:source=waste"
+        },
+        "amenity=waste_disposal": {
+            "minZoom": 15,
+            "sign": "<img data-src='maki:waste-basket'>"
         },
         "amenity=waste_basket": {
             "minZoom": 18,
-            "sign": "<img src='maki:waste-basket'>"
+            "sign": "<img data-src='maki:waste-basket'>"
         }
     }
 }

water.json

@@ -3,117 +3,267 @@
     "name": {
         "de": "Gewässer",
         "en": "Waterbodies",
-        "fr": "Hydrographie"
+        "fr": "Hydrographie",
+        "hu": "Vizek",
+        "pt": "Massas de água",
+        "pt-br": "Hidrografia"
     },
     "query": {
         "10": [
             "(",
             "way[waterway~\"^(river|canal)$\"];",
-            "way[natural~\"^(divide)$\"];",
+            "nwr[natural~\"^(divide|bay|strait)$\"];",
             "way[natural=water][water~\"^(lake|lagoon|reservoir|canal)$\"];",
             "relation[natural=water][type=multipolygon][water~\"^(lake|lagoon|reservoir|canal)$\"];",
             ")"
         ],
         "13": [
             "(",
-            "node[natural~\"^(water|divide)$\"];",
+            "nwr[natural~\"^(water|divide|bay|strait|spring|hot_spring|geyser)$\"];",
-            "way[natural~\"^(water|divide)$\"];",
             "relation[type=multipolygon][natural=water];",
             "relation[type=multipolygon][waterway=riverbank];",
-            "way[waterway];",
+            "nwr[waterway];",
             ")"
         ]
     },
     "feature": {
-        "description": [
+        "pre": [
             "{% if tags.waterway %}",
-            "{{ tagTrans('waterway', tags.waterway) }}",
+            "  {% set key = 'waterway' %}",
+            "  {% set value = tags.waterway %}",
             "{% elseif tags.water %}",
-            "{{ tagTrans('water', tags.water) }}",
+            "  {% set key = 'water' %}",
+            "  {% set value = tags.water %}",
             "{% elseif tags.natural %}",
-            "{{ tagTrans('natural', tags.natural) }}",
+            "  {% set key = 'natural' %}",
+            "  {% set value = tags.natural %}",
+            "{% endif %}",
+            "{% set kv = key ~ '=' ~ value %}",
+            "{% set data = const[kv]|default(const['natural=water']) %}"
+        ],
+        "description": [
+            "{{ tagTrans(key, value) }}"
+        ],
+        "body": [
+            "<ul>",
+            "{% if tags.intermittent %}",
+            "  <li class='hasSymbol'>",
+            "   <i class=\"far fa-circle\"></i>",
+            "   <span class='key'>{{ keyTrans('intermittent') }}:</span>",
+            "   <span class='value'>{{ tagTrans('intermittent', tags.intermittent) }}</span>",
+            "{% endif %}",
+            "</ul>"
+        ],
+        "markerSign": [
+            "{{ const[kv].sign|raw }}"
+        ],
+        "markerSymbol": [
+            "{% if data.symbol == 'pointer' %}",
+            "{{ markerPointer({ fillColor: '#3388ff' })|raw }}",
             "{% endif %}"
         ],
-        "markerSymbol": null,
         "listMarkerSymbol": [
-            "{% if tags.natural == 'water' %}",
+            "{% if data.symbol == 'pointer' %}",
+            "{{ markerCircle({ fillColor: '#3388ff' })|raw }}",
+            "{% elseif data.symbol == 'polygon' %}",
             "polygon",
             "{% else %}",
             "line",
             "{% endif %}"
         ],
-        "priority": [
+        "priority": "{{ data.priority }}",
-            "{% if tags.natural == 'divide' %}",
-            "0",
-            "{% elseif tags.natural == 'water' and tags.water in ['lake', 'lagoon', 'reservoir', 'canal'] %}",
-            "0",
-            "{% elseif tags.waterway == 'river' %}",
-            "1",
-            "{% elseif tags.waterway == 'stream' %}",
-            "3",
-            "{% elseif tags.waterway == 'ditch' %}",
-            "5",
-            "{% else %}",
-            "2",
-            "{% endif %}"
-        ],
         "style": {
-            "width": [
+            "width": "{{ data.style.width }}",
-                "{% if tags.waterway == 'river' %}",
+            "color": "{{ data.style.color }}",
-                "4",
-                "{% elseif tags.waterway == 'stream' %}",
-                "2",
-                "{% elseif tags.waterway == 'ditch' %}",
-                "1",
-                "{% else %}",
-                "3",
-                "{% endif %}"
-            ],
-            "color": [
-                "{% if tags.natural == 'divide' %}",
-                "#ff0000",
-                "{% elseif tags.waterway in [ 'dam', 'weir' ] %}",
-                "#000000",
-                "{% else %}",
-                "#3388ff",
-                "{% endif %}"
-            ],
             "text": [
-                "{% if type=='way' and tags.waterway in [ 'river', 'stream', 'canal', 'ditch', 'wadi', 'drystream' ] %}",
+                "{% if data.text %}",
                 "{{ tags.name }}   ➔   ",
                 "{% endif %}"
             ],
-            "textRepeat": "1"
+            "textRepeat": "1",
+            "dashArray": "{% if tags.intermittent == 'yes' %}5,5{% endif %}",
+            "lineCap": "{% if tags.intermittent == 'yes' %}butt{% else %}round{% endif %}"
+        }
+    },
+    "const": {
+        "natural=water": {
+            "zoom": 10,
+            "symbol": "polygon",
+            "style": {
+                "width": 3,
+                "color": "#3388ff"
+            },
+            "priority": 2
+        },
+        "water=lake": {
+            "zoom": 10,
+            "symbol": "polygon",
+            "style": {
+                "width": 3,
+                "color": "#3388ff"
+            },
+            "hideInfo": true,
+            "priority": 0
+        },
+        "water=lagoon": {
+            "zoom": 10,
+            "symbol": "polygon",
+            "style": {
+                "width": 3,
+                "color": "#3388ff"
+            },
+            "hideInfo": true,
+            "priority": 0
+        },
+        "water=reservoir": {
+            "zoom": 10,
+            "symbol": "polygon",
+            "style": {
+                "width": 3,
+                "color": "#3388ff"
+            },
+            "hideInfo": true,
+            "priority": 0
+        },
+        "waterway=river": {
+            "zoom": 10,
+            "symbol": "line",
+            "style": {
+                "width": 4,
+                "color": "#3388ff"
+            },
+            "text": true,
+            "priority": 1
+        },
+        "waterway=canal": {
+            "alias": [
+                "water=canal"
+            ],
+            "zoom": 10,
+            "symbol": "line",
+            "style": {
+                "width": 4,
+                "color": "#3388ff"
+            },
+            "text": true,
+            "priority": 1
+        },
+        "waterway=stream": {
+            "zoom": 13,
+            "symbol": "line",
+            "style": {
+                "width": 2,
+                "color": "#3388ff"
+            },
+            "text": true,
+            "priority": 3
+        },
+        "waterway=drain": {
+            "zoom": 13,
+            "symbol": "line",
+            "style": {
+                "width": 2,
+                "color": "#3388ff"
+            },
+            "text": true,
+            "priority": 3
+        },
+        "waterway=ditch": {
+            "zoom": 13,
+            "symbol": "line",
+            "style": {
+                "width": 1,
+                "color": "#3388ff"
+            },
+            "text": true,
+            "priority": 5
+        },
+        "natural=spring": {
+            "sign": "<i class='fas fa-water'></i>",
+            "zoom": 13,
+            "symbol": "pointer"
+        },
+        "natural=hot_spring": {
+            "sign": "<i style='color: orange;' class='fas fa-water'></i>",
+            "zoom": 13,
+            "symbol": "pointer"
+        },
+        "natural=geyser": {
+            "sign": "<i style='color: red;' class='fas fa-water'></i>",
+            "zoom": 13,
+            "symbol": "pointer"
+        },
+        "waterway=waterfall": {
+            "sign": "<img data-src='maki:waterfall'>",
+            "zoom": 13,
+            "symbol": "pointer"
+        },
+        "waterway=dam": {
+            "zoom": 13,
+            "symbol": "line",
+            "style": {
+                "width": 3,
+                "color": "#000000"
+            },
+            "priority": 3
+        },
+        "waterway=weir": {
+            "zoom": 13,
+            "symbol": "line",
+            "style": {
+                "width": 3,
+                "color": "#000000"
+            },
+            "priority": 3
+        },
+        "natural=divide": {
+            "zoom": 10,
+            "symbol": "line",
+            "style": {
+                "width": 3,
+                "color": "#ff0000"
+            },
+            "text": true,
+            "priority": 0
+        }
+    },
+    "filter": {
+        "type": {
+            "name": "{{ trans('filter:type') }}",
+            "key": "natural",
+            "type": "select",
+            "show_default": "true",
+            "values": "{% for k, data in const %}<option value=\"{{ k }}\" query=\"(nwr[{{ k }}];{% for a in data.alias %}nwr[{{ a }}];{% endfor %})\">{{ tagTrans(k) }}</option>{% endfor %}",
+            "sort": "natsort"
+        },
+        "intermittent": {
+            "name": "{{ keyTrans('intermittent') }}",
+            "key": "intermittent",
+            "type": "radio",
+            "values": "<option value='yes' query=\"nwr[intermittent][intermittent!=no]\">{{ tagTrans('intermittent', 'yes') }}</option><option value='no' query=\"(nwr[!intermittent];nwr[intermittent=no];)\">{{ tagTrans('intermittent', 'no') }}</option>"
         }
     },
     "info": [
         "<table>",
+        "  {% for k, data in const %}",
+        "    {% if not data.hideInfo and data.zoom <= map.zoom %}",
+        "    <tr>",
+        "      <td>",
+        "      {% if data.symbol == 'pointer' %}",
+        "        {{ markerCircle({ fillColor: '#3388ff' })|raw }}<div class='sign'>{{ data.sign|raw }}</div>",
+        "      {% elseif data.symbol == 'polygon' %}",
+        "        {{ markerPolygon(data.style)|raw }}",
+        "      {% elseif data.symbol == 'line' %}",
+        "        {{ markerLine(data.style)|raw }}",
+        "      {% endif %}",
+        "      </td>",
+        "      <td>{{ tagTrans(k) }}</td>",
+        "    </tr>",
+        "    {% endif %}",
+        "  {% endfor %}",
         "  <tr>",
-        "    <td>{{ markerPolygon(evaluate({ \"natural\": \"water\" }))|raw }}</td>",
+        "    <td>{{ markerLine({ width: 3, color: '#3388ff', dashArray: '5,5', lineCap: 'butt' })|raw }}</td>",
-        "    <td>{{ tagTrans('natural', 'water') }}</td>",
+        "    <td>{{ keyTrans('intermittent') }}</td>",
-        "  </tr>",
-        "  <tr>",
-        "    <td>{{ markerLine(evaluate({ \"waterway\": \"river\" }))|raw }}</td>",
-        "    <td>{{ tagTrans('waterway', 'river') }},",
-        " {{ tagTrans('waterway', 'canal') }}</td>",
-        "  </tr>",
-        "{% if map.zoom >= 13 %}",
-        "  <tr>",
-        "    <td>{{ markerLine(evaluate({ \"waterway\": \"stream\" }))|raw }}</td>",
-        "    <td>{{ tagTrans('waterway', 'stream') }}</td>",
-        "  </tr>",
-        "  <tr>",
-        "    <td>{{ markerLine(evaluate({ \"waterway\": \"ditch\" }))|raw }}</td>",
-        "    <td>{{ tagTrans('waterway', 'ditch') }}</td>",
-        "  </tr>",
-        "  <tr>",
-        "    <td>{{ markerLine(evaluate({ \"waterway\": \"dam\" }))|raw }}</td>",
-        "    <td>{{ tagTrans('waterway', 'dam') }}, {{ tagTrans('waterway', 'weir') }}</td>",
-        "  </tr>",
-        "{% endif %}",
-        "  <tr>",
-        "    <td>{{ markerLine(evaluate({ \"natural\": \"divide\" }))|raw }}</td>",
-        "    <td>{{ tagTrans('natural', 'divide') }}</td>",
         "  </tr>",
         "</table>"
     ]

wikipedia.json

@@ -2,7 +2,11 @@
     "type": "overpass",
     "name": {
         "de": "Wikipedia",
-        "en": "Wikipedia"
+        "en": "Wikipedia",
+        "fr": "Wikipédia",
+        "hu": "Wikipédia",
+        "pt": "Wikipédia",
+        "pt-br": "Wikipédia"
     },
     "query": {
         "14": [