From cc2f1c06b71e8ec661ed898e7c4634934762ac92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Thu, 7 Jun 2018 22:02:35 +0200 Subject: [PATCH 01/34] Fossil Energy: new category --- fossil-energy.json | 52 ++++++++++++++++++++++++++++++++++++++++++++++ index.json | 3 +++ 2 files changed, 55 insertions(+) create mode 100644 fossil-energy.json diff --git a/fossil-energy.json b/fossil-energy.json new file mode 100644 index 000000000..9e13d730c --- /dev/null +++ b/fossil-energy.json @@ -0,0 +1,52 @@ +{ + "type": "overpass", + "name": { + "de": "Fossile Energie", + "en": "Fossil energy" + }, + "query": { + "11": [ + "(", + "way[man_made=pipeline][substance~\"^(oil|gas|lng|cng|multiphase)$\"];", + "relation[man_made=pipeline][substance~\"^(oil|gas|lng|cng|multiphase)$\"];", + "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)$\"];", + ")" + ], + "13": [ + "(", + "way[man_made=pipeline][substance~\"^(oil|gas|lng|cng|multiphase)$\"];", + "relation[man_made=pipeline][substance~\"^(oil|gas|lng|cng|multiphase)$\"];", + "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)$\"];", + ")" + ] + }, + "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.landuse == 'industrial' %}", + "{{ tagTrans('landuse', tags.landuse) }} ({{ tagTrans('industrial', tags.industrial) }})", + "{% elseif tags.waterway == 'offshore_field' %}", + "{{ tagTrans('waterway', tags.waterway) }}", + "{% endif %}" + ], + "markerSymbol": null + } +} diff --git a/index.json b/index.json index 1b5b475a5..5c4104e52 100644 --- a/index.json +++ b/index.json @@ -237,6 +237,9 @@ { "id": "power" }, + { + "id": "fossil-energy" + }, { "id": "railway", "type": "index", From 44fe15406c04ea9e860bbb1b4261a377b5bbb417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Sun, 10 Jun 2018 20:53:34 +0200 Subject: [PATCH 02/34] Fossil Energy: include coal and power generators --- fossil-energy.json | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/fossil-energy.json b/fossil-energy.json index 9e13d730c..b34f2eb08 100644 --- a/fossil-energy.json +++ b/fossil-energy.json @@ -7,31 +7,39 @@ "query": { "11": [ "(", - "way[man_made=pipeline][substance~\"^(oil|gas|lng|cng|multiphase)$\"];", - "relation[man_made=pipeline][substance~\"^(oil|gas|lng|cng|multiphase)$\"];", - "way[landuse=industrial][industrial~\"^(refinery)$\"];", - "relation[landuse=industrial][industrial~\"^(refinery)$\"];", + "way[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(coal|oil|gas|lng|cng|multiphase)(|;.*)$\"];", + "relation[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(coal|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\"~\"^(|.*;)(coal|oil|gas|diesel|gasoline)(|;.*)$\"];", + "way[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(coal|oil|gas|diesel|gasoline)(|;.*)$\"];", + "relation[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(coal|oil|gas|diesel|gasoline)(|;.*)$\"];", ")" ], "13": [ "(", - "way[man_made=pipeline][substance~\"^(oil|gas|lng|cng|multiphase)$\"];", - "relation[man_made=pipeline][substance~\"^(oil|gas|lng|cng|multiphase)$\"];", - "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[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(coal|oil|gas|lng|cng|multiphase)(|;.*)$\"];", + "relation[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(coal|oil|gas|lng|cng|multiphase)(|;.*)$\"];", + "node[landuse=industrial][industrial~\"^(|.*;)(coal|oil|gas|lng|cng|multiphase|refinery|oil_refinery)(|;.*)$\"];", + "way[landuse=industrial][industrial~\"^(|.*;)(coal|oil|gas|lng|cng|multiphase|refinery|oil_refinery)(|;.*)$\"];", + "relation[landuse=industrial][industrial~\"^(|.*;)(coal|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)$\"];", + "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\"~\"^(|.*;)(coal|oil|gas|diesel|gasoline)(|;.*)$\"];", + "way[power~\"^(plant|generator)$\"][\"generator:source\"~\"^(|.*;)(coal|oil|gas|diesel|gasoline)(|;.*)$\"];", + "relation[power~\"^(plant|generator)$\"][\"generator:source\"~\"^(|.*;)(coal|oil|gas|diesel|gasoline)(|;.*)$\"];", ")" ] }, From 9858d7908018e9371e2b5acc6665f701b6c30ee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Sun, 17 Jun 2018 21:41:46 +0200 Subject: [PATCH 03/34] fossil-energy: include quarry and mine_shaft (coal) --- fossil-energy.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/fossil-energy.json b/fossil-energy.json index b34f2eb08..cb4714e68 100644 --- a/fossil-energy.json +++ b/fossil-energy.json @@ -7,6 +7,11 @@ "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|oil|gas|lng|cng|multiphase)(|;.*)$\"];", "relation[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(coal|oil|gas|lng|cng|multiphase)(|;.*)$\"];", "node[landuse=industrial][industrial~\"^(|.*;)(refinery)(|;.*)$\"];", @@ -24,6 +29,12 @@ ], "13": [ "(", + "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(|;.*)$\"];", + "relation[man_made~\"^(mineshaft)$\"][resource~\"^(|.*;)coal(|;.*)$\"];", "way[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(coal|oil|gas|lng|cng|multiphase)(|;.*)$\"];", "relation[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(coal|oil|gas|lng|cng|multiphase)(|;.*)$\"];", "node[landuse=industrial][industrial~\"^(|.*;)(coal|oil|gas|lng|cng|multiphase|refinery|oil_refinery)(|;.*)$\"];", From 1147a67d8319f621f610dcf39addeb1bab1d8c07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Tue, 14 Aug 2018 06:19:46 +0200 Subject: [PATCH 04/34] Re-organize infrastructure/energy; Rename power->electric_power --- power.json => electric_power.json | 4 ++-- index.json | 18 ++++++++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) rename power.json => electric_power.json (96%) diff --git a/power.json b/electric_power.json similarity index 96% rename from power.json rename to electric_power.json index b833d324d..029fac540 100644 --- a/power.json +++ b/electric_power.json @@ -3,8 +3,8 @@ "name": { "ast": "Enerxía", "cs": "Elektřina", - "de": "Energie", - "en": "Power", + "de": "Elektrischer Strom", + "en": "Electric Power", "et": "Elekter", "fr": "Énergie", "hu": "Áramellátás", diff --git a/index.json b/index.json index 5c4104e52..acb6252e9 100644 --- a/index.json +++ b/index.json @@ -235,10 +235,20 @@ "id": "military" }, { - "id": "power" - }, - { - "id": "fossil-energy" + "id": "energy", + "type": "index", + "name": { + "en": "Energy", + "de": "Energie" + }, + "subCategories": [ + { + "id": "electric_power" + }, + { + "id": "fossil-energy" + } + ] }, { "id": "railway", From a180b52039bae09098c51fdafee109dbddc16e13 Mon Sep 17 00:00:00 2001 From: Igor Eliezer Date: Mon, 27 Aug 2018 06:30:28 -0300 Subject: [PATCH 05/34] Fix pt-br.json Small grammar mistake, for consistency. --- lang/pt-br.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/pt-br.json b/lang/pt-br.json index 60568c0cb..35918feeb 100644 --- a/lang/pt-br.json +++ b/lang/pt-br.json @@ -7,7 +7,7 @@ "category:car_amenities": "Equipamentos", "category:car_furniture": "Mobiliário urbano", "category:car_maxspeed": "Velocidade máxima", - "category:car_routes": "Rota rodoviária", + "category:car_routes": "Rotas rodoviárias", "category:children": "Equipamentos infantis", "category:communication": "Comunicação", "category:construction": "Terrenos vazios e obras", From fa0abe70ec4583d42cc9ea868729798d92e6741c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Mon, 27 Aug 2018 12:32:07 +0200 Subject: [PATCH 06/34] Import pt-br translations to categories --- car_routes.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/car_routes.json b/car_routes.json index 1125d21c4..eb59ae4e2 100644 --- a/car_routes.json +++ b/car_routes.json @@ -2,7 +2,7 @@ "type": "overpass", "name": { "en": "Car routes", - "pt-br": "Rota rodoviária" + "pt-br": "Rotas rodoviárias" }, "query": { "10": "relation[type=route][route=road]" From 363b6021b42ea1c93438c153c71ce887c0cff24a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Mon, 27 Aug 2018 22:14:41 +0200 Subject: [PATCH 07/34] Translate payment options --- detailsBody.html | 2 +- popupBody.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/detailsBody.html b/detailsBody.html index 303db55ad..17c970652 100644 --- a/detailsBody.html +++ b/detailsBody.html @@ -94,7 +94,7 @@ {{ keyTrans('payment') }}: {% for k, tag in payment %} - {% if tags[tag] == 'no' %}{{ k }} {% else %}{{ k }} {% endif %} + {% if tags[tag] == 'no' %}{{ keyTrans(tag, { default: k }) }} {% else %}{{ keyTrans(tag, { default: k }) }} {% endif %} {% endfor %} diff --git a/popupBody.html b/popupBody.html index ffa09d249..46533572d 100644 --- a/popupBody.html +++ b/popupBody.html @@ -92,7 +92,7 @@ {{ keyTrans('payment') }}: {% for k, tag in payment %} - {% if tags[tag] == 'no' %}{{ k }} {% else %}{{ k }} {% endif %} + {% if tags[tag] == 'no' %}{{ keyTrans(tag, { default: k }) }} {% else %}{{ keyTrans(tag, { default: k }) }} {% endif %} {% endfor %} From e9981668b67eab070966b30748bb4d9ca84cc5d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Mon, 27 Aug 2018 22:18:41 +0200 Subject: [PATCH 08/34] Separate payment options by ',' --- detailsBody.html | 5 ++++- popupBody.html | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/detailsBody.html b/detailsBody.html index 17c970652..39ffac33c 100644 --- a/detailsBody.html +++ b/detailsBody.html @@ -93,8 +93,11 @@ {{ keyTrans('payment') }}: + {% set i = 0 %} {% for k, tag in payment %} - {% if tags[tag] == 'no' %}{{ keyTrans(tag, { default: k }) }} {% else %}{{ keyTrans(tag, { default: k }) }} {% endif %} + {%- if i > 0 %},{% endif %} + {% if tags[tag] == 'no' %}{{ keyTrans(tag, { default: k }) }}{% else %}{{ keyTrans(tag, { default: k }) }}{% endif -%} + {% set i = i + 1 -%} {% endfor %} diff --git a/popupBody.html b/popupBody.html index 46533572d..b50895225 100644 --- a/popupBody.html +++ b/popupBody.html @@ -91,8 +91,11 @@ {{ keyTrans('payment') }}: + {% set i = 0 %} {% for k, tag in payment %} - {% if tags[tag] == 'no' %}{{ keyTrans(tag, { default: k }) }} {% else %}{{ keyTrans(tag, { default: k }) }} {% endif %} + {%- if i > 0 %},{% endif %} + {% if tags[tag] == 'no' %}{{ keyTrans(tag, { default: k }) }}{% else %}{{ keyTrans(tag, { default: k }) }}{% endif -%} + {% set i = i + 1 -%} {% endfor %} From e066f56f4de70713f1d717cc862b22b74e45b732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Mon, 27 Aug 2018 22:20:13 +0200 Subject: [PATCH 09/34] Payment options: tooltip for each value --- detailsBody.html | 2 +- popupBody.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/detailsBody.html b/detailsBody.html index 39ffac33c..6b8d1801d 100644 --- a/detailsBody.html +++ b/detailsBody.html @@ -96,7 +96,7 @@ {% set i = 0 %} {% for k, tag in payment %} {%- if i > 0 %},{% endif %} - {% if tags[tag] == 'no' %}{{ keyTrans(tag, { default: k }) }}{% else %}{{ keyTrans(tag, { default: k }) }}{% endif -%} + {% if tags[tag] == 'no' %}{{ keyTrans(tag, { default: k }) }}{% else %}{{ keyTrans(tag, { default: k }) }}{% endif -%} {% set i = i + 1 -%} {% endfor %} diff --git a/popupBody.html b/popupBody.html index b50895225..63b831792 100644 --- a/popupBody.html +++ b/popupBody.html @@ -94,7 +94,7 @@ {% set i = 0 %} {% for k, tag in payment %} {%- if i > 0 %},{% endif %} - {% if tags[tag] == 'no' %}{{ keyTrans(tag, { default: k }) }}{% else %}{{ keyTrans(tag, { default: k }) }}{% endif -%} + {% if tags[tag] == 'no' %}{{ keyTrans(tag, { default: k }) }}{% else %}{{ keyTrans(tag, { default: k }) }}{% endif -%} {% set i = i + 1 -%} {% endfor %} From 937d96a1779903b6d37a7c67ec49591018f653a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Tue, 28 Aug 2018 07:08:02 +0200 Subject: [PATCH 10/34] historic: use different translation/icon for "historic=memorial memorial=plaque" --- historic.json | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/historic.json b/historic.json index 76c2e270f..9111eea30 100644 --- a/historic.json +++ b/historic.json @@ -36,8 +36,14 @@ ] }, "feature": { - "description": "{{ tagTransList('historic', tags.historic) }}", - "markerSign": "{{ const[tags.historic].sign|raw }}" + "pre": [ + "{% set value = tags.historic %}", + "{% if const[tags.historic ~ ' memorial=' ~ tags.memorial] %}", + " {% set value = tags.historic ~ ' memorial=' ~ tags.memorial %}", + "{% endif %}" + ], + "description": "{{ tagTransList('historic', value) }}", + "markerSign": "{{ const[value].sign|raw }}" }, "info": [ "", @@ -78,6 +84,10 @@ "sign": "", "zoom": 14 }, + "memorial memorial=plaque": { + "sign": "", + "zoom": 14 + }, "monument": { "sign": "", "zoom": 11 From bd815e0553cd1ca5dbb4d80cdbd3872c567a448f Mon Sep 17 00:00:00 2001 From: debyos Date: Tue, 9 Oct 2018 12:25:11 +0200 Subject: [PATCH 11/34] Hungarian translation completed Zweiter Versuch mit GitHub! --- lang/hu.json | 90 ++++++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/lang/hu.json b/lang/hu.json index 18aff4a76..9998acca1 100644 --- a/lang/hu.json +++ b/lang/hu.json @@ -1,66 +1,66 @@ { - "category:administrative": "Adminisztratív határok", + "category:administrative": "Közigazgatási határok", "category:agriculture": "Mezőgazdaság", - "category:alternative_amenities": "", - "category:alternative_routes": "", - "category:buildings": "", - "category:car_amenities": "", - "category:car_furniture": "", - "category:car_maxspeed": "", - "category:children": "", + "category:alternative_amenities": "Létesítmények", + "category:alternative_routes": "Útvonalak", + "category:buildings": "Épületek", + "category:car_amenities": "Létesítmények", + "category:car_furniture": "Jelzőtáblák", + "category:car_maxspeed": "Sebességkorlátozás", + "category:children": "Létesítmények gyermekeknek", "category:communication": "Kommunikácó", - "category:construction": "", - "category:craft": "", + "category:construction": "Építési terület", + "category:craft": "Műhelyek", "category:culture": "Kultúra", - "category:culture_religion": "Kultúra", - "category:cycle_amenities": "", - "category:cycle_routes": "", - "category:education": "", - "category:emergency": "", - "category:financial": "", - "category:gastro-smoking": "", - "category:gastro": "Gasztronómia", - "category:health": "", - "category:hiking_routes": "", - "category:historic": "Historikus", + "category:culture_religion": "Kultúra és vallás", + "category:cycle_amenities": "Kerékpáros létesítmények", + "category:cycle_routes": "Kerékpáros útvonalak", + "category:education": "Oktatás", + "category:emergency": "Vészhelyzet", + "category:financial": "Pénzügyek", + "category:gastro-smoking": "Nem dohányzó vendéglátóhelyek", + "category:gastro": "Vendéglátás", + "category:health": "Egészségügy", + "category:hiking_routes": "Turistautak", + "category:historic": "Történelmi objektumok", "category:index": "", - "category:internet": "Internethozzáférés", - "category:leisure": "", - "category:military": "Katonai", - "category:mtb-routes": "", + "category:internet": "Internetcsatlakozás", + "category:leisure": "Szabadidős létesítmények", + "category:military": "Katonai objektumok", + "category:mtb-routes": "Hegyikerékpáros útvonalak", "category:natural": "Természeti képződmények", "category:other": "Egyéb", - "category:outdoor": "", + "category:outdoor": "Szabadtéri tevékenységek", "category:phone": "Telefon", "category:places": "Helyek", "category:places_geo": "Helyek", - "category:playgrounds": "", + "category:playgrounds": "Játszóterek", "category:post": "Posta", "category:power": "Áramellátás", - "category:pt": "", + "category:pt": "Tömegközlekedési térkép", "category:pt:stops": "Megállók és állomások", - "category:pt:routes": "", - "category:pt_amenities": "", - "category:public": "", - "category:railway-electrification": "", - "category:railway-infrastructure": "", - "category:railway-routes": "", + "category:pt:routes": "Útvonalak", + "category:pt_amenities": "Létesítmények", + "category:public": "Közszolgáltatások", + "category:railway-electrification": "Vasút villamosítottsága", + "category:railway-infrastructure": "Vasúti infrastruktúra", + "category:railway-routes": "Vasútvonalak", "category:religion": "Vallás", "category:residential": "Lakóövezetek", - "category:resources": "", + "category:resources": "Bányászat", "category:shop": "Vásárlás", "category:sport": "Sport", - "category:tourism_attractions": "Túrizmus", - "category:tourism_services": "Túrizmus", - "category:transport_alternative": "Alternatív (Krékpár, Túra)", - "category:walk_amenities": "", - "category:waste": "", - "category:water": "", - "category:wikipedia": "", - "category:works": "", - "category:leisure_sport_shopping": "Szabadidő", + "category:tourism_attractions": "Turizmus", + "category:tourism_services": "Turizmus", + "category:transport_alternative": "Alternatív (Kerékpár, Túra)", + "category:walk_amenities": "Gyalogos létesítmények", + "category:waste": "Hulladék", + "category:water": "Vizek", + "category:wikipedia": "Wikipédia", + "category:works": "Üzemek", + "category:leisure_sport_shopping": "Szabadidő, sport és vásárlás", "category:railway": "Vasút", - "category:services": "Szolgáltatás", + "category:services": "Szolgáltatások", "category:transport": "Közlekedés", "category:transport_pt": "Tömegközlekedés" } From aa4849675ae54f34133071c8f4a5e0746315a6f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Tue, 9 Oct 2018 12:37:52 +0200 Subject: [PATCH 12/34] Import hu translations to categories --- administrative.json | 2 +- alternative_amenities.json | 1 + alternative_routes.json | 1 + buildings.json | 1 + car_amenities.json | 1 + car_furniture.json | 1 + car_maxspeed.json | 1 + children.json | 1 + construction.json | 1 + craft.json | 1 + culture_religion.json | 2 +- cycle_amenities.json | 1 + cycle_routes.json | 1 + education.json | 1 + emergency.json | 1 + financial.json | 1 + gastro-smoking.json | 1 + gastro.json | 2 +- health.json | 1 + hiking_routes.json | 1 + historic.json | 2 +- index.json | 4 ++-- internet.json | 2 +- leisure.json | 1 + military.json | 2 +- mtb-routes.json | 1 + outdoor.json | 1 + playgrounds.json | 1 + pt.json | 2 ++ pt_amenities.json | 1 + public.json | 1 + railway-electrification.json | 1 + railway-infrastructure.json | 1 + railway-routes.json | 1 + resources.json | 1 + tourism_attractions.json | 2 +- tourism_services.json | 2 +- transport_alternative.json | 2 +- walk_amenities.json | 1 + waste.json | 1 + water.json | 1 + wikipedia.json | 1 + works.json | 1 + 43 files changed, 45 insertions(+), 11 deletions(-) diff --git a/administrative.json b/administrative.json index 7d243f736..8ca7688f8 100644 --- a/administrative.json +++ b/administrative.json @@ -8,7 +8,7 @@ "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", diff --git a/alternative_amenities.json b/alternative_amenities.json index 969b636b1..aff6cd951 100644 --- a/alternative_amenities.json +++ b/alternative_amenities.json @@ -5,6 +5,7 @@ "de": "Einrichtungen", "en": "Amenities", "fr": "Équipement", + "hu": "Létesítmények", "it": "Infrastrutture", "ja": "生活環境", "nl": "Voorzieningen", diff --git a/alternative_routes.json b/alternative_routes.json index 019e49d7c..6eb5fa612 100644 --- a/alternative_routes.json +++ b/alternative_routes.json @@ -5,6 +5,7 @@ "de": "(ausgeschilderte) Routen", "en": "Routes", "fr": "Routes", + "hu": "Útvonalak", "it": "Itinerari segnalati", "ja": "ルート", "nl": "Alternatieve routes", diff --git a/buildings.json b/buildings.json index eba8b839c..5dacc6fc5 100644 --- a/buildings.json +++ b/buildings.json @@ -4,6 +4,7 @@ "de": "Gebäude", "en": "Buildings", "fr": "Bâtiments", + "hu": "Épületek", "pt": "Edifícios", "pt-br": "Edificações" }, diff --git a/car_amenities.json b/car_amenities.json index 9351fee46..97e47da0f 100644 --- a/car_amenities.json +++ b/car_amenities.json @@ -6,6 +6,7 @@ "de": "Einrichtungen", "en": "Amenities", "fr": "Équipements auto", + "hu": "Létesítmények", "it": "Infrastrutture", "ja": "生活環境", "nl": "Voorzieningen", diff --git a/car_furniture.json b/car_furniture.json index c4afb3d6c..f479affce 100644 --- a/car_furniture.json +++ b/car_furniture.json @@ -5,6 +5,7 @@ "de": "Straßenausstattung", "en": "Street Furniture", "fr": "Fournitures automobiles", + "hu": "Jelzőtáblák", "it": "Dotazioni stradali", "ja": "街路設置公共物", "nl": "Straatmeubilair", diff --git a/car_maxspeed.json b/car_maxspeed.json index ef2165241..0b50d6037 100644 --- a/car_maxspeed.json +++ b/car_maxspeed.json @@ -4,6 +4,7 @@ "de": "Höchstgeschwindigkeiten", "en": "Maxspeed", "fr": "Limites de vitesse", + "hu": "Sebességkorlátozás", "pt": "Velocidade máxima", "pt-br": "Velocidade máxima" }, diff --git a/children.json b/children.json index 8b40cbabf..2c3f7c090 100644 --- a/children.json +++ b/children.json @@ -4,6 +4,7 @@ "de": "Einrichtungen für Kinder", "en": "Children amenities", "fr": "Équipements pour enfants", + "hu": "Létesítmények gyermekeknek", "pt-br": "Equipamentos infantis" }, "query": { diff --git a/construction.json b/construction.json index 0839228f0..73495f7c9 100644 --- a/construction.json +++ b/construction.json @@ -6,6 +6,7 @@ "de": "Baustellen", "en": "Construction Sites", "fr": "Constructions", + "hu": "Építési terület", "it": "Cantieri", "ja": "工事中", "nl": "Bouwterrein", diff --git a/craft.json b/craft.json index c1b119b73..f9c49d4a1 100644 --- a/craft.json +++ b/craft.json @@ -4,6 +4,7 @@ "de": "Handwerk", "en": "Craft", "fr": "Artisanat", + "hu": "Műhelyek", "pt": "Artesanato", "pt-br": "Ofícios" }, diff --git a/culture_religion.json b/culture_religion.json index ee1cd5d0e..2d68d9271 100644 --- a/culture_religion.json +++ b/culture_religion.json @@ -10,7 +10,7 @@ "es": "Cultura y religión", "et": "Kultuur ja religioon", "fr": "Culture et Religion", - "hu": "Kultúra", + "hu": "Kultúra és vallás", "it": "Cultura", "ja": "文化", "nl": "Cultuur", diff --git a/cycle_amenities.json b/cycle_amenities.json index f1bfac9b3..925ade8a2 100644 --- a/cycle_amenities.json +++ b/cycle_amenities.json @@ -4,6 +4,7 @@ "de": "Einrichtungen", "en": "Amenities", "fr": "Équipements vélo", + "hu": "Kerékpáros létesítmények", "pt-br": "Equipamentos" }, "query": { diff --git a/cycle_routes.json b/cycle_routes.json index 5df6c4caa..c12c47d7e 100644 --- a/cycle_routes.json +++ b/cycle_routes.json @@ -4,6 +4,7 @@ "de": "Radrouten", "en": "Cycle Routes", "fr": "Itinéraires vélo", + "hu": "Kerékpáros útvonalak", "pt": "Ciclovias", "pt-br": "Ciclorrotas" }, diff --git a/education.json b/education.json index 57bdc3dc9..c366e82f1 100644 --- a/education.json +++ b/education.json @@ -8,6 +8,7 @@ "en": "Educational Services", "et": "Haridusteenused", "fr": "Éducation", + "hu": "Oktatás", "it": "Istruzione", "ja": "教育サービス", "nl": "Onderwijs", diff --git a/emergency.json b/emergency.json index 588c14dee..64ef840b3 100644 --- a/emergency.json +++ b/emergency.json @@ -10,6 +10,7 @@ "es": "Servicios de emergencia", "et": "Hädaabi teenused", "fr": "Services d'urgence", + "hu": "Vészhelyzet", "it": "Servizi d'emergenza", "ja": "緊急サービス", "nl": "Hulpdiensten", diff --git a/financial.json b/financial.json index 0320bbc43..b0ea37a4b 100644 --- a/financial.json +++ b/financial.json @@ -7,6 +7,7 @@ "el": "Χρήμα", "en": "Financial", "fr": "Finance", + "hu": "Pénzügyek", "it": "Finanze", "ja": "金融", "nl": "Financieel", diff --git a/gastro-smoking.json b/gastro-smoking.json index 2bd2b6fe6..e3be9d716 100644 --- a/gastro-smoking.json +++ b/gastro-smoking.json @@ -4,6 +4,7 @@ "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" }, diff --git a/gastro.json b/gastro.json index 369ff4c5c..d83858610 100644 --- a/gastro.json +++ b/gastro.json @@ -7,7 +7,7 @@ "el": "Γαστρονομία", "en": "Gastronomy", "fr": "Restauration", - "hu": "Gasztronómia", + "hu": "Vendéglátás", "it": "Gastronomia", "ja": "食べ物", "nl": "Gastronomie", diff --git a/health.json b/health.json index 08e3cd2c6..14bb4b7e1 100644 --- a/health.json +++ b/health.json @@ -7,6 +7,7 @@ "el": "Υγεία", "en": "Health", "fr": "Santé", + "hu": "Egészségügy", "it": "Sanità", "ja": "健康", "nl": "Gezondheid", diff --git a/hiking_routes.json b/hiking_routes.json index 97e20b095..c553c1384 100644 --- a/hiking_routes.json +++ b/hiking_routes.json @@ -4,6 +4,7 @@ "de": "Wanderrouten", "en": "Hiking routes", "fr": "Itinéraires pédestres", + "hu": "Turistautak", "pt": "Rotas de caminhada", "pt-br": "Rotas de caminhada" }, diff --git a/historic.json b/historic.json index 9111eea30..8ab235da2 100644 --- a/historic.json +++ b/historic.json @@ -8,7 +8,7 @@ "en": "Historic", "et": "Ajalooline", "fr": "Histoire", - "hu": "Historikus", + "hu": "Történelmi objektumok", "it": "Storia", "ja": "記念", "nl": "Historisch", diff --git a/index.json b/index.json index e2236974f..b84ba4f76 100644 --- a/index.json +++ b/index.json @@ -14,7 +14,7 @@ "es": "Ocio, deporte y compras", "et": "Vaba aeg, sport ja ostmine", "fr": "Loisirs", - "hu": "Szabadidő", + "hu": "Szabadidő, sport és vásárlás", "it": "Tempo libero, sport e shopping", "ja": "レジャー", "nl": "Vrije tijd, Sport en Winkelen", @@ -62,7 +62,7 @@ "es": "Servicios", "et": "Teenused", "fr": "Services", - "hu": "Szolgáltatás", + "hu": "Szolgáltatások", "it": "Servizi", "ja": "サービス", "nl": "Dienstverlening", diff --git a/internet.json b/internet.json index 04454cee8..d6e9b5147 100644 --- a/internet.json +++ b/internet.json @@ -7,7 +7,7 @@ "en": "Internet access", "es": "Acceso a Internet", "fr": "Internet", - "hu": "Internethozzáférés", + "hu": "Internetcsatlakozás", "ja": "インターネット接続", "nl": "Internettoegang", "pt": "Acesso à Internet", diff --git a/leisure.json b/leisure.json index 2dca40344..32a6cd721 100644 --- a/leisure.json +++ b/leisure.json @@ -7,6 +7,7 @@ "el": "Αναψυχή", "en": "Leisure", "fr": "Loisirs", + "hu": "Szabadidős létesítmények", "it": "Tempo libero", "ja": "レジャー", "nl": "Vrije tijd", diff --git a/military.json b/military.json index 602868c2b..4c4eade24 100644 --- a/military.json +++ b/military.json @@ -7,7 +7,7 @@ "el": "Στρατιωτικό", "en": "Military", "fr": "Militaire", - "hu": "Katonai", + "hu": "Katonai objektumok", "it": "Militare", "ja": "軍事", "nl": "Militair", diff --git a/mtb-routes.json b/mtb-routes.json index 2bca75eb6..08d1270c2 100644 --- a/mtb-routes.json +++ b/mtb-routes.json @@ -3,6 +3,7 @@ "name": { "en": "Mountain bike routes", "fr": "Itinéraires de VTT", + "hu": "Hegyikerékpáros útvonalak", "pt-br": "Rotas mountain bike" }, "query": { diff --git a/outdoor.json b/outdoor.json index fdf222532..eb3c29019 100644 --- a/outdoor.json +++ b/outdoor.json @@ -4,6 +4,7 @@ "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": [ diff --git a/playgrounds.json b/playgrounds.json index 789cf3e06..84bc87141 100644 --- a/playgrounds.json +++ b/playgrounds.json @@ -6,6 +6,7 @@ "en": "Playground", "et": "Mänguväljak", "fr": "Jeux pour enfants", + "hu": "Játszóterek", "pt": "Parques infantis", "pt-br": "Parquinhos", "ro": "Loc de joaca", diff --git a/pt.json b/pt.json index 42c56e739..86ec0ee2b 100644 --- a/pt.json +++ b/pt.json @@ -3,6 +3,7 @@ "name": { "de": "ÖV Karte", "en": "Public transport map", + "hu": "Tömegközlekedési térkép", "pt-br": "Mapa de transporte público" }, "query": { @@ -41,6 +42,7 @@ "de": "Routen", "en": "Routes", "fr": "Lignes", + "hu": "Útvonalak", "pt": "Rotas", "pt-br": "Rotas" } diff --git a/pt_amenities.json b/pt_amenities.json index b5b5127b4..7d8d92176 100644 --- a/pt_amenities.json +++ b/pt_amenities.json @@ -6,6 +6,7 @@ "de": "Einrichtungen", "en": "Amenities", "fr": "Équipements", + "hu": "Létesítmények", "it": "Infrastrutture", "ja": "生活環境", "nl": "Voorzieningen", diff --git a/public.json b/public.json index 45ea203f1..cf28f627a 100644 --- a/public.json +++ b/public.json @@ -8,6 +8,7 @@ "en": "Public Services", "et": "Kommunaalteenused", "fr": "Services Publics", + "hu": "Közszolgáltatások", "it": "Servizi pubblici", "ja": "公共サービス", "nl": "Openbare diensten", diff --git a/railway-electrification.json b/railway-electrification.json index 3784a23e8..f54ba20c5 100644 --- a/railway-electrification.json +++ b/railway-electrification.json @@ -4,6 +4,7 @@ "de": "Eisenbahn Elektrifizierung", "en": "Railway electrification", "fr": "Puissance électrique ferroviaire", + "hu": "Vasút villamosítottsága", "pt": "Eletrificação ferroviária", "pt-br": "Eletrificação ferroviária" }, diff --git a/railway-infrastructure.json b/railway-infrastructure.json index 24cd53da0..938104873 100644 --- a/railway-infrastructure.json +++ b/railway-infrastructure.json @@ -4,6 +4,7 @@ "de": "Eisenbahn Infrastruktur", "en": "Railway infrastructure", "fr": "Infrastructure ferroviaire", + "hu": "Vasúti infrastruktúra", "pt": "Infraestrutura ferroviária", "pt-br": "Infraestrutura ferroviária" }, diff --git a/railway-routes.json b/railway-routes.json index ff201823a..874589567 100644 --- a/railway-routes.json +++ b/railway-routes.json @@ -3,6 +3,7 @@ "name": { "en": "Railway Routes", "fr": "Lignes ferroviaires", + "hu": "Vasútvonalak", "pt-br": "Rotas ferroviárias" }, "query": { diff --git a/resources.json b/resources.json index 04f30bd3d..014a2bfad 100644 --- a/resources.json +++ b/resources.json @@ -6,6 +6,7 @@ "de": "Ressourcengewinnung", "en": "Resource Extraction", "fr": "Extraction des ressources", + "hu": "Bányászat", "it": "Areee estrattive", "nl": "Grondstoffenwinning", "pt": "Extração de recursos", diff --git a/tourism_attractions.json b/tourism_attractions.json index f9a36f34c..bceb585d6 100644 --- a/tourism_attractions.json +++ b/tourism_attractions.json @@ -8,7 +8,7 @@ "en": "Tourism", "et": "Turism", "fr": "Tourisme", - "hu": "Túrizmus", + "hu": "Turizmus", "it": "Turismo", "ja": "観光", "nl": "Toerisme", diff --git a/tourism_services.json b/tourism_services.json index 970d16cc6..c0c7855a7 100644 --- a/tourism_services.json +++ b/tourism_services.json @@ -8,7 +8,7 @@ "en": "Tourism", "et": "Turism", "fr": "Tourisme", - "hu": "Túrizmus", + "hu": "Turizmus", "it": "Turismo", "ja": "観光", "nl": "Toerisme", diff --git a/transport_alternative.json b/transport_alternative.json index 703cc56cb..32278c7c9 100644 --- a/transport_alternative.json +++ b/transport_alternative.json @@ -5,7 +5,7 @@ "el": "Εναλλακτικά (ποδηλασία, ορειβασία,...)", "et": "Alternatiivne (jalgrattasõit, matkamine, ...)", "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, ...)", diff --git a/walk_amenities.json b/walk_amenities.json index 6aeba5270..63f56b61d 100644 --- a/walk_amenities.json +++ b/walk_amenities.json @@ -4,6 +4,7 @@ "de": "Einrichtungen", "en": "Amenities", "fr": "Équipements piétons", + "hu": "Gyalogos létesítmények", "pt-br": "Equipamentos" }, "query": { diff --git a/waste.json b/waste.json index 662e2c7bc..089514280 100644 --- a/waste.json +++ b/waste.json @@ -6,6 +6,7 @@ "de": "Entsorgung", "en": "Disposal", "fr": "Déchets/Recyclage", + "hu": "Hulladék", "it": "Smaltimento", "ja": "処理場", "nl": "Afvalverwijdering", diff --git a/water.json b/water.json index f70d0edc0..a2d7f2219 100644 --- a/water.json +++ b/water.json @@ -4,6 +4,7 @@ "de": "Gewässer", "en": "Waterbodies", "fr": "Hydrographie", + "hu": "Vizek", "pt": "Massas de água", "pt-br": "Hidrografia" }, diff --git a/wikipedia.json b/wikipedia.json index 72bcf0d9d..a1774a480 100644 --- a/wikipedia.json +++ b/wikipedia.json @@ -4,6 +4,7 @@ "de": "Wikipedia", "en": "Wikipedia", "fr": "Wikipédia", + "hu": "Wikipédia", "pt": "Wikipédia", "pt-br": "Wikipédia" }, diff --git a/works.json b/works.json index 75bc26ee8..b9d6bca29 100644 --- a/works.json +++ b/works.json @@ -6,6 +6,7 @@ "de": "Fabriken", "en": "Works", "fr": "Zones industrielles", + "hu": "Üzemek", "it": "Fabbriche", "ja": "工場", "nl": "Fabrieken", From ec620a9823208d1a53fddb9abc84d623247b2c5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Tue, 9 Oct 2018 12:54:53 +0200 Subject: [PATCH 13/34] Fix order of language strings in lang/ files --- lang/ast.json | 5 +++-- lang/ca.json | 5 +++-- lang/cs.json | 5 +++-- lang/de.json | 5 +++-- lang/el.json | 5 +++-- lang/en.json | 5 +++-- lang/es.json | 5 +++-- lang/et.json | 5 +++-- lang/fr.json | 5 +++-- lang/hu.json | 5 +++-- lang/it.json | 5 +++-- lang/ja.json | 5 +++-- lang/nl.json | 5 +++-- lang/pl.json | 5 +++-- lang/pt-br.json | 4 ++-- lang/pt.json | 5 +++-- lang/ro.json | 5 +++-- lang/ru.json | 5 +++-- lang/template.json | 5 +++-- lang/uk.json | 5 +++-- 20 files changed, 59 insertions(+), 40 deletions(-) diff --git a/lang/ast.json b/lang/ast.json index 54948ae44..0da2b006c 100644 --- a/lang/ast.json +++ b/lang/ast.json @@ -7,6 +7,7 @@ "category:car_amenities": "Infraestructures", "category:car_furniture": "Acondicionamientu urbanu", "category:car_maxspeed": "", + "category:car_routes": "", "category:children": "", "category:communication": "Comunicaciones", "category:construction": "Sitios d'obres", @@ -18,8 +19,8 @@ "category:education": "Servicios educativos", "category:emergency": "Servicios d'emerxencia", "category:financial": "Dineru", - "category:gastro-smoking": "", "category:gastro": "Gastronomía", + "category:gastro-smoking": "", "category:health": "Salú", "category:hiking_routes": "", "category:historic": "Hestoria", @@ -38,8 +39,8 @@ "category:post": "Corréu", "category:power": "Enerxía", "category:pt": "", - "category:pt:stops": "Paraes y estaciones", "category:pt:routes": "", + "category:pt:stops": "Paraes y estaciones", "category:pt_amenities": "Infraestructures", "category:public": "Serviciu Públicu", "category:railway-electrification": "", diff --git a/lang/ca.json b/lang/ca.json index de49b3a71..56d24fb49 100644 --- a/lang/ca.json +++ b/lang/ca.json @@ -7,6 +7,7 @@ "category:car_amenities": "", "category:car_furniture": "", "category:car_maxspeed": "", + "category:car_routes": "", "category:children": "", "category:communication": "Comunicacions", "category:construction": "", @@ -18,8 +19,8 @@ "category:education": "", "category:emergency": "Serveis d'emergència", "category:financial": "", - "category:gastro-smoking": "", "category:gastro": "", + "category:gastro-smoking": "", "category:health": "", "category:hiking_routes": "", "category:historic": "", @@ -38,8 +39,8 @@ "category:post": "", "category:power": "", "category:pt": "", - "category:pt:stops": "", "category:pt:routes": "", + "category:pt:stops": "", "category:pt_amenities": "", "category:public": "", "category:railway-electrification": "", diff --git a/lang/cs.json b/lang/cs.json index 14c38f751..d079b9328 100644 --- a/lang/cs.json +++ b/lang/cs.json @@ -7,6 +7,7 @@ "category:car_amenities": "Občasnká vybavenost", "category:car_furniture": "Pouliční přislušenství", "category:car_maxspeed": "", + "category:car_routes": "", "category:children": "", "category:communication": "Komunikace", "category:construction": "Staveniště", @@ -18,8 +19,8 @@ "category:education": "Vzdělávací služby", "category:emergency": "Pohotovostní služby", "category:financial": "Finanční služby", - "category:gastro-smoking": "", "category:gastro": "Stravování", + "category:gastro-smoking": "", "category:health": "Zdravotnictví", "category:hiking_routes": "", "category:historic": "Historické", @@ -38,8 +39,8 @@ "category:post": "Poštovní služby", "category:power": "Elektřina", "category:pt": "", - "category:pt:stops": "Zastávky & Stanice", "category:pt:routes": "", + "category:pt:stops": "Zastávky & Stanice", "category:pt_amenities": "Občanská vybavenost", "category:public": "Veřejné služby", "category:railway-electrification": "", diff --git a/lang/de.json b/lang/de.json index 1f9715d94..8fac42dc9 100644 --- a/lang/de.json +++ b/lang/de.json @@ -7,6 +7,7 @@ "category:car_amenities": "Einrichtungen", "category:car_furniture": "Straßenausstattung", "category:car_maxspeed": "Höchstgeschwindigkeiten", + "category:car_routes": "", "category:children": "Einrichtungen für Kinder", "category:communication": "Kommunikation", "category:construction": "Baustellen", @@ -18,8 +19,8 @@ "category:education": "Bildungseinrichtungen", "category:emergency": "Notfalldienste", "category:financial": "Finanzen", - "category:gastro-smoking": "Rauchfreie Gastronomie", "category:gastro": "Gastronomie", + "category:gastro-smoking": "Rauchfreie Gastronomie", "category:health": "Gesundheitsdienste", "category:hiking_routes": "Wanderrouten", "category:historic": "Geschichte", @@ -38,8 +39,8 @@ "category:post": "Post", "category:power": "Energie", "category:pt": "ÖV Karte", - "category:pt:stops": "Haltestellen", "category:pt:routes": "Routen", + "category:pt:stops": "Haltestellen", "category:pt_amenities": "Einrichtungen", "category:public": "Öffentliche Dienste", "category:railway-electrification": "Eisenbahn Elektrifizierung", diff --git a/lang/el.json b/lang/el.json index a629d5351..f2b6c5cd6 100644 --- a/lang/el.json +++ b/lang/el.json @@ -7,6 +7,7 @@ "category:car_amenities": "", "category:car_furniture": "", "category:car_maxspeed": "", + "category:car_routes": "", "category:children": "", "category:communication": "Επικοινωνίες", "category:construction": "", @@ -18,8 +19,8 @@ "category:education": "Υπηρεσίες Εκπαίδευσης", "category:emergency": "Υπηρεσίες Έκτακτης Ανάγκης", "category:financial": "Χρήμα", - "category:gastro-smoking": "", "category:gastro": "Γαστρονομία", + "category:gastro-smoking": "", "category:health": "Υγεία", "category:hiking_routes": "", "category:historic": "Ιστορικά", @@ -38,8 +39,8 @@ "category:post": "", "category:power": "", "category:pt": "", - "category:pt:stops": "Στάσεις & Σταθμοί", "category:pt:routes": "", + "category:pt:stops": "Στάσεις & Σταθμοί", "category:pt_amenities": "", "category:public": "Δημόσιες Υπηρεσίες", "category:railway-electrification": "", diff --git a/lang/en.json b/lang/en.json index c5920a4dc..62ab60e8d 100644 --- a/lang/en.json +++ b/lang/en.json @@ -7,6 +7,7 @@ "category:car_amenities": "Amenities", "category:car_furniture": "Street Furniture", "category:car_maxspeed": "Maxspeed", + "category:car_routes": "Car routes", "category:children": "Children amenities", "category:communication": "Communication", "category:construction": "Construction Sites", @@ -18,8 +19,8 @@ "category:education": "Educational Services", "category:emergency": "Emergency Services", "category:financial": "Financial", - "category:gastro-smoking": "Smokefree Gastronomy", "category:gastro": "Gastronomy", + "category:gastro-smoking": "Smokefree Gastronomy", "category:health": "Health", "category:hiking_routes": "Hiking routes", "category:historic": "Historic", @@ -38,8 +39,8 @@ "category:post": "Post", "category:power": "Power", "category:pt": "Public transport map", - "category:pt:stops": "Stops & Stations", "category:pt:routes": "Routes", + "category:pt:stops": "Stops & Stations", "category:pt_amenities": "Amenities", "category:public": "Public Services", "category:railway-electrification": "Railway electrification", diff --git a/lang/es.json b/lang/es.json index 18d7d3e71..e008d9b7a 100644 --- a/lang/es.json +++ b/lang/es.json @@ -7,6 +7,7 @@ "category:car_amenities": "", "category:car_furniture": "", "category:car_maxspeed": "", + "category:car_routes": "", "category:children": "", "category:communication": "", "category:construction": "", @@ -18,8 +19,8 @@ "category:education": "", "category:emergency": "Servicios de emergencia", "category:financial": "", - "category:gastro-smoking": "", "category:gastro": "", + "category:gastro-smoking": "", "category:health": "", "category:hiking_routes": "", "category:historic": "", @@ -38,8 +39,8 @@ "category:post": "", "category:power": "", "category:pt": "", - "category:pt:stops": "Paradas y estaciones", "category:pt:routes": "", + "category:pt:stops": "Paradas y estaciones", "category:pt_amenities": "", "category:public": "", "category:railway-electrification": "", diff --git a/lang/et.json b/lang/et.json index fcd606637..b70642796 100644 --- a/lang/et.json +++ b/lang/et.json @@ -7,6 +7,7 @@ "category:car_amenities": "", "category:car_furniture": "", "category:car_maxspeed": "", + "category:car_routes": "", "category:children": "", "category:communication": "Kommunikatsioon", "category:construction": "", @@ -18,8 +19,8 @@ "category:education": "Haridusteenused", "category:emergency": "Hädaabi teenused", "category:financial": "", - "category:gastro-smoking": "", "category:gastro": "", + "category:gastro-smoking": "", "category:health": "", "category:hiking_routes": "", "category:historic": "Ajalooline", @@ -38,8 +39,8 @@ "category:post": "", "category:power": "Elekter", "category:pt": "", - "category:pt:stops": "", "category:pt:routes": "", + "category:pt:stops": "", "category:pt_amenities": "", "category:public": "Kommunaalteenused", "category:railway-electrification": "", diff --git a/lang/fr.json b/lang/fr.json index 296657007..e40e82aa1 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -7,6 +7,7 @@ "category:car_amenities": "Équipements auto", "category:car_furniture": "Fournitures automobiles", "category:car_maxspeed": "Limites de vitesse", + "category:car_routes": "", "category:children": "Équipements pour enfants", "category:communication": "Communication", "category:construction": "Constructions", @@ -18,8 +19,8 @@ "category:education": "Éducation", "category:emergency": "Services d'urgence", "category:financial": "Finance", - "category:gastro-smoking": "Restauration sans tabac", "category:gastro": "Restauration", + "category:gastro-smoking": "Restauration sans tabac", "category:health": "Santé", "category:hiking_routes": "Itinéraires pédestres", "category:historic": "Histoire", @@ -38,8 +39,8 @@ "category:post": "", "category:power": "Énergie", "category:pt": "", - "category:pt:stops": "Arrêts/Stops, Stations", "category:pt:routes": "Lignes", + "category:pt:stops": "Arrêts/Stops, Stations", "category:pt_amenities": "Équipements", "category:public": "Services Publics", "category:railway-electrification": "Puissance électrique ferroviaire", diff --git a/lang/hu.json b/lang/hu.json index 9998acca1..19424f92e 100644 --- a/lang/hu.json +++ b/lang/hu.json @@ -7,6 +7,7 @@ "category:car_amenities": "Létesítmények", "category:car_furniture": "Jelzőtáblák", "category:car_maxspeed": "Sebességkorlátozás", + "category:car_routes": "", "category:children": "Létesítmények gyermekeknek", "category:communication": "Kommunikácó", "category:construction": "Építési terület", @@ -18,8 +19,8 @@ "category:education": "Oktatás", "category:emergency": "Vészhelyzet", "category:financial": "Pénzügyek", - "category:gastro-smoking": "Nem dohányzó vendéglátóhelyek", "category:gastro": "Vendéglátás", + "category:gastro-smoking": "Nem dohányzó vendéglátóhelyek", "category:health": "Egészségügy", "category:hiking_routes": "Turistautak", "category:historic": "Történelmi objektumok", @@ -38,8 +39,8 @@ "category:post": "Posta", "category:power": "Áramellátás", "category:pt": "Tömegközlekedési térkép", - "category:pt:stops": "Megállók és állomások", "category:pt:routes": "Útvonalak", + "category:pt:stops": "Megállók és állomások", "category:pt_amenities": "Létesítmények", "category:public": "Közszolgáltatások", "category:railway-electrification": "Vasút villamosítottsága", diff --git a/lang/it.json b/lang/it.json index d910d5cb1..4a78a3c36 100644 --- a/lang/it.json +++ b/lang/it.json @@ -7,6 +7,7 @@ "category:car_amenities": "Infrastrutture", "category:car_furniture": "Dotazioni stradali", "category:car_maxspeed": "", + "category:car_routes": "", "category:children": "", "category:communication": "Communicazioni", "category:construction": "Cantieri", @@ -18,8 +19,8 @@ "category:education": "Istruzione", "category:emergency": "Servizi d'emergenza", "category:financial": "Finanze", - "category:gastro-smoking": "", "category:gastro": "Gastronomia", + "category:gastro-smoking": "", "category:health": "Sanità", "category:hiking_routes": "", "category:historic": "Storia", @@ -38,8 +39,8 @@ "category:post": "", "category:power": "Energia", "category:pt": "", - "category:pt:stops": "Stazioni e fermate", "category:pt:routes": "", + "category:pt:stops": "Stazioni e fermate", "category:pt_amenities": "Infrastrutture", "category:public": "Servizi pubblici", "category:railway-electrification": "", diff --git a/lang/ja.json b/lang/ja.json index bb9baa304..ae4833aae 100644 --- a/lang/ja.json +++ b/lang/ja.json @@ -7,6 +7,7 @@ "category:car_amenities": "生活環境", "category:car_furniture": "街路設置公共物", "category:car_maxspeed": "", + "category:car_routes": "", "category:children": "", "category:communication": "交流", "category:construction": "工事中", @@ -18,8 +19,8 @@ "category:education": "教育サービス", "category:emergency": "緊急サービス", "category:financial": "金融", - "category:gastro-smoking": "", "category:gastro": "食べ物", + "category:gastro-smoking": "", "category:health": "健康", "category:hiking_routes": "", "category:historic": "記念", @@ -38,8 +39,8 @@ "category:post": "郵便", "category:power": "電力", "category:pt": "", - "category:pt:stops": "停留所と駅", "category:pt:routes": "", + "category:pt:stops": "停留所と駅", "category:pt_amenities": "生活環境", "category:public": "公共サービス", "category:railway-electrification": "", diff --git a/lang/nl.json b/lang/nl.json index beab1900a..fcbf21b56 100644 --- a/lang/nl.json +++ b/lang/nl.json @@ -7,6 +7,7 @@ "category:car_amenities": "Voorzieningen", "category:car_furniture": "Straatmeubilair", "category:car_maxspeed": "", + "category:car_routes": "", "category:children": "", "category:communication": "Communicatie", "category:construction": "Bouwterrein", @@ -18,8 +19,8 @@ "category:education": "Onderwijs", "category:emergency": "Hulpdiensten", "category:financial": "Financieel", - "category:gastro-smoking": "", "category:gastro": "Gastronomie", + "category:gastro-smoking": "", "category:health": "Gezondheid", "category:hiking_routes": "", "category:historic": "Historisch", @@ -38,8 +39,8 @@ "category:post": "Post", "category:power": "Stroomvoorziening", "category:pt": "", - "category:pt:stops": "Haltes en Stations", "category:pt:routes": "", + "category:pt:stops": "Haltes en Stations", "category:pt_amenities": "Voorzieningen", "category:public": "Openbare diensten", "category:railway-electrification": "", diff --git a/lang/pl.json b/lang/pl.json index e4ef278ec..f4113a4a2 100644 --- a/lang/pl.json +++ b/lang/pl.json @@ -7,6 +7,7 @@ "category:car_amenities": "", "category:car_furniture": "Elementy drogowe", "category:car_maxspeed": "", + "category:car_routes": "", "category:children": "", "category:communication": "", "category:construction": "", @@ -18,8 +19,8 @@ "category:education": "Edukacyjne", "category:emergency": "", "category:financial": "Finasowe", - "category:gastro-smoking": "", "category:gastro": "Gastronomia", + "category:gastro-smoking": "", "category:health": "Zdrowie", "category:hiking_routes": "", "category:historic": "Miejsca Historyczne", @@ -38,8 +39,8 @@ "category:post": "", "category:power": "", "category:pt": "", - "category:pt:stops": "Przystanki i Stacje", "category:pt:routes": "", + "category:pt:stops": "Przystanki i Stacje", "category:pt_amenities": "", "category:public": "", "category:railway-electrification": "", diff --git a/lang/pt-br.json b/lang/pt-br.json index 35918feeb..cb1e35c01 100644 --- a/lang/pt-br.json +++ b/lang/pt-br.json @@ -19,8 +19,8 @@ "category:education": "Educação", "category:emergency": "Emergência", "category:financial": "Finanças", - "category:gastro-smoking": "Gastronomia sem fumo", "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", @@ -39,8 +39,8 @@ "category:post": "Correios", "category:power": "Energia", "category:pt": "Mapa de transporte público", - "category:pt:stops": "Paradas e estações", "category:pt:routes": "Rotas", + "category:pt:stops": "Paradas e estações", "category:pt_amenities": "Equipamentos", "category:public": "Serviços públicos", "category:railway-electrification": "Eletrificação ferroviária", diff --git a/lang/pt.json b/lang/pt.json index 6b83f42fe..0c20ffb73 100644 --- a/lang/pt.json +++ b/lang/pt.json @@ -7,6 +7,7 @@ "category:car_amenities": "", "category:car_furniture": "Mobiliário urbano", "category:car_maxspeed": "Velocidade máxima", + "category:car_routes": "", "category:children": "", "category:communication": "Comunicação", "category:construction": "Locais de construção", @@ -18,8 +19,8 @@ "category:education": "Educação", "category:emergency": "Emergência", "category:financial": "Finanças", - "category:gastro-smoking": "Restauração livre de tabaco", "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", @@ -38,8 +39,8 @@ "category:post": "Correios", "category:power": "Eletricidade", "category:pt": "", - "category:pt:stops": "", "category:pt:routes": "Rotas", + "category:pt:stops": "", "category:pt_amenities": "", "category:public": "Serviços públicos", "category:railway-electrification": "Eletrificação ferroviária", diff --git a/lang/ro.json b/lang/ro.json index 543a7399d..a99002677 100644 --- a/lang/ro.json +++ b/lang/ro.json @@ -7,6 +7,7 @@ "category:car_amenities": "", "category:car_furniture": "", "category:car_maxspeed": "", + "category:car_routes": "", "category:children": "", "category:communication": "Comunicatii", "category:construction": "", @@ -18,8 +19,8 @@ "category:education": "Servicii educatie", "category:emergency": "Servicii urgenta", "category:financial": "Financiar", - "category:gastro-smoking": "", "category:gastro": "Gastronomie", + "category:gastro-smoking": "", "category:health": "Sanatate", "category:hiking_routes": "", "category:historic": "Istoric", @@ -38,8 +39,8 @@ "category:post": "", "category:power": "Energie", "category:pt": "", - "category:pt:stops": "", "category:pt:routes": "", + "category:pt:stops": "", "category:pt_amenities": "", "category:public": "Servicii publice", "category:railway-electrification": "", diff --git a/lang/ru.json b/lang/ru.json index 3f308a26d..85ebc4f68 100644 --- a/lang/ru.json +++ b/lang/ru.json @@ -7,6 +7,7 @@ "category:car_amenities": "Обслуживание транспорта", "category:car_furniture": "Элементы дороги", "category:car_maxspeed": "", + "category:car_routes": "", "category:children": "", "category:communication": "Услуги связи", "category:construction": "Места строительства", @@ -18,8 +19,8 @@ "category:education": "Образование", "category:emergency": "Экстренные службы", "category:financial": "Финансы", - "category:gastro-smoking": "", "category:gastro": "Общепит", + "category:gastro-smoking": "", "category:health": "Медицина", "category:hiking_routes": "", "category:historic": "Историческое", @@ -38,8 +39,8 @@ "category:post": "", "category:power": "Энергетика", "category:pt": "", - "category:pt:stops": "Остановки и станции", "category:pt:routes": "", + "category:pt:stops": "Остановки и станции", "category:pt_amenities": "Транспортные принадлежности", "category:public": "Общественные места", "category:railway-electrification": "", diff --git a/lang/template.json b/lang/template.json index 56c2d2c6d..6cae75aca 100644 --- a/lang/template.json +++ b/lang/template.json @@ -7,6 +7,7 @@ "category:car_amenities": "", "category:car_furniture": "", "category:car_maxspeed": "", + "category:car_routes": "", "category:children": "", "category:communication": "", "category:construction": "", @@ -18,8 +19,8 @@ "category:education": "", "category:emergency": "", "category:financial": "", - "category:gastro-smoking": "", "category:gastro": "", + "category:gastro-smoking": "", "category:health": "", "category:hiking_routes": "", "category:historic": "", @@ -38,8 +39,8 @@ "category:post": "", "category:power": "", "category:pt": "", - "category:pt:stops": "", "category:pt:routes": "", + "category:pt:stops": "", "category:pt_amenities": "", "category:public": "", "category:railway-electrification": "", diff --git a/lang/uk.json b/lang/uk.json index 8ac916e49..953a82f23 100644 --- a/lang/uk.json +++ b/lang/uk.json @@ -7,6 +7,7 @@ "category:car_amenities": "Amenities", "category:car_furniture": "Street Furniture", "category:car_maxspeed": "", + "category:car_routes": "", "category:children": "", "category:communication": "Телекомунікації", "category:construction": "", @@ -18,8 +19,8 @@ "category:education": "Освіта", "category:emergency": "Швидка допомога", "category:financial": "Фінанси", - "category:gastro-smoking": "", "category:gastro": "Гастрономія", + "category:gastro-smoking": "", "category:health": "Здоров'я", "category:hiking_routes": "", "category:historic": "Історія", @@ -38,8 +39,8 @@ "category:post": "", "category:power": "", "category:pt": "", - "category:pt:stops": "Зупинки та станції", "category:pt:routes": "", + "category:pt:stops": "Зупинки та станції", "category:pt_amenities": "Amenities", "category:public": "Громадські місця", "category:railway-electrification": "", From fe7792fda7fa708f6ad291cf01f26030273dad9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Tue, 9 Oct 2018 12:55:19 +0200 Subject: [PATCH 14/34] Add some category titles which were accidentially missing --- lang/ast.json | 18 +++++++++++------- lang/ca.json | 14 +++++++++++--- lang/cs.json | 18 +++++++++++------- lang/de.json | 22 +++++++++++----------- lang/el.json | 16 +++++++++++----- lang/en.json | 22 +++++++++++----------- lang/es.json | 14 +++++++++++--- lang/et.json | 17 +++++++++++------ lang/fr.json | 22 +++++++++++----------- lang/hu.json | 17 +++++++++++------ lang/it.json | 18 +++++++++++------- lang/ja.json | 18 +++++++++++------- lang/nl.json | 18 +++++++++++------- lang/pl.json | 17 +++++++++++------ lang/pt-br.json | 22 +++++++++++----------- lang/pt.json | 22 +++++++++++----------- lang/ro.json | 17 +++++++++++------ lang/ru.json | 18 +++++++++++------- lang/template.json | 10 ++++++++++ lang/uk.json | 17 +++++++++++------ 20 files changed, 219 insertions(+), 138 deletions(-) diff --git a/lang/ast.json b/lang/ast.json index 0da2b006c..c2e4e16c6 100644 --- a/lang/ast.json +++ b/lang/ast.json @@ -25,8 +25,10 @@ "category:hiking_routes": "", "category:historic": "Hestoria", "category:index": "", + "category:infrastructure": "", "category:internet": "Accesu a Internet", "category:leisure": "Recréu", + "category:leisure_sport_shopping": "Recréu, deportes y compres", "category:military": "Militar", "category:mtb-routes": "", "category:natural": "Formaciones naturales", @@ -43,26 +45,28 @@ "category:pt:stops": "Paraes y estaciones", "category:pt_amenities": "Infraestructures", "category:public": "Serviciu Públicu", + "category:railway": "Ferrocarril", "category:railway-electrification": "", "category:railway-infrastructure": "", "category:railway-routes": "", "category:religion": "Relixón", "category:residential": "Zones residenciales", "category:resources": "Estraición de recursos", + "category:services": "Servicios", "category:shop": "Compres", + "category:special": "", "category:sport": "Deportes", "category:tourism_attractions": "Turismu", "category:tourism_services": "Turismu", + "category:transport": "Tresporte", "category:transport_alternative": "Alternativu (Ciclismu, senderismu, ...)", + "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": "", "category:wikipedia": "", - "category:works": "Fábriques", - "category:leisure_sport_shopping": "Recréu, deportes y compres", - "category:railway": "Ferrocarril", - "category:services": "Servicios", - "category:transport": "Tresporte", - "category:transport_car": "Tráficu individual", - "category:transport_pt": "Tresporte Públicu" + "category:works": "Fábriques" } diff --git a/lang/ca.json b/lang/ca.json index 56d24fb49..8be27ba28 100644 --- a/lang/ca.json +++ b/lang/ca.json @@ -25,8 +25,10 @@ "category:hiking_routes": "", "category:historic": "", "category:index": "", + "category:infrastructure": "", "category:internet": "Accés a Internet", "category:leisure": "", + "category:leisure_sport_shopping": "Oci, esport i compres", "category:military": "", "category:mtb-routes": "", "category:natural": "", @@ -43,22 +45,28 @@ "category:pt:stops": "", "category:pt_amenities": "", "category:public": "", + "category:railway": "", "category:railway-electrification": "", "category:railway-infrastructure": "", "category:railway-routes": "", "category:religion": "", "category:residential": "", "category:resources": "", + "category:services": "Serveis", "category:shop": "", + "category:special": "", "category:sport": "", "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:leisure_sport_shopping": "Oci, esport i compres", - "category:services": "Serveis" + "category:works": "" } diff --git a/lang/cs.json b/lang/cs.json index d079b9328..05c221ec9 100644 --- a/lang/cs.json +++ b/lang/cs.json @@ -25,8 +25,10 @@ "category:hiking_routes": "", "category:historic": "Historické", "category:index": "", + "category:infrastructure": "", "category:internet": "Přístup k internetu", "category:leisure": "Volný čas", + "category:leisure_sport_shopping": "Volný čas, sporty a nákupy", "category:military": "Vojenské", "category:mtb-routes": "", "category:natural": "Přírodní úkazy", @@ -43,26 +45,28 @@ "category:pt:stops": "Zastávky & Stanice", "category:pt_amenities": "Občanská vybavenost", "category:public": "Veřejné služby", + "category:railway": "Železnice", "category:railway-electrification": "", "category:railway-infrastructure": "", "category:railway-routes": "", "category:religion": "Religion", "category:residential": "Obytné oblasti", "category:resources": "Těžba surovin", + "category:services": "Služby", "category:shop": "Obchody", + "category:special": "", "category:sport": "Sport", "category:tourism_attractions": "Turistika", "category:tourism_services": "Turistika", + "category:transport": "Doprava", "category:transport_alternative": "Alternativní (Cyklistika, Pěší turistika, ...)", + "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": "", "category:wikipedia": "", - "category:works": "Továrny", - "category:leisure_sport_shopping": "Volný čas, sporty a nákupy", - "category:railway": "Železnice", - "category:services": "Služby", - "category:transport": "Doprava", - "category:transport_car": "Individuální doprava", - "category:transport_pt": "Veřejná doprava" + "category:works": "Továrny" } diff --git a/lang/de.json b/lang/de.json index 8fac42dc9..64e096f93 100644 --- a/lang/de.json +++ b/lang/de.json @@ -25,8 +25,10 @@ "category:hiking_routes": "Wanderrouten", "category:historic": "Geschichte", "category:index": "", + "category:infrastructure": "Infrastruktur", "category:internet": "Internetzugang", "category:leisure": "Freizeit", + "category:leisure_sport_shopping": "Freizeit, Sport und Einkauf", "category:military": "Militär", "category:mtb-routes": "", "category:natural": "Geographische Objekte", @@ -43,30 +45,28 @@ "category:pt:stops": "Haltestellen", "category:pt_amenities": "Einrichtungen", "category:public": "Öffentliche Dienste", + "category:railway": "Eisenbahn", "category:railway-electrification": "Eisenbahn Elektrifizierung", "category:railway-infrastructure": "Eisenbahn Infrastruktur", "category:railway-routes": "", "category:religion": "Religion", "category:residential": "Wohngebiete", "category:resources": "Ressourcengewinnung", + "category:services": "Dienste", "category:shop": "Einkauf", + "category:special": "Spezial", "category:sport": "Sport", "category:tourism_attractions": "Tourismus", "category:tourism_services": "Tourismus", + "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:infrastructure": "Infrastruktur", - "category:leisure_sport_shopping": "Freizeit, Sport und Einkauf", - "category:railway": "Eisenbahn", - "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" + "category:works": "Fabriken" } diff --git a/lang/el.json b/lang/el.json index f2b6c5cd6..8dd6d13ee 100644 --- a/lang/el.json +++ b/lang/el.json @@ -25,8 +25,10 @@ "category:hiking_routes": "", "category:historic": "Ιστορικά", "category:index": "", + "category:infrastructure": "", "category:internet": "", "category:leisure": "Αναψυχή", + "category:leisure_sport_shopping": "Αναψυχή, Αθλητισμός και Αγορές", "category:military": "Στρατιωτικό", "category:mtb-routes": "", "category:natural": "Φυσικοί Σχηματισμοί", @@ -43,24 +45,28 @@ "category:pt:stops": "Στάσεις & Σταθμοί", "category:pt_amenities": "", "category:public": "Δημόσιες Υπηρεσίες", + "category:railway": "", "category:railway-electrification": "", "category:railway-infrastructure": "", "category:railway-routes": "", "category:religion": "Θρησκεία", "category:residential": "Περιοχές Κατοικίας", "category:resources": "", + "category:services": "Υπηρεσίες", "category:shop": "Αγορές", + "category:special": "", "category:sport": "Άθληση", "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:leisure_sport_shopping": "Αναψυχή, Αθλητισμός και Αγορές", - "category:services": "Υπηρεσίες", - "category:transport": "Μεταφορές", - "category:transport_pt": "Δημόσιες Μεταφορές" + "category:works": "" } diff --git a/lang/en.json b/lang/en.json index 62ab60e8d..302245a4a 100644 --- a/lang/en.json +++ b/lang/en.json @@ -25,8 +25,10 @@ "category:hiking_routes": "Hiking routes", "category:historic": "Historic", "category:index": "", + "category:infrastructure": "Infrastructure", "category:internet": "Internet access", "category:leisure": "Leisure", + "category:leisure_sport_shopping": "Leisure, Sport and Shopping", "category:military": "Military", "category:mtb-routes": "Mountain bike routes", "category:natural": "Natural Formations", @@ -43,30 +45,28 @@ "category:pt:stops": "Stops & Stations", "category:pt_amenities": "Amenities", "category:public": "Public Services", + "category:railway": "Railway", "category:railway-electrification": "Railway electrification", "category:railway-infrastructure": "Railway infrastructure", "category:railway-routes": "Railway Routes", "category:religion": "Religion", "category:residential": "Residential Areas", "category:resources": "Resource Extraction", + "category:services": "Services", "category:shop": "Shopping", + "category:special": "Special", "category:sport": "Sport", "category:tourism_attractions": "Tourism", "category:tourism_services": "Tourism", + "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:infrastructure": "Infrastructure", - "category:leisure_sport_shopping": "Leisure, Sport and Shopping", - "category:railway": "Railway", - "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" + "category:works": "Works" } diff --git a/lang/es.json b/lang/es.json index e008d9b7a..98640c8f3 100644 --- a/lang/es.json +++ b/lang/es.json @@ -25,8 +25,10 @@ "category:hiking_routes": "", "category:historic": "", "category:index": "", + "category:infrastructure": "", "category:internet": "Acceso a Internet", "category:leisure": "", + "category:leisure_sport_shopping": "Ocio, deporte y compras", "category:military": "", "category:mtb-routes": "", "category:natural": "", @@ -43,22 +45,28 @@ "category:pt:stops": "Paradas y estaciones", "category:pt_amenities": "", "category:public": "", + "category:railway": "", "category:railway-electrification": "", "category:railway-infrastructure": "", "category:railway-routes": "", "category:religion": "", "category:residential": "", "category:resources": "", + "category:services": "Servicios", "category:shop": "", + "category:special": "", "category:sport": "", "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:leisure_sport_shopping": "Ocio, deporte y compras", - "category:services": "Servicios" + "category:works": "" } diff --git a/lang/et.json b/lang/et.json index b70642796..32fb0544b 100644 --- a/lang/et.json +++ b/lang/et.json @@ -25,8 +25,10 @@ "category:hiking_routes": "", "category:historic": "Ajalooline", "category:index": "", + "category:infrastructure": "", "category:internet": "", "category:leisure": "", + "category:leisure_sport_shopping": "Vaba aeg, sport ja ostmine", "category:military": "", "category:mtb-routes": "", "category:natural": "", @@ -43,25 +45,28 @@ "category:pt:stops": "", "category:pt_amenities": "", "category:public": "Kommunaalteenused", + "category:railway": "Raudtee", "category:railway-electrification": "", "category:railway-infrastructure": "", "category:railway-routes": "", "category:religion": "Religioon", "category:residential": "Elamupiirkonnad", "category:resources": "", + "category:services": "Teenused", "category:shop": "Ostmine", + "category:special": "", "category:sport": "", "category:tourism_attractions": "Turism", "category:tourism_services": "Turism", + "category:transport": "Transport", "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:leisure_sport_shopping": "Vaba aeg, sport ja ostmine", - "category:railway": "Raudtee", - "category:services": "Teenused", - "category:transport": "Transport", - "category:transport_pt": "Ühistransport" + "category:works": "" } diff --git a/lang/fr.json b/lang/fr.json index e40e82aa1..6fec0e04c 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -25,8 +25,10 @@ "category:hiking_routes": "Itinéraires pédestres", "category:historic": "Histoire", "category:index": "", + "category:infrastructure": "Infrastructures", "category:internet": "Internet", "category:leisure": "Loisirs", + "category:leisure_sport_shopping": "Loisirs", "category:military": "Militaire", "category:mtb-routes": "Itinéraires de VTT", "category:natural": "Éléments naturels", @@ -43,30 +45,28 @@ "category:pt:stops": "Arrêts/Stops, Stations", "category:pt_amenities": "Équipements", "category:public": "Services Publics", + "category:railway": "Chemins de fer", "category:railway-electrification": "Puissance électrique ferroviaire", "category:railway-infrastructure": "Infrastructure ferroviaire", "category:railway-routes": "Lignes ferroviaires", "category:religion": "Religion", "category:residential": "Zones résidentielles", "category:resources": "Extraction des ressources", + "category:services": "Services", "category:shop": "Magasins/Boutiques", + "category:special": "Catégories spéciales", "category:sport": "Sports", "category:tourism_attractions": "Tourisme", "category:tourism_services": "Tourisme", + "category:transport": "Transports", "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 piétons", "category:waste": "Déchets/Recyclage", "category:water": "Hydrographie", "category:wikipedia": "Wikipédia", - "category:works": "Zones industrielles", - "category:infrastructure": "Infrastructures", - "category:leisure_sport_shopping": "Loisirs", - "category:railway": "Chemins de fer", - "category:services": "Services", - "category:special": "Catégories spéciales", - "category:transport": "Transports", - "category:transport_car": "Transport automobile", - "category:transport_cycle": "Cyclisme", - "category:transport_pt": "Transports publics", - "category:transport_walk": "Marche à pied" + "category:works": "Zones industrielles" } diff --git a/lang/hu.json b/lang/hu.json index 19424f92e..71e29c9cc 100644 --- a/lang/hu.json +++ b/lang/hu.json @@ -25,8 +25,10 @@ "category:hiking_routes": "Turistautak", "category:historic": "Történelmi objektumok", "category:index": "", + "category:infrastructure": "", "category:internet": "Internetcsatlakozás", "category:leisure": "Szabadidős létesítmények", + "category:leisure_sport_shopping": "Szabadidő, sport és vásárlás", "category:military": "Katonai objektumok", "category:mtb-routes": "Hegyikerékpáros útvonalak", "category:natural": "Természeti képződmények", @@ -43,25 +45,28 @@ "category:pt:stops": "Megállók és állomások", "category:pt_amenities": "Létesítmények", "category:public": "Közszolgáltatások", + "category:railway": "Vasút", "category:railway-electrification": "Vasút villamosítottsága", "category:railway-infrastructure": "Vasúti infrastruktúra", "category:railway-routes": "Vasútvonalak", "category:religion": "Vallás", "category:residential": "Lakóövezetek", "category:resources": "Bányászat", + "category:services": "Szolgáltatások", "category:shop": "Vásárlás", + "category:special": "", "category:sport": "Sport", "category:tourism_attractions": "Turizmus", "category:tourism_services": "Turizmus", + "category:transport": "Közlekedés", "category:transport_alternative": "Alternatív (Kerékpár, Túra)", + "category:transport_car": "", + "category:transport_cycle": "", + "category:transport_pt": "Tömegközlekedés", + "category:transport_walk": "", "category:walk_amenities": "Gyalogos létesítmények", "category:waste": "Hulladék", "category:water": "Vizek", "category:wikipedia": "Wikipédia", - "category:works": "Üzemek", - "category:leisure_sport_shopping": "Szabadidő, sport és vásárlás", - "category:railway": "Vasút", - "category:services": "Szolgáltatások", - "category:transport": "Közlekedés", - "category:transport_pt": "Tömegközlekedés" + "category:works": "Üzemek" } diff --git a/lang/it.json b/lang/it.json index 4a78a3c36..96517f0fb 100644 --- a/lang/it.json +++ b/lang/it.json @@ -25,8 +25,10 @@ "category:hiking_routes": "", "category:historic": "Storia", "category:index": "", + "category:infrastructure": "", "category:internet": "", "category:leisure": "Tempo libero", + "category:leisure_sport_shopping": "Tempo libero, sport e shopping", "category:military": "Militare", "category:mtb-routes": "", "category:natural": "Natura", @@ -43,26 +45,28 @@ "category:pt:stops": "Stazioni e fermate", "category:pt_amenities": "Infrastrutture", "category:public": "Servizi pubblici", + "category:railway": "Ferrovie", "category:railway-electrification": "", "category:railway-infrastructure": "", "category:railway-routes": "", "category:religion": "Religione", "category:residential": "Aree residenziali", "category:resources": "Areee estrattive", + "category:services": "Servizi", "category:shop": "Acquisti", + "category:special": "", "category:sport": "Sport", "category:tourism_attractions": "Turismo", "category:tourism_services": "Turismo", + "category:transport": "Trasporti", "category:transport_alternative": "Alternativi (bicicletta, camminate, ...)", + "category:transport_car": "Trasporti individuali", + "category:transport_cycle": "", + "category:transport_pt": "Trasporti pubblici", + "category:transport_walk": "", "category:walk_amenities": "", "category:waste": "Smaltimento", "category:water": "", "category:wikipedia": "", - "category:works": "Fabbriche", - "category:leisure_sport_shopping": "Tempo libero, sport e shopping", - "category:railway": "Ferrovie", - "category:services": "Servizi", - "category:transport": "Trasporti", - "category:transport_car": "Trasporti individuali", - "category:transport_pt": "Trasporti pubblici" + "category:works": "Fabbriche" } diff --git a/lang/ja.json b/lang/ja.json index ae4833aae..b1e963fed 100644 --- a/lang/ja.json +++ b/lang/ja.json @@ -25,8 +25,10 @@ "category:hiking_routes": "", "category:historic": "記念", "category:index": "", + "category:infrastructure": "", "category:internet": "インターネット接続", "category:leisure": "レジャー", + "category:leisure_sport_shopping": "レジャー", "category:military": "軍事", "category:mtb-routes": "", "category:natural": "自然地層", @@ -43,26 +45,28 @@ "category:pt:stops": "停留所と駅", "category:pt_amenities": "生活環境", "category:public": "公共サービス", + "category:railway": "鉄道", "category:railway-electrification": "", "category:railway-infrastructure": "", "category:railway-routes": "", "category:religion": "宗教", "category:residential": "住居エリア", "category:resources": "", + "category:services": "サービス", "category:shop": "ショッピング", + "category:special": "", "category:sport": "スポーツ", "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:leisure_sport_shopping": "レジャー", - "category:railway": "鉄道", - "category:services": "サービス", - "category:transport": "輸送", - "category:transport_car": "個人輸送機関", - "category:transport_pt": "公共輸送" + "category:works": "工場" } diff --git a/lang/nl.json b/lang/nl.json index fcbf21b56..edb0a135e 100644 --- a/lang/nl.json +++ b/lang/nl.json @@ -25,8 +25,10 @@ "category:hiking_routes": "", "category:historic": "Historisch", "category:index": "", + "category:infrastructure": "", "category:internet": "Internettoegang", "category:leisure": "Vrije tijd", + "category:leisure_sport_shopping": "Vrije tijd, Sport en Winkelen", "category:military": "Militair", "category:mtb-routes": "", "category:natural": "Natuurlijke Formaties", @@ -43,26 +45,28 @@ "category:pt:stops": "Haltes en Stations", "category:pt_amenities": "Voorzieningen", "category:public": "Openbare diensten", + "category:railway": "Spoorwegen", "category:railway-electrification": "", "category:railway-infrastructure": "", "category:railway-routes": "", "category:religion": "Religie", "category:residential": "Woongebieden", "category:resources": "Grondstoffenwinning", + "category:services": "Dienstverlening", "category:shop": "Winkelen", + "category:special": "", "category:sport": "Sport", "category:tourism_attractions": "Toerisme", "category:tourism_services": "Toerisme", + "category:transport": "Vervoer", "category:transport_alternative": "Alternatief (Fiets, Wandel, ...)", + "category:transport_car": "Gemotoriseerd individueel verkeer", + "category:transport_cycle": "", + "category:transport_pt": "Openbaar vervoer", + "category:transport_walk": "", "category:walk_amenities": "", "category:waste": "Afvalverwijdering", "category:water": "", "category:wikipedia": "", - "category:works": "Fabrieken", - "category:leisure_sport_shopping": "Vrije tijd, Sport en Winkelen", - "category:railway": "Spoorwegen", - "category:services": "Dienstverlening", - "category:transport": "Vervoer", - "category:transport_car": "Gemotoriseerd individueel verkeer", - "category:transport_pt": "Openbaar vervoer" + "category:works": "Fabrieken" } diff --git a/lang/pl.json b/lang/pl.json index f4113a4a2..45961b027 100644 --- a/lang/pl.json +++ b/lang/pl.json @@ -25,8 +25,10 @@ "category:hiking_routes": "", "category:historic": "Miejsca Historyczne", "category:index": "", + "category:infrastructure": "", "category:internet": "", "category:leisure": "", + "category:leisure_sport_shopping": "Wypoczynek, Sport i Zakupy", "category:military": "", "category:mtb-routes": "", "category:natural": "", @@ -43,25 +45,28 @@ "category:pt:stops": "Przystanki i Stacje", "category:pt_amenities": "", "category:public": "", + "category:railway": "", "category:railway-electrification": "", "category:railway-infrastructure": "", "category:railway-routes": "", "category:religion": "", "category:residential": "", "category:resources": "", + "category:services": "Usługi", "category:shop": "Zakupy", + "category:special": "", "category:sport": "", "category:tourism_attractions": "Turystyka", "category:tourism_services": "Turystyka", + "category:transport": "Transport", "category:transport_alternative": "", + "category:transport_car": "Transport Indywidualny", + "category:transport_cycle": "", + "category:transport_pt": "Transport Publiczny", + "category:transport_walk": "", "category:walk_amenities": "", "category:waste": "", "category:water": "", "category:wikipedia": "", - "category:works": "", - "category:leisure_sport_shopping": "Wypoczynek, Sport i Zakupy", - "category:services": "Usługi", - "category:transport": "Transport", - "category:transport_car": "Transport Indywidualny", - "category:transport_pt": "Transport Publiczny" + "category:works": "" } diff --git a/lang/pt-br.json b/lang/pt-br.json index cb1e35c01..a79642a33 100644 --- a/lang/pt-br.json +++ b/lang/pt-br.json @@ -25,8 +25,10 @@ "category:hiking_routes": "Rotas de caminhada", "category:historic": "Histórico", "category:index": "Índice", + "category:infrastructure": "Infraestrutura", "category:internet": "Acesso à Internet", "category:leisure": "Lazer", + "category:leisure_sport_shopping": "Lazer, esportes e compras", "category:military": "Militar", "category:mtb-routes": "Rotas mountain bike", "category:natural": "Formações naturais", @@ -43,30 +45,28 @@ "category:pt:stops": "Paradas e estações", "category:pt_amenities": "Equipamentos", "category:public": "Serviços públicos", + "category:railway": "Ferrovia", "category:railway-electrification": "Eletrificação ferroviária", "category:railway-infrastructure": "Infraestrutura ferroviária", "category:railway-routes": "Rotas ferroviárias", "category:religion": "Religião", "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:tourism_attractions": "Turismo", "category:tourism_services": "Serviços de turismo", + "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": "Fábricas", - "category:infrastructure": "Infraestrutura", - "category:leisure_sport_shopping": "Lazer, esportes e compras", - "category:railway": "Ferrovia", - "category:services": "Prestação de serviços", - "category:special": "Especial", - "category:transport": "Mobilidade", - "category:transport_car": "Tráfego individual", - "category:transport_cycle": "Ciclismo", - "category:transport_pt": "Transporte público", - "category:transport_walk": "Pedestre" + "category:works": "Fábricas" } diff --git a/lang/pt.json b/lang/pt.json index 0c20ffb73..e055231cf 100644 --- a/lang/pt.json +++ b/lang/pt.json @@ -25,8 +25,10 @@ "category:hiking_routes": "Rotas de caminhada", "category:historic": "Histórico", "category:index": "", + "category:infrastructure": "Infraestrutura", "category:internet": "Acesso à Internet", "category:leisure": "Lazer", + "category:leisure_sport_shopping": "Lazer, desporto e compras", "category:military": "Militar", "category:mtb-routes": "", "category:natural": "Formações naturais", @@ -43,30 +45,28 @@ "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-infrastructure": "Infraestrutura ferroviária", "category:railway-routes": "", "category:religion": "Religião", "category:residential": "Áreas residenciais", "category:resources": "Extração de recursos", + "category:services": "Serviços", "category:shop": "Compras", + "category:special": "Especial", "category:sport": "Desporto", "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:infrastructure": "Infraestrutura", - "category:leisure_sport_shopping": "Lazer, desporto e compras", - "category:railway": "Linhas ferroviárias", - "category:services": "Serviços", - "category:special": "Especial", - "category:transport": "Transportes", - "category:transport_car": "Transporte individual", - "category:transport_cycle": "Ciclismo", - "category:transport_pt": "Transportes públicos", - "category:transport_walk": "Pedestre" + "category:works": "Fábricas" } diff --git a/lang/ro.json b/lang/ro.json index a99002677..d79d6b096 100644 --- a/lang/ro.json +++ b/lang/ro.json @@ -25,8 +25,10 @@ "category:hiking_routes": "", "category:historic": "Istoric", "category:index": "", + "category:infrastructure": "", "category:internet": "Acces internet", "category:leisure": "Timp liber", + "category:leisure_sport_shopping": "Timp liber, Sport si Cumparaturi", "category:military": "Militar", "category:mtb-routes": "", "category:natural": "", @@ -43,25 +45,28 @@ "category:pt:stops": "", "category:pt_amenities": "", "category:public": "Servicii publice", + "category:railway": "", "category:railway-electrification": "", "category:railway-infrastructure": "", "category:railway-routes": "", "category:religion": "Religie", "category:residential": "Zona rezidentiala", "category:resources": "", + "category:services": "Servicii", "category:shop": "Cumpărături", + "category:special": "", "category:sport": "", "category:tourism_attractions": "Turism", "category:tourism_services": "Turism", + "category:transport": "Transport", "category:transport_alternative": "Alternativ(Bicicleta,Drumetii)", + "category:transport_car": "Trafic individual", + "category:transport_cycle": "", + "category:transport_pt": "Transport public", + "category:transport_walk": "", "category:walk_amenities": "", "category:waste": "", "category:water": "", "category:wikipedia": "", - "category:works": "", - "category:leisure_sport_shopping": "Timp liber, Sport si Cumparaturi", - "category:services": "Servicii", - "category:transport": "Transport", - "category:transport_car": "Trafic individual", - "category:transport_pt": "Transport public" + "category:works": "" } diff --git a/lang/ru.json b/lang/ru.json index 85ebc4f68..7a2a36f3c 100644 --- a/lang/ru.json +++ b/lang/ru.json @@ -25,8 +25,10 @@ "category:hiking_routes": "", "category:historic": "Историческое", "category:index": "", + "category:infrastructure": "", "category:internet": "", "category:leisure": "Досуг", + "category:leisure_sport_shopping": "Досуг", "category:military": "Вооружённые силы", "category:mtb-routes": "", "category:natural": "Природные образования", @@ -43,26 +45,28 @@ "category:pt:stops": "Остановки и станции", "category:pt_amenities": "Транспортные принадлежности", "category:public": "Общественные места", + "category:railway": "Железные дороги", "category:railway-electrification": "", "category:railway-infrastructure": "", "category:railway-routes": "", "category:religion": "Религия", "category:residential": "Жилые районы", "category:resources": "Добыча ресурсов", + "category:services": "Услуги", "category:shop": "Покупки", + "category:special": "", "category:sport": "Спорт", "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:leisure_sport_shopping": "Досуг", - "category:railway": "Железные дороги", - "category:services": "Услуги", - "category:transport": "Транспорт", - "category:transport_car": "Частный транспорт", - "category:transport_pt": "Общественный транспорт" + "category:works": "Промышленность" } diff --git a/lang/template.json b/lang/template.json index 6cae75aca..2f475441f 100644 --- a/lang/template.json +++ b/lang/template.json @@ -25,8 +25,10 @@ "category:hiking_routes": "", "category:historic": "", "category:index": "", + "category:infrastructure": "", "category:internet": "", "category:leisure": "", + "category:leisure_sport_shopping": "", "category:military": "", "category:mtb-routes": "", "category:natural": "", @@ -43,17 +45,25 @@ "category:pt:stops": "", "category:pt_amenities": "", "category:public": "", + "category:railway": "", "category:railway-electrification": "", "category:railway-infrastructure": "", "category:railway-routes": "", "category:religion": "", "category:residential": "", "category:resources": "", + "category:services": "", "category:shop": "", + "category:special": "", "category:sport": "", "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": "", diff --git a/lang/uk.json b/lang/uk.json index 953a82f23..e9778eb5c 100644 --- a/lang/uk.json +++ b/lang/uk.json @@ -25,8 +25,10 @@ "category:hiking_routes": "", "category:historic": "Історія", "category:index": "", + "category:infrastructure": "", "category:internet": "", "category:leisure": "Дозвілля", + "category:leisure_sport_shopping": "Дозвілля", "category:military": "", "category:mtb-routes": "", "category:natural": "Природне середовище", @@ -43,25 +45,28 @@ "category:pt:stops": "Зупинки та станції", "category:pt_amenities": "Amenities", "category:public": "Громадські місця", + "category:railway": "", "category:railway-electrification": "", "category:railway-infrastructure": "", "category:railway-routes": "", "category:religion": "Релігія", "category:residential": "Житлова зона", "category:resources": "", + "category:services": "Послуги", "category:shop": "Торгівля", + "category:special": "", "category:sport": "Спорт. Інше.", "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:leisure_sport_shopping": "Дозвілля", - "category:services": "Послуги", - "category:transport": "Транспорт", - "category:transport_car": "Приватний транспорт", - "category:transport_pt": "Громадський транспорт" + "category:works": "" } From 61969d4ae01e8ccd911e409db2cb7b23a8c9991e Mon Sep 17 00:00:00 2001 From: debyos Date: Tue, 9 Oct 2018 13:23:02 +0200 Subject: [PATCH 15/34] Update and completion of missing translations --- lang/hu.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lang/hu.json b/lang/hu.json index 71e29c9cc..5bb0c187c 100644 --- a/lang/hu.json +++ b/lang/hu.json @@ -7,7 +7,7 @@ "category:car_amenities": "Létesítmények", "category:car_furniture": "Jelzőtáblák", "category:car_maxspeed": "Sebességkorlátozás", - "category:car_routes": "", + "category:car_routes": "Autós útvonalak", "category:children": "Létesítmények gyermekeknek", "category:communication": "Kommunikácó", "category:construction": "Építési terület", @@ -24,8 +24,8 @@ "category:health": "Egészségügy", "category:hiking_routes": "Turistautak", "category:historic": "Történelmi objektumok", - "category:index": "", - "category:infrastructure": "", + "category:index": "Tartalom", + "category:infrastructure": "Infrastruktúra", "category:internet": "Internetcsatlakozás", "category:leisure": "Szabadidős létesítmények", "category:leisure_sport_shopping": "Szabadidő, sport és vásárlás", @@ -54,16 +54,16 @@ "category:resources": "Bányászat", "category:services": "Szolgáltatások", "category:shop": "Vásárlás", - "category:special": "", + "category:special": "Speciális", "category:sport": "Sport", - "category:tourism_attractions": "Turizmus", - "category:tourism_services": "Turizmus", + "category:tourism_attractions": "Látnivalók", + "category:tourism_services": "Turisztikai szolgáltatások", "category:transport": "Közlekedés", "category:transport_alternative": "Alternatív (Kerékpár, Túra)", - "category:transport_car": "", - "category:transport_cycle": "", + "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": "", + "category:transport_walk": "Gyalogos közlekedés", "category:walk_amenities": "Gyalogos létesítmények", "category:waste": "Hulladék", "category:water": "Vizek", From 6c95b95080d1b3910f63397ad43db6eba28176c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Tue, 9 Oct 2018 13:50:29 +0200 Subject: [PATCH 16/34] Import hu translations to categories --- car_routes.json | 1 + index.json | 16 +++++++++++----- tourism_attractions.json | 2 +- tourism_services.json | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/car_routes.json b/car_routes.json index eb59ae4e2..05ccea549 100644 --- a/car_routes.json +++ b/car_routes.json @@ -2,6 +2,7 @@ "type": "overpass", "name": { "en": "Car routes", + "hu": "Autós útvonalak", "pt-br": "Rotas rodoviárias" }, "query": { diff --git a/index.json b/index.json index b84ba4f76..c3eb88e90 100644 --- a/index.json +++ b/index.json @@ -131,7 +131,8 @@ "en": "Walking", "fr": "Marche à pied", "pt-br": "Pedestre", - "pt": "Pedestre" + "pt": "Pedestre", + "hu": "Gyalogos közlekedés" }, "subCategories": [ { @@ -150,7 +151,8 @@ "en": "Cycling", "fr": "Cyclisme", "pt-br": "Ciclismo", - "pt": "Ciclismo" + "pt": "Ciclismo", + "hu": "Kerékpáros közlekedés" }, "subCategories": [ { @@ -209,7 +211,8 @@ "ru": "Частный транспорт", "uk": "Приватний транспорт", "pt-br": "Tráfego individual", - "pt": "Transporte individual" + "pt": "Transporte individual", + "hu": "Autós közlekedés" }, "subCategories": [ { @@ -233,7 +236,8 @@ "en": "Infrastructure", "fr": "Infrastructures", "pt-br": "Infraestrutura", - "pt": "Infraestrutura" + "pt": "Infraestrutura", + "hu": "Infrastruktúra" }, "subCategories": [ { @@ -303,7 +307,8 @@ "de": "Spezial", "pt-br": "Especial", "fr": "Catégories spéciales", - "pt": "Especial" + "pt": "Especial", + "hu": "Speciális" }, "subCategories": [ { @@ -316,6 +321,7 @@ } ], "name": { + "hu": "Tartalom", "pt-br": "Índice" } } diff --git a/tourism_attractions.json b/tourism_attractions.json index bceb585d6..7fdfea76c 100644 --- a/tourism_attractions.json +++ b/tourism_attractions.json @@ -8,7 +8,7 @@ "en": "Tourism", "et": "Turism", "fr": "Tourisme", - "hu": "Turizmus", + "hu": "Látnivalók", "it": "Turismo", "ja": "観光", "nl": "Toerisme", diff --git a/tourism_services.json b/tourism_services.json index c0c7855a7..721916ed8 100644 --- a/tourism_services.json +++ b/tourism_services.json @@ -8,7 +8,7 @@ "en": "Tourism", "et": "Turism", "fr": "Tourisme", - "hu": "Turizmus", + "hu": "Turisztikai szolgáltatások", "it": "Turismo", "ja": "観光", "nl": "Toerisme", From c8a0dea2994aa472439ec7c2bc107945e7b03742 Mon Sep 17 00:00:00 2001 From: debyos Date: Wed, 10 Oct 2018 09:25:26 +0200 Subject: [PATCH 17/34] Minor improvements --- lang/hu.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/hu.json b/lang/hu.json index 5bb0c187c..0173a9e89 100644 --- a/lang/hu.json +++ b/lang/hu.json @@ -8,7 +8,7 @@ "category:car_furniture": "Jelzőtáblák", "category:car_maxspeed": "Sebességkorlátozás", "category:car_routes": "Autós útvonalak", - "category:children": "Létesítmények gyermekeknek", + "category:children": "Gyermekek", "category:communication": "Kommunikácó", "category:construction": "Építési terület", "category:craft": "Műhelyek", @@ -27,7 +27,7 @@ "category:index": "Tartalom", "category:infrastructure": "Infrastruktúra", "category:internet": "Internetcsatlakozás", - "category:leisure": "Szabadidős létesítmények", + "category:leisure": "Szabadidő", "category:leisure_sport_shopping": "Szabadidő, sport és vásárlás", "category:military": "Katonai objektumok", "category:mtb-routes": "Hegyikerékpáros útvonalak", From d14db0f12545bc07e6542c6767ca77f57cd93d85 Mon Sep 17 00:00:00 2001 From: debyos Date: Wed, 10 Oct 2018 09:29:16 +0200 Subject: [PATCH 18/34] Another minor improvement Sorry, I have forgotten this one --- lang/hu.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/hu.json b/lang/hu.json index 5bb0c187c..a55a33907 100644 --- a/lang/hu.json +++ b/lang/hu.json @@ -7,7 +7,7 @@ "category:car_amenities": "Létesítmények", "category:car_furniture": "Jelzőtáblák", "category:car_maxspeed": "Sebességkorlátozás", - "category:car_routes": "Autós útvonalak", + "category:car_routes": "Főútvonalak", "category:children": "Létesítmények gyermekeknek", "category:communication": "Kommunikácó", "category:construction": "Építési terület", From a97bdff17f4b0629326a133bbcb35ac8e2ca7546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Wed, 10 Oct 2018 14:22:09 +0200 Subject: [PATCH 19/34] Import hu translations to categories --- car_routes.json | 2 +- children.json | 2 +- leisure.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/car_routes.json b/car_routes.json index 05ccea549..f30b89eba 100644 --- a/car_routes.json +++ b/car_routes.json @@ -2,7 +2,7 @@ "type": "overpass", "name": { "en": "Car routes", - "hu": "Autós útvonalak", + "hu": "Főútvonalak", "pt-br": "Rotas rodoviárias" }, "query": { diff --git a/children.json b/children.json index 2c3f7c090..e814ed101 100644 --- a/children.json +++ b/children.json @@ -4,7 +4,7 @@ "de": "Einrichtungen für Kinder", "en": "Children amenities", "fr": "Équipements pour enfants", - "hu": "Létesítmények gyermekeknek", + "hu": "Gyermekek", "pt-br": "Equipamentos infantis" }, "query": { diff --git a/leisure.json b/leisure.json index 32a6cd721..7a0180652 100644 --- a/leisure.json +++ b/leisure.json @@ -7,7 +7,7 @@ "el": "Αναψυχή", "en": "Leisure", "fr": "Loisirs", - "hu": "Szabadidős létesítmények", + "hu": "Szabadidő", "it": "Tempo libero", "ja": "レジャー", "nl": "Vrije tijd", From 6f93c2412385166a4c04e5770d34711dcdd8ea9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Sat, 20 Oct 2018 14:47:15 +0200 Subject: [PATCH 20/34] Health: bugfix icons --- health.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/health.json b/health.json index 14bb4b7e1..a54078285 100644 --- a/health.json +++ b/health.json @@ -61,7 +61,7 @@ "{{ tagTransList('healthcare:speciality', attribute(tags, 'healthcare:speciality')) }}", "{% endif %}" ], - "markerSign": "{{ const[concat(key, '=', value)]|raw }}" + "markerSign": "{{ const[key ~ '=' ~ value]|raw }}" }, "info": [ "
", From 0d37e906c8fae4bd9e857ec6cac99f0d50c65928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Wed, 24 Oct 2018 20:36:51 +0200 Subject: [PATCH 21/34] Split memorial from historic --- culture_religion.json | 3 ++ historic.json | 34 ++++++---------------- memorial.json | 65 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 26 deletions(-) create mode 100644 memorial.json diff --git a/culture_religion.json b/culture_religion.json index 2d68d9271..52cc1a5aa 100644 --- a/culture_religion.json +++ b/culture_religion.json @@ -28,6 +28,9 @@ { "id": "historic" }, + { + "id": "memorial" + }, { "id": "religion" }, diff --git a/historic.json b/historic.json index 8ab235da2..dab36a187 100644 --- a/historic.json +++ b/historic.json @@ -22,28 +22,22 @@ "query": { "11": [ "(", - "node[historic~\"^(castle|archaeological_site|battlefield|monument)$\"];", - "way[historic~\"^(castle|archaeological_site|battlefield|monument)$\"];", - "relation[historic~\"^(castle|archaeological_site|battlefield|monument)$\"];", + "node[historic~\"^(castle|archaeological_site|battlefield)$\"];", + "way[historic~\"^(castle|archaeological_site|battlefield)$\"];", + "relation[historic~\"^(castle|archaeological_site|battlefield)$\"];", ")" ], "14": [ "(", - "node[historic];", - "way[historic];", - "relation[historic];", + "node[historic][historic!~\"^(memorial|monument)$\"];", + "way[historic][historic!~\"^(memorial|monument)$\"];", + "relation[historic][historic!~\"^(memorial|monument)$\"];", ")" ] }, "feature": { - "pre": [ - "{% set value = tags.historic %}", - "{% if const[tags.historic ~ ' memorial=' ~ tags.memorial] %}", - " {% set value = tags.historic ~ ' memorial=' ~ tags.memorial %}", - "{% endif %}" - ], - "description": "{{ tagTransList('historic', value) }}", - "markerSign": "{{ const[value].sign|raw }}" + "description": "{{ tagTransList('historic', tags.historic) }}", + "markerSign": "{{ const[tags.historic].sign|raw }}" }, "info": [ "
", @@ -79,18 +73,6 @@ "aircraft": { "sign": "", "zoom": 14 - }, - "memorial": { - "sign": "", - "zoom": 14 - }, - "memorial memorial=plaque": { - "sign": "", - "zoom": 14 - }, - "monument": { - "sign": "", - "zoom": 11 } } } diff --git a/memorial.json b/memorial.json new file mode 100644 index 000000000..666c93a5e --- /dev/null +++ b/memorial.json @@ -0,0 +1,65 @@ +{ + "type": "overpass", + "name": { + "de": "Denkmäler", + "en": "Memorials" + }, + "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 value = tags.historic %}", + "{% if const[tags.historic ~ ' memorial=' ~ tags.memorial] %}", + " {% set value = tags.historic ~ ' memorial=' ~ tags.memorial %}", + "{% endif %}" + ], + "description": "{{ tagTransList('historic', value) }}", + "markerSign": "{{ const[value].sign|raw }}" + }, + "info": [ + "
", + "{% for value, data in const %}", + "{% if data.zoom <= map.zoom %}", + " ", + " ", + " ", + " ", + "{% endif %}", + "{% endfor %}", + "{% if 14 <= map.zoom %}", + " ", + " ", + " ", + " ", + "{% endif %}", + "
{{ markerCircle({})|raw }}
{{ data.sign|raw }}
{{ tagTrans('historic', value) }}
{{ markerCircle({})|raw }}
{{ trans('other') }}
" + ], + "const": { + "memorial": { + "sign": "", + "zoom": 14 + }, + "memorial memorial=plaque": { + "sign": "", + "zoom": 14 + }, + "monument": { + "sign": "", + "zoom": 11 + } + } +} From 979714e92cc73760d992a9462e35c38e1afc7356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Wed, 24 Oct 2018 21:29:12 +0200 Subject: [PATCH 22/34] Memorial: use "historic=memorial memorial=*" (or alias memorial:type=*) as description --- memorial.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/memorial.json b/memorial.json index 666c93a5e..117785c57 100644 --- a/memorial.json +++ b/memorial.json @@ -23,8 +23,10 @@ "feature": { "pre": [ "{% set value = tags.historic %}", - "{% if const[tags.historic ~ ' memorial=' ~ tags.memorial] %}", + "{% if tags.historic == 'memorial' and tags.memorial %}", " {% set value = tags.historic ~ ' memorial=' ~ tags.memorial %}", + "{% elseif tags.historic == 'memorial' and attribute(tags, 'memorial:type') %}", + " {% set value = tags.historic ~ ' memorial=' ~ attribute(tags, 'memorial:type') %}", "{% endif %}" ], "description": "{{ tagTransList('historic', value) }}", From 2564cbd9efca9436dcb546ad152be5a81811efa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Wed, 24 Oct 2018 22:21:51 +0200 Subject: [PATCH 23/34] historic/religion: move wayside_cross/wayside_shrine to religion --- historic.json | 6 +++--- religion.json | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/historic.json b/historic.json index dab36a187..e69ce8b0f 100644 --- a/historic.json +++ b/historic.json @@ -29,9 +29,9 @@ ], "14": [ "(", - "node[historic][historic!~\"^(memorial|monument)$\"];", - "way[historic][historic!~\"^(memorial|monument)$\"];", - "relation[historic][historic!~\"^(memorial|monument)$\"];", + "node[historic][historic!~\"^(memorial|monument|wayside_cross|wayside_shrine)$\"];", + "way[historic][historic!~\"^(memorial|monument|wayside_cross|wayside_shrine)$\"];", + "relation[historic][historic!~\"^(memorial|monument|wayside_cross|wayside_shrine)$\"];", ")" ] }, diff --git a/religion.json b/religion.json index 967b59ed2..c5b12fcd6 100644 --- a/religion.json +++ b/religion.json @@ -27,6 +27,18 @@ "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)$\"];", + "way[historic~\"^wayside_(cross|shrine)$\"];", + "relation[historic~\"^wayside_(cross|shrine)$\"];", + ")" ] }, "feature": { @@ -34,6 +46,9 @@ "{% if tags.landuse == 'cemetery' %}", "{% set key = 'landuse' %}", "{% set value = tags.landuse %}", + "{% elseif tags.historic == 'wayside_cross' or tags.historic == 'wayside_shrine' %}", + "{% set key = 'historic' %}", + "{% set value = tags.historic %}", "{% else %}", "{% set key = 'amenity' %}", "{% set value = tags.amenity %}", From 8261dedec9b6bbe1e88cb950fdcbace9fcb2247e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Wed, 15 Aug 2018 21:36:08 +0200 Subject: [PATCH 24/34] Split fossil-energy in coal resp oil_gas --- coal.json | 35 ++++++++++++++++++++++++++++++ index.json | 5 ++++- oil_gas.json | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 coal.json create mode 100644 oil_gas.json diff --git a/coal.json b/coal.json new file mode 100644 index 000000000..1ac92b17d --- /dev/null +++ b/coal.json @@ -0,0 +1,35 @@ +{ + "type": "overpass", + "name": { + "de": "Kohle", + "en": "Coal" + }, + "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.landuse == 'industrial' %}", + "{{ tagTrans('landuse', tags.landuse) }} ({{ tagTrans('industrial', tags.industrial) }})", + "{% endif %}" + ], + "markerSymbol": null + } +} diff --git a/index.json b/index.json index acb6252e9..ec3deced8 100644 --- a/index.json +++ b/index.json @@ -246,7 +246,10 @@ "id": "electric_power" }, { - "id": "fossil-energy" + "id": "coal" + }, + { + "id": "oil_gas" } ] }, diff --git a/oil_gas.json b/oil_gas.json new file mode 100644 index 000000000..6ce7d9ae6 --- /dev/null +++ b/oil_gas.json @@ -0,0 +1,60 @@ +{ + "type": "overpass", + "name": { + "de": "Erdgas", + "en": "Natural gas" + }, + "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.landuse == 'industrial' %}", + "{{ tagTrans('landuse', tags.landuse) }} ({{ tagTrans('industrial', tags.industrial) }})", + "{% elseif tags.waterway == 'offshore_field' %}", + "{{ tagTrans('waterway', tags.waterway) }}", + "{% endif %}" + ], + "markerSymbol": null + } +} From dd826ba6e6f9a0ccbff8ed7f0e6fe40756aa1cfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Thu, 25 Oct 2018 19:21:44 +0200 Subject: [PATCH 25/34] coal, oil_gas: improvements --- coal.json | 4 ++++ oil_gas.json | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/coal.json b/coal.json index 1ac92b17d..ff1191343 100644 --- a/coal.json +++ b/coal.json @@ -26,6 +26,10 @@ "{{ 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.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 %}" diff --git a/oil_gas.json b/oil_gas.json index 6ce7d9ae6..96aa12601 100644 --- a/oil_gas.json +++ b/oil_gas.json @@ -1,8 +1,8 @@ { "type": "overpass", "name": { - "de": "Erdgas", - "en": "Natural gas" + "de": "Erdöl und Erdgas", + "en": "Petroleum and natural gas" }, "query": { "11": [ @@ -49,10 +49,12 @@ "{{ tagTrans('man_made', 'pipeline') }} ({{ tagTrans('substance', tags.substance) }})", "{% elseif tags.man_made %}", "{{ tagTrans('man_made', tags.man_made) }}", - "{% elseif tags.landuse == 'industrial' %}", - "{{ tagTrans('landuse', tags.landuse) }} ({{ tagTrans('industrial', tags.industrial) }})", + "{% elseif tags.power == 'plant' %}", + "{{ tagTrans('power', 'plant') }} {% 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 From aba940bc6e97f844d4cb17f5abac210c2f1cb83e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Fri, 26 Oct 2018 08:13:24 +0200 Subject: [PATCH 26/34] car_routes: improve refs - natsort refs - remove duplicate refs - split&trim refs from way --- car_routes.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/car_routes.json b/car_routes.json index f30b89eba..fb623aae8 100644 --- a/car_routes.json +++ b/car_routes.json @@ -22,7 +22,9 @@ "{% set refs = [] %}", "{% set color = '#d41d8c' %}", "{% if tags.ref %}", - " {% set refs = refs|merge([ tags.ref ]) %}", + " {% for ref in tags.ref|split(';') %}", + " {% set refs = refs|merge([ ref|trim ]) %}", + " {% endfor %}", "{% endif %}", "", "{% for master in masters %}", @@ -32,7 +34,9 @@ " {% if master.tags.ref %}", " {% set refs = refs|merge([ master.tags.ref ]) %}", " {% endif %}", - "{% endfor %}" + "{% endfor %}", + "", + "{% set refs = refs|unique|natsort({ insensitive: true }) %}" ], "body": [ "

Routes

", From 60a90b2725df2d24b78eb24796911695d1f6afa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Fri, 26 Oct 2018 08:18:33 +0200 Subject: [PATCH 27/34] =?UTF-8?q?All=20routes:=20join=20route=20refs=20by?= =?UTF-8?q?=20'=20=C2=B7=20'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- car_routes.json | 2 +- cycle_routes.json | 2 +- hiking_routes.json | 2 +- mtb-routes.json | 2 +- pt.json | 4 ++-- railway-routes.json | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/car_routes.json b/car_routes.json index fb623aae8..a31247e8e 100644 --- a/car_routes.json +++ b/car_routes.json @@ -56,7 +56,7 @@ "color": "{{ color }}", "width": 4, "opacity": 1, - "text": "{{ refs|join(' ') }} ", + "text": "{{ refs|join(' · ') }} ", "textRepeat": "1", "textOffset": "12", "textFontWeight": "bold" diff --git a/cycle_routes.json b/cycle_routes.json index c12c47d7e..3844eec18 100644 --- a/cycle_routes.json +++ b/cycle_routes.json @@ -58,7 +58,7 @@ "color": "{{ const[network].color }}", "width": 4, "opacity": 1, - "text": "{{ refs|join(' ') }} ", + "text": "{{ refs|join(' · ') }} ", "textRepeat": "1", "textOffset": "12", "textFontWeight": "bold" diff --git a/hiking_routes.json b/hiking_routes.json index c553c1384..3bf40d9ca 100644 --- a/hiking_routes.json +++ b/hiking_routes.json @@ -57,7 +57,7 @@ "color": "{{ const[network].color }}", "width": 4, "opacity": 1, - "text": "{{ refs|join(' ') }} ", + "text": "{{ refs|join(' · ') }} ", "textRepeat": "1", "textOffset": "12", "textFontWeight": "bold" diff --git a/mtb-routes.json b/mtb-routes.json index 08d1270c2..02d2c7137 100644 --- a/mtb-routes.json +++ b/mtb-routes.json @@ -44,7 +44,7 @@ "color": "#007fff", "width": 4, "opacity": 1, - "text": "{{ refs|join(' ') }} ", + "text": "{{ refs|join(' · ') }} ", "textRepeat": "1", "textOffset": "12", "textFontWeight": "bold" diff --git a/pt.json b/pt.json index 86ec0ee2b..f4351c73e 100644 --- a/pt.json +++ b/pt.json @@ -123,12 +123,12 @@ "listStopsMarkerSymbol": "{{ markerCircle({ width: 5, color: color, fillOpacity: '1', radius: 3 })|raw }}", "listStopsExclude": "{{ not isStop or stopCount == 0 }}", "listStopsTitle": "{{ tags.name|default(stopName)|default(id) }}", - "listStopsDescription": "{{ refs|join(' ') }}", + "listStopsDescription": "{{ refs|join(' · ') }}", "listRoutesExclude": "true", "style:way": { "width": "3", "color": "{{ color|default('#ff0000') }}", - "text": "{{ refs|join(' ') }} ", + "text": "{{ refs|join(' · ') }} ", "textRepeat": "1", "textOffset": "12", "textFontWeight": "bold" diff --git a/railway-routes.json b/railway-routes.json index 874589567..f06a1d373 100644 --- a/railway-routes.json +++ b/railway-routes.json @@ -51,7 +51,7 @@ "color": "{{ color }}", "width": 4, "opacity": 1, - "text": "{{ refs|join(' ') }} ", + "text": "{{ refs|join(' · ') }} ", "textRepeat": "1", "textOffset": "12", "textFontWeight": "bold" From 7c98911738ac7bbc284f320ea7fc4ed47240246c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Fri, 26 Oct 2018 11:01:16 +0200 Subject: [PATCH 28/34] pt: show 'loading' on stops when not fully loaded yet or 'unknown' when unnamed (or can't be referenced from not loaded stop_area) --- pt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt.json b/pt.json index f4351c73e..46451cf37 100644 --- a/pt.json +++ b/pt.json @@ -60,7 +60,7 @@ "

Stops

    ", "{% 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' %}", - "
  • {{ member.tags.name|default(member.id) }}
    • ", + "
  • {% if member.tags %}{{ member.tags.name|default(trans('unknown')) }}{% else %}{{ trans('loading') }}{% endif %}
    • ", "{% endif %}", "{% endfor %}", "
" @@ -122,7 +122,7 @@ "listStopsMarkerSign": null, "listStopsMarkerSymbol": "{{ markerCircle({ width: 5, color: color, fillOpacity: '1', radius: 3 })|raw }}", "listStopsExclude": "{{ not isStop or stopCount == 0 }}", - "listStopsTitle": "{{ tags.name|default(stopName)|default(id) }}", + "listStopsTitle": "{% if tags %}{{ tags.name|default(stopName)|default(trans('unknown')) }}{% else %}
  • {{ trans('loading') }}
    • {% endif %}", "listStopsDescription": "{{ refs|join(' · ') }}", "listRoutesExclude": "true", "style:way": { From a1c25cfe7691b973a66e25aca79e3e4933feac1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Fri, 26 Oct 2018 19:27:57 +0200 Subject: [PATCH 29/34] railway-maxspeed: new category --- index.json | 3 ++ railway-maxspeed.json | 114 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) create mode 100644 railway-maxspeed.json diff --git a/index.json b/index.json index c3eb88e90..3438f798c 100644 --- a/index.json +++ b/index.json @@ -277,6 +277,9 @@ { "id": "railway-electrification" }, + { + "id": "railway-maxspeed" + }, { "id": "railway-routes" } diff --git a/railway-maxspeed.json b/railway-maxspeed.json new file mode 100644 index 000000000..261bdcf5b --- /dev/null +++ b/railway-maxspeed.json @@ -0,0 +1,114 @@ +{ + "type": "overpass", + "name": { + "de": "Höchstgeschwindigkeiten", + "en": "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][railway!~'^(platform|abandoned|disused|station|proposed|subway_entrance)$'];" + }, + "feature": { + "pre": [ + "{% if tags.maxspeed is not defined %}", + "{% set maxspeedKmh = null %}", + "{% set maxspeed = null %}", + "{% set unit = null %}", + "{% else %}", + "", + "{% if tags.maxspeed|matches(\"^[0-9]+$\") %}", + "{% set maxspeedKmh = tags.maxspeed %}", + "{% set maxspeed = tags.maxspeed %}", + "{% set unit = \"km/h\" %}", + "{% endif %}", + "", + "", + "{% set m = tags.maxspeed|matches(\"(^[0-9]+) mph$\") %}", + "{% if m %}", + "{% set maxspeedKmh = m[1] * 1.60934 %}", + "{% set maxspeed = 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 %}" + ], + "description": [ + "{% if maxspeed %}", + "{{ maxspeed }} {{ unit }}", + "{% elseif tags.maxspeed %}", + "{{ tags.maxspeed }}", + "{% else %}", + "{{ trans('unknown') }}", + "{% endif %}" + ], + "markerSymbol": null, + "listMarkerSymbol": "line", + "style": { + "width": "3", + "color": "{{ color }}" + } + }, + "const": { + "colorMap": [ + "#00af00", + "#ff7f00", + "#ff0000", + "#af00af" + ], + "highestColorSpeed": 300, + "offsetColorSpeed": 20 + }, + "info": [ + "
    ", + "", + " ", + " ", + " ", + " ", + "{% for i in range(25, 280, 25) %}", + " ", + " ", + " ", + " ", + "{% endfor %}", + " ", + " ", + " ", + " ", + "
    {{ markerLine(evaluate({}))|raw }}{{ trans('unknown') }}
    {{ markerLine(evaluate({ \"maxspeed\": i }))|raw }}{{ i }}km/h
    {{ markerLine(evaluate({ \"maxspeed\": 300 }))|raw }}≥300km/h
    ", + "
    ", + "", + "
    ", + "", + " ", + " ", + " ", + " ", + "{% for i in range(15, 150, 15) %}", + " ", + " ", + " ", + " ", + "{% endfor %}", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + "
    {{ markerLine(evaluate({}))|raw }}{{ trans('unknown') }}
    {{ markerLine(evaluate({ \"maxspeed\": (i * 1.60934)|round }))|raw }}{{ i }}mph
    {{ markerLine(evaluate({ \"maxspeed\": (175 * 1.60934)|round }))|raw }}175mph
    {{ markerLine(evaluate({ \"maxspeed\": (200 * 1.60934)|round }))|raw }}≥200mph
    ", + "
    " + ] +} From e6838b8e2de4d2a3a5d9d9eb6702c1b43be92e75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Fri, 26 Oct 2018 19:36:59 +0200 Subject: [PATCH 30/34] car_maxspeed/railway-maxspeed: show speed (w/o unit) as label --- car_maxspeed.json | 5 ++++- railway-maxspeed.json | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/car_maxspeed.json b/car_maxspeed.json index 0b50d6037..b2249f360 100644 --- a/car_maxspeed.json +++ b/car_maxspeed.json @@ -57,7 +57,10 @@ "listMarkerSymbol": "line", "style": { "width": "3", - "color": "{{ color }}" + "color": "{{ color }}", + "text": "{{ maxspeed }} ", + "textRepeat": "1", + "textFontWeight": "bold" } }, "const": { diff --git a/railway-maxspeed.json b/railway-maxspeed.json index 261bdcf5b..9ce73db86 100644 --- a/railway-maxspeed.json +++ b/railway-maxspeed.json @@ -55,7 +55,10 @@ "listMarkerSymbol": "line", "style": { "width": "3", - "color": "{{ color }}" + "color": "{{ color }}", + "text": "{{ maxspeed }} ", + "textRepeat": "1", + "textFontWeight": "bold" } }, "const": { From 3122a83cbe7f66c0f04d1fbdec4e24b66e201ec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Fri, 26 Oct 2018 20:32:16 +0200 Subject: [PATCH 31/34] railway-maxspeed: prefix name by railway (DE/EN) --- railway-maxspeed.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/railway-maxspeed.json b/railway-maxspeed.json index 9ce73db86..10fb8a45f 100644 --- a/railway-maxspeed.json +++ b/railway-maxspeed.json @@ -1,8 +1,8 @@ { "type": "overpass", "name": { - "de": "Höchstgeschwindigkeiten", - "en": "Maxspeed", + "de": "Eisenbahn Höchstgeschwindigkeiten", + "en": "Railway Maxspeed", "fr": "Limites de vitesse", "hu": "Sebességkorlátozás", "pt": "Velocidade máxima", From 0ca6f228a00cde0fa69fc38a09954f7e6c1bc311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Fri, 26 Oct 2018 20:36:20 +0200 Subject: [PATCH 32/34] remove fossil-energy (has been split into oil_gas and coal) --- fossil-energy.json | 71 ---------------------------------------------- 1 file changed, 71 deletions(-) delete mode 100644 fossil-energy.json diff --git a/fossil-energy.json b/fossil-energy.json deleted file mode 100644 index cb4714e68..000000000 --- a/fossil-energy.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "type": "overpass", - "name": { - "de": "Fossile Energie", - "en": "Fossil energy" - }, - "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|oil|gas|lng|cng|multiphase)(|;.*)$\"];", - "relation[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(coal|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\"~\"^(|.*;)(coal|oil|gas|diesel|gasoline)(|;.*)$\"];", - "way[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(coal|oil|gas|diesel|gasoline)(|;.*)$\"];", - "relation[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(coal|oil|gas|diesel|gasoline)(|;.*)$\"];", - ")" - ], - "13": [ - "(", - "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(|;.*)$\"];", - "relation[man_made~\"^(mineshaft)$\"][resource~\"^(|.*;)coal(|;.*)$\"];", - "way[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(coal|oil|gas|lng|cng|multiphase)(|;.*)$\"];", - "relation[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(coal|oil|gas|lng|cng|multiphase)(|;.*)$\"];", - "node[landuse=industrial][industrial~\"^(|.*;)(coal|oil|gas|lng|cng|multiphase|refinery|oil_refinery)(|;.*)$\"];", - "way[landuse=industrial][industrial~\"^(|.*;)(coal|oil|gas|lng|cng|multiphase|refinery|oil_refinery)(|;.*)$\"];", - "relation[landuse=industrial][industrial~\"^(|.*;)(coal|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\"~\"^(|.*;)(coal|oil|gas|diesel|gasoline)(|;.*)$\"];", - "way[power~\"^(plant|generator)$\"][\"generator:source\"~\"^(|.*;)(coal|oil|gas|diesel|gasoline)(|;.*)$\"];", - "relation[power~\"^(plant|generator)$\"][\"generator:source\"~\"^(|.*;)(coal|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.landuse == 'industrial' %}", - "{{ tagTrans('landuse', tags.landuse) }} ({{ tagTrans('industrial', tags.industrial) }})", - "{% elseif tags.waterway == 'offshore_field' %}", - "{{ tagTrans('waterway', tags.waterway) }}", - "{% endif %}" - ], - "markerSymbol": null - } -} From fd3659240da8c6d122886cb60ebad06688d2c97b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Fri, 26 Oct 2018 20:39:46 +0200 Subject: [PATCH 33/34] Make new categories translateable --- lang/ast.json | 8 +++++++- lang/ca.json | 8 +++++++- lang/cs.json | 8 +++++++- lang/de.json | 8 +++++++- lang/el.json | 8 +++++++- lang/en.json | 8 +++++++- lang/es.json | 8 +++++++- lang/et.json | 8 +++++++- lang/fr.json | 8 +++++++- lang/hu.json | 8 +++++++- lang/it.json | 8 +++++++- lang/ja.json | 8 +++++++- lang/nl.json | 8 +++++++- lang/pl.json | 8 +++++++- lang/pt-br.json | 8 +++++++- lang/pt.json | 8 +++++++- lang/ro.json | 8 +++++++- lang/ru.json | 8 +++++++- lang/template.json | 8 +++++++- lang/uk.json | 8 +++++++- 20 files changed, 140 insertions(+), 20 deletions(-) diff --git a/lang/ast.json b/lang/ast.json index c2e4e16c6..bbf1fe4f9 100644 --- a/lang/ast.json +++ b/lang/ast.json @@ -9,6 +9,7 @@ "category:car_maxspeed": "", "category:car_routes": "", "category:children": "", + "category:coal": "", "category:communication": "Comunicaciones", "category:construction": "Sitios d'obres", "category:craft": "", @@ -17,7 +18,9 @@ "category:cycle_amenities": "", "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": "", @@ -29,9 +32,12 @@ "category:internet": "Accesu a Internet", "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:network": "", + "category:oil_gas": "", "category:other": "Otres", "category:outdoor": "", "category:phone": "Teléfonos", @@ -39,7 +45,6 @@ "category:places_geo": "Llugares", "category:playgrounds": "Xuegos infantiles", "category:post": "Corréu", - "category:power": "Enerxía", "category:pt": "", "category:pt:routes": "", "category:pt:stops": "Paraes y estaciones", @@ -48,6 +53,7 @@ "category:railway": "Ferrocarril", "category:railway-electrification": "", "category:railway-infrastructure": "", + "category:railway-maxspeed": "", "category:railway-routes": "", "category:religion": "Relixón", "category:residential": "Zones residenciales", diff --git a/lang/ca.json b/lang/ca.json index 8be27ba28..817dabdd5 100644 --- a/lang/ca.json +++ b/lang/ca.json @@ -9,6 +9,7 @@ "category:car_maxspeed": "", "category:car_routes": "", "category:children": "", + "category:coal": "", "category:communication": "Comunicacions", "category:construction": "", "category:craft": "", @@ -17,7 +18,9 @@ "category:cycle_amenities": "", "category:cycle_routes": "", "category:education": "", + "category:electric_power": "", "category:emergency": "Serveis d'emergència", + "category:energy": "", "category:financial": "", "category:gastro": "", "category:gastro-smoking": "", @@ -29,9 +32,12 @@ "category:internet": "Accés a Internet", "category:leisure": "", "category:leisure_sport_shopping": "Oci, esport i compres", + "category:memorial": "", "category:military": "", "category:mtb-routes": "", "category:natural": "", + "category:network": "", + "category:oil_gas": "", "category:other": "", "category:outdoor": "", "category:phone": "", @@ -39,7 +45,6 @@ "category:places_geo": "", "category:playgrounds": "", "category:post": "", - "category:power": "", "category:pt": "", "category:pt:routes": "", "category:pt:stops": "", @@ -48,6 +53,7 @@ "category:railway": "", "category:railway-electrification": "", "category:railway-infrastructure": "", + "category:railway-maxspeed": "", "category:railway-routes": "", "category:religion": "", "category:residential": "", diff --git a/lang/cs.json b/lang/cs.json index 05c221ec9..3983a2564 100644 --- a/lang/cs.json +++ b/lang/cs.json @@ -9,6 +9,7 @@ "category:car_maxspeed": "", "category:car_routes": "", "category:children": "", + "category:coal": "", "category:communication": "Komunikace", "category:construction": "Staveniště", "category:craft": "", @@ -17,7 +18,9 @@ "category:cycle_amenities": "", "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": "", @@ -29,9 +32,12 @@ "category:internet": "Přístup k internetu", "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:network": "", + "category:oil_gas": "", "category:other": "Jiné", "category:outdoor": "", "category:phone": "Telefony", @@ -39,7 +45,6 @@ "category:places_geo": "Sídla", "category:playgrounds": "Hřiště", "category:post": "Poštovní služby", - "category:power": "Elektřina", "category:pt": "", "category:pt:routes": "", "category:pt:stops": "Zastávky & Stanice", @@ -48,6 +53,7 @@ "category:railway": "Železnice", "category:railway-electrification": "", "category:railway-infrastructure": "", + "category:railway-maxspeed": "", "category:railway-routes": "", "category:religion": "Religion", "category:residential": "Obytné oblasti", diff --git a/lang/de.json b/lang/de.json index 64e096f93..e48999236 100644 --- a/lang/de.json +++ b/lang/de.json @@ -9,6 +9,7 @@ "category:car_maxspeed": "Höchstgeschwindigkeiten", "category:car_routes": "", "category:children": "Einrichtungen für Kinder", + "category:coal": "Kohle", "category:communication": "Kommunikation", "category:construction": "Baustellen", "category:craft": "Handwerk", @@ -17,7 +18,9 @@ "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", @@ -29,9 +32,12 @@ "category:internet": "Internetzugang", "category:leisure": "Freizeit", "category:leisure_sport_shopping": "Freizeit, Sport und Einkauf", + "category:memorial": "Denkmäler", "category:military": "Militär", "category:mtb-routes": "", "category:natural": "Geographische Objekte", + "category:network": "", + "category:oil_gas": "Erdöl und Erdgas", "category:other": "Andere", "category:outdoor": "Freiluftaktivitäten", "category:phone": "Telekommunikation", @@ -39,7 +45,6 @@ "category:places_geo": "Orte", "category:playgrounds": "Spielplätze", "category:post": "Post", - "category:power": "Energie", "category:pt": "ÖV Karte", "category:pt:routes": "Routen", "category:pt:stops": "Haltestellen", @@ -48,6 +53,7 @@ "category:railway": "Eisenbahn", "category:railway-electrification": "Eisenbahn Elektrifizierung", "category:railway-infrastructure": "Eisenbahn Infrastruktur", + "category:railway-maxspeed": "Eisenbahn Höchstgeschwindigkeiten", "category:railway-routes": "", "category:religion": "Religion", "category:residential": "Wohngebiete", diff --git a/lang/el.json b/lang/el.json index 8dd6d13ee..c25f63f47 100644 --- a/lang/el.json +++ b/lang/el.json @@ -9,6 +9,7 @@ "category:car_maxspeed": "", "category:car_routes": "", "category:children": "", + "category:coal": "", "category:communication": "Επικοινωνίες", "category:construction": "", "category:craft": "", @@ -17,7 +18,9 @@ "category:cycle_amenities": "", "category:cycle_routes": "", "category:education": "Υπηρεσίες Εκπαίδευσης", + "category:electric_power": "", "category:emergency": "Υπηρεσίες Έκτακτης Ανάγκης", + "category:energy": "", "category:financial": "Χρήμα", "category:gastro": "Γαστρονομία", "category:gastro-smoking": "", @@ -29,9 +32,12 @@ "category:internet": "", "category:leisure": "Αναψυχή", "category:leisure_sport_shopping": "Αναψυχή, Αθλητισμός και Αγορές", + "category:memorial": "", "category:military": "Στρατιωτικό", "category:mtb-routes": "", "category:natural": "Φυσικοί Σχηματισμοί", + "category:network": "", + "category:oil_gas": "", "category:other": "", "category:outdoor": "", "category:phone": "", @@ -39,7 +45,6 @@ "category:places_geo": "Μέρη", "category:playgrounds": "", "category:post": "", - "category:power": "", "category:pt": "", "category:pt:routes": "", "category:pt:stops": "Στάσεις & Σταθμοί", @@ -48,6 +53,7 @@ "category:railway": "", "category:railway-electrification": "", "category:railway-infrastructure": "", + "category:railway-maxspeed": "", "category:railway-routes": "", "category:religion": "Θρησκεία", "category:residential": "Περιοχές Κατοικίας", diff --git a/lang/en.json b/lang/en.json index 302245a4a..46851f26c 100644 --- a/lang/en.json +++ b/lang/en.json @@ -9,6 +9,7 @@ "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", @@ -17,7 +18,9 @@ "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", @@ -29,9 +32,12 @@ "category:internet": "Internet access", "category:leisure": "Leisure", "category:leisure_sport_shopping": "Leisure, Sport and Shopping", + "category:memorial": "Memorials", "category:military": "Military", "category:mtb-routes": "Mountain bike routes", "category:natural": "Natural Formations", + "category:network": "Network infrastructure", + "category:oil_gas": "Petroleum and natural gas", "category:other": "Other", "category:outdoor": "Outdoor activities", "category:phone": "Phone", @@ -39,7 +45,6 @@ "category:places_geo": "Places", "category:playgrounds": "Playground", "category:post": "Post", - "category:power": "Power", "category:pt": "Public transport map", "category:pt:routes": "Routes", "category:pt:stops": "Stops & Stations", @@ -48,6 +53,7 @@ "category:railway": "Railway", "category:railway-electrification": "Railway electrification", "category:railway-infrastructure": "Railway infrastructure", + "category:railway-maxspeed": "Railway Maxspeed", "category:railway-routes": "Railway Routes", "category:religion": "Religion", "category:residential": "Residential Areas", diff --git a/lang/es.json b/lang/es.json index 98640c8f3..853d88bc2 100644 --- a/lang/es.json +++ b/lang/es.json @@ -9,6 +9,7 @@ "category:car_maxspeed": "", "category:car_routes": "", "category:children": "", + "category:coal": "", "category:communication": "", "category:construction": "", "category:craft": "", @@ -17,7 +18,9 @@ "category:cycle_amenities": "", "category:cycle_routes": "", "category:education": "", + "category:electric_power": "", "category:emergency": "Servicios de emergencia", + "category:energy": "", "category:financial": "", "category:gastro": "", "category:gastro-smoking": "", @@ -29,9 +32,12 @@ "category:internet": "Acceso a Internet", "category:leisure": "", "category:leisure_sport_shopping": "Ocio, deporte y compras", + "category:memorial": "", "category:military": "", "category:mtb-routes": "", "category:natural": "", + "category:network": "", + "category:oil_gas": "", "category:other": "", "category:outdoor": "", "category:phone": "", @@ -39,7 +45,6 @@ "category:places_geo": "", "category:playgrounds": "", "category:post": "", - "category:power": "", "category:pt": "", "category:pt:routes": "", "category:pt:stops": "Paradas y estaciones", @@ -48,6 +53,7 @@ "category:railway": "", "category:railway-electrification": "", "category:railway-infrastructure": "", + "category:railway-maxspeed": "", "category:railway-routes": "", "category:religion": "", "category:residential": "", diff --git a/lang/et.json b/lang/et.json index 32fb0544b..2a1d43e4c 100644 --- a/lang/et.json +++ b/lang/et.json @@ -9,6 +9,7 @@ "category:car_maxspeed": "", "category:car_routes": "", "category:children": "", + "category:coal": "", "category:communication": "Kommunikatsioon", "category:construction": "", "category:craft": "", @@ -17,7 +18,9 @@ "category:cycle_amenities": "", "category:cycle_routes": "", "category:education": "Haridusteenused", + "category:electric_power": "Elekter", "category:emergency": "Hädaabi teenused", + "category:energy": "", "category:financial": "", "category:gastro": "", "category:gastro-smoking": "", @@ -29,9 +32,12 @@ "category:internet": "", "category:leisure": "", "category:leisure_sport_shopping": "Vaba aeg, sport ja ostmine", + "category:memorial": "", "category:military": "", "category:mtb-routes": "", "category:natural": "", + "category:network": "", + "category:oil_gas": "", "category:other": "Ülejäänud", "category:outdoor": "", "category:phone": "Telefon", @@ -39,7 +45,6 @@ "category:places_geo": "Kohad", "category:playgrounds": "Mänguväljak", "category:post": "", - "category:power": "Elekter", "category:pt": "", "category:pt:routes": "", "category:pt:stops": "", @@ -48,6 +53,7 @@ "category:railway": "Raudtee", "category:railway-electrification": "", "category:railway-infrastructure": "", + "category:railway-maxspeed": "", "category:railway-routes": "", "category:religion": "Religioon", "category:residential": "Elamupiirkonnad", diff --git a/lang/fr.json b/lang/fr.json index 6fec0e04c..93d167cc1 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -9,6 +9,7 @@ "category:car_maxspeed": "Limites de vitesse", "category:car_routes": "", "category:children": "Équipements pour enfants", + "category:coal": "", "category:communication": "Communication", "category:construction": "Constructions", "category:craft": "Artisanat", @@ -17,7 +18,9 @@ "category:cycle_amenities": "Équipements vélo", "category:cycle_routes": "Itinéraires vélo", "category:education": "Éducation", + "category:electric_power": "Énergie", "category:emergency": "Services d'urgence", + "category:energy": "", "category:financial": "Finance", "category:gastro": "Restauration", "category:gastro-smoking": "Restauration sans tabac", @@ -29,9 +32,12 @@ "category:internet": "Internet", "category:leisure": "Loisirs", "category:leisure_sport_shopping": "Loisirs", + "category:memorial": "", "category:military": "Militaire", "category:mtb-routes": "Itinéraires de VTT", "category:natural": "Éléments naturels", + "category:network": "", + "category:oil_gas": "", "category:other": "Autres", "category:outdoor": "Activités de plein air", "category:phone": "Téléphone", @@ -39,7 +45,6 @@ "category:places_geo": "Lieux", "category:playgrounds": "Jeux pour enfants", "category:post": "", - "category:power": "Énergie", "category:pt": "", "category:pt:routes": "Lignes", "category:pt:stops": "Arrêts/Stops, Stations", @@ -48,6 +53,7 @@ "category:railway": "Chemins de fer", "category:railway-electrification": "Puissance électrique ferroviaire", "category:railway-infrastructure": "Infrastructure ferroviaire", + "category:railway-maxspeed": "Limites de vitesse", "category:railway-routes": "Lignes ferroviaires", "category:religion": "Religion", "category:residential": "Zones résidentielles", diff --git a/lang/hu.json b/lang/hu.json index 541d46f64..159590406 100644 --- a/lang/hu.json +++ b/lang/hu.json @@ -9,6 +9,7 @@ "category:car_maxspeed": "Sebességkorlátozás", "category:car_routes": "Főútvonalak", "category:children": "Gyermekek", + "category:coal": "", "category:communication": "Kommunikácó", "category:construction": "Építési terület", "category:craft": "Műhelyek", @@ -17,7 +18,9 @@ "category:cycle_amenities": "Kerékpáros létesítmények", "category:cycle_routes": "Kerékpáros útvonalak", "category:education": "Oktatás", + "category:electric_power": "Áramellátás", "category:emergency": "Vészhelyzet", + "category:energy": "", "category:financial": "Pénzügyek", "category:gastro": "Vendéglátás", "category:gastro-smoking": "Nem dohányzó vendéglátóhelyek", @@ -29,9 +32,12 @@ "category:internet": "Internetcsatlakozás", "category:leisure": "Szabadidő", "category:leisure_sport_shopping": "Szabadidő, sport és vásárlás", + "category:memorial": "", "category:military": "Katonai objektumok", "category:mtb-routes": "Hegyikerékpáros útvonalak", "category:natural": "Természeti képződmények", + "category:network": "", + "category:oil_gas": "", "category:other": "Egyéb", "category:outdoor": "Szabadtéri tevékenységek", "category:phone": "Telefon", @@ -39,7 +45,6 @@ "category:places_geo": "Helyek", "category:playgrounds": "Játszóterek", "category:post": "Posta", - "category:power": "Áramellátás", "category:pt": "Tömegközlekedési térkép", "category:pt:routes": "Útvonalak", "category:pt:stops": "Megállók és állomások", @@ -48,6 +53,7 @@ "category:railway": "Vasút", "category:railway-electrification": "Vasút villamosítottsága", "category:railway-infrastructure": "Vasúti infrastruktúra", + "category:railway-maxspeed": "Sebességkorlátozás", "category:railway-routes": "Vasútvonalak", "category:religion": "Vallás", "category:residential": "Lakóövezetek", diff --git a/lang/it.json b/lang/it.json index 96517f0fb..7c62381d8 100644 --- a/lang/it.json +++ b/lang/it.json @@ -9,6 +9,7 @@ "category:car_maxspeed": "", "category:car_routes": "", "category:children": "", + "category:coal": "", "category:communication": "Communicazioni", "category:construction": "Cantieri", "category:craft": "", @@ -17,7 +18,9 @@ "category:cycle_amenities": "", "category:cycle_routes": "", "category:education": "Istruzione", + "category:electric_power": "Energia", "category:emergency": "Servizi d'emergenza", + "category:energy": "", "category:financial": "Finanze", "category:gastro": "Gastronomia", "category:gastro-smoking": "", @@ -29,9 +32,12 @@ "category:internet": "", "category:leisure": "Tempo libero", "category:leisure_sport_shopping": "Tempo libero, sport e shopping", + "category:memorial": "", "category:military": "Militare", "category:mtb-routes": "", "category:natural": "Natura", + "category:network": "", + "category:oil_gas": "", "category:other": "Altri", "category:outdoor": "", "category:phone": "", @@ -39,7 +45,6 @@ "category:places_geo": "Luoghi", "category:playgrounds": "", "category:post": "", - "category:power": "Energia", "category:pt": "", "category:pt:routes": "", "category:pt:stops": "Stazioni e fermate", @@ -48,6 +53,7 @@ "category:railway": "Ferrovie", "category:railway-electrification": "", "category:railway-infrastructure": "", + "category:railway-maxspeed": "", "category:railway-routes": "", "category:religion": "Religione", "category:residential": "Aree residenziali", diff --git a/lang/ja.json b/lang/ja.json index b1e963fed..0e5e62f62 100644 --- a/lang/ja.json +++ b/lang/ja.json @@ -9,6 +9,7 @@ "category:car_maxspeed": "", "category:car_routes": "", "category:children": "", + "category:coal": "", "category:communication": "交流", "category:construction": "工事中", "category:craft": "", @@ -17,7 +18,9 @@ "category:cycle_amenities": "", "category:cycle_routes": "", "category:education": "教育サービス", + "category:electric_power": "電力", "category:emergency": "緊急サービス", + "category:energy": "", "category:financial": "金融", "category:gastro": "食べ物", "category:gastro-smoking": "", @@ -29,9 +32,12 @@ "category:internet": "インターネット接続", "category:leisure": "レジャー", "category:leisure_sport_shopping": "レジャー", + "category:memorial": "", "category:military": "軍事", "category:mtb-routes": "", "category:natural": "自然地層", + "category:network": "", + "category:oil_gas": "", "category:other": "その他", "category:outdoor": "", "category:phone": "電話", @@ -39,7 +45,6 @@ "category:places_geo": "場所", "category:playgrounds": "", "category:post": "郵便", - "category:power": "電力", "category:pt": "", "category:pt:routes": "", "category:pt:stops": "停留所と駅", @@ -48,6 +53,7 @@ "category:railway": "鉄道", "category:railway-electrification": "", "category:railway-infrastructure": "", + "category:railway-maxspeed": "", "category:railway-routes": "", "category:religion": "宗教", "category:residential": "住居エリア", diff --git a/lang/nl.json b/lang/nl.json index edb0a135e..8b1d6afad 100644 --- a/lang/nl.json +++ b/lang/nl.json @@ -9,6 +9,7 @@ "category:car_maxspeed": "", "category:car_routes": "", "category:children": "", + "category:coal": "", "category:communication": "Communicatie", "category:construction": "Bouwterrein", "category:craft": "", @@ -17,7 +18,9 @@ "category:cycle_amenities": "", "category:cycle_routes": "", "category:education": "Onderwijs", + "category:electric_power": "Stroomvoorziening", "category:emergency": "Hulpdiensten", + "category:energy": "", "category:financial": "Financieel", "category:gastro": "Gastronomie", "category:gastro-smoking": "", @@ -29,9 +32,12 @@ "category:internet": "Internettoegang", "category:leisure": "Vrije tijd", "category:leisure_sport_shopping": "Vrije tijd, Sport en Winkelen", + "category:memorial": "", "category:military": "Militair", "category:mtb-routes": "", "category:natural": "Natuurlijke Formaties", + "category:network": "", + "category:oil_gas": "", "category:other": "Andere", "category:outdoor": "", "category:phone": "Telefonie", @@ -39,7 +45,6 @@ "category:places_geo": "Plaatsen", "category:playgrounds": "", "category:post": "Post", - "category:power": "Stroomvoorziening", "category:pt": "", "category:pt:routes": "", "category:pt:stops": "Haltes en Stations", @@ -48,6 +53,7 @@ "category:railway": "Spoorwegen", "category:railway-electrification": "", "category:railway-infrastructure": "", + "category:railway-maxspeed": "", "category:railway-routes": "", "category:religion": "Religie", "category:residential": "Woongebieden", diff --git a/lang/pl.json b/lang/pl.json index 45961b027..aced0df22 100644 --- a/lang/pl.json +++ b/lang/pl.json @@ -9,6 +9,7 @@ "category:car_maxspeed": "", "category:car_routes": "", "category:children": "", + "category:coal": "", "category:communication": "", "category:construction": "", "category:craft": "", @@ -17,7 +18,9 @@ "category:cycle_amenities": "", "category:cycle_routes": "", "category:education": "Edukacyjne", + "category:electric_power": "", "category:emergency": "", + "category:energy": "", "category:financial": "Finasowe", "category:gastro": "Gastronomia", "category:gastro-smoking": "", @@ -29,9 +32,12 @@ "category:internet": "", "category:leisure": "", "category:leisure_sport_shopping": "Wypoczynek, Sport i Zakupy", + "category:memorial": "", "category:military": "", "category:mtb-routes": "", "category:natural": "", + "category:network": "", + "category:oil_gas": "", "category:other": "", "category:outdoor": "", "category:phone": "", @@ -39,7 +45,6 @@ "category:places_geo": "Miejsca", "category:playgrounds": "", "category:post": "", - "category:power": "", "category:pt": "", "category:pt:routes": "", "category:pt:stops": "Przystanki i Stacje", @@ -48,6 +53,7 @@ "category:railway": "", "category:railway-electrification": "", "category:railway-infrastructure": "", + "category:railway-maxspeed": "", "category:railway-routes": "", "category:religion": "", "category:residential": "", diff --git a/lang/pt-br.json b/lang/pt-br.json index a79642a33..10476d8b9 100644 --- a/lang/pt-br.json +++ b/lang/pt-br.json @@ -9,6 +9,7 @@ "category:car_maxspeed": "Velocidade máxima", "category:car_routes": "Rotas rodoviárias", "category:children": "Equipamentos infantis", + "category:coal": "", "category:communication": "Comunicação", "category:construction": "Terrenos vazios e obras", "category:craft": "Ofícios", @@ -17,7 +18,9 @@ "category:cycle_amenities": "Equipamentos", "category:cycle_routes": "Ciclorrotas", "category:education": "Educação", + "category:electric_power": "Energia", "category:emergency": "Emergência", + "category:energy": "", "category:financial": "Finanças", "category:gastro": "Gastronomia", "category:gastro-smoking": "Gastronomia sem fumo", @@ -29,9 +32,12 @@ "category:internet": "Acesso à Internet", "category:leisure": "Lazer", "category:leisure_sport_shopping": "Lazer, esportes e compras", + "category:memorial": "", "category:military": "Militar", "category:mtb-routes": "Rotas mountain bike", "category:natural": "Formações naturais", + "category:network": "", + "category:oil_gas": "", "category:other": "Outros", "category:outdoor": "Atividades ao ar livre", "category:phone": "Telefone", @@ -39,7 +45,6 @@ "category:places_geo": "Lugares", "category:playgrounds": "Parquinhos", "category:post": "Correios", - "category:power": "Energia", "category:pt": "Mapa de transporte público", "category:pt:routes": "Rotas", "category:pt:stops": "Paradas e estações", @@ -48,6 +53,7 @@ "category:railway": "Ferrovia", "category:railway-electrification": "Eletrificação ferroviária", "category:railway-infrastructure": "Infraestrutura ferroviária", + "category:railway-maxspeed": "Velocidade máxima", "category:railway-routes": "Rotas ferroviárias", "category:religion": "Religião", "category:residential": "Áreas residenciais", diff --git a/lang/pt.json b/lang/pt.json index e055231cf..bc57099f6 100644 --- a/lang/pt.json +++ b/lang/pt.json @@ -9,6 +9,7 @@ "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", @@ -17,7 +18,9 @@ "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", @@ -29,9 +32,12 @@ "category:internet": "Acesso à Internet", "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:network": "", + "category:oil_gas": "", "category:other": "Outros", "category:outdoor": "", "category:phone": "Telefone", @@ -39,7 +45,6 @@ "category:places_geo": "Lugares", "category:playgrounds": "Parques infantis", "category:post": "Correios", - "category:power": "Eletricidade", "category:pt": "", "category:pt:routes": "Rotas", "category:pt:stops": "", @@ -48,6 +53,7 @@ "category:railway": "Linhas ferroviárias", "category:railway-electrification": "Eletrificação ferroviária", "category:railway-infrastructure": "Infraestrutura ferroviária", + "category:railway-maxspeed": "Velocidade máxima", "category:railway-routes": "", "category:religion": "Religião", "category:residential": "Áreas residenciais", diff --git a/lang/ro.json b/lang/ro.json index d79d6b096..dbc1e619a 100644 --- a/lang/ro.json +++ b/lang/ro.json @@ -9,6 +9,7 @@ "category:car_maxspeed": "", "category:car_routes": "", "category:children": "", + "category:coal": "", "category:communication": "Comunicatii", "category:construction": "", "category:craft": "", @@ -17,7 +18,9 @@ "category:cycle_amenities": "", "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": "", @@ -29,9 +32,12 @@ "category:internet": "Acces internet", "category:leisure": "Timp liber", "category:leisure_sport_shopping": "Timp liber, Sport si Cumparaturi", + "category:memorial": "", "category:military": "Militar", "category:mtb-routes": "", "category:natural": "", + "category:network": "", + "category:oil_gas": "", "category:other": "Altele", "category:outdoor": "", "category:phone": "Telefon", @@ -39,7 +45,6 @@ "category:places_geo": "Locuri", "category:playgrounds": "Loc de joaca", "category:post": "", - "category:power": "Energie", "category:pt": "", "category:pt:routes": "", "category:pt:stops": "", @@ -48,6 +53,7 @@ "category:railway": "", "category:railway-electrification": "", "category:railway-infrastructure": "", + "category:railway-maxspeed": "", "category:railway-routes": "", "category:religion": "Religie", "category:residential": "Zona rezidentiala", diff --git a/lang/ru.json b/lang/ru.json index 7a2a36f3c..0237ae35c 100644 --- a/lang/ru.json +++ b/lang/ru.json @@ -9,6 +9,7 @@ "category:car_maxspeed": "", "category:car_routes": "", "category:children": "", + "category:coal": "", "category:communication": "Услуги связи", "category:construction": "Места строительства", "category:craft": "", @@ -17,7 +18,9 @@ "category:cycle_amenities": "", "category:cycle_routes": "", "category:education": "Образование", + "category:electric_power": "Энергетика", "category:emergency": "Экстренные службы", + "category:energy": "", "category:financial": "Финансы", "category:gastro": "Общепит", "category:gastro-smoking": "", @@ -29,9 +32,12 @@ "category:internet": "", "category:leisure": "Досуг", "category:leisure_sport_shopping": "Досуг", + "category:memorial": "", "category:military": "Вооружённые силы", "category:mtb-routes": "", "category:natural": "Природные образования", + "category:network": "", + "category:oil_gas": "", "category:other": "Прочее", "category:outdoor": "", "category:phone": "", @@ -39,7 +45,6 @@ "category:places_geo": "Места", "category:playgrounds": "", "category:post": "", - "category:power": "Энергетика", "category:pt": "", "category:pt:routes": "", "category:pt:stops": "Остановки и станции", @@ -48,6 +53,7 @@ "category:railway": "Железные дороги", "category:railway-electrification": "", "category:railway-infrastructure": "", + "category:railway-maxspeed": "", "category:railway-routes": "", "category:religion": "Религия", "category:residential": "Жилые районы", diff --git a/lang/template.json b/lang/template.json index 2f475441f..6f83241eb 100644 --- a/lang/template.json +++ b/lang/template.json @@ -9,6 +9,7 @@ "category:car_maxspeed": "", "category:car_routes": "", "category:children": "", + "category:coal": "", "category:communication": "", "category:construction": "", "category:craft": "", @@ -17,7 +18,9 @@ "category:cycle_amenities": "", "category:cycle_routes": "", "category:education": "", + "category:electric_power": "", "category:emergency": "", + "category:energy": "", "category:financial": "", "category:gastro": "", "category:gastro-smoking": "", @@ -29,9 +32,12 @@ "category:internet": "", "category:leisure": "", "category:leisure_sport_shopping": "", + "category:memorial": "", "category:military": "", "category:mtb-routes": "", "category:natural": "", + "category:network": "", + "category:oil_gas": "", "category:other": "", "category:outdoor": "", "category:phone": "", @@ -39,7 +45,6 @@ "category:places_geo": "", "category:playgrounds": "", "category:post": "", - "category:power": "", "category:pt": "", "category:pt:routes": "", "category:pt:stops": "", @@ -48,6 +53,7 @@ "category:railway": "", "category:railway-electrification": "", "category:railway-infrastructure": "", + "category:railway-maxspeed": "", "category:railway-routes": "", "category:religion": "", "category:residential": "", diff --git a/lang/uk.json b/lang/uk.json index e9778eb5c..7c67359c1 100644 --- a/lang/uk.json +++ b/lang/uk.json @@ -9,6 +9,7 @@ "category:car_maxspeed": "", "category:car_routes": "", "category:children": "", + "category:coal": "", "category:communication": "Телекомунікації", "category:construction": "", "category:craft": "", @@ -17,7 +18,9 @@ "category:cycle_amenities": "", "category:cycle_routes": "", "category:education": "Освіта", + "category:electric_power": "", "category:emergency": "Швидка допомога", + "category:energy": "", "category:financial": "Фінанси", "category:gastro": "Гастрономія", "category:gastro-smoking": "", @@ -29,9 +32,12 @@ "category:internet": "", "category:leisure": "Дозвілля", "category:leisure_sport_shopping": "Дозвілля", + "category:memorial": "", "category:military": "", "category:mtb-routes": "", "category:natural": "Природне середовище", + "category:network": "", + "category:oil_gas": "", "category:other": "Інше", "category:outdoor": "", "category:phone": "", @@ -39,7 +45,6 @@ "category:places_geo": "Місцевість", "category:playgrounds": "Дитячий майданчик", "category:post": "", - "category:power": "", "category:pt": "", "category:pt:routes": "", "category:pt:stops": "Зупинки та станції", @@ -48,6 +53,7 @@ "category:railway": "", "category:railway-electrification": "", "category:railway-infrastructure": "", + "category:railway-maxspeed": "", "category:railway-routes": "", "category:religion": "Релігія", "category:residential": "Житлова зона", From 1a1c093ef46da855dec53d4c81f866a6dfec13a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Fri, 26 Oct 2018 22:22:14 +0200 Subject: [PATCH 34/34] historic/religion: also show wayside_chapel in religion --- historic.json | 6 +++--- religion.json | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/historic.json b/historic.json index e69ce8b0f..f09cf10fc 100644 --- a/historic.json +++ b/historic.json @@ -29,9 +29,9 @@ ], "14": [ "(", - "node[historic][historic!~\"^(memorial|monument|wayside_cross|wayside_shrine)$\"];", - "way[historic][historic!~\"^(memorial|monument|wayside_cross|wayside_shrine)$\"];", - "relation[historic][historic!~\"^(memorial|monument|wayside_cross|wayside_shrine)$\"];", + "node[historic][historic!~\"^(memorial|monument|wayside_cross|wayside_shrine|wayside_chapel)$\"];", + "way[historic][historic!~\"^(memorial|monument|wayside_cross|wayside_shrine|wayside_chapel)$\"];", + "relation[historic][historic!~\"^(memorial|monument|wayside_cross|wayside_shrine|wayside_chapel)$\"];", ")" ] }, diff --git a/religion.json b/religion.json index c5b12fcd6..ebdc2b66d 100644 --- a/religion.json +++ b/religion.json @@ -35,9 +35,9 @@ "relation[amenity~\"^(place_of_worship|grave_yard|crematorium)$\"];", "way[landuse~\"^(cemetery)$\"];", "relation[landuse~\"^(cemetery)$\"];", - "node[historic~\"^wayside_(cross|shrine)$\"];", - "way[historic~\"^wayside_(cross|shrine)$\"];", - "relation[historic~\"^wayside_(cross|shrine)$\"];", + "node[historic~\"^wayside_(cross|shrine|chapel)$\"];", + "way[historic~\"^wayside_(cross|shrine|chapel)$\"];", + "relation[historic~\"^wayside_(cross|shrine|chapel)$\"];", ")" ] }, @@ -46,7 +46,7 @@ "{% if tags.landuse == 'cemetery' %}", "{% set key = 'landuse' %}", "{% set value = tags.landuse %}", - "{% elseif tags.historic == 'wayside_cross' or tags.historic == 'wayside_shrine' %}", + "{% elseif tags.historic in [ 'wayside_cross', 'wayside_shrine', 'wayside_chapel' ] %}", "{% set key = 'historic' %}", "{% set value = tags.historic %}", "{% else %}",