From cec3fac810bef2be3bd648b379b00e98381cfb83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sat, 14 Nov 2020 18:55:15 +0100
Subject: [PATCH 1/6] natural: include place=island (z>=9) and place=islet
(z>=13)
---
natural.json | 39 +++++++++++++++++++++++++++++++++------
1 file changed, 33 insertions(+), 6 deletions(-)
diff --git a/natural.json b/natural.json
index 53749c3..990d263 100644
--- a/natural.json
+++ b/natural.json
@@ -20,36 +20,49 @@
"9": [
"(",
"node[natural~\"^(peak|volcano|valley)$\"];",
+ "nwr[place~\"^(island)$\"];",
")"
],
"13": [
"(",
"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": [
"(",
"nwr[natural][natural!~\"^(water|divide|bay|strait|spring|hot_spring|geyser|tree)$\"];",
+ "nwr[place~\"^(island|islet)$\"];",
")"
],
"18": [
"(",
"nwr[natural][natural!~\"^(water|divide|bay|strait|spring|hot_spring|geyser)$\"];",
+ "nwr[place~\"^(island|islet)$\"];",
")"
]
},
"feature": {
+ "pre": [
+ "{% if tags.place in [ 'island', 'islet' ] %}",
+ "{% set key = 'place' %}",
+ "{% set value = tags.place %}",
+ "{% else %}",
+ "{% set key = 'natural' %}",
+ "{% set value = tags.natural %}",
+ "{% endif %}"
+ ],
"title": [
"{{ localizedTag(tags, 'name') | default(trans('unnamed')) }}",
"{% if tags.natural == 'peak' and tags.ele %}({{ tags.ele }}m){% endif %}"
],
- "description": "{{ tagTrans('natural', tags.natural) }}",
+ "description": "{{ tagTrans(key, value) }}",
"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 }}"
},
"filter": {
"type": {
@@ -57,12 +70,26 @@
"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>",
+ "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",
"op": "has"
}
},
"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": {
"zoom": 13,
"sign": "<i class='fas fa-tree'></i>",
From 1be852519753915ca6032075ca4903a516cb0ddd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sat, 14 Nov 2020 19:01:32 +0100
Subject: [PATCH 2/6] natural: list named items first
---
natural.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/natural.json b/natural.json
index 990d263..32d4819 100644
--- a/natural.json
+++ b/natural.json
@@ -62,7 +62,8 @@
},
"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 }}"
+ "listMarkerSymbol": "{{ markerCircle({ fillColor: const[value].color|default('#f2756a') })|raw }}",
+ "priority": "{% if tags.name %}0{% else %}1{% endif %}"
},
"filter": {
"type": {
From a83107490a6d18690ed2baf2b29f1a008a6761c2 Mon Sep 17 00:00:00 2001
From: Engin Gem <engingem@gmail.com>
Date: Thu, 24 Dec 2020 22:27:17 +0000
Subject: [PATCH 3/6] Translated using Weblate (Turkish)
Currently translated at 40.2% (39 of 97 strings)
Translation: OpenStreetBrowser/Main Categories
Translate-URL: http://weblate.openstreetbrowser.org/projects/openstreetbrowser/main-categories/tr/
---
lang/tr.json | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/lang/tr.json b/lang/tr.json
index 2993a2c..384a2c8 100644
--- a/lang/tr.json
+++ b/lang/tr.json
@@ -15,5 +15,27 @@
"category:climbing": "Tırmanış",
"category:administrative": "İdari Alanlar",
"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"
}
From 79625fca09d506334ba7e9711cde1c40c9c1811c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Wed, 6 Jan 2021 10:09:34 +0100
Subject: [PATCH 4/6] Adapt to Maki Icon Set 6.0.0
---
leisure.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/leisure.json b/leisure.json
index fbe2449..42b03ab 100644
--- a/leisure.json
+++ b/leisure.json
@@ -101,7 +101,7 @@
"escape_game": "<i class='fas fa-shoe-prints'></i>",
"firepit": "<img data-src='maki:fire-station'>",
"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'>",
"garden": "<img data-src='maki:garden'>",
"golf_course": "<img data-src='maki:golf'>",
@@ -121,7 +121,7 @@
"slipway": "<img data-src='maki:slipway'>",
"sport": "<img data-src='maki:soccer'>",
"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'>",
"summer_camp": "<i class='fas fa-sun'></i>",
"swimming_area": "<img data-src='maki:swimming'>",
From 7c4aa1ae8036bdf0be0c08b66ecca952fc59e9c3 Mon Sep 17 00:00:00 2001
From: Igor Eliezer <igor.eliezer@gmail.com>
Date: Wed, 27 Jan 2021 20:47:31 +0000
Subject: [PATCH 5/6] Translated using Weblate (Portuguese)
Currently translated at 92.8% (90 of 97 strings)
Translation: OpenStreetBrowser/Main Categories
Translate-URL: http://weblate.openstreetbrowser.org/projects/openstreetbrowser/main-categories/pt/
---
lang/pt.json | 63 ++++++++++++++++++++++++++++------------------------
1 file changed, 34 insertions(+), 29 deletions(-)
diff --git a/lang/pt.json b/lang/pt.json
index f22254b..b08a95b 100644
--- a/lang/pt.json
+++ b/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:agriculture": "Agricultura",
- "category:alternative_amenities": "",
+ "category:alternative_amenities": "Equipamentos",
"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: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_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:construction": "Locais de construção",
"category:craft": "Artesanato",
"category:culture": "Cultura",
"category:culture_religion": "Cultura e religião",
- "category:cycle_amenities": "",
+ "category:cycle_amenities": "Equipamentos",
"category:cycle_routes": "Ciclovias",
"category:education": "Educação",
"category:electric_power": "Eletricidade",
"category:emergency": "Emergência",
- "category:energy": "",
+ "category:energy": "Energia",
"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:index": "Índice de categorias",
"category:infrastructure": "Infraestrutura",
"category:internet": "Acesso à Internet",
- "category:law": "",
+ "category:law": "Direito",
"category:leisure": "Lazer",
"category:leisure_sport_shopping": "Lazer, desporto e compras",
- "category:memorial": "",
+ "category:memorial": "Memoriais e monumentos",
"category:military": "Militar",
"category:mtb-routes": "",
"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:outdoor": "",
+ "category:outdoor": "Atividades ao ar livre",
"category:phone": "Telefone",
"category:places": "Lugares",
"category:places_geo": "Lugares",
"category:playgrounds": "Parques infantis",
"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:stops": "",
- "category:pt_amenities": "",
+ "category:pt_amenities": "Equipamentos",
"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:railway-routes": "Rotas ferroviárias",
"category:religion": "Religião",
- "category:renewables": "",
+ "category:renewables": "Renováveis",
"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:swimming_bathing": "Natação e banho",
"category:tourism_attractions": "Turismo",
"category:tourism_services": "Turismo",
"category:transport": "Transportes",
- "category:transport_alternative": "",
+ "category:transport_alternative": "Modais de transporte alternativo",
"category:transport_car": "Transporte individual",
"category:transport_cycle": "Ciclismo",
"category:transport_pt": "Transportes públicos",
"category:transport_walk": "Pedestre",
- "category:walk_amenities": "",
+ "category:walk_amenities": "Equipamentos",
"category:waste": "Lixo",
"category:water": "Massas de água",
"category:wikipedia": "Wikipédia",
@@ -90,5 +90,10 @@
"category:xmas": "",
"date format not understood": "",
"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"
}
From c7183f3403cba5feea5e7b59de58ef392250c106 Mon Sep 17 00:00:00 2001
From: Igor Eliezer <igor.eliezer@gmail.com>
Date: Wed, 27 Jan 2021 20:47:31 +0000
Subject: [PATCH 6/6] Translated using Weblate (Portuguese)
Currently translated at 92.8% (90 of 97 strings)
Translation: OpenStreetBrowser/Main Categories
Translate-URL: http://weblate.openstreetbrowser.org/projects/openstreetbrowser/main-categories/pt/
---
lang/pt.json | 63 ++++++++++++++++++++++++++++------------------------
1 file changed, 34 insertions(+), 29 deletions(-)
diff --git a/lang/pt.json b/lang/pt.json
index f22254b..b08a95b 100644
--- a/lang/pt.json
+++ b/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:agriculture": "Agricultura",
- "category:alternative_amenities": "",
+ "category:alternative_amenities": "Equipamentos",
"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: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_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:construction": "Locais de construção",
"category:craft": "Artesanato",
"category:culture": "Cultura",
"category:culture_religion": "Cultura e religião",
- "category:cycle_amenities": "",
+ "category:cycle_amenities": "Equipamentos",
"category:cycle_routes": "Ciclovias",
"category:education": "Educação",
"category:electric_power": "Eletricidade",
"category:emergency": "Emergência",
- "category:energy": "",
+ "category:energy": "Energia",
"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:index": "Índice de categorias",
"category:infrastructure": "Infraestrutura",
"category:internet": "Acesso à Internet",
- "category:law": "",
+ "category:law": "Direito",
"category:leisure": "Lazer",
"category:leisure_sport_shopping": "Lazer, desporto e compras",
- "category:memorial": "",
+ "category:memorial": "Memoriais e monumentos",
"category:military": "Militar",
"category:mtb-routes": "",
"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:outdoor": "",
+ "category:outdoor": "Atividades ao ar livre",
"category:phone": "Telefone",
"category:places": "Lugares",
"category:places_geo": "Lugares",
"category:playgrounds": "Parques infantis",
"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:stops": "",
- "category:pt_amenities": "",
+ "category:pt_amenities": "Equipamentos",
"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:railway-routes": "Rotas ferroviárias",
"category:religion": "Religião",
- "category:renewables": "",
+ "category:renewables": "Renováveis",
"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:swimming_bathing": "Natação e banho",
"category:tourism_attractions": "Turismo",
"category:tourism_services": "Turismo",
"category:transport": "Transportes",
- "category:transport_alternative": "",
+ "category:transport_alternative": "Modais de transporte alternativo",
"category:transport_car": "Transporte individual",
"category:transport_cycle": "Ciclismo",
"category:transport_pt": "Transportes públicos",
"category:transport_walk": "Pedestre",
- "category:walk_amenities": "",
+ "category:walk_amenities": "Equipamentos",
"category:waste": "Lixo",
"category:water": "Massas de água",
"category:wikipedia": "Wikipédia",
@@ -90,5 +90,10 @@
"category:xmas": "",
"date format not understood": "",
"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"
}