From a567b73d1ad58ca72489a886c02b2089932a2a9d Mon Sep 17 00:00:00 2001 From: Igor Eliezer Date: Fri, 9 Mar 2018 18:03:33 -0300 Subject: [PATCH 01/26] Create pt-br.json Creating Brazilian Portuguese translation for categories-main. --- lang/pt-br.json | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 lang/pt-br.json diff --git a/lang/pt-br.json b/lang/pt-br.json new file mode 100644 index 00000000..b1c9f054 --- /dev/null +++ b/lang/pt-br.json @@ -0,0 +1,66 @@ +{ + "category:administrative": "Divisão Político-Administrativa", + "category:agriculture": "Agricultura", + "category:alternative_amenities": "Equipamentos", + "category:alternative_routes": "Rotas", + "category:buildings": "Edificações", + "category:car_amenities": "Equipamentos", + "category:car_furniture": "Mobiliário Urbano", + "category:car_maxspeed": "Velocidade Máxima", + "category:children": "Equipamentos Infantis", + "category:communication": "Comunicação", + "category:construction": "Canteiros de Obras", + "category:culture": "Cultura", + "category:culture_religion": "Cultura", + "category:cycle_amenities": "Equipamentos", + "category:cycle_routes": "Ciclorrotas", + "category:education": "Educação", + "category:emergency": "Emergência", + "category:financial": "Finanças", + "category:gastro": "Gastronomia", + "category:health": "Saúde e Assistência", + "category:hiking_routes": "Rotas de Caminhada", + "category:historic": "Histórico", + "category:index": null, + "category:internet": "Acesso à Internet", + "category:leisure": "Lazer", + "category:military": "Militar", + "category:natural": "Formações Naturais", + "category:other": "Outros", + "category:phone": "Telefone", + "category:places": "Lugares", + "category:places_geo": "Lugares", + "category:playgrounds": "Parquinhos", + "category:post": "Correios", + "category:power": "Energia", + "category:pt_amenities": "Equipamentos", + "category:pt_routes": "Rotas", + "category:pt_stops": "Paradas e Estações", + "category:public": "Serviços Públicos", + "category:railway-electrification": "Eletrificação Ferroviária", + "category:railway-infrastructure": "Infraestrutura Ferroviária", + "category:religion": "Religião", + "category:residential": "Áreas Residenciais", + "category:resources": "Extração de Recursos", + "category:shop": "Compras", + "category:sport": "Esportes", + "category:tourism_attractions": "Turismo", + "category:tourism_services": "Turismo", + "category:transport_alternative": null, + "category:walk_amenities": "Equipamentos", + "category:waste": "Lixo", + "category:water": "Hidrografia", + "category:wikipedia": "Wikipédia", + "category:works": "Fábricas" + "category:cycle_infrastructure": "Ciclovias", + "category:infrastructure": "Infraestrutura", + "category:leisure_sport_shopping": "Lazer, Esportes e Compras", + "category:railway": "Ferrovia", + "category:services": "Serviços", + "category:special": "Especial", + "category:transport": "Transportes", + "category:transport_car": "Tráfego Individual", + "category:transport_cycle": "Ciclismo", + "category:transport_pt": "Transporte Público", + "category:transport_walk": "Pedestre" +} From 8ff6fde7becb1da52a0bfaebc72db5371ca70078 Mon Sep 17 00:00:00 2001 From: Igor Eliezer Date: Fri, 9 Mar 2018 18:23:54 -0300 Subject: [PATCH 02/26] Fix missing comma --- 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 b1c9f054..4536be3f 100644 --- a/lang/pt-br.json +++ b/lang/pt-br.json @@ -51,7 +51,7 @@ "category:waste": "Lixo", "category:water": "Hidrografia", "category:wikipedia": "Wikipédia", - "category:works": "Fábricas" + "category:works": "Fábricas", "category:cycle_infrastructure": "Ciclovias", "category:infrastructure": "Infraestrutura", "category:leisure_sport_shopping": "Lazer, Esportes e Compras", From 22c878b47c4a85daffb7fcf32eddad80b629b56d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Sat, 10 Mar 2018 15:08:41 +0100 Subject: [PATCH 03/26] Import category titles from translation (pt-br) --- administrative.json | 1 + agriculture.json | 1 + alternative_amenities.json | 1 + alternative_routes.json | 1 + buildings.json | 3 ++- car_amenities.json | 1 + car_furniture.json | 1 + car_maxspeed.json | 3 ++- children.json | 3 ++- communication.json | 1 + construction.json | 1 + culture.json | 1 + culture_religion.json | 7 ++++--- cycle_amenities.json | 3 ++- cycle_routes.json | 3 ++- education.json | 1 + emergency.json | 1 + financial.json | 1 + gastro.json | 1 + health.json | 1 + hiking_routes.json | 3 ++- historic.json | 1 + index.json | 30 ++++++++++++++++++++---------- internet.json | 1 + leisure.json | 1 + military.json | 1 + natural.json | 1 + other.json | 1 + phone.json | 1 + places.json | 1 + places_geo.json | 1 + playgrounds.json | 1 + post.json | 3 ++- power.json | 1 + pt_amenities.json | 1 + pt_routes.json | 3 ++- pt_stops.json | 1 + public.json | 1 + railway-electrification.json | 3 ++- railway-infrastructure.json | 3 ++- religion.json | 1 + residential.json | 1 + resources.json | 1 + shop.json | 1 + sport.json | 1 + tourism_attractions.json | 1 + tourism_services.json | 1 + walk_amenities.json | 3 ++- waste.json | 1 + water.json | 3 ++- wikipedia.json | 3 ++- works.json | 1 + 52 files changed, 87 insertions(+), 26 deletions(-) diff --git a/administrative.json b/administrative.json index c248b190..7f6bf0ea 100644 --- a/administrative.json +++ b/administrative.json @@ -11,6 +11,7 @@ "hu": "Adminisztratív határok", "it": "Suddivisioni amministrative", "nl": "Administratieve gebieden", + "pt-br": "Divisão Político-Administrativa", "ro": "Zona administrativa", "ru": "Административные границы" }, diff --git a/agriculture.json b/agriculture.json index ea8177c8..ad3a03b6 100644 --- a/agriculture.json +++ b/agriculture.json @@ -12,6 +12,7 @@ "it": "Agricoltura", "ja": "農業", "nl": "Landbouw", + "pt-br": "Agricultura", "ro": "Agricultura", "ru": "Сельское хозяйство" }, diff --git a/alternative_amenities.json b/alternative_amenities.json index b7cbe833..969b636b 100644 --- a/alternative_amenities.json +++ b/alternative_amenities.json @@ -8,6 +8,7 @@ "it": "Infrastrutture", "ja": "生活環境", "nl": "Voorzieningen", + "pt-br": "Equipamentos", "ru": "Полезные места", "uk": "Amenities" } diff --git a/alternative_routes.json b/alternative_routes.json index 1e65963b..f9ad5546 100644 --- a/alternative_routes.json +++ b/alternative_routes.json @@ -8,6 +8,7 @@ "it": "Itinerari segnalati", "ja": "ルート", "nl": "Alternatieve routes", + "pt-br": "Rotas", "ru": "Маршруты", "uk": "Маршрути" } diff --git a/buildings.json b/buildings.json index 3527bb0f..17b49fa7 100644 --- a/buildings.json +++ b/buildings.json @@ -3,7 +3,8 @@ "name": { "de": "Gebäude", "en": "Buildings", - "fr": "Bâtiments" + "fr": "Bâtiments", + "pt-br": "Edificações" }, "query": { "16": [ diff --git a/car_amenities.json b/car_amenities.json index 88efd27d..882d4f0e 100644 --- a/car_amenities.json +++ b/car_amenities.json @@ -9,6 +9,7 @@ "it": "Infrastrutture", "ja": "生活環境", "nl": "Voorzieningen", + "pt-br": "Equipamentos", "ru": "Обслуживание транспорта", "uk": "Amenities" }, diff --git a/car_furniture.json b/car_furniture.json index 77ccb576..39cb6290 100644 --- a/car_furniture.json +++ b/car_furniture.json @@ -9,6 +9,7 @@ "ja": "街路設置公共物", "nl": "Straatmeubilair", "pl": "Elementy drogowe", + "pt-br": "Mobiliário Urbano", "ru": "Элементы дороги", "uk": "Street Furniture" } diff --git a/car_maxspeed.json b/car_maxspeed.json index 97209661..4cd4929d 100644 --- a/car_maxspeed.json +++ b/car_maxspeed.json @@ -3,7 +3,8 @@ "name": { "de": "Höchstgeschwindigkeiten", "en": "Maxspeed", - "fr": "Limites de vitesse" + "fr": "Limites de vitesse", + "pt-br": "Velocidade Máxima" }, "query": { "11": "way[highway~\"^(motorway|trunk)$\"];", diff --git a/children.json b/children.json index 1ac1511a..52554e6e 100644 --- a/children.json +++ b/children.json @@ -3,7 +3,8 @@ "name": { "de": "Einrichtungen für Kinder", "en": "Children amenities", - "fr": "Équipements pour enfants" + "fr": "Équipements pour enfants", + "pt-br": "Equipamentos Infantis" }, "query": { "15": [ diff --git a/communication.json b/communication.json index 1762ae36..ca554a13 100644 --- a/communication.json +++ b/communication.json @@ -13,6 +13,7 @@ "it": "Communicazioni", "ja": "交流", "nl": "Communicatie", + "pt-br": "Comunicação", "ro": "Comunicatii", "ru": "Услуги связи", "uk": "Телекомунікації" diff --git a/construction.json b/construction.json index 927575cf..4ec32325 100644 --- a/construction.json +++ b/construction.json @@ -9,6 +9,7 @@ "it": "Cantieri", "ja": "工事中", "nl": "Bouwterrein", + "pt-br": "Canteiros de Obras", "ru": "Места строительства" }, "query": { diff --git a/culture.json b/culture.json index d44f689d..aeb7220f 100644 --- a/culture.json +++ b/culture.json @@ -15,6 +15,7 @@ "ja": "文化", "nl": "Cultuur", "pl": "Kultura", + "pt-br": "Cultura", "ro": "Cultura", "ru": "Культура", "uk": "Культура " diff --git a/culture_religion.json b/culture_religion.json index 7b694932..b43b74e3 100644 --- a/culture_religion.json +++ b/culture_religion.json @@ -6,15 +6,16 @@ "cs": "Kultura", "de": "Kultur und Religion", "el": "Πολιτισμός", - "en": "Culture and Religion", + "en": "Culture", "es": "Cultura y religión", "et": "Kultuur ja religioon", - "fr": "Culture et Religion", + "fr": "Religion", "hu": "Kultúra", "it": "Cultura", "ja": "文化", "nl": "Cultuur", "pl": "Kultura", + "pt-br": "Cultura", "ro": "Cultura", "ru": "Культура", "uk": "Культура " @@ -33,4 +34,4 @@ "id": "tourism_attractions" } ] -} \ No newline at end of file +} diff --git a/cycle_amenities.json b/cycle_amenities.json index ed004c51..2c92eb24 100644 --- a/cycle_amenities.json +++ b/cycle_amenities.json @@ -3,7 +3,8 @@ "name": { "de": "Einrichtungen", "en": "Amenities", - "fr": "Équipements vélo" + "fr": "Équipements vélo", + "pt-br": "Equipamentos" }, "query": { "13": [ diff --git a/cycle_routes.json b/cycle_routes.json index 6d27c7d7..14cd4fa3 100644 --- a/cycle_routes.json +++ b/cycle_routes.json @@ -3,7 +3,8 @@ "name": { "de": "Radrouten", "en": "Cycle Routes", - "fr": "Itinéraires vélo" + "fr": "Itinéraires vélo", + "pt-br": "Ciclorrotas" }, "query": { "6": "relation[type=route][route=bicycle][network~'^(icn)$']", diff --git a/education.json b/education.json index 82a9c6f0..31e6c160 100644 --- a/education.json +++ b/education.json @@ -12,6 +12,7 @@ "ja": "教育サービス", "nl": "Onderwijs", "pl": "Edukacyjne", + "pt-br": "Educação", "ro": "Servicii educatie", "ru": "Образование", "uk": "Освіта" diff --git a/emergency.json b/emergency.json index eed4da03..ab044352 100644 --- a/emergency.json +++ b/emergency.json @@ -13,6 +13,7 @@ "it": "Servizi d'emergenza", "ja": "緊急サービス", "nl": "Hulpdiensten", + "pt-br": "Emergência", "ro": "Servicii urgenta", "ru": "Экстренные службы", "uk": "Швидка допомога" diff --git a/financial.json b/financial.json index c8d47b49..08c35085 100644 --- a/financial.json +++ b/financial.json @@ -11,6 +11,7 @@ "ja": "金融", "nl": "Financieel", "pl": "Finasowe", + "pt-br": "Finanças", "ro": "Financiar", "ru": "Финансы", "uk": "Фінанси" diff --git a/gastro.json b/gastro.json index 44504c59..e97c08db 100644 --- a/gastro.json +++ b/gastro.json @@ -12,6 +12,7 @@ "ja": "食べ物", "nl": "Gastronomie", "pl": "Gastronomia", + "pt-br": "Gastronomia", "ro": "Gastronomie", "ru": "Общепит", "uk": "Гастрономія" diff --git a/health.json b/health.json index 50b14b87..d107cec1 100644 --- a/health.json +++ b/health.json @@ -11,6 +11,7 @@ "ja": "健康", "nl": "Gezondheid", "pl": "Zdrowie", + "pt-br": "Saúde e Assistência", "ro": "Sanatate", "ru": "Медицина", "uk": "Здоров'я" diff --git a/hiking_routes.json b/hiking_routes.json index b4398cbf..16bcd05d 100644 --- a/hiking_routes.json +++ b/hiking_routes.json @@ -3,7 +3,8 @@ "name": { "de": "Wanderrouten", "en": "Hiking routes", - "fr": "Itinéraires pédestres" + "fr": "Itinéraires pédestres", + "pt-br": "Rotas de Caminhada" }, "query": { "10": "relation[type=route][route=hiking][network~\"^(iwn)$\"]", diff --git a/historic.json b/historic.json index 30bfa83a..f1a20dc5 100644 --- a/historic.json +++ b/historic.json @@ -13,6 +13,7 @@ "ja": "記念", "nl": "Historisch", "pl": "Miejsca Historyczne", + "pt-br": "Histórico", "ro": "Istoric", "ru": "Историческое", "uk": "Історія" diff --git a/index.json b/index.json index 8f861b88..0e810afe 100644 --- a/index.json +++ b/index.json @@ -21,7 +21,8 @@ "pl": "Wypoczynek, Sport i Zakupy", "ro": "Timp liber, Sport si Cumparaturi", "ru": "Досуг", - "uk": "Дозвілля" + "uk": "Дозвілля", + "pt-br": "Lazer, Esportes e Compras" }, "subCategories": [ { @@ -61,7 +62,8 @@ "pl": "Usługi", "ro": "Servicii", "ru": "Услуги", - "uk": "Послуги" + "uk": "Послуги", + "pt-br": "Serviços" }, "subCategories": [ { @@ -108,7 +110,8 @@ "pl": "Transport", "ro": "Transport", "ru": "Транспорт", - "uk": "Транспорт" + "uk": "Транспорт", + "pt-br": "Transportes" }, "subCategories": [ { @@ -117,7 +120,8 @@ "name": { "de": "Zu Fuß gehen", "en": "Walking", - "fr": "Marche à pied" + "fr": "Marche à pied", + "pt-br": "Pedestre" }, "subCategories": [ { @@ -134,7 +138,8 @@ "name": { "de": "Radfahren", "en": "Cycling", - "fr": "Cyclisme" + "fr": "Cyclisme", + "pt-br": "Ciclismo" }, "subCategories": [ { @@ -163,7 +168,8 @@ "pl": "Transport Publiczny", "ro": "Transport public", "ru": "Общественный транспорт", - "uk": "Громадський транспорт" + "uk": "Громадський транспорт", + "pt-br": "Transporte Público" }, "subCategories": [ { @@ -192,7 +198,8 @@ "pl": "Transport Indywidualny", "ro": "Trafic individual", "ru": "Частный транспорт", - "uk": "Приватний транспорт" + "uk": "Приватний транспорт", + "pt-br": "Tráfego Individual" }, "subCategories": [ { @@ -211,7 +218,8 @@ "name": { "de": "Infrastruktur", "en": "Infrastructure", - "fr": "Infrastructures" + "fr": "Infrastructures", + "pt-br": "Infraestrutura" }, "subCategories": [ { @@ -240,7 +248,8 @@ "it": "Ferrovie", "ja": "鉄道", "nl": "Spoorwegen", - "ru": "Железные дороги" + "ru": "Железные дороги", + "pt-br": "Ferrovia" }, "subCategories": [ { @@ -273,7 +282,8 @@ "type": "index", "name": { "en": "Special", - "de": "Spezial" + "de": "Spezial", + "pt-br": "Especial" }, "subCategories": [ { diff --git a/internet.json b/internet.json index 61cce3b0..1bafbe49 100644 --- a/internet.json +++ b/internet.json @@ -10,6 +10,7 @@ "hu": "Internethozzáférés", "ja": "インターネット接続", "nl": "Internettoegang", + "pt-br": "Acesso à Internet", "ro": "Acces internet" } } diff --git a/leisure.json b/leisure.json index f719e1a3..2dfbcf2e 100644 --- a/leisure.json +++ b/leisure.json @@ -10,6 +10,7 @@ "it": "Tempo libero", "ja": "レジャー", "nl": "Vrije tijd", + "pt-br": "Lazer", "ro": "Timp liber", "ru": "Досуг", "uk": "Дозвілля" diff --git a/military.json b/military.json index c1207f62..9c3e3ce4 100644 --- a/military.json +++ b/military.json @@ -11,6 +11,7 @@ "it": "Militare", "ja": "軍事", "nl": "Militair", + "pt-br": "Militar", "ro": "Militar", "ru": "Вооружённые силы" }, diff --git a/natural.json b/natural.json index 71573d81..ec35b9f3 100644 --- a/natural.json +++ b/natural.json @@ -11,6 +11,7 @@ "it": "Natura", "ja": "自然地層", "nl": "Natuurlijke Formaties", + "pt-br": "Formações Naturais", "ru": "Природные образования", "uk": "Природне середовище" }, diff --git a/other.json b/other.json index b02e32bc..8ea04723 100644 --- a/other.json +++ b/other.json @@ -10,6 +10,7 @@ "it": "Altri", "ja": "その他", "nl": "Andere", + "pt-br": "Outros", "ro": "Altele", "ru": "Прочее", "uk": "Інше" diff --git a/phone.json b/phone.json index 2bf6e9aa..a2554e1c 100644 --- a/phone.json +++ b/phone.json @@ -9,6 +9,7 @@ "hu": "Telefon", "ja": "電話", "nl": "Telefonie", + "pt-br": "Telefone", "ro": "Telefon" } } diff --git a/places.json b/places.json index 251da747..f0fc8036 100644 --- a/places.json +++ b/places.json @@ -13,6 +13,7 @@ "ja": "場所", "nl": "Plaatsen", "pl": "Miejsca", + "pt-br": "Lugares", "ro": "Locuri", "ru": "Места", "uk": "Місцевість" diff --git a/places_geo.json b/places_geo.json index 850e54f4..e83a8376 100644 --- a/places_geo.json +++ b/places_geo.json @@ -13,6 +13,7 @@ "ja": "場所", "nl": "Plaatsen", "pl": "Miejsca", + "pt-br": "Lugares", "ro": "Locuri", "ru": "Места", "uk": "Місцевість" diff --git a/playgrounds.json b/playgrounds.json index 2e8ff6a3..79802ee0 100644 --- a/playgrounds.json +++ b/playgrounds.json @@ -6,6 +6,7 @@ "en": "Playground", "et": "Mänguväljak", "fr": "Jeux pour enfants", + "pt-br": "Parquinhos", "ro": "Loc de joaca", "uk": "Дитячий майданчик" } diff --git a/post.json b/post.json index 1e1b1a92..1e851be0 100644 --- a/post.json +++ b/post.json @@ -6,6 +6,7 @@ "en": "Post", "hu": "Posta", "ja": "郵便", - "nl": "Post" + "nl": "Post", + "pt-br": "Correios" } } diff --git a/power.json b/power.json index b2723692..b833d324 100644 --- a/power.json +++ b/power.json @@ -11,6 +11,7 @@ "it": "Energia", "ja": "電力", "nl": "Stroomvoorziening", + "pt-br": "Energia", "ro": "Energie", "ru": "Энергетика" }, diff --git a/pt_amenities.json b/pt_amenities.json index 72a500ba..b5b5127b 100644 --- a/pt_amenities.json +++ b/pt_amenities.json @@ -9,6 +9,7 @@ "it": "Infrastrutture", "ja": "生活環境", "nl": "Voorzieningen", + "pt-br": "Equipamentos", "ru": "Транспортные принадлежности", "uk": "Amenities" }, diff --git a/pt_routes.json b/pt_routes.json index f6509400..6f8f365e 100644 --- a/pt_routes.json +++ b/pt_routes.json @@ -3,7 +3,8 @@ "name": { "de": "Routen", "en": "Routes", - "fr": "Lignes" + "fr": "Lignes", + "pt-br": "Rotas" }, "query": { "12": "relation[type=route][route~\"^(subway|monorail|ferry|train)$\"];", diff --git a/pt_stops.json b/pt_stops.json index bdb63edf..0905b231 100644 --- a/pt_stops.json +++ b/pt_stops.json @@ -13,6 +13,7 @@ "ja": "停留所と駅", "nl": "Haltes en Stations", "pl": "Przystanki i Stacje", + "pt-br": "Paradas e Estações", "ru": "Остановки и станции", "uk": "Зупинки та станції" }, diff --git a/public.json b/public.json index 548bccd6..2678071a 100644 --- a/public.json +++ b/public.json @@ -11,6 +11,7 @@ "it": "Servizi pubblici", "ja": "公共サービス", "nl": "Openbare diensten", + "pt-br": "Serviços Públicos", "ro": "Servicii publice", "ru": "Общественные места", "uk": "Громадські місця" diff --git a/railway-electrification.json b/railway-electrification.json index 0a3bea61..72a69419 100644 --- a/railway-electrification.json +++ b/railway-electrification.json @@ -3,7 +3,8 @@ "name": { "de": "Eisenbahn Elektrifizierung", "en": "Railway electrification", - "fr": "Puissance électrique ferroviaire" + "fr": "Puissance électrique ferroviaire", + "pt-br": "Eletrificação Ferroviária" }, "query": { "11": "way[railway=rail][railway!~'^(platform|abandoned|disused|station|proposed|subway_entrance)$'][usage~'^(main|branch)$'];", diff --git a/railway-infrastructure.json b/railway-infrastructure.json index 095e9548..a33e91e7 100644 --- a/railway-infrastructure.json +++ b/railway-infrastructure.json @@ -3,7 +3,8 @@ "name": { "de": "Eisenbahn Infrastruktur", "en": "Railway infrastructure", - "fr": "Infrastructure ferroviaire" + "fr": "Infrastructure ferroviaire", + "pt-br": "Infraestrutura Ferroviária" }, "query": { "11": "(way[railway=rail][usage~'^(main|branch)$'];node[railway~'^(station)$'];)", diff --git a/religion.json b/religion.json index dd27a2ff..bb833c50 100644 --- a/religion.json +++ b/religion.json @@ -12,6 +12,7 @@ "it": "Religione", "ja": "宗教", "nl": "Religie", + "pt-br": "Religião", "ro": "Religie", "ru": "Религия", "uk": "Релігія" diff --git a/residential.json b/residential.json index 6cd2fcc4..23278bef 100644 --- a/residential.json +++ b/residential.json @@ -12,6 +12,7 @@ "it": "Aree residenziali", "ja": "住居エリア", "nl": "Woongebieden", + "pt-br": "Áreas Residenciais", "ro": "Zona rezidentiala", "ru": "Жилые районы", "uk": "Житлова зона" diff --git a/resources.json b/resources.json index 2c2a243a..cf2f4e42 100644 --- a/resources.json +++ b/resources.json @@ -8,6 +8,7 @@ "fr": "Extraction des ressources", "it": "Areee estrattive", "nl": "Grondstoffenwinning", + "pt-br": "Extração de Recursos", "ru": "Добыча ресурсов" }, "query": { diff --git a/shop.json b/shop.json index e4a00488..53ef5cc2 100644 --- a/shop.json +++ b/shop.json @@ -13,6 +13,7 @@ "ja": "ショッピング", "nl": "Winkelen", "pl": "Zakupy", + "pt-br": "Compras", "ro": "Cumpărături", "ru": "Покупки", "uk": "Торгівля" diff --git a/sport.json b/sport.json index 4a94d8c9..335a626d 100644 --- a/sport.json +++ b/sport.json @@ -11,6 +11,7 @@ "it": "Sport", "ja": "スポーツ", "nl": "Sport", + "pt-br": "Esportes", "ru": "Спорт", "uk": "Спорт. Інше." }, diff --git a/tourism_attractions.json b/tourism_attractions.json index e262f801..0005c053 100644 --- a/tourism_attractions.json +++ b/tourism_attractions.json @@ -13,6 +13,7 @@ "ja": "観光", "nl": "Toerisme", "pl": "Turystyka", + "pt-br": "Turismo", "ro": "Turism", "ru": "Туризм", "uk": "Туризм" diff --git a/tourism_services.json b/tourism_services.json index 05366e62..e332cdc7 100644 --- a/tourism_services.json +++ b/tourism_services.json @@ -13,6 +13,7 @@ "ja": "観光", "nl": "Toerisme", "pl": "Turystyka", + "pt-br": "Turismo", "ro": "Turism", "ru": "Туризм", "uk": "Туризм" diff --git a/walk_amenities.json b/walk_amenities.json index e1c8f94e..6aeba527 100644 --- a/walk_amenities.json +++ b/walk_amenities.json @@ -3,7 +3,8 @@ "name": { "de": "Einrichtungen", "en": "Amenities", - "fr": "Équipements piétons" + "fr": "Équipements piétons", + "pt-br": "Equipamentos" }, "query": { "13": [ diff --git a/waste.json b/waste.json index e7dc3cad..0cefae3a 100644 --- a/waste.json +++ b/waste.json @@ -9,6 +9,7 @@ "it": "Smaltimento", "ja": "処理場", "nl": "Afvalverwijdering", + "pt-br": "Lixo", "ru": "Переработка отходов" }, "query": { diff --git a/water.json b/water.json index 4f844761..a601e010 100644 --- a/water.json +++ b/water.json @@ -3,7 +3,8 @@ "name": { "de": "Gewässer", "en": "Waterbodies", - "fr": "Hydrographie" + "fr": "Hydrographie", + "pt-br": "Hidrografia" }, "query": { "10": [ diff --git a/wikipedia.json b/wikipedia.json index 2c937d6d..a3babd59 100644 --- a/wikipedia.json +++ b/wikipedia.json @@ -3,7 +3,8 @@ "name": { "de": "Wikipedia", "en": "Wikipedia", - "fr": "Wikipédia" + "fr": "Wikipédia", + "pt-br": "Wikipédia" }, "query": { "14": [ diff --git a/works.json b/works.json index 4c4b78fa..9906f290 100644 --- a/works.json +++ b/works.json @@ -9,6 +9,7 @@ "it": "Fabbriche", "ja": "工場", "nl": "Fabrieken", + "pt-br": "Fábricas", "ru": "Промышленность" }, "query": { From 411044a1644f810b6d116875f2af8ba6b78c8be0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Sun, 11 Mar 2018 06:19:24 +0100 Subject: [PATCH 04/26] Translations: add template.json file --- lang/template.json | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 lang/template.json diff --git a/lang/template.json b/lang/template.json new file mode 100644 index 00000000..43abbeaa --- /dev/null +++ b/lang/template.json @@ -0,0 +1,66 @@ +{ + "category:administrative": "", + "category:agriculture": "", + "category:alternative_amenities": "", + "category:alternative_routes": "", + "category:buildings": "", + "category:car_amenities": "", + "category:car_furniture": "", + "category:car_maxspeed": "", + "category:children": "", + "category:communication": "", + "category:construction": "", + "category:culture": "", + "category:culture_religion": "", + "category:cycle_amenities": "", + "category:cycle_infrastructure": "", + "category:cycle_routes": "", + "category:education": "", + "category:emergency": "", + "category:financial": "", + "category:gastro": "", + "category:health": "", + "category:hiking_routes": "", + "category:historic": "", + "category:index": "", + "category:infrastructure": "", + "category:internet": "", + "category:leisure": "", + "category:leisure_sport_shopping": "", + "category:military": "", + "category:natural": "", + "category:other": "", + "category:phone": "", + "category:places": "", + "category:places_geo": "", + "category:playgrounds": "", + "category:post": "", + "category:power": "", + "category:pt_amenities": "", + "category:pt_routes": "", + "category:pt_stops": "", + "category:public": "", + "category:railway": "", + "category:railway-electrification": "", + "category:railway-infrastructure": "", + "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": "" +} From b4897eadd23b7416dce35fdc7830974b5c2b4c65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Fri, 16 Mar 2018 21:08:42 +0100 Subject: [PATCH 05/26] Agriculture: priorities --- agriculture.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/agriculture.json b/agriculture.json index ad3a03b6..e7f29274 100644 --- a/agriculture.json +++ b/agriculture.json @@ -26,6 +26,15 @@ ] }, "feature": { - "description": "{{ tagTrans('landuse', tags.landuse) }}" + "description": "{{ tagTrans('landuse', tags.landuse) }}", + "priority": [ + "{% if tags.landuse == 'farmyard' %}", + "0", + "{% elseif tags.landuse == 'allotments' %}", + "1", + "{% else %}", + "2", + "{% endif %}" + ] } -} +} \ No newline at end of file From a0b6ccb06e33783799066cfeee0457a09e497f3f Mon Sep 17 00:00:00 2001 From: Cybereric Date: Mon, 19 Mar 2018 19:14:10 +0100 Subject: [PATCH 06/26] Categories update --- lang/fr.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lang/fr.json b/lang/fr.json index 600f13cd..eff71b2f 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -4,7 +4,7 @@ "category:alternative_amenities": "Équipement", "category:alternative_routes": "Routes", "category:buildings": "Bâtiments", - "category:car_amenities": "Infrastructures routières", + "category:car_amenities": "Équipements auto", "category:car_furniture": "Fournitures automobiles", "category:car_maxspeed": "Limites de vitesse", "category:children": "Équipements pour enfants", @@ -13,9 +13,9 @@ "category:culture": "Culture", "category:culture_religion": "Religion", "category:cycle_amenities": "Équipements vélo", - "category:cycle_infrastructure": "Infrastructure vélo", + "category:cycle_infrastructure": "Infrastructures vélo", "category:cycle_routes": "Itinéraires vélo", - "category:education": "Services éducatifs", + "category:education": "Éducation", "category:emergency": "Services d'urgence", "category:financial": "Finance", "category:gastro": "Gastronomie", @@ -48,10 +48,10 @@ "category:resources": "Extraction des ressources", "category:services": "Services", "category:shop": "Magasinage/Shopping", - "category:special": null, + "category:special": "Spécial", "category:sport": "Autres sports", "category:tourism_attractions": "Tourisme", - "category:tourism_services": "Services touristiques", + "category:tourism_services": "Tourisme", "category:transport": "Transports", "category:transport_alternative": "Alternatif (Cyclisme, Randonnée, ...)", "category:transport_car": "Transport automobile", @@ -59,7 +59,7 @@ "category:transport_pt": "Transports publics", "category:transport_walk": "Marche à pied", "category:walk_amenities": "Équipements piétons", - "category:waste": "Rebuts", + "category:waste": "Déchets/Recyclage", "category:water": "Hydrographie", "category:wikipedia": "Wikipédia", "category:works": "Zones industrielles" From d976bb063ddffb07bcc81dfb3c9234f2ff9b2cc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Mon, 19 Mar 2018 20:53:08 +0100 Subject: [PATCH 07/26] Import category titles from translation (fr) --- car_amenities.json | 2 +- education.json | 2 +- index.json | 3 ++- tourism_services.json | 2 +- waste.json | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/car_amenities.json b/car_amenities.json index 882d4f0e..1c009710 100644 --- a/car_amenities.json +++ b/car_amenities.json @@ -5,7 +5,7 @@ "cs": "Občasnká vybavenost", "de": "Einrichtungen", "en": "Amenities", - "fr": "Infrastructures routières", + "fr": "Équipements auto", "it": "Infrastrutture", "ja": "生活環境", "nl": "Voorzieningen", diff --git a/education.json b/education.json index 31e6c160..7b2ac9d3 100644 --- a/education.json +++ b/education.json @@ -7,7 +7,7 @@ "el": "Υπηρεσίες Εκπαίδευσης", "en": "Educational Services", "et": "Haridusteenused", - "fr": "Services éducatifs", + "fr": "Éducation", "it": "Istruzione", "ja": "教育サービス", "nl": "Onderwijs", diff --git a/index.json b/index.json index 0e810afe..1625c4aa 100644 --- a/index.json +++ b/index.json @@ -283,7 +283,8 @@ "name": { "en": "Special", "de": "Spezial", - "pt-br": "Especial" + "pt-br": "Especial", + "fr": "Spécial" }, "subCategories": [ { diff --git a/tourism_services.json b/tourism_services.json index e332cdc7..29eb0021 100644 --- a/tourism_services.json +++ b/tourism_services.json @@ -7,7 +7,7 @@ "el": "Τουρισμός", "en": "Tourism", "et": "Turism", - "fr": "Services touristiques", + "fr": "Tourisme", "hu": "Túrizmus", "it": "Turismo", "ja": "観光", diff --git a/waste.json b/waste.json index 0cefae3a..00fd5d74 100644 --- a/waste.json +++ b/waste.json @@ -5,7 +5,7 @@ "cs": "Nakládání s odpady", "de": "Entsorgung", "en": "Disposal", - "fr": "Rebuts", + "fr": "Déchets/Recyclage", "it": "Smaltimento", "ja": "処理場", "nl": "Afvalverwijdering", From 8cfdc2c23ca0b6a6fd78fc7d2ab2854f9e166f46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Thu, 22 Mar 2018 13:17:42 +0100 Subject: [PATCH 08/26] Culture and Religion: fix title (en, fr) --- culture_religion.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/culture_religion.json b/culture_religion.json index b43b74e3..9ba32a82 100644 --- a/culture_religion.json +++ b/culture_religion.json @@ -6,10 +6,10 @@ "cs": "Kultura", "de": "Kultur und Religion", "el": "Πολιτισμός", - "en": "Culture", + "en": "Culture and Religion", "es": "Cultura y religión", "et": "Kultuur ja religioon", - "fr": "Religion", + "fr": "Culture et Religion", "hu": "Kultúra", "it": "Cultura", "ja": "文化", From ad500f33c18e102c2c4fb9af4a199e824d075534 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Thu, 22 Mar 2018 13:36:49 +0100 Subject: [PATCH 09/26] Emergency: use emergency=phone instead amenity=emergency_phone --- emergency.json | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/emergency.json b/emergency.json index ab044352..0b39e12d 100644 --- a/emergency.json +++ b/emergency.json @@ -28,13 +28,23 @@ ], "13": [ "(", - "node[amenity~\"^(fire_station|hospital|police|emergency_phone)$\"];", - "way[amenity~\"^(fire_station|hospital|police|emergency_phone)$\"];", - "relation[amenity~\"^(fire_station|hospital|police|emergency_phone)$\"];", + "node[amenity~\"^(fire_station|hospital|police)$\"];", + "way[amenity~\"^(fire_station|hospital|police)$\"];", + "relation[amenity~\"^(fire_station|hospital|police)$\"];", + "node[emergency~\"^(phone)$\"];", ")" ] }, "feature": { + "pre": [ + "{% if tags.amenity in [ 'fire_station', 'hospital', 'police' ] %}", + "{% set key = 'amenity' %}", + "{% set value = tags.amenity %}", + "{% elseif tags.emergency %}", + "{% set key = 'emergency' %}", + "{% set value = tags.emergency %}", + "{% endif %}" + ], "description": "{{ tagTrans('amenity', tags.amenity) }}", "markerSign": [ "{% set data = const[tags.amenity] %}", @@ -49,28 +59,28 @@ "{% if data.zoom <= map.zoom %}", " ", " {{ markerCircle({})|raw }}
{{ data.sign }}
", - " {{ tagTrans('amenity', value) }}", + " {{ tagTrans(value|split('=')[0], value|split('=')[1]) }}", " ", "{% endif %}", "{% endfor %}", "" ], "const": { - "fire_station": { + "amenity=fire_station": { "zoom": "11", "sign": "🔥" }, - "hospital": { + "amenity=hospital": { "zoom": "11", "sign": "🏥" }, - "police": { + "amenity=police": { "zoom": "13", "sign": "👮" }, - "emergency_phone": { + "emergency=phone": { "zoom": "13", "sign": "📞" } } -} +} \ No newline at end of file From 6d373b006668ae5413bd0c565dfda1c1a2015f68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Thu, 22 Mar 2018 13:48:59 +0100 Subject: [PATCH 10/26] Health: handle tag keys (drawback: duplicate entries in info) --- health.json | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/health.json b/health.json index d107cec1..92c8c91a 100644 --- a/health.json +++ b/health.json @@ -59,31 +59,32 @@ "{{ tagTransList('healthcare:speciality', attribute(tags, 'healthcare:speciality')) }}", "{% endif %}" ], - "markerSign": "{{ const[value]|raw }}" + "markerSign": "{{ const[concat(key, '=', value)]|raw }}" }, "info": [ "", "{% for value, sign in const %}", " ", " ", - " ", + " ", " ", "{% endfor %}", "
{{ markerCircle({})|raw }}
{{ sign|raw }}
{{ tagTrans('amenity', value) }}{{ tagTrans(value|split('=')[0], value|split('=')[1]) }}
" ], "const": { - "baby_hatch": "🚼", - "blood_bank": "", - "blood_donation": "", - "clinic": "🏥", - "defibrillator": "", - "dentist": "", - "doctor": "", - "doctors": "", - "hospital": "🏥", - "nursing_home": "", - "pharmacy": "", - "social_facility": "", - "veterinary": "" + "amenity=baby_hatch": "🚼", + "healthcare=blood_bank": "", + "healthcare=blood_donation": "", + "healthcare=clinic": "🏥", + "emergency=defibrillator": "", + "healthcare=dentist": "", + "healthcare=doctor": "", + "amenity=doctors": "", + "amenity=hospital": "🏥", + "healthcare=hospital": "🏥", + "amenity=nursing_home": "", + "amenity=pharmacy": "", + "amenity=social_facility": "", + "amenity=veterinary": "" } -} +} \ No newline at end of file From 6f91f00762763d6bc09d17fd0f1738d3b56b0d9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Sat, 24 Mar 2018 21:44:27 +0100 Subject: [PATCH 11/26] Gastronomy Smoking: new category! --- gastro-smoking.json | 66 +++++++++++++++++++++++++++++++++++++++++++++ index.json | 3 +++ 2 files changed, 69 insertions(+) create mode 100644 gastro-smoking.json diff --git a/gastro-smoking.json b/gastro-smoking.json new file mode 100644 index 00000000..2cec2975 --- /dev/null +++ b/gastro-smoking.json @@ -0,0 +1,66 @@ +{ + "type": "overpass", + "name": { + "de": "Rauchfreie Gastronomie", + "en": "Smokefree Gastronomy" + }, + "query": { + "16": "(node[amenity~'^(bar|biergarten|cafe|fast_food|ice_cream|pub|restaurant)$'];way[amenity~'^(bar|biergarten|cafe|fast_food|ice_cream|pub|restaurant)$'];relation[amenity~'^(bar|biergarten|cafe|fast_food|ice_cream|pub|restaurant)$'];);" + }, + "feature": { + "pre": [ + "{% if tags.smoking == 'yes' or tags.smoking == 'dedicated' %}", + " {% set smoking_color='red' %}", + " {% set smoking_icon='🚬' %}", + "{% elseif tags.smoking == 'separated' or tags.smoking == 'isolated' %}", + " {% set smoking_color='#ffdf00' %}", + " {% set smoking_icon='🚬' %}", + "{% elseif tags.smoking == 'no' or tags.smoking == 'outside' or tags.smokefree == 'yes' %}", + " {% set smoking_color='#00ff00' %}", + " {% set smoking_icon='🚭' %}", + "{% else %}", + " {% set smoking_color='white' %}", + " {% set smoking_icon='' %}", + "{% endif %}" + ], + "description": "{{ tagTrans('amenity', tags.amenity) }}", + "body": [ + "
    ", + "
  • ", + " ", + " {{ keyTrans('cuisine') }}:", + " {{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}", + "
    • ", + "
  • ", + " 🚬", + " {{ keyTrans('smoking') }}:", + " {% if tags.smoking %}{{ tagTrans('smoking', tags.smoking) }}{% else %}{{ trans('unknown') }}{% endif %}", + "
    • ", + "
" + ], + "markerSign": "{% if tags.amenity=='bar' %}🍸{% elseif tags.amenity=='biergarten'%}🍻{% elseif tags.amenity=='cafe' %}☕{% elseif tags.amenity=='fast_food' %}🍔{% elseif tags.amenity=='ice_cream' %}🍨{% elseif tags.amenity=='pub' %}🍺{% else %}🍴{% endif %}", + "markerSymbol": "{{ markerPointer({\"fillColor\": smoking_color })|raw }}", + "listMarkerSymbol": "{{ markerCircle({\"fillColor\": smoking_color })|raw }}" + }, + "info": [ + "{{ keyTrans('smoking') }}:", + "", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + "
{{ markerCircle({ \"fillColor\": \"#00ff00\" })|raw }}{{ tagTrans('smoking', 'no') }}, {{ tagTrans('smoking', 'outside') }}
{{ markerCircle({ \"fillColor\": \"#ffdf00\" })|raw }}{{ tagTrans('smoking', 'separated') }}, {{ tagTrans('smoking', 'isolated') }}
{{ markerCircle({ \"fillColor\": \"red\" })|raw }}{{ tagTrans('smoking', 'yes') }}, {{ tagTrans('smoking', 'dedicated') }}
{{ markerCircle({ \"fillColor\": \"white\" })|raw }}{{ trans('unknown') }}
" + ] +} diff --git a/index.json b/index.json index 1625c4aa..0ecc2645 100644 --- a/index.json +++ b/index.json @@ -28,6 +28,9 @@ { "id": "gastro" }, + { + "id": "gastro-smoking" + }, { "id": "shop" }, From 82ad789095baf0563436b007949f5184577f5a73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Sun, 25 Mar 2018 09:03:22 +0200 Subject: [PATCH 12/26] Index: move gastro-smoking to special --- index.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.json b/index.json index 0ecc2645..8826c435 100644 --- a/index.json +++ b/index.json @@ -28,9 +28,6 @@ { "id": "gastro" }, - { - "id": "gastro-smoking" - }, { "id": "shop" }, @@ -290,6 +287,9 @@ "fr": "Spécial" }, "subCategories": [ + { + "id": "gastro-smoking" + }, { "id": "wikipedia" } From b8dcb0e4e16c6a08dbeca379c0840da842ef341d Mon Sep 17 00:00:00 2001 From: Cybereric Date: Mon, 26 Mar 2018 12:19:08 +0200 Subject: [PATCH 13/26] Better french translations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Explanation for the requested changes : Gastronomie : I have a problem with "Gastronomie". ;-) Its meaning in french is more "Kochkunst" and "Kunst des guten Essens" You can speak too of some "fameux restaurants gastronomiques" (berühmte Gourmetrestaurants) but if you want to speak of all ways to eat (restaurant, fast-food, etc) you'll use "catering" in english and "restauration" in french. As far I know it could be "Gastgewerbe" in german. Magasinage/Shopping: "Magasinage" is used as "Shopping" by french speakers only in Canada. See >>> https://fr.wiktionary.org/wiki/magasinage In french it has other meanings (stocking some goods) "Shopping" describes an action but not the shops so it's why I think "Magasins / Boutiques" would be better in french. Special: Instead of "Spécial" wich is an adjective I propose "Catégories spéciales" which is more meaningful. Other sports: Why "other" ? I've seen that in english it's just "sport". It seems that the requests are searching only for "sport=*". So "Sports" is OK. --- lang/fr.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/fr.json b/lang/fr.json index eff71b2f..fc7cced3 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -18,7 +18,7 @@ "category:education": "Éducation", "category:emergency": "Services d'urgence", "category:financial": "Finance", - "category:gastro": "Gastronomie", + "category:gastro": "Restauration", "category:health": "Santé", "category:hiking_routes": "Itinéraires pédestres", "category:historic": "Histoire", @@ -47,9 +47,9 @@ "category:residential": "Zones résidentielles", "category:resources": "Extraction des ressources", "category:services": "Services", - "category:shop": "Magasinage/Shopping", - "category:special": "Spécial", - "category:sport": "Autres sports", + "category:shop": "Magasins/Boutiques", + "category:special": "Catégories spéciales", + "category:sport": "Sports", "category:tourism_attractions": "Tourisme", "category:tourism_services": "Tourisme", "category:transport": "Transports", From a58a5ae4ddee37a9041093ccc908bba9cb35f85f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Mon, 26 Mar 2018 18:44:41 +0200 Subject: [PATCH 14/26] Update translations --- gastro.json | 2 +- index.json | 2 +- lang/ast.json | 1 + lang/ca.json | 1 + lang/cs.json | 1 + lang/de.json | 1 + lang/el.json | 1 + lang/en.json | 3 ++- lang/es.json | 1 + lang/et.json | 1 + lang/fr.json | 27 ++++++++++++++------------- lang/hu.json | 1 + lang/it.json | 1 + lang/ja.json | 1 + lang/nl.json | 1 + lang/pl.json | 1 + lang/pt-br.json | 1 + lang/ro.json | 1 + lang/ru.json | 1 + lang/template.json | 25 +++++++++++++------------ lang/uk.json | 1 + shop.json | 2 +- sport.json | 2 +- 23 files changed, 49 insertions(+), 30 deletions(-) diff --git a/gastro.json b/gastro.json index e97c08db..c0c12983 100644 --- a/gastro.json +++ b/gastro.json @@ -6,7 +6,7 @@ "de": "Gastronomie", "el": "Γαστρονομία", "en": "Gastronomy", - "fr": "Gastronomie", + "fr": "Restauration", "hu": "Gasztronómia", "it": "Gastronomia", "ja": "食べ物", diff --git a/index.json b/index.json index 8826c435..2cda7455 100644 --- a/index.json +++ b/index.json @@ -284,7 +284,7 @@ "en": "Special", "de": "Spezial", "pt-br": "Especial", - "fr": "Spécial" + "fr": "Catégories spéciales" }, "subCategories": [ { diff --git a/lang/ast.json b/lang/ast.json index ff08375b..3e2809f0 100644 --- a/lang/ast.json +++ b/lang/ast.json @@ -17,6 +17,7 @@ "category:education": "Servicios educativos", "category:emergency": "Servicios d'emerxencia", "category:financial": "Dineru", + "category:gastro-smoking": "", "category:gastro": "Gastronomía", "category:health": "Salú", "category:hiking_routes": null, diff --git a/lang/ca.json b/lang/ca.json index dd1e6742..ab0ea2bc 100644 --- a/lang/ca.json +++ b/lang/ca.json @@ -17,6 +17,7 @@ "category:education": null, "category:emergency": "Serveis d'emergència", "category:financial": null, + "category:gastro-smoking": "", "category:gastro": null, "category:health": null, "category:hiking_routes": null, diff --git a/lang/cs.json b/lang/cs.json index 9658f817..6cedc0b3 100644 --- a/lang/cs.json +++ b/lang/cs.json @@ -17,6 +17,7 @@ "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:health": "Zdravotnictví", "category:hiking_routes": null, diff --git a/lang/de.json b/lang/de.json index 702fe3fe..65b2751c 100644 --- a/lang/de.json +++ b/lang/de.json @@ -17,6 +17,7 @@ "category:education": "Bildungseinrichtungen", "category:emergency": "Notfalldienste", "category:financial": "Finanzen", + "category:gastro-smoking": "Rauchfreie Gastronomie", "category:gastro": "Gastronomie", "category:health": "Gesundheitsdienste", "category:hiking_routes": "Wanderrouten", diff --git a/lang/el.json b/lang/el.json index fdd4ea71..9ad636d8 100644 --- a/lang/el.json +++ b/lang/el.json @@ -17,6 +17,7 @@ "category:education": "Υπηρεσίες Εκπαίδευσης", "category:emergency": "Υπηρεσίες Έκτακτης Ανάγκης", "category:financial": "Χρήμα", + "category:gastro-smoking": "", "category:gastro": "Γαστρονομία", "category:health": "Υγεία", "category:hiking_routes": null, diff --git a/lang/en.json b/lang/en.json index 73fc8836..34058357 100644 --- a/lang/en.json +++ b/lang/en.json @@ -11,12 +11,13 @@ "category:communication": "Communication", "category:construction": "Construction Sites", "category:culture": "Culture", - "category:culture_religion": "Culture", + "category:culture_religion": "Culture and Religion", "category:cycle_amenities": "Amenities", "category:cycle_routes": "Cycle Routes", "category:education": "Educational Services", "category:emergency": "Emergency Services", "category:financial": "Financial", + "category:gastro-smoking": "Smokefree Gastronomy", "category:gastro": "Gastronomy", "category:health": "Health", "category:hiking_routes": "Hiking routes", diff --git a/lang/es.json b/lang/es.json index 1929f96a..fd4edb17 100644 --- a/lang/es.json +++ b/lang/es.json @@ -17,6 +17,7 @@ "category:education": null, "category:emergency": "Servicios de emergencia", "category:financial": null, + "category:gastro-smoking": "", "category:gastro": null, "category:health": null, "category:hiking_routes": null, diff --git a/lang/et.json b/lang/et.json index f7fb354b..7a7e53ec 100644 --- a/lang/et.json +++ b/lang/et.json @@ -17,6 +17,7 @@ "category:education": "Haridusteenused", "category:emergency": "Hädaabi teenused", "category:financial": null, + "category:gastro-smoking": "", "category:gastro": null, "category:health": null, "category:hiking_routes": null, diff --git a/lang/fr.json b/lang/fr.json index fc7cced3..c9c81702 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -11,22 +11,20 @@ "category:communication": "Communication", "category:construction": "Constructions", "category:culture": "Culture", - "category:culture_religion": "Religion", + "category:culture_religion": "Culture et Religion", "category:cycle_amenities": "Équipements vélo", - "category:cycle_infrastructure": "Infrastructures vélo", "category:cycle_routes": "Itinéraires vélo", "category:education": "Éducation", "category:emergency": "Services d'urgence", "category:financial": "Finance", + "category:gastro-smoking": "", "category:gastro": "Restauration", "category:health": "Santé", "category:hiking_routes": "Itinéraires pédestres", "category:historic": "Histoire", "category:index": null, - "category:infrastructure": "Infrastructures", "category:internet": "Internet", "category:leisure": "Loisirs", - "category:leisure_sport_shopping": "Loisirs", "category:military": "Militaire", "category:natural": "Éléments naturels", "category:other": "Autres", @@ -40,27 +38,30 @@ "category:pt_routes": "Lignes", "category:pt_stops": "Arrêts/Stops, Stations", "category:public": "Services Publics", - "category:railway": "Chemins de fer", "category:railway-electrification": "Puissance électrique ferroviaire", "category:railway-infrastructure": "Infrastructure ferroviaire", "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:works": "Zones industrielles", + "category:cycle_infrastructure": "Infrastructures vélo", + "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" } diff --git a/lang/hu.json b/lang/hu.json index b67026b3..baa80114 100644 --- a/lang/hu.json +++ b/lang/hu.json @@ -17,6 +17,7 @@ "category:education": null, "category:emergency": null, "category:financial": null, + "category:gastro-smoking": "", "category:gastro": "Gasztronómia", "category:health": null, "category:hiking_routes": null, diff --git a/lang/it.json b/lang/it.json index 6e46050a..aec466c8 100644 --- a/lang/it.json +++ b/lang/it.json @@ -17,6 +17,7 @@ "category:education": "Istruzione", "category:emergency": "Servizi d'emergenza", "category:financial": "Finanze", + "category:gastro-smoking": "", "category:gastro": "Gastronomia", "category:health": "Sanità", "category:hiking_routes": null, diff --git a/lang/ja.json b/lang/ja.json index 78b3036d..dc75e8ea 100644 --- a/lang/ja.json +++ b/lang/ja.json @@ -17,6 +17,7 @@ "category:education": "教育サービス", "category:emergency": "緊急サービス", "category:financial": "金融", + "category:gastro-smoking": "", "category:gastro": "食べ物", "category:health": "健康", "category:hiking_routes": null, diff --git a/lang/nl.json b/lang/nl.json index 06c2e8a8..68d60522 100644 --- a/lang/nl.json +++ b/lang/nl.json @@ -17,6 +17,7 @@ "category:education": "Onderwijs", "category:emergency": "Hulpdiensten", "category:financial": "Financieel", + "category:gastro-smoking": "", "category:gastro": "Gastronomie", "category:health": "Gezondheid", "category:hiking_routes": null, diff --git a/lang/pl.json b/lang/pl.json index aec05c2b..305e715b 100644 --- a/lang/pl.json +++ b/lang/pl.json @@ -17,6 +17,7 @@ "category:education": "Edukacyjne", "category:emergency": null, "category:financial": "Finasowe", + "category:gastro-smoking": "", "category:gastro": "Gastronomia", "category:health": "Zdrowie", "category:hiking_routes": null, diff --git a/lang/pt-br.json b/lang/pt-br.json index 4536be3f..14ffd622 100644 --- a/lang/pt-br.json +++ b/lang/pt-br.json @@ -17,6 +17,7 @@ "category:education": "Educação", "category:emergency": "Emergência", "category:financial": "Finanças", + "category:gastro-smoking": "", "category:gastro": "Gastronomia", "category:health": "Saúde e Assistência", "category:hiking_routes": "Rotas de Caminhada", diff --git a/lang/ro.json b/lang/ro.json index 929e1309..d3446734 100644 --- a/lang/ro.json +++ b/lang/ro.json @@ -17,6 +17,7 @@ "category:education": "Servicii educatie", "category:emergency": "Servicii urgenta", "category:financial": "Financiar", + "category:gastro-smoking": "", "category:gastro": "Gastronomie", "category:health": "Sanatate", "category:hiking_routes": null, diff --git a/lang/ru.json b/lang/ru.json index 8dcff005..cf6e2a4e 100644 --- a/lang/ru.json +++ b/lang/ru.json @@ -17,6 +17,7 @@ "category:education": "Образование", "category:emergency": "Экстренные службы", "category:financial": "Финансы", + "category:gastro-smoking": "", "category:gastro": "Общепит", "category:health": "Медицина", "category:hiking_routes": null, diff --git a/lang/template.json b/lang/template.json index 43abbeaa..8819bcbc 100644 --- a/lang/template.json +++ b/lang/template.json @@ -13,20 +13,18 @@ "category:culture": "", "category:culture_religion": "", "category:cycle_amenities": "", - "category:cycle_infrastructure": "", "category:cycle_routes": "", "category:education": "", "category:emergency": "", "category:financial": "", + "category:gastro-smoking": "", "category:gastro": "", "category:health": "", "category:hiking_routes": "", "category:historic": "", "category:index": "", - "category:infrastructure": "", "category:internet": "", "category:leisure": "", - "category:leisure_sport_shopping": "", "category:military": "", "category:natural": "", "category:other": "", @@ -40,27 +38,30 @@ "category:pt_routes": "", "category:pt_stops": "", "category:public": "", - "category:railway": "", "category:railway-electrification": "", "category:railway-infrastructure": "", "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:works": "", + "category:cycle_infrastructure": "", + "category:infrastructure": "", + "category:leisure_sport_shopping": "", + "category:railway": "", + "category:services": "", + "category:special": "", + "category:transport": "", + "category:transport_car": "", + "category:transport_cycle": "", + "category:transport_pt": "", + "category:transport_walk": "" } diff --git a/lang/uk.json b/lang/uk.json index bb3597f8..49de445f 100644 --- a/lang/uk.json +++ b/lang/uk.json @@ -17,6 +17,7 @@ "category:education": "Освіта", "category:emergency": "Швидка допомога", "category:financial": "Фінанси", + "category:gastro-smoking": "", "category:gastro": "Гастрономія", "category:health": "Здоров'я", "category:hiking_routes": null, diff --git a/shop.json b/shop.json index 53ef5cc2..b99c127a 100644 --- a/shop.json +++ b/shop.json @@ -7,7 +7,7 @@ "el": "Αγορές", "en": "Shopping", "et": "Ostmine", - "fr": "Magasinage/Shopping", + "fr": "Magasins/Boutiques", "hu": "Vásárlás", "it": "Acquisti", "ja": "ショッピング", diff --git a/sport.json b/sport.json index 335a626d..ef6be0e9 100644 --- a/sport.json +++ b/sport.json @@ -6,7 +6,7 @@ "de": "Sport", "el": "Άθληση", "en": "Sport", - "fr": "Autres sports", + "fr": "Sports", "hu": "Sport", "it": "Sport", "ja": "スポーツ", From 4320c213240f2aaf1c5b42a817799cfc12e098b3 Mon Sep 17 00:00:00 2001 From: Cybereric Date: Tue, 27 Mar 2018 13:48:57 +0200 Subject: [PATCH 15/26] Smoking free category FR translation In France this category will be useful for smokers as it's now forbidden to smoke in public places. A lot of work to do to make the map "green" ;-) >>> https://www.openstreetbrowser.org/#map=16/47.2135/-1.5526&categories=gastro-smoking --- lang/fr.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/fr.json b/lang/fr.json index c9c81702..f533ed6e 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -17,7 +17,7 @@ "category:education": "Éducation", "category:emergency": "Services d'urgence", "category:financial": "Finance", - "category:gastro-smoking": "", + "category:gastro-smoking": "Restauration sans tabac", "category:gastro": "Restauration", "category:health": "Santé", "category:hiking_routes": "Itinéraires pédestres", @@ -37,7 +37,7 @@ "category:pt_amenities": "Équipements", "category:pt_routes": "Lignes", "category:pt_stops": "Arrêts/Stops, Stations", - "category:public": "Services Publics", + "category:public": "Services publics", "category:railway-electrification": "Puissance électrique ferroviaire", "category:railway-infrastructure": "Infrastructure ferroviaire", "category:religion": "Religion", From baaf77be4d923d6a915482a653cdbb01f964111f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Wed, 28 Mar 2018 22:30:02 +0200 Subject: [PATCH 16/26] gastro-smoking: update lang fr --- gastro-smoking.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gastro-smoking.json b/gastro-smoking.json index 2cec2975..bc8c3812 100644 --- a/gastro-smoking.json +++ b/gastro-smoking.json @@ -2,7 +2,8 @@ "type": "overpass", "name": { "de": "Rauchfreie Gastronomie", - "en": "Smokefree Gastronomy" + "en": "Smokefree Gastronomy", + "fr": "Restauration sans tabac" }, "query": { "16": "(node[amenity~'^(bar|biergarten|cafe|fast_food|ice_cream|pub|restaurant)$'];way[amenity~'^(bar|biergarten|cafe|fast_food|ice_cream|pub|restaurant)$'];relation[amenity~'^(bar|biergarten|cafe|fast_food|ice_cream|pub|restaurant)$'];);" From b6707d9d621bf45521a4aef624ca4369c8d4c5d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Mon, 9 Apr 2018 21:13:45 +0200 Subject: [PATCH 17/26] Historic: center icon of memorials --- historic.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/historic.json b/historic.json index f1a20dc5..48e27273 100644 --- a/historic.json +++ b/historic.json @@ -74,7 +74,7 @@ "zoom": 14 }, "memorial": { - "sign": "", + "sign": "", "zoom": 14 }, "monument": { @@ -82,4 +82,4 @@ "zoom": 11 } } -} +} \ No newline at end of file From 80a07e84aae0c46af5ab4ecb13827a598bca20a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Sun, 20 May 2018 11:55:36 +0200 Subject: [PATCH 18/26] Car / Cycle Amenities: include ev charging stations --- car_amenities.json | 5 ++++- cycle_amenities.json | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/car_amenities.json b/car_amenities.json index 1c009710..67daf231 100644 --- a/car_amenities.json +++ b/car_amenities.json @@ -19,6 +19,8 @@ "node[amenity~\"^(car_rental|car_sharing|fuel)$\"];", "way[amenity~\"^(car_rental|car_sharing|fuel)$\"];", "relation[amenity~\"^(car_rental|car_sharing|fuel)$\"];", + "node[amenity~\"^(charging_station)$\"][car!=\"no\"];", + "node[amenity~\"^(charging_station)$\"][motorcycle!=\"no\"];", ")" ], "16": [ @@ -44,6 +46,7 @@ "charging_station": "🔌 ", "fuel": "⛽", "parking": "🅿", - "motorcycle_parking": "🅿" + "motorcycle_parking": "🅿", + "charging_station": "🔌" } } diff --git a/cycle_amenities.json b/cycle_amenities.json index 2c92eb24..12d20a19 100644 --- a/cycle_amenities.json +++ b/cycle_amenities.json @@ -22,6 +22,7 @@ "node[amenity~\"^(bicycle_.*|compressed_air)$\"];", "way[amenity~\"^(bicycle_.*|compressed_air)$\"];", "relation[amenity~\"^(bicycle_.*|compressed_air)$\"];", + "node[amenity~\"^(charging_station)$\"][bicycle!=\"no\"];", "node[shop~\"^(bicycle)$\"];", "way[shop~\"^(bicycle)$\"];", "relation[shop~\"^(bicycle)$\"];", @@ -122,6 +123,10 @@ "amenity=compressed_air": { "sign": "A", "priority": 2 + }, + "amenity=charging_station": { + "sign": "🔌", + "priority": 2 } } -} +} \ No newline at end of file From 318e97494ee57831806efa825621cb94d8d9ff05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Sun, 20 May 2018 15:14:31 +0200 Subject: [PATCH 19/26] Craft: new category --- craft.json | 73 ++++++++++++++++++++++++++++++++++++++++++++++ index.json | 3 ++ lang/ast.json | 1 + lang/ca.json | 1 + lang/cs.json | 1 + lang/de.json | 1 + lang/el.json | 1 + lang/en.json | 1 + lang/es.json | 1 + lang/et.json | 1 + lang/fr.json | 3 +- lang/hu.json | 1 + lang/it.json | 1 + lang/ja.json | 1 + lang/nl.json | 1 + lang/pl.json | 1 + lang/pt-br.json | 1 + lang/ro.json | 1 + lang/ru.json | 1 + lang/template.json | 1 + lang/uk.json | 1 + 21 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 craft.json diff --git a/craft.json b/craft.json new file mode 100644 index 00000000..9c361fea --- /dev/null +++ b/craft.json @@ -0,0 +1,73 @@ +{ + "type": "overpass", + "name": { + "de": "Handwerk", + "en": "Craft" + }, + "query": { + "15": "(node[craft];way[craft];relation[craft];);" + }, + "feature": { + "description": "{{ tagTransList('craft', tags.craft) }}", + "markerSign": "{% set craft0 = tags.craft|split(';')[0] %}{% if const.crafts[craft0] %}{% set v = const.crafts[craft0] %}{% else %}{% set v = const.default %}{% endif %}{% if v|slice(0, 3) == 'fa-' %}{% else %}{{ v|raw }}{% endif %}" + }, + "const": { + "default": "", + "crafts": { + "bakery": "fa-birthday-cake", + "beekeeper": "🐝", + "blacksmith": "🔨", + "boatbuilder": "⛵", + "bookbinder": "📕", + "brewery": "fa-beer", + "builder": "🚧", + "carpenter": "", + "carpet_layer": "", + "caterer": "fa-birthday-cake", + "chimney_sweeper": "", + "clockmaker": "⌚", + "confectionery": "", + "distillery": "🍷", + "dressmaker": "👚", + "electrician": "🔌", + "floorer": "", + "gardener": "⚘", + "glaziery": "", + "handicraft": "", + "hvac": "", + "insulation": "", + "jeweller": "💍", + "key_cutter": "🔑", + "locksmith": "🔑", + "metal_construction": "", + "optician": "👓", + "painter": "🖌", + "parquet_layer": "", + "photographer": "📷", + "photographic_laboratory": "📷", + "piano_tuner": "", + "plasterer": "", + "plumber": "", + "pottery": "", + "rigger": "", + "roofer": "", + "saddler": "🐎", + "sailmaker": "⛵", + "sawmill": "", + "scaffolder": "", + "sculptor": "", + "shoemaker": "👞", + "stand_builder": "", + "stonemason": "", + "sun_protection": "", + "tailor": "👚", + "tiler": "", + "tinsmith": "", + "turner": "", + "upholsterer": "", + "watchmaker": "⌚", + "window_construction": "", + "winery": "🍷" + } + } +} diff --git a/index.json b/index.json index 2cda7455..1b5b475a 100644 --- a/index.json +++ b/index.json @@ -31,6 +31,9 @@ { "id": "shop" }, + { + "id": "craft" + }, { "id": "leisure" }, diff --git a/lang/ast.json b/lang/ast.json index 3e2809f0..827a0312 100644 --- a/lang/ast.json +++ b/lang/ast.json @@ -10,6 +10,7 @@ "category:children": null, "category:communication": "Comunicaciones", "category:construction": "Sitios d'obres", + "category:craft": "", "category:culture": "Cultura", "category:culture_religion": "Cultura", "category:cycle_amenities": null, diff --git a/lang/ca.json b/lang/ca.json index ab0ea2bc..6a797d96 100644 --- a/lang/ca.json +++ b/lang/ca.json @@ -10,6 +10,7 @@ "category:children": null, "category:communication": "Comunicacions", "category:construction": null, + "category:craft": "", "category:culture": "Cultura", "category:culture_religion": "Cultura i religió", "category:cycle_amenities": null, diff --git a/lang/cs.json b/lang/cs.json index 6cedc0b3..92078a44 100644 --- a/lang/cs.json +++ b/lang/cs.json @@ -10,6 +10,7 @@ "category:children": null, "category:communication": "Komunikace", "category:construction": "Staveniště", + "category:craft": "", "category:culture": "Kultura", "category:culture_religion": "Kultura", "category:cycle_amenities": null, diff --git a/lang/de.json b/lang/de.json index 65b2751c..ba519279 100644 --- a/lang/de.json +++ b/lang/de.json @@ -10,6 +10,7 @@ "category:children": "Einrichtungen für Kinder", "category:communication": "Kommunikation", "category:construction": "Baustellen", + "category:craft": "Handwerk", "category:culture": "Kultur", "category:culture_religion": "Kultur und Religion", "category:cycle_amenities": "Einrichtungen", diff --git a/lang/el.json b/lang/el.json index 9ad636d8..a8b68ee4 100644 --- a/lang/el.json +++ b/lang/el.json @@ -10,6 +10,7 @@ "category:children": null, "category:communication": "Επικοινωνίες", "category:construction": null, + "category:craft": "", "category:culture": "Πολιτισμός", "category:culture_religion": "Πολιτισμός", "category:cycle_amenities": null, diff --git a/lang/en.json b/lang/en.json index 34058357..2b8fc3c2 100644 --- a/lang/en.json +++ b/lang/en.json @@ -10,6 +10,7 @@ "category:children": "Children amenities", "category:communication": "Communication", "category:construction": "Construction Sites", + "category:craft": "Craft", "category:culture": "Culture", "category:culture_religion": "Culture and Religion", "category:cycle_amenities": "Amenities", diff --git a/lang/es.json b/lang/es.json index fd4edb17..f82052d8 100644 --- a/lang/es.json +++ b/lang/es.json @@ -10,6 +10,7 @@ "category:children": null, "category:communication": null, "category:construction": null, + "category:craft": "", "category:culture": "Cultura", "category:culture_religion": "Cultura y religión", "category:cycle_amenities": null, diff --git a/lang/et.json b/lang/et.json index 7a7e53ec..a325cf50 100644 --- a/lang/et.json +++ b/lang/et.json @@ -10,6 +10,7 @@ "category:children": null, "category:communication": "Kommunikatsioon", "category:construction": null, + "category:craft": "", "category:culture": "Kultuur", "category:culture_religion": "Kultuur ja religioon", "category:cycle_amenities": null, diff --git a/lang/fr.json b/lang/fr.json index f533ed6e..d4ca0960 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -10,6 +10,7 @@ "category:children": "Équipements pour enfants", "category:communication": "Communication", "category:construction": "Constructions", + "category:craft": "", "category:culture": "Culture", "category:culture_religion": "Culture et Religion", "category:cycle_amenities": "Équipements vélo", @@ -37,7 +38,7 @@ "category:pt_amenities": "Équipements", "category:pt_routes": "Lignes", "category:pt_stops": "Arrêts/Stops, Stations", - "category:public": "Services publics", + "category:public": "Services Publics", "category:railway-electrification": "Puissance électrique ferroviaire", "category:railway-infrastructure": "Infrastructure ferroviaire", "category:religion": "Religion", diff --git a/lang/hu.json b/lang/hu.json index baa80114..7cb807f2 100644 --- a/lang/hu.json +++ b/lang/hu.json @@ -10,6 +10,7 @@ "category:children": null, "category:communication": "Kommunikácó", "category:construction": null, + "category:craft": "", "category:culture": "Kultúra", "category:culture_religion": "Kultúra", "category:cycle_amenities": null, diff --git a/lang/it.json b/lang/it.json index aec466c8..74785334 100644 --- a/lang/it.json +++ b/lang/it.json @@ -10,6 +10,7 @@ "category:children": null, "category:communication": "Communicazioni", "category:construction": "Cantieri", + "category:craft": "", "category:culture": "Cultura", "category:culture_religion": "Cultura", "category:cycle_amenities": null, diff --git a/lang/ja.json b/lang/ja.json index dc75e8ea..173f4677 100644 --- a/lang/ja.json +++ b/lang/ja.json @@ -10,6 +10,7 @@ "category:children": null, "category:communication": "交流", "category:construction": "工事中", + "category:craft": "", "category:culture": "文化", "category:culture_religion": "文化", "category:cycle_amenities": null, diff --git a/lang/nl.json b/lang/nl.json index 68d60522..e5420671 100644 --- a/lang/nl.json +++ b/lang/nl.json @@ -10,6 +10,7 @@ "category:children": null, "category:communication": "Communicatie", "category:construction": "Bouwterrein", + "category:craft": "", "category:culture": "Cultuur", "category:culture_religion": "Cultuur", "category:cycle_amenities": null, diff --git a/lang/pl.json b/lang/pl.json index 305e715b..251dc1d4 100644 --- a/lang/pl.json +++ b/lang/pl.json @@ -10,6 +10,7 @@ "category:children": null, "category:communication": null, "category:construction": null, + "category:craft": "", "category:culture": "Kultura", "category:culture_religion": "Kultura", "category:cycle_amenities": null, diff --git a/lang/pt-br.json b/lang/pt-br.json index 14ffd622..94975024 100644 --- a/lang/pt-br.json +++ b/lang/pt-br.json @@ -10,6 +10,7 @@ "category:children": "Equipamentos Infantis", "category:communication": "Comunicação", "category:construction": "Canteiros de Obras", + "category:craft": "", "category:culture": "Cultura", "category:culture_religion": "Cultura", "category:cycle_amenities": "Equipamentos", diff --git a/lang/ro.json b/lang/ro.json index d3446734..d726a6c7 100644 --- a/lang/ro.json +++ b/lang/ro.json @@ -10,6 +10,7 @@ "category:children": null, "category:communication": "Comunicatii", "category:construction": null, + "category:craft": "", "category:culture": "Cultura", "category:culture_religion": "Cultura", "category:cycle_amenities": null, diff --git a/lang/ru.json b/lang/ru.json index cf6e2a4e..9985ae04 100644 --- a/lang/ru.json +++ b/lang/ru.json @@ -10,6 +10,7 @@ "category:children": null, "category:communication": "Услуги связи", "category:construction": "Места строительства", + "category:craft": "", "category:culture": "Культура", "category:culture_religion": "Культура", "category:cycle_amenities": null, diff --git a/lang/template.json b/lang/template.json index 8819bcbc..54044bdb 100644 --- a/lang/template.json +++ b/lang/template.json @@ -10,6 +10,7 @@ "category:children": "", "category:communication": "", "category:construction": "", + "category:craft": "", "category:culture": "", "category:culture_religion": "", "category:cycle_amenities": "", diff --git a/lang/uk.json b/lang/uk.json index 49de445f..f8e7d1d4 100644 --- a/lang/uk.json +++ b/lang/uk.json @@ -10,6 +10,7 @@ "category:children": null, "category:communication": "Телекомунікації", "category:construction": null, + "category:craft": "", "category:culture": "Культура ", "category:culture_religion": "Культура ", "category:cycle_amenities": null, From 3ed43d7f7df76d9e8a2e238cbb9e766bae9591f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Tue, 22 May 2018 18:31:08 +0200 Subject: [PATCH 20/26] Cycle Amenities: show charging stations from z13 --- cycle_amenities.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cycle_amenities.json b/cycle_amenities.json index 12d20a19..6e8bd185 100644 --- a/cycle_amenities.json +++ b/cycle_amenities.json @@ -12,6 +12,7 @@ "node[amenity~\"^(bicycle_rental)$\"];", "way[amenity~\"^(bicycle_rental)$\"];", "relation[amenity~\"^(bicycle_rental)$\"];", + "node[amenity~\"^(charging_station)$\"][bicycle!=\"no\"];", "node[shop~\"^(bicycle)$\"];", "way[shop~\"^(bicycle)$\"];", "relation[shop~\"^(bicycle)$\"];", @@ -129,4 +130,4 @@ "priority": 2 } } -} \ No newline at end of file +} From b3500f54911aeed7bcfc0543383995e7993c42e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Tue, 29 May 2018 09:19:17 +0200 Subject: [PATCH 21/26] Tourism Services: bugfix (API adaption) --- tourism_services.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tourism_services.json b/tourism_services.json index 29eb0021..910dbb81 100644 --- a/tourism_services.json +++ b/tourism_services.json @@ -23,14 +23,14 @@ "(", "node[tourism~\"^(alpine_hut|apartment|camp_site|caravan_site|chalet|guest_house|hostel|hotel|motel|wilderness_hut)$\"];", "way[tourism~\"^(alpine_hut|apartment|camp_site|caravan_site|chalet|guest_house|hostel|hotel|motel|wilderness_hut)$\"];", - "relation[tourism~\"^(alpine_hut|apartment|camp_site|caravan_site|chalet|guest_house|hostel|hotel|motel|wilderness_hut)$\"]", + "relation[tourism~\"^(alpine_hut|apartment|camp_site|caravan_site|chalet|guest_house|hostel|hotel|motel|wilderness_hut)$\"];", ")" ], "16": [ "(", "node[tourism~\"^(alpine_hut|apartment|camp_site|caravan_site|chalet|guest_house|hostel|hotel|information|motel|wilderness_hut)$\"];", "way[tourism~\"^(alpine_hut|apartment|camp_site|caravan_site|chalet|guest_house|hostel|hotel|information|motel|wilderness_hut)$\"];", - "relation[tourism~\"^(alpine_hut|apartment|camp_site|caravan_site|chalet|guest_house|hostel|hotel|information|motel|wilderness_hut)$\"]", + "relation[tourism~\"^(alpine_hut|apartment|camp_site|caravan_site|chalet|guest_house|hostel|hotel|information|motel|wilderness_hut)$\"];", ")" ] }, @@ -96,4 +96,4 @@ "zoom": 16 } } -} +} \ No newline at end of file From 5412b0b57ec6d91a66d7959cee6b84986d798176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Mon, 4 Jun 2018 16:03:27 +0200 Subject: [PATCH 22/26] Bugfixes (API adaption) --- financial.json | 4 ++-- sport.json | 2 +- tourism_attractions.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/financial.json b/financial.json index 08c35085..b8dc5b5e 100644 --- a/financial.json +++ b/financial.json @@ -21,14 +21,14 @@ "(", "node[amenity~\"^(bank)$\"];", "way[amenity~\"^(bank)$\"];", - "relation[amenity~\"^(bank)$\"]", + "relation[amenity~\"^(bank)$\"];", ")" ], "15": [ "(", "node[amenity~\"^(bank|bureau_de_change|atm)$\"];", "way[amenity~\"^(bank|bureau_de_change|atm)$\"];", - "relation[amenity~\"^(bank|bureau_de_change|atm)$\"]", + "relation[amenity~\"^(bank|bureau_de_change|atm)$\"];", ")" ] }, diff --git a/sport.json b/sport.json index ef6be0e9..50ee5b03 100644 --- a/sport.json +++ b/sport.json @@ -16,7 +16,7 @@ "uk": "Спорт. Інше." }, "query": { - "14": "(node[sport];way[sport];relation[sport])" + "14": "(node[sport];way[sport];relation[sport];)" }, "feature": { "title": "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) |default(tagTransList('sport', tags.sport)) }}", diff --git a/tourism_attractions.json b/tourism_attractions.json index 0005c053..0df04af4 100644 --- a/tourism_attractions.json +++ b/tourism_attractions.json @@ -23,7 +23,7 @@ "(", "node[tourism][tourism!~\"^(alpine_hut|apartment|camp_site|caravan_site|chalet|guest_house|hostel|hotel|information|motel|wilderness_hut)$\"];", "way[tourism][tourism!~\"^(alpine_hut|apartment|camp_site|caravan_site|chalet|guest_house|hostel|hotel|information|motel|wilderness_hut)$\"];", - "relation[tourism][tourism!~\"^(alpine_hut|apartment|camp_site|caravan_site|chalet|guest_house|hostel|hotel|information|motel|wilderness_hut)$\"]", + "relation[tourism][tourism!~\"^(alpine_hut|apartment|camp_site|caravan_site|chalet|guest_house|hostel|hotel|information|motel|wilderness_hut)$\"];", ")" ] }, From 10af6d8202bc3dd3125e4103aac78cc7d5384431 Mon Sep 17 00:00:00 2001 From: Cybereric Date: Fri, 8 Jun 2018 23:29:35 +0200 Subject: [PATCH 23/26] Update fr.json --- lang/fr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/fr.json b/lang/fr.json index d4ca0960..7a833b30 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -10,7 +10,7 @@ "category:children": "Équipements pour enfants", "category:communication": "Communication", "category:construction": "Constructions", - "category:craft": "", + "category:craft": "Artisanat", "category:culture": "Culture", "category:culture_religion": "Culture et Religion", "category:cycle_amenities": "Équipements vélo", From f7370616378bd3f4bb7e18c633899f58ac4dbdb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Sat, 9 Jun 2018 21:47:38 +0200 Subject: [PATCH 24/26] Craft: import translation (fr) --- craft.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/craft.json b/craft.json index 9c361fea..dbacde23 100644 --- a/craft.json +++ b/craft.json @@ -2,7 +2,8 @@ "type": "overpass", "name": { "de": "Handwerk", - "en": "Craft" + "en": "Craft", + "fr": "Artisanat" }, "query": { "15": "(node[craft];way[craft];relation[craft];);" From aee96a7e1136ce2e9f438ba32b30fae669825837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Tue, 12 Jun 2018 06:50:10 +0200 Subject: [PATCH 25/26] cycle_amenities: translate bicycle tube dispensers --- cycle_amenities.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cycle_amenities.json b/cycle_amenities.json index 6e8bd185..f1bfac9b 100644 --- a/cycle_amenities.json +++ b/cycle_amenities.json @@ -59,7 +59,13 @@ "", "{% if tags.capacity %}({{ tags.capacity }}){% endif %}" ], - "description": "{{ tagTrans(key, value) }}", + "description": [ + "{% if tags.amenity == 'vending_machine' %}", + "{{ tagTransList('amenity=vending_machine vending', value) }}", + "{% else %}", + "{{ tagTrans(key, value) }}", + "{% endif %}" + ], "body": [ "{% if tags.capacity %}", " {{ keyTrans('capacity') }}: {{ tags.capacity }}", From 31d0d59148776a7e8fa9ce532223435c8acee38e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Thu, 14 Jun 2018 09:12:40 +0200 Subject: [PATCH 26/26] Religion: description depends on the building=* tag --- religion.json | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/religion.json b/religion.json index bb833c50..9da14aba 100644 --- a/religion.json +++ b/religion.json @@ -38,15 +38,29 @@ "{% set value = tags.amenity %}", "{% endif %}" ], - "description": "{{ tagTrans(key, value) }}{% if tags.religion %}: {{ tagTransList('religion', tags.religion) }}{% endif %}", + "description": [ + "{% if tags.building and tags.religion %}", + " {% if isTranslated('tag:building=' ~ tags.building ~ ' religion=' ~ tags.religion) %}", + " {{ trans('tag:building=' ~ tags.building ~ ' religion=' ~ tags.religion) }}", + " {% elseif tags.building != 'yes' %}", + " {{ trans('tag:building=' ~ tags.building) }}{% if tags.religion %}: {{ tagTransList('religion', tags.religion) }}{% endif %}", + " {% else %}", + " {{ tagTrans(key, value) }}: {{ tagTransList('religion', tags.religion) }}", + " {% endif %}", + "{% else %}", + " {{ tagTrans(key, value) }}{% if tags.religion %}: {{ tagTransList('religion', tags.religion) }}{% endif %}", + "{% endif %}" + ], "popupDescription": "{{ tagTrans(key, value) }}", "body": [ + "{% if tags.building %}", + " {{ keyTrans('building') }}: {{ tagTrans('building', tags.building) }}
", + "{% endif %}", "{% if tags.religion %}", - " {{ keyTrans('religion') }}: {{ tagTransList('religion', tags.religion) }}", + " {{ keyTrans('religion') }}: {{ tagTransList('religion', tags.religion) }}
", "{% endif %}", "{% if tags.denomination %}", - "
", - " {{ keyTrans('denomination') }}: {{ tagTransList('denomination', tags.denomination) }}", + " {{ keyTrans('denomination') }}: {{ tagTransList('denomination', tags.denomination) }}
", "{% endif %}" ], "markerSign": [