Browse Source

Merge branch 'master' into layouts

bug-43
parent
commit
84e4d245b4
  1. 63
      lang/pt.json
  2. 24
      lang/tr.json
  3. 4
      leisure.json
  4. 40
      natural.json

63
lang/pt.json

@ -1,88 +1,88 @@
{ {
"Objects with diet information": "",
"Objects with diet information": "Objetos com informações sobre dieta",
"category:administrative": "Regiões administrativas", "category:administrative": "Regiões administrativas",
"category:agriculture": "Agricultura", "category:agriculture": "Agricultura",
"category:alternative_amenities": "",
"category:alternative_amenities": "Equipamentos",
"category:alternative_routes": "Rotas", "category:alternative_routes": "Rotas",
"category:buildings": "Edifícios", "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:buildings-entrances": "Entradas",
"category:buildings-figure-ground": "Cheios e vazios",
"category:buildings-height": "Altura dos edifícios",
"category:buildings-start_date": "Idade dos edifícios",
"category:buildings-type": "Tipos dos edifícios",
"category:car_amenities": "Equipamentos",
"category:car_furniture": "Mobiliário urbano", "category:car_furniture": "Mobiliário urbano",
"category:car_maxspeed": "Velocidade máxima", "category:car_maxspeed": "Velocidade máxima",
"category:car_routes": "",
"category:children": "",
"category:coal": "",
"category:car_routes": "Rotas rodoviárias",
"category:children": "Equipamentos infantis",
"category:coal": "Carvão",
"category:communication": "Comunicação", "category:communication": "Comunicação",
"category:construction": "Locais de construção", "category:construction": "Locais de construção",
"category:craft": "Artesanato", "category:craft": "Artesanato",
"category:culture": "Cultura", "category:culture": "Cultura",
"category:culture_religion": "Cultura e religião", "category:culture_religion": "Cultura e religião",
"category:cycle_amenities": "",
"category:cycle_amenities": "Equipamentos",
"category:cycle_routes": "Ciclovias", "category:cycle_routes": "Ciclovias",
"category:education": "Educação", "category:education": "Educação",
"category:electric_power": "Eletricidade", "category:electric_power": "Eletricidade",
"category:emergency": "Emergência", "category:emergency": "Emergência",
"category:energy": "",
"category:energy": "Energia",
"category:financial": "Finanças", "category:financial": "Finanças",
"category:gastro": "Restauração", "category:gastro": "Restauração",
"category:gastro-smoking": "Restauração livre de tabaco", "category:gastro-smoking": "Restauração livre de tabaco",
"category:health": "Saúde", "category:health": "Saúde",
"category:hiking_routes": "Rotas de caminhada", "category:hiking_routes": "Rotas de caminhada",
"category:historic": "Histórico", "category:historic": "Histórico",
"category:index": "",
"category:index": "Índice de categorias",
"category:infrastructure": "Infraestrutura", "category:infrastructure": "Infraestrutura",
"category:internet": "Acesso à Internet", "category:internet": "Acesso à Internet",
"category:law": "",
"category:law": "Direito",
"category:leisure": "Lazer", "category:leisure": "Lazer",
"category:leisure_sport_shopping": "Lazer, desporto e compras", "category:leisure_sport_shopping": "Lazer, desporto e compras",
"category:memorial": "",
"category:memorial": "Memoriais e monumentos",
"category:military": "Militar", "category:military": "Militar",
"category:mtb-routes": "", "category:mtb-routes": "",
"category:natural": "Formações naturais", "category:natural": "Formações naturais",
"category:office": "",
"category:oil_gas": "",
"category:organisations": "",
"category:office": "Escritórios",
"category:oil_gas": "Petróleo e gás natural",
"category:organisations": "Organizações",
"category:other": "Outros", "category:other": "Outros",
"category:outdoor": "",
"category:outdoor": "Atividades ao ar livre",
"category:phone": "Telefone", "category:phone": "Telefone",
"category:places": "Lugares", "category:places": "Lugares",
"category:places_geo": "Lugares", "category:places_geo": "Lugares",
"category:playgrounds": "Parques infantis", "category:playgrounds": "Parques infantis",
"category:post": "Correios", "category:post": "Correios",
"category:power_routes": "",
"category:pt": "",
"category:power_routes": "Rotas energéticas",
"category:pt": "Mapa de transporte público",
"category:pt:routes": "Rotas", "category:pt:routes": "Rotas",
"category:pt:stops": "", "category:pt:stops": "",
"category:pt_amenities": "",
"category:pt_amenities": "Equipamentos",
"category:public": "Serviços públicos", "category:public": "Serviços públicos",
"category:railway": "Linhas ferroviárias", "category:railway": "Linhas ferroviárias",
"category:railway-electrification": "Eletrificação ferroviária", "category:railway-electrification": "Eletrificação ferroviária",
"category:railway-gauge": "", "category:railway-gauge": "",
"category:railway-infrastructure": "Infraestrutura ferroviária", "category:railway-infrastructure": "Infraestrutura ferroviária",
"category:railway-maxspeed": "Velocidade máxima", "category:railway-maxspeed": "Velocidade máxima",
"category:railway-routes": "",
"category:railway-routes": "Rotas ferroviárias",
"category:religion": "Religião", "category:religion": "Religião",
"category:renewables": "",
"category:renewables": "Renováveis",
"category:residential": "Áreas residenciais", "category:residential": "Áreas residenciais",
"category:resources": "Extração de recursos", "category:resources": "Extração de recursos",
"category:services": "Serviços", "category:services": "Serviços",
"category:shop": "Compras", "category:shop": "Compras",
"category:special": "Especial", "category:special": "Especial",
"category:sport": "Desporto", "category:sport": "Desporto",
"category:swimming_bathing": "",
"category:swimming_bathing": "Natação e banho",
"category:tourism_attractions": "Turismo", "category:tourism_attractions": "Turismo",
"category:tourism_services": "Turismo", "category:tourism_services": "Turismo",
"category:transport": "Transportes", "category:transport": "Transportes",
"category:transport_alternative": "",
"category:transport_alternative": "Modais de transporte alternativo",
"category:transport_car": "Transporte individual", "category:transport_car": "Transporte individual",
"category:transport_cycle": "Ciclismo", "category:transport_cycle": "Ciclismo",
"category:transport_pt": "Transportes públicos", "category:transport_pt": "Transportes públicos",
"category:transport_walk": "Pedestre", "category:transport_walk": "Pedestre",
"category:walk_amenities": "",
"category:walk_amenities": "Equipamentos",
"category:waste": "Lixo", "category:waste": "Lixo",
"category:water": "Massas de água", "category:water": "Massas de água",
"category:wikipedia": "Wikipédia", "category:wikipedia": "Wikipédia",
@ -90,5 +90,10 @@
"category:xmas": "", "category:xmas": "",
"date format not understood": "", "date format not understood": "",
"outdated feature": "", "outdated feature": "",
"xmas:outdated-warning": ""
"xmas:outdated-warning": "",
"category:climbing": "Escalada",
"category:developable_areas": "Áreas urbanizáveis",
"category:developments": "Planeamento e construção",
"category:proposals": "Propostas",
"category:roads": "Vias"
} }

24
lang/tr.json

@ -15,5 +15,27 @@
"category:climbing": "Tırmanış", "category:climbing": "Tırmanış",
"category:administrative": "İdari Alanlar", "category:administrative": "İdari Alanlar",
"category:communication": "İletişim", "category:communication": "İletişim",
"category:construction": "İnşaat Sahaları"
"category:construction": "İnşaat Sahaları",
"Objects with diet information": "Diyet bilgisi içeren Nesneler",
"category:alternative_amenities": "Tesisler",
"category:coal": "Kömür",
"category:culture": "Kültür",
"category:culture_religion": "Kültür ve Din",
"category:cycle_amenities": "Tesisler",
"category:cycle_routes": "Bisiklet Rotaları",
"category:developable_areas": "Gelişim Sahaları",
"category:developments": "Planlama ve İnşaat",
"category:education": "Eğitim Servisleri",
"category:electric_power": "Elektrik Enerjisi",
"category:emergency": "Acil Servisler",
"category:energy": "Enerji",
"category:financial": "Finansal",
"category:gastro": "Gastronomi",
"category:health": "Sağlık",
"category:hiking_routes": "Yürüyüş rotaları",
"category:historic": "Tarihi",
"category:index": "Kategori İndeksi",
"category:infrastructure": "Altyapı",
"category:internet": "İnternet erişimi",
"category:law": "Hukuk"
} }

4
leisure.json

@ -101,7 +101,7 @@
"escape_game": "<i class='fas fa-shoe-prints'></i>", "escape_game": "<i class='fas fa-shoe-prints'></i>",
"firepit": "<img data-src='maki:fire-station'>", "firepit": "<img data-src='maki:fire-station'>",
"fishing": "<img data-src='temaki:fishing_pier'>", "fishing": "<img data-src='temaki:fishing_pier'>",
"fitness_centre": "<img data-src='maki:fitness-center'>",
"fitness_centre": "<img data-src='maki:fitness-centre'>",
"fitness_station": "<img data-src='temaki:physiotherapist'>", "fitness_station": "<img data-src='temaki:physiotherapist'>",
"garden": "<img data-src='maki:garden'>", "garden": "<img data-src='maki:garden'>",
"golf_course": "<img data-src='maki:golf'>", "golf_course": "<img data-src='maki:golf'>",
@ -121,7 +121,7 @@
"slipway": "<img data-src='maki:slipway'>", "slipway": "<img data-src='maki:slipway'>",
"sport": "<img data-src='maki:soccer'>", "sport": "<img data-src='maki:soccer'>",
"sports_centre": "<img data-src='temaki:tennis'>", "sports_centre": "<img data-src='temaki:tennis'>",
"sports_hall": "<img data-src='maki:fitness-center'>",
"sports_hall": "<img data-src='maki:fitness-centre'>",
"stadium": "<img data-src='maki:stadium'>", "stadium": "<img data-src='maki:stadium'>",
"summer_camp": "<i class='fas fa-sun'></i>", "summer_camp": "<i class='fas fa-sun'></i>",
"swimming_area": "<img data-src='maki:swimming'>", "swimming_area": "<img data-src='maki:swimming'>",

40
natural.json

@ -20,33 +20,47 @@
"9": [ "9": [
"(", "(",
"node[natural~\"^(peak|volcano|valley)$\"];", "node[natural~\"^(peak|volcano|valley)$\"];",
"nwr[place~\"^(island)$\"];",
")" ")"
], ],
"13": [ "13": [
"(", "(",
"nwr[natural~\"^(peak|volcano|wood|glacier|cape|peninsula|beach|coastline|reef|hill|valley|ridge|arete|saddle|sinkhole|cave_entrance|isthmus)$\"];", "nwr[natural~\"^(peak|volcano|wood|glacier|cape|peninsula|beach|coastline|reef|hill|valley|ridge|arete|saddle|sinkhole|cave_entrance|isthmus)$\"];",
"nwr[place~\"^(island|islet)$\"];",
")" ")"
], ],
"16": [ "16": [
"(", "(",
"nwr[natural][natural!~\"^(water|divide|bay|strait|spring|hot_spring|geyser|tree)$\"];", "nwr[natural][natural!~\"^(water|divide|bay|strait|spring|hot_spring|geyser|tree)$\"];",
"nwr[place~\"^(island|islet)$\"];",
")" ")"
], ],
"18": [ "18": [
"(", "(",
"nwr[natural][natural!~\"^(water|divide|bay|strait|spring|hot_spring|geyser)$\"];", "nwr[natural][natural!~\"^(water|divide|bay|strait|spring|hot_spring|geyser)$\"];",
"nwr[place~\"^(island|islet)$\"];",
")" ")"
] ]
}, },
"feature": { "feature": {
"pre": [
"{% if tags.place in [ 'island', 'islet' ] %}",
"{% set key = 'place' %}",
"{% set value = tags.place %}",
"{% else %}",
"{% set key = 'natural' %}",
"{% set value = tags.natural %}",
"{% endif %}"
],
"details": "{% if tags.natural == 'peak' and tags.ele %}{{ tags.ele }}m{% endif %}", "details": "{% if tags.natural == 'peak' and tags.ele %}{{ tags.ele }}m{% endif %}",
"description": "{{ tagTrans('natural', tags.natural) }}",
"description": "{{ tagTrans(key, value) }}",
"style": { "style": {
"color": "{{ const[tags.natural].color|default('#f2756a') }}"
"color": "{{ const[value].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 }}"
"markerSign": "<span style='color: white'>{{ const[value].sign|raw }}</span>",
"markerSymbol": "{{ markerPointer({ fillColor: const[value].color|default('#f2756a') })|raw }}",
"listMarkerSymbol": "{{ markerCircle({ fillColor: const[value].color|default('#f2756a') })|raw }}",
"priority": "{% if tags.name %}0{% else %}1{% endif %}"
}, },
"filter": { "filter": {
"type": { "type": {
@ -54,12 +68,26 @@
"key": "natural", "key": "natural",
"type": "select", "type": "select",
"show_default": "true", "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>",
"values": "{% set list = [] %}{% for k, v in const %}<option value=\"{{ k }}\" {% if v.key %}query='nwr[\"{{ v.key }}\"=\"{{ k }}\"]'{% endif %}>{% set list = list|merge([ k ]) %}{{ tagTrans(v.key|default('natural'), k) }}</option>{% endfor %}<option weight='1' value='other' query='nwr[natural][natural!~\"^(|.*;)({{ list|join('|') }})(|;.*)$\"]'>{{ trans('other') }}</option>",
"sort": "natsort", "sort": "natsort",
"op": "has" "op": "has"
} }
}, },
"const": { "const": {
"island": {
"zoom": 9,
"sign": "<img data-src='temaki:island_trees_building'>",
"color": "#cfb997",
"key": "place",
"group": "landform"
},
"islet": {
"zoom": 13,
"sign": "<img data-src='temaki:island_trees_building'>",
"color": "#cfb997",
"key": "place",
"group": "landform"
},
"wood": { "wood": {
"zoom": 13, "zoom": 13,
"sign": "<i class='fas fa-tree'></i>", "sign": "<i class='fas fa-tree'></i>",

Loading…
Cancel
Save