diff --git a/app/src/main/assets/country_metadata/BD.yml b/app/src/main/assets/country_metadata/BD.yml index 09083a6e26..cfa9e8cb74 100644 --- a/app/src/main/assets/country_metadata/BD.yml +++ b/app/src/main/assets/country_metadata/BD.yml @@ -30,8 +30,8 @@ atmOperators: [Dutch-Bangla Bank Limited ATM ডাচ-বাংলা ব্য Bank Fast Track ATM, Dutch-Bangla Bank ATM ডাচ-বাংলা ব্যাংকের এটিএম, Dutch-Bangla Bank ATM, Dutch Bangla Bank Ltd., Dutch Bangla Bank Limited ডাচ বাংলা ব্যাংক লিমিটেড, Dutch Bangla Bank Fast Track ডাচ বাংলা ব্যাংক ফাস্ট ট্র্যাক, Dutch Bangla Bank ATM ডাচ বাংলা ব্যাংক এটিএম, Dhaka Bank Limited - ATM, DBBL atm, DBBL ATM ডিবিবিএল এটিএম, City Bank Limited, Brac Bank ATM, Bank Asia Limited ATM - ব্যাংক এশিয়া লিমিটেড এটিএম, BRAC Bank ATM] + ATM, Dhaka Bank ATM, DBBL atm, DBBL ATM ডিবিবিএল এটিএম, City Bank Limited, Brac Bank ATM, Bank Asia + Limited ATM ব্যাংক এশিয়া লিমিটেড এটিএম, BRAC Bank ATM] firstDayOfWorkweek: Su isLeftHandTraffic: true mobileCountryCode: 470 diff --git a/app/src/main/assets/country_metadata/BE.yml b/app/src/main/assets/country_metadata/BE.yml index 1379f744fc..d03655200d 100644 --- a/app/src/main/assets/country_metadata/BE.yml +++ b/app/src/main/assets/country_metadata/BE.yml @@ -3,8 +3,8 @@ atmOperators: [BNP Paribas Fortis, KBC, Argenta, BeoBank, ING, Belfius, BNP Pari De Post, Crelan, Beobank, BNP Parisbas Fortis, bpost bank, Record Bank, Record, Europabank, BNP-Paribas Fortis, Axa, AXA Bank] chargingStationOperators: [Allego, Blue Corner, Ionity, allego, Smoov Allego, Luminus, The Plugin Company, Tesla, Smoov, PitPoint, - Colruyt, Bluecorner, smoov allego, BlueCorner, smoov, charge.brussels, bluecorner, allegro / smoov, - Pitpoint Brussels, Partago, ORES, Lidl, Eoly, EV-Box, De Lijn, BlueConnect, Allegro] + Colruyt, Bluecorner, smoov allego, Lidl, BlueCorner, smoov, charge.brussels, bluecorner, allegro / + smoov, Pitpoint Brussels, Partago, ORES, Eoly, EV-Box, De Lijn, BlueConnect, Audi, Allegro] clothesContainerOperators: [Vlaams Inzamel Centrum Textiel, Wereld Missie Hulp, Les Petits Riens - Spullenhulp, Terre, Vlaams Internationaal Centrum, IDELUX-Environnement, Oxfam, Curitas n.v., V.H.S. Europ, Curitas, De Kringwinkel, Terre ASBL, Wereldmissiehulp, Caritas n.v., ivio, IVAREM, WMH, Vlaams Inzamelcentrum Textiel, Curitas diff --git a/app/src/main/assets/country_metadata/BG.yml b/app/src/main/assets/country_metadata/BG.yml index 33e223e6a9..57499a3c8c 100644 --- a/app/src/main/assets/country_metadata/BG.yml +++ b/app/src/main/assets/country_metadata/BG.yml @@ -1,12 +1,12 @@ # Do not edit. Source files are in /res/country_metadata additionalStreetsignLanguages: [international] atmOperators: [Fibank, ДСК, ОББ, FIBank, Postbank, Банка ДСК, Райфайзенбанк, Unicredit Bulbank, Централна кооперативна - банка, УниКредит Булбанк, Unicredit, UniCredit Bulbank, UniCredit, ЦКБ, ПИБ, Raiffeisenbank, DSK - Bank, Райфайзен Банк, Райфайзен, Пощенска банка, Raiffeisen, DSK, Уникредит Булбанк, Първа Инвестиционна - Банка, Обединена българска банка, Обединена Българска Банка, Unicredit bulbank, Raiffeisen Bank, - Piraeus Bank, OBB, FiBank, CCB, Фибанк, Първа инвестиционна банка, Общинска банка, Общинска Банка, - Инвестбанк, Банк ДСК, Société Générale, ProCredit Bank, First Investment Bank, Euronet, Central Cooperative - Bank, Allianz] + банка, УниКредит Булбанк, Unicredit, UniCredit Bulbank, UniCredit, ЦКБ, Райфайзен Банк, ПИБ, Raiffeisenbank, + DSK Bank, Райфайзен, Пощенска банка, Raiffeisen, DSK, Уникредит Булбанк, Първа Инвестиционна Банка, + Обединена българска банка, Обединена Българска Банка, Unicredit bulbank, Raiffeisen Bank, Piraeus Bank, + OBB, FiBank, CCB, Фибанк, Първа инвестиционна банка, Общинска банка, Общинска Банка, Инвестбанк, Банк + ДСК, Société Générale, ProCredit Bank, First Investment Bank, Euronet, Central Cooperative Bank, + Allianz] chargingStationOperators: [ОП „Общински паркинги и синя зона“ - Варна] clothesContainerOperators: [БЧК, texcycle] isLivingStreetKnown: true diff --git a/app/src/main/assets/country_metadata/CA-BC.yml b/app/src/main/assets/country_metadata/CA-BC.yml index 9e3842dca2..d7390ed07e 100644 --- a/app/src/main/assets/country_metadata/CA-BC.yml +++ b/app/src/main/assets/country_metadata/CA-BC.yml @@ -1,7 +1,7 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [CIBC, RBC, TD Canada Trust, RBC Royal Bank, Scotiabank, Vancity, BMO, ScotiaBank, DC Bank, coastcapital savings, TD Bank, Royal Bank, Envision Financial, DCBank, Coast Capital] -chargingStationOperators: [Flo, BC Hydro, ChargePoint, Tesla, Chargepoint, City of Maple Ridge / ChargePoint] +chargingStationOperators: [Flo, ChargePoint, BC Hydro, Tesla, Chargepoint, City of Maple Ridge / ChargePoint] clothesContainerOperators: [Developmental Disabilities Association, Cerebral Palsy Association of BC, Canadian Diabetes Association, Big Brothers of Greater Vancouver Clothing Donation] officialLanguages: [en] diff --git a/app/src/main/assets/country_metadata/CH.yml b/app/src/main/assets/country_metadata/CH.yml index 12d9047276..499b2515b9 100644 --- a/app/src/main/assets/country_metadata/CH.yml +++ b/app/src/main/assets/country_metadata/CH.yml @@ -17,8 +17,8 @@ atmOperators: [Raiffeisen, PostFinance, Postfinance, Credit Suisse, UBS, Zürche chargingStationOperators: [Tesla, IWB, Repower AG, Lidl, Groupe E, EVite, Tesla Motors Inc., EBL, ALTIS, ABB, easy4you, bike-energy, Altis, m-way, Technische Betriebe Glarus Nord, ESB, EKZ, evpass, Migros, Infovel, Gemeinde Pontresina, CKW, WWZ, IBAarau AG, FHNW, Enerti, Comfort Hotel Egerkingen, my elmo, greenmotion, ewl, evpass.ch, - eCarup, Renault, Raiffeisen, Move, Evpass, Eniwa AG, Eniva, Energie 360°, EWN, BKW, Agrola, AEW Energie - AG, swisscharge, mway, move, groupe e, groupe, ewz, energie360°, elmoove, ee-en.ch, eCarUp, Werkbetriebe + energie360°, eCarup, Renault, Raiffeisen, Move, Evpass, Eniwa AG, Eniva, Energie 360°, EWN, BKW, Agrola, + AEW Energie AG, swisscharge, mway, move, groupe e, groupe, ewz, elmoove, ee-en.ch, eCarUp, Werkbetriebe Frauenfeld, Tesla Inc., Tesla Destination Charging, Technische Betriebe Wil, Technische Betriebe Kreuzlingen, Swisscharge, SwissCharge, Socar, SAK, Romande Energie, Repower, RTB Regionale Technische Betriebe, Landi Matzigen, IKEA, Hotel Riverside, GoFast, Garage Keigel, Energie Wasser Bern, Energie diff --git a/app/src/main/assets/country_metadata/CZ.yml b/app/src/main/assets/country_metadata/CZ.yml index a2d84ba093..3e4f73918d 100644 --- a/app/src/main/assets/country_metadata/CZ.yml +++ b/app/src/main/assets/country_metadata/CZ.yml @@ -1,11 +1,11 @@ # Do not edit. Source files are in /res/country_metadata -atmOperators: [Česká spořitelna, ČSOB, Komerční banka, Pharro, Euronet, Česká Spořitelna, Raiffeisenbank, KB, Air Bank, - GE Money Bank, Komerční Banka, Moneta, UniCredit Bank, Moneta Money Bank, CSOB, AirBank, EuroNet, MONETA - Money Bank, GE Money, Česká spořitelna a.s., Poštovní spořitelna, Air bank, Unicredit Bank, Moneta - Bank, Komerční banka a.s., Airbank, ČS, Travelex, Sberbank, Raiffeisen Bank, MONETA Money Bank a.s., - Citibank, komerční banka, airbank, Raiffeisen bank, Komeční banka, GE Money bank, GE, Fio, Era, České - spořitelny, Česká spořitelna a. s., www.wbtcb.com, mBank, UniCreditBank, UniCredit bank, Raiffeisen, - Oberbank, OK Point, MONETA, Fio Banka, FIO, ERA, Airbank a.s.] +atmOperators: [Česká spořitelna, ČSOB, Komerční banka, Pharro, Euronet, Česká Spořitelna, Raiffeisenbank, Air Bank, + KB, GE Money Bank, Komerční Banka, Moneta, UniCredit Bank, Moneta Money Bank, CSOB, AirBank, EuroNet, + MONETA Money Bank, GE Money, Česká spořitelna a.s., Poštovní spořitelna, Air bank, Unicredit Bank, + Moneta Bank, Komerční banka a.s., Airbank, ČS, Travelex, Sberbank, Raiffeisen Bank, MONETA Money Bank + a.s., Citibank, komerční banka, airbank, Raiffeisen bank, Komeční banka, GE Money bank, GE, Fio, + Era, České spořitelny, Česká spořitelna a. s., www.wbtcb.com, mBank, UniCreditBank, UniCredit bank, + Raiffeisen, Oberbank, OK Point, MONETA, Fio Banka, FIO, ERA, Airbank a.s.] chargingStationOperators: [ČEZ, ČEZ (CCS/CHAdeMO/Mennekes type2), PRE, EVMAPA, E.ON (CCS/CHAdeMO/Mennekes), ČEZ (CCS/CHAdeMO/Mennekes typ2), beskolo, EON, E.ON, ČEZ (CCS/CHAdeMO/Mennekes type 2), Tesla, ČEZ (CCS/CHAdeMO and Mennekes type2), evmapa.cz, MOL (CCS/CHAdeMO/Mennekes), CCS/CHAdeMO and Mennekes type2, ČEZ (CCS/CHAdeMO/Mennekes), diff --git a/app/src/main/assets/country_metadata/DE.yml b/app/src/main/assets/country_metadata/DE.yml index 7c3cbd6bf6..ee27352812 100644 --- a/app/src/main/assets/country_metadata/DE.yml +++ b/app/src/main/assets/country_metadata/DE.yml @@ -9,70 +9,70 @@ atmOperators: [Sparkasse, Postbank, Euronet, Volksbank, Deutsche Bank, ING-DiBa, Mittelbrandenburgische Sparkasse, ING Diba, Commerzbank AG, Sparkasse Trier, Saalesparkasse, ICCash, Stadtsparkasse Düsseldorf, Sparkasse Herford, Sparkasse Bochum, BBBank, Aachener Bank, Sparkasse Holstein, Sparkasse Chemnitz, Sparkasse Leipzig, ING-DiBa AG, Degussa Bank, Volksbank Dessau-Anhalt eG, Sparkasse - Hanauerland, Sparkasse Bielefeld, Kreissparkasse Köln, Kreissparkasse Böblingen, IC Cash Services - GmbH, Berliner Volksbank eG, Bankhaus Lenz, BW-Bank, Volksbank Krefeld eG, Stadtsparkasse, ING-Diba, - Stadt-Sparkasse Solingen, Sparkasse Mainz, Sparkasse Hanau, Ostsächsische Sparkasse Dresden, Targobank, - Sparkasse Bodensee, Sparkasse Bayreuth, Nord-Ostsee Sparkasse, Förde Sparkasse, Deutsche Post, Cardpoint - GmbH, BW Bank, Volks- und Raiffeisenbank, Taunus Sparkasse, Sparkasse Westholstein, Sparkasse Vorpommern, - Sparkasse Saarbrücken, Sparkasse Mittelthüringen, Sparkasse LeerWittmund, Mainzer Volksbank, Kasseler - Sparkasse, IC Cash, Volksbank Kraichgau eG, Sparkasse Witten, Sparkasse Nürnberg, Sparkasse Gießen, + Hanauerland, Kreissparkasse Köln, Kreissparkasse Böblingen, IC Cash Services GmbH, Berliner Volksbank + eG, Bankhaus Lenz, BW-Bank, Volksbank Krefeld eG, Stadtsparkasse, Sparkasse Bielefeld, ING-Diba, + Stadt-Sparkasse Solingen, Sparkasse Mainz, Sparkasse Hanau, Ostsächsische Sparkasse Dresden, Nord-Ostsee + Sparkasse, Targobank, Sparkasse Bodensee, Sparkasse Bayreuth, Förde Sparkasse, Deutsche Post, Cardpoint + GmbH, BW Bank, Volks- und Raiffeisenbank, Taunus Sparkasse, Sparkasse Westholstein, Sparkasse Saarbrücken, + Sparkasse Mittelthüringen, Sparkasse LeerWittmund, Mainzer Volksbank, Kasseler Sparkasse, IC Cash, + Volksbank Kraichgau eG, Sparkasse Witten, Sparkasse Vorpommern, Sparkasse Nürnberg, Sparkasse Gießen, Postbank AG, Münchner Bank, Kreissparkasse Verden, Kreissparkasse Tübingen, Ing Diba, Cardpoint, Braunschweigische Landessparkasse, Sparkasse zu Lübeck, Sparkasse Schwäbisch Hall, Sparkasse Rhein Neckar Nord, Sparkasse Kraichgau, Sparkasse Freising, Sparkasse Emden, Sparkasse Dortmund, Raiffeisenbank Oldenburg eG, - Volksbank Reutlingen, VR-Bank Bad Hersfeld-Rotenburg eG, Stadtsparkasse Wuppertal, Stadtsparkasse Kaiserslautern, - Sparkasse Neuss, Sparkasse Münsterland Ost, Sparkasse Mittelsachsen, Sparkasse Hildesheim, Sparkasse - Hannover, Kreissparkasse Reutlingen, Kreissparkasse Ostalb, Kreissparkasse Ludwigsburg, Bremische - Volksbank eG, transact Elektronische Zahlungssysteme GmbH, Volksbank Raiffeisenbank, Volksbank Köln - Bonn eG, Stadtsparkasse Magdeburg, Sparkasse Rhein-Nahe, Sparkasse Harburg-Buxtehude, Sparkasse - HRV, Sparkasse Darmstadt, ReiseBank AG, Ostsächsische Sparkasse, Landessparkasse zu Oldenburg, Kreissparkasse - Waiblingen, Kreissparkasse Esslingen-Nürtingen, Ing-DiBa, IC Cash Services, Frankfurter Sparkasse, - Erzgebirgssparkasse, cardpoint, Volksbank Trier eG, Volksbank Lahr eG, Volksbank Heilbronn, Volksbank - Bühl eG, VR Bank Schwäbisch Hall-Crailsheim eG, Sparkasse Schwäbisch Hall - Crailsheim, Sparkasse + Nord-Ostsee-Sparkasse, Volksbank Reutlingen, VR-Bank Bad Hersfeld-Rotenburg eG, Stadtsparkasse Wuppertal, + Stadtsparkasse Kaiserslautern, Sparkasse Neuss, Sparkasse Münsterland Ost, Sparkasse Mittelsachsen, + Sparkasse Hildesheim, Sparkasse Hannover, Landessparkasse zu Oldenburg, Kreissparkasse Reutlingen, + Kreissparkasse Ostalb, Kreissparkasse Ludwigsburg, Bremische Volksbank eG, transact Elektronische Zahlungssysteme + GmbH, Volksbank Raiffeisenbank, Volksbank Köln Bonn eG, Stadtsparkasse Magdeburg, Sparkasse Rhein-Nahe, + Sparkasse Harburg-Buxtehude, Sparkasse HRV, Sparkasse Darmstadt, ReiseBank AG, Ostsächsische Sparkasse, + Kreissparkasse Waiblingen, Kreissparkasse Esslingen-Nürtingen, Ing-DiBa, IC Cash Services, Frankfurter + Sparkasse, Erzgebirgssparkasse, cardpoint, Volksbank Trier eG, Volksbank Lahr eG, Volksbank Heilbronn, + Volksbank Bühl eG, VR Bank Schwäbisch Hall-Crailsheim eG, Sparkasse Schwäbisch Hall - Crailsheim, Sparkasse Regensburg, Sparkasse Paderborn-Detmold, Sparkasse Jena-Saale-Holzland, Sparkasse Düsseldorf, Sparkasse - Duisburg, Santander, Nord-Ostsee-Sparkasse, Nassauische Sparkasse, Landesbank Baden-Württemberg, - Kreissparkasse Gelnhausen, Ing-Diba] + Duisburg, Santander, Nassauische Sparkasse, Landesbank Baden-Württemberg, Kreissparkasse Gelnhausen, + Ing-Diba] chargingStationOperators: [Stromnetz Hamburg, Stadtwerke München, EnBW, innogy, RWE, Allego, allego, RWE-Effizienz, Innogy, E-WALD GmbH, LEW, EWE, SWU Stadtwerke Ulm/Neu-Ulm GmbH, Tesla, EnBW Energie Baden-Württemberg AG, be emobil, NEW, Kaufland, Lidl, Tank & Rast, e-regio GmbH & Co. KG, Vattenfall, Stadtwerke Augsburg, SWM, Lechwerke AG, Ionity, Energie- und Wasserversorgung Bonn/Rhein-Sieg GmbH, Tesla Motors Inc., E.ON, Tesla Motors, FairEnergie GmbH, ENSO Energie Sachsen Ost AG, DREWAG - Stadtwerke Dresden GmbH, Aldi Süd, ADAC, innogy SE, N-Ergie, Stadtwerke Norderstedt, EWE Vertrieb GmbH, Westfalen Weser Netz, EWV, BMW, E-Werk Mittelbaden, - Stadtwerke Leipzig, Mainova, innogy eMobility Solutions GmbH, IKEA, Energie Baden-Württemberg AG, Stadtwerke + Stadtwerke Leipzig, Mainova, Energie Baden-Württemberg AG, innogy eMobility Solutions GmbH, IKEA, Stadtwerke Osnabrück, RheinEnergie, Kreiswerke Main-Kinzig GmbH, Ionity GmbH, Energie- und Wasserversorgung Bruchsal GmbH, Energie und Wasser Potsdam GmbH, wallbe, Stadtwerke Witten, Regensburger Energie- - und Wasserversorgung AG & Co KG, eins energie in sachsen, Stadtwerke Düsseldorf, NewMotion, envia - M, eE4mobile eG, STAWAG, Fastned, EWR, enviaM, Stadtwerke Tübingen, Stadtwerke Speyer GmbH, ladenetz.de, - TheNewMotion, Stadtwerke Bielefeld, Edeka, Bauhaus, Süwag Energie AG, Stawag, Stadtwerke Marburg, Stadtwerke - Bochum, SWB, Porsche, DREWAG - Stadtwerke Dresden, Bayernwerk AG, eon, e-on Drive, VGS mbH, Süwag, + und Wasserversorgung AG & Co KG, Fastned, eins energie in sachsen, Stadtwerke Düsseldorf, NewMotion, + envia M, Stadtwerke Bielefeld, STAWAG, EWR, enviaM, eE4mobile eG, Stadtwerke Tübingen, Stadtwerke Speyer + GmbH, ladenetz.de, TheNewMotion, SWB, Edeka, Bauhaus, Süwag Energie AG, Stawag, Stadtwerke Marburg, + Stadtwerke Bochum, Porsche, DREWAG - Stadtwerke Dresden, Bayernwerk AG, eon, e-on Drive, VGS mbH, Süwag, Stadtwerke Meerbusch GmbH, N-ERGIE Aktiengesellschaft, N-ERGIE, Lech Elektrizitätswerke Augsburg, Ikea, Audi AG, ALDI Süd, swb, Stadtwerke Pforzheim, Stadtwerke Heide, Pfalzwerke, OVAG, IONITY, Entega Energie GmbH, Energieversorgung Rodau GmbH, ENTEGA Energie GmbH, DREWAG, Allego GmbH, Stadtwerke Tübingen GmbH, Stadtwerke Iserlohn - Heimatversorger, Mainzer Stadtwerke, Kreis Paderborn, Entega, E-Wald GmbH, Bayernwerk, BEW, eeMobility, e.on, e.dis, WVV, The New Motion, TankE GmbH, TEAG, Stadtwerke Rhede GmbH, Stadtwerke Herne, Rheinenergie, RWE Effizienz GmbH, Ovag, Mennekes, Kreiswerke Main-Kinzig, - ENBW, EAM, Allegro, enercity, emma, SÜC Energie und H2O GmbH, Stadtwerke Baden-Baden, RWE / DEW21, - Pfalzwerke AG, Maingau, Ladeverbund+, LEW Augsburg, Innogy eMobility Solutions GmbH, EGG Energieversorgung - Gera, Charge-ON GmbH] -clothesContainerOperators: [Deutsches Rotes Kreuz, Loop, Aktion Hoffnung, AWG, GEB, ALBA Braunschweig GmbH, Humana, Stadtreinigung - Hamburg, Malteser, Stadt Karlsruhe, AHE;Deutsches Rotes Kreuz, Abfallwirtschaftsgesellschaft Wuppertal, - Vorwerker Diakonie, DRK, Zweckverband für Abfallwirtschaft Kempten, Technische Betriebe Velbert AöR, - Abfallwirtschaftsbetrieb München, Texaid, hoelp, Kolping, AWB Köln, AWB, AHE, AWO, GOA, bonnorange - AöR, Technische Betriebe Remscheid, Darbo Recycling, Step, Malteser Hilfsdienst e.V., Landkreis - Prignitz, Berlin-Textilrecycling, Remondis, Malteser Hilfsdienst, FWS, CityGreenPoint, aha Zweckverband - Abfallwirtschaft Region Hannover, Stadt Stuttgart, TEXAID, Aktex Rohstoff-Recycling Nord, Diakoniewerk - Essen, Bayerisches Rotes Kreuz, Retextil Recycling International, Abfall- und Wertstofflogistik - Neuss GmbH (AWL), Isevtex, AWISTA, AHG alpha Handelskontor, AHA, unknown, Veolia, Kolpingwerk, HeDi, - Gew. Fa. Mettex, DRK Kreisverband Bonn e.V., Brotex, AWM, ZKE, Däsa Wiederverwertungs GmbH, Altkleiderfirma - Nargül, illegal, Textil-Recycling Nord, RS, Kolping Recycling GmbH, TEXAID Deutschland GmbH, Stadt - Karlsruhe Amt für Abfallwirtschaft, Deutsches Rotes Kreuz e.V., DRK-Kreisverband Trier-Saarburg - e.V., Bera Textilrecycling, Baliz Textilwerke, Akza Textilrecycling, Neue Arbeit Lahr, Hoppe, HUMANA - Kleidersammlung GmbH, Familienschutzwerk, BRK, AWISTA GmbH, AHE;Deutsches Rotes Kreuz;Ruhrtalengel, - aha, TEXAID Collection, SP Textilverwertung, Retextil, Maltheser Hilfsdienst, Johanniter, HUMANA, Diakonisches - Werk Kassel, Deutsche Lebens-Rettungs-Gesellschaft e.V., DESWOS, TEXAID Collection GmbH, Stadtreinigung - Leipzig, SOEX, Haytex Textilrecycling, Ginotex, DRK-Kreisverband Koblenz-Stadt e.V., DRK KV Ammerland, - Content KG, Bethel, Baliz, Awista, ZVO, Wittmann, USB, Stadtreiniger Kassel, Sehbehinderten Selbsthilfe - Kurpfalz-Odenwald e.V., REMONDIS, OKA Textil, KuB GmbH, Kreisentsorgungs GmbH Vogtland (KEV), Kolpingsfamilie - Ostbevern e. V., Faircollect, East-West Textilrecycling Kursun, East-West, Caritas, Arbeiter-Samariter-Bund] + ENBW, EAM, Allegro, enercity, emma, SÜC Energie und H2O GmbH, Stadtwerke Göttingen, Stadtwerke Baden-Baden, + RWE / DEW21, Pfalzwerke AG, Maingau, Ladeverbund+, LEW Augsburg, Innogy eMobility Solutions GmbH, EGG + Energieversorgung Gera, Charge-ON GmbH] +clothesContainerOperators: [Deutsches Rotes Kreuz, Loop, Aktion Hoffnung, AWG, GEB, ALBA Braunschweig GmbH, Humana, Malteser, Stadtreinigung + Hamburg, Stadt Karlsruhe, AHE;Deutsches Rotes Kreuz, Abfallwirtschaftsgesellschaft Wuppertal, Vorwerker + Diakonie, DRK, Zweckverband für Abfallwirtschaft Kempten, Technische Betriebe Velbert AöR, Abfallwirtschaftsbetrieb + München, Texaid, hoelp, Kolping, AWB Köln, AWB, AHE, AWO, GOA, bonnorange AöR, Technische Betriebe + Remscheid, Darbo Recycling, Step, Malteser Hilfsdienst e.V., Landkreis Prignitz, Remondis, Malteser + Hilfsdienst, FWS, CityGreenPoint, Berlin-Textilrecycling, aha Zweckverband Abfallwirtschaft Region + Hannover, Stadt Stuttgart, TEXAID, Bayerisches Rotes Kreuz, Aktex Rohstoff-Recycling Nord, Diakoniewerk + Essen, Abfall- und Wertstofflogistik Neuss GmbH (AWL), Retextil Recycling International, Isevtex, + AWISTA, AHG alpha Handelskontor, AHA, unknown, ZKE, Veolia, Kolpingwerk, HeDi, Gew. Fa. Mettex, DRK + Kreisverband Bonn e.V., Brotex, AWM, Däsa Wiederverwertungs GmbH, Altkleiderfirma Nargül, illegal, + Textil-Recycling Nord, RS, Kolping Recycling GmbH, Deutsches Rotes Kreuz e.V., TEXAID Deutschland GmbH, + Stadt Karlsruhe Amt für Abfallwirtschaft, DRK-Kreisverband Trier-Saarburg e.V., Bera Textilrecycling, + Baliz Textilwerke, Akza Textilrecycling, SP Textilverwertung, Neue Arbeit Lahr, Hoppe, HUMANA Kleidersammlung + GmbH, Familienschutzwerk, BRK, AWISTA GmbH, AHE;Deutsches Rotes Kreuz;Ruhrtalengel, aha, TEXAID + Collection GmbH, TEXAID Collection, Retextil, Maltheser Hilfsdienst, Johanniter, HUMANA, Diakonisches + Werk Kassel, Deutsche Lebens-Rettungs-Gesellschaft e.V., DESWOS, Stadtreinigung Leipzig, SOEX, Haytex + Textilrecycling, Ginotex, DRK-Kreisverband Koblenz-Stadt e.V., DRK KV Ammerland, Content KG, Bethel, + Baliz, Awista, ZVO, Wittmann, USB, Stadtreiniger Kassel, Sehbehinderten Selbsthilfe Kurpfalz-Odenwald + e.V., REMONDIS, OKA Textil, KuB GmbH, Kreisentsorgungs GmbH Vogtland (KEV), Kolpingsfamilie Ostbevern + e. V., Faircollect, East-West Textilrecycling Kursun, East-West, Caritas, Arbeiter-Samariter-Bund] isAdvisorySpeedLimitKnown: false isLivingStreetKnown: true isSlowZoneKnown: true diff --git a/app/src/main/assets/country_metadata/ES.yml b/app/src/main/assets/country_metadata/ES.yml index 39b72092bd..d2e466269a 100644 --- a/app/src/main/assets/country_metadata/ES.yml +++ b/app/src/main/assets/country_metadata/ES.yml @@ -3,15 +3,15 @@ additionalStreetsignLanguages: [ca, eu, gl, ast] additionalValidHousenumberRegex: s/n atmOperators: [Santander, Bankia, BBVA, La Caixa, Banco Santander, Telebanco 4B, Banco Popular, CaixaBank, Euronet, Kutxabank, Sabadell, Caja Rural, Banca March, Unicaja, Cajamar, Banc Sabadell, IberCaja, Banco Sabadell, - Liberbank, Abanca, Deutsche Bank, Euro 6000, Caixabank, ABANCA, Servired, Popular, BBK, Telebanco, + Liberbank, Abanca, Deutsche Bank, ABANCA, Euro 6000, Caixabank, Servired, Popular, BBK, Telebanco, Ibercaja, Euro6000, Sabadell Atlántico, Kutxa, ING, Caja Duero, Bankinter, BanCaixa, Laboral Kutxa, Caixa Bank, Banco Pastor, euronet, Cajasol, BMN, kutxabank, EspañaDuero, Catalunya Caixa, Cajasur, CAM, Banco de Sabadell, Bancaja, la Caixa, Targo Bank, ING Direct, Euronet Worldwide, Euro Automatic - Cash, Caja rural, Caja Madrid, Caja Granada, Caja España, Caja Cantabria, Caixa Galicia, BancaMarch, - BANTIERRA, BANKIA, cajamar, bankia, Vital Kutxa, Santander 4B, Sabadell Guipuzcoano, Sa Nostra, Ruralcaja, - Cash Zone, CajaSur, Caja Rural de Soria, Caja Rural de Salamanca, Caja Rural de Extremadura, Caixa - bank, Caixa Penedès, Caixa Catalunya, Caixa, CAIXABANK, CAI, Banco de Santander, Banco de Andalucía, - Banco Sabadell Atlántico, Banco Caixa Geral, 4B] + Cash, Caja rural, Caja Madrid, Caja España, Caja Cantabria, BancaMarch, BANTIERRA, BANKIA, cajamar, + bankia, Vital Kutxa, Santander 4B, Sabadell Guipuzcoano, Sa Nostra, Ruralcaja, Cash Zone, CajaSur, + Caja Rural de Soria, Caja Rural de Salamanca, Caja Rural de Extremadura, Caja Granada, Caixa bank, + Caixa Penedès, Caixa Galicia, Caixa Catalunya, Caixa, CAIXABANK, CAI, Banco de Santander, Banco de + Andalucía, Banco Sabadell Atlántico, Banco Caixa Geral, 4B] chargingStationOperators: [IBIL, Tesla Motors Inc., EDP, Iberdrola, GIC, Viesgo, Feníe Energía, edp, Easycharger, Cargacoches, Urbener, Endesa, Àrea Metropolitana de Barcelona, Wenea, Ionity, Ibil, Fenienergia, EMT, Ajuntament de Vic, Tesla, Fenie Energia, Ajuntament de Lleida, VNG Aparcaments, Serrano Park III, Serrano Park I, Repsol, diff --git a/app/src/main/assets/country_metadata/FX.yml b/app/src/main/assets/country_metadata/FX.yml index 301cc3cca3..e2c9e2f05f 100644 --- a/app/src/main/assets/country_metadata/FX.yml +++ b/app/src/main/assets/country_metadata/FX.yml @@ -7,7 +7,7 @@ atmOperators: [La Banque Postale, Crédit Agricole, Société Générale, Caisse Orange bank, La banque postale, Banque Rhône-Alpes, Banque Populaire Grand Ouest, Banque Dupuy de Parseval, la banque postale, credit agricole, Banque Postale, Banque Chabrières, BNP PARIBAS] chargingStationOperators: [Bouygues Énergies et Services, Izivia, Freshmile, Clem, Sodetrel Mobilité, Mouv Élec Var, Sodetrel, SEDI, - EneRSIEIL, SDE35, Sorégies, SDEY, Mobive, SYANE, SDE07, Tesla Motors, SIPLEC, SYME05, Séolis, Ionity, + EneRSIEIL, SDE35, Sorégies, SDEY, Mobive, SYANE, SDE07, Tesla Motors, SIPLEC, SYME05, Ionity, Séolis, Morbihan énergies, SEY 78, Renault, MobiSDEC, SYDELA, SDED, Electric 55 Charging, Morbihan Énergies, SDE04, Syndicat Départemental d'Énergie de Loire-Atlantique (SYDELA) | FR*S44, InEnergies, Lidl, Saint-Louis, Autolib', SIEL42, Clem', Plus de Bornes, Mota, Auchan, Tesla, SIEGE 27, Effia, RSE, Syndicat de l'Énergie diff --git a/app/src/main/assets/country_metadata/GB.yml b/app/src/main/assets/country_metadata/GB.yml index 3e65614032..3f8fb73ab6 100644 --- a/app/src/main/assets/country_metadata/GB.yml +++ b/app/src/main/assets/country_metadata/GB.yml @@ -8,8 +8,8 @@ atmOperators: [RBS, Barclays Bank PLC, HSBC, NatWest, Tesco, Barclays, Santander Asda, First Trust, Co-Operative Bank, Nationwide Building Society, Nat West, Cooperative Bank, Coop, ASDA, cashzone, Sainsbury, HBOS, Alliance & Leicester, Notemachine, National Westminster Bank Plc, Morrisons, Marks & Spencer, LINK, tesco, co-op, The Co-operative Food, Tesco Express, Sainsbury's Finance, - HSBC Bank plc, Barclays Bank, natwest, link, barclays, Sainsburys Bank, One Stop, Cooperative, Coop - Bank, Co-op Bank, Co-Op, sainsburys, bankmachine, Travelex, The Royal Bank of Scotland, The Co-operative + HSBC Bank plc, Barclays Bank, natwest, link, barclays, The Royal Bank of Scotland, Sainsburys Bank, + One Stop, Cooperative, Coop Bank, Co-op Bank, Co-Op, sainsburys, bankmachine, Travelex, The Co-operative Group, The Co-Operative Bank, Royal Mail, Post Office Money, Post Office Ltd, National Westminster Bank, Lloyds Banking Group, Lloyds Bank plc, DC ATM, BankMachine, Bank of Ireland; Post Office, Bank Of Ireland, Abbey, AIB] @@ -28,8 +28,8 @@ chargingStationOperators: [Ecotricity, Source London, Pod Point, Tesla Motors In your Car, Centro, Bullring, Boot and Shoe, Beech Hill Hotel, 'AutoCharge: EV Pedestal', Allego] clothesContainerOperators: [Salvation Army, The Fire Fighters Charity, Brighton & Hove City Council, The Salvation Army, British Heart Foundation, Scope, Rushcliffe Borough Council, Nottingham City Council, Traid, Cystic Fibrosis - Trust, South Norfolk Council, Cancer Fund for Children, traid, TRAID, Severn Waste Services, Oxfam, - Fife Council] + Trust, South Norfolk Council, Cancer Fund for Children, traid, The Firefighters Charity, TRAID, + Severn Waste Services, Oxfam, Fife Council] isAdvisorySpeedLimitKnown: true isLeftHandTraffic: true isLivingStreetKnown: true diff --git a/app/src/main/assets/country_metadata/IN-KL.yml b/app/src/main/assets/country_metadata/IN-KL.yml index 8dfb3b3edf..0b8ce2d7c6 100644 --- a/app/src/main/assets/country_metadata/IN-KL.yml +++ b/app/src/main/assets/country_metadata/IN-KL.yml @@ -1,20 +1,20 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [SBI, State Bank of India, Federal Bank, SBI ATM, South Indian Bank, Canara Bank, Federal Bank ATM, State Bank Of India, South Indian Bank ATM, state bank of india, sbi, State Bank ATM, Axis Bank, federal - bank, SBT, Canara Bank ATM, ICICI Bank, FEDERAL BANK, south indian bank, canara bank, State Bank, - HDFC Bank, ATM, Union Bank, State Bank of Travancore, ICICI Bank ATM, State Bank Of India ATM, Federal + bank, SBT, Canara Bank ATM, ICICI Bank, south indian bank, canara bank, State Bank, HDFC Bank, FEDERAL + BANK, ATM, Union Bank, State Bank of Travancore, ICICI Bank ATM, State Bank Of India ATM, Federal bank, State Bank of India ATM, STATE BANK OF INDIA, HDFC, CANARA BANK ATM, federal bank atm, Indian Bank, ICICI, FEDERAL BANK ATM, sbi atm, Syndicate Bank ATM, Punjab National Bank ATM, Punjab National Bank, HDFC Bank ATM, Bank of India, Axis Bank ATM, south indian bank atm, Union Bank of India, Union - Bank ATM, Syndicate Bank, State bank, SOUTH INDIAN BANK, Indian Overseas Bank, IOB ATM, Dhanalakshmi - Bank, Canara, Bank of Baroda, Axis bank, icici bank, fedaral bank, canara bank ATM, atm, State bank - of India, SBI atm, PNB, Kerala Gramin Bank, INDIA ONE ATM, IDBI Bank, ICICI BANK ATM, ESAF ATM, + Bank ATM, Syndicate Bank, State bank, Indian Overseas Bank, IOB ATM, Dhanalakshmi Bank, Canara, + Bank of Baroda, Axis bank, icici bank, fedaral bank, canara bank ATM, atm, State bank of India, SOUTH + INDIAN BANK, SBI atm, PNB, Kerala Gramin Bank, INDIA ONE ATM, IDBI Bank, ICICI BANK ATM, ESAF ATM, CSB, CANARA BANK, BANK OF INDIA, union bank, state bank of INDIA, south indian bank ATM, kerala Gramin Bank, india one ATM, icici bank atm, icici, axis bank, Vijaya Bank ATM, Union Bank Of India Atm, - Union Bank Of India ATM, UNION BANK, Tamilnad Mercantile Bank, State bank of india, State Bank of India - (SBI), State Bank ATM & CDM, South indian bank, South Indian bank, Sbi atm, STATE BANK ATM, SOUTH - INDIAN BANK ATM, SMG, SIB ATM, SBT ATM, PUNJAB NATIONAL BANK, India1 Atm, India One ATM, IOB, INDIA - ONE, IDCB, IDBI Bank ATM, IDBI, ICICI ATM, HDFC bank atm, HDFC ATM, Fedral Bank, Federal Bank Ltd., - ESAF, Dhanlaxmi Bank ATM, Dhanalaxmi Bank, City Union Bank, Central Bank, Catholic Syrian Bank, Canara - bank ATM, CSB ATM, Bank of india, Bank of India ATM, BOI ATM] + Union Bank Of India ATM, UNION BANK, Tamilnad Mercantile Bank, TDCB ATM, State bank of india, State + Bank of India (SBI), State Bank ATM & CDM, South indian bank, South Indian bank, Sbi atm, STATE + BANK ATM, SOUTH INDIAN BANK ATM, SMG, SIB ATM, SBT ATM, PUNJAB NATIONAL BANK, India1 Atm, India + One ATM, IOB, INDIA ONE, IDCB, IDBI Bank ATM, IDBI, ICICI ATM, HDFC bank atm, HDFC ATM, Fedral Bank, + Federal Bank Ltd., ESAF, Dhanlaxmi Bank ATM, Dhanalaxmi Bank, City Union Bank, Central Bank, Catholic + Syrian Bank, Canara bank ATM, CSB ATM, Bank of india, Bank of India ATM, BOI ATM] officialLanguages: [ml] diff --git a/app/src/main/assets/country_metadata/IN-UP.yml b/app/src/main/assets/country_metadata/IN-UP.yml index 0fe665bf35..17ea7ab755 100644 --- a/app/src/main/assets/country_metadata/IN-UP.yml +++ b/app/src/main/assets/country_metadata/IN-UP.yml @@ -1,6 +1,6 @@ # Do not edit. Source files are in /res/country_metadata -atmOperators: [State Bank of India, HDFC Bank, SBI, Punjab National Bank, ICICI Bank, Bank of Baroda, Axis Bank, PNB, - ICICI, state bank of india, Union Bank of India, State Bank of India (SBI), State Bank, Bank of Baroda - ATM, Ballia, Axis Bank ATM] +atmOperators: [State Bank of India, HDFC Bank, Axis Bank, SBI, Punjab National Bank, ICICI Bank, Bank of Baroda, PNB, + ICICI, state bank of india, Union Bank of India, State Bank of India (SBI), State Bank, HDFC, Bank + of Baroda ATM, Ballia, Axis Bank ATM] chargingStationOperators: [AB] officialLanguages: [hi, ur] diff --git a/app/src/main/assets/country_metadata/IR.yml b/app/src/main/assets/country_metadata/IR.yml index 5e7546840b..4233f2f8c0 100644 --- a/app/src/main/assets/country_metadata/IR.yml +++ b/app/src/main/assets/country_metadata/IR.yml @@ -1,8 +1,8 @@ # Do not edit. Source files are in /res/country_metadata additionalStreetsignLanguages: [en] atmOperators: [بانک ملی, بانک ملت, بانک صادرات, بانک شهر, بانک سپه, بانک تجارت, بانک مسکن, بانک انصار, بانک رفاه, بانک - سامان, بانک پاسارگاد, بانک کشاورزی, خودپرداز بانک ملی, بانک قوامین, خودپرداز بانک ملت, پست بانک, - خودپرداز بانک سپه, بانک ملی ایران, خودپرداز بانک صادرات, خودپرداز بانک تجارت, بانک اقتصاد نوین, بانک + سامان, بانک کشاورزی, بانک پاسارگاد, خودپرداز بانک ملی, بانک قوامین, خودپرداز بانک ملت, پست بانک, + خودپرداز بانک صادرات, خودپرداز بانک سپه, بانک ملی ایران, خودپرداز بانک تجارت, بانک اقتصاد نوین, بانک پارسیان, بانک سینا, بانک آینده, خودپرداز بانک شهر, بانک رفاه کارگران, خودپرداز, ملی, خودپرداز بانک کشاورزی, بانک گردشگری, بانک حکمت ایرانیان, خودپرداز بانک پاسارگاد, قوامین, صادرات, خودپرداز بانک رفاه, خودپرداز بانک آینده, پاسارگاد, عابر بانک, خودپرداز بانک قوامین, خودپرداز بانک انصار, تجارت, diff --git a/app/src/main/assets/country_metadata/IT.yml b/app/src/main/assets/country_metadata/IT.yml index 909b9eeb30..dad68ec009 100644 --- a/app/src/main/assets/country_metadata/IT.yml +++ b/app/src/main/assets/country_metadata/IT.yml @@ -34,12 +34,12 @@ atmOperators: [Poste Italiane, Unicredit, Intesa Sanpaolo, Monte dei Paschi di S Dei Paschi Di Siena, Banca Fideuram, Banca Atestina di Credito Cooperativo, Banca Antonveneta, BNL Gruppo BNP Paribas, BCC di Sesto San Giovanni, BCC Caravaggio] chargingStationOperators: [Enel, Enel X, a2a, Alperia, ENEL, Alperia Smart Mobility, Agsm Verona Spa, Tesla Motors Inc., enel x, - Evway, ENEL X, Hera / AcegasApsAmga, Duferco, BlueTorino, A22, Tesla, Etraction, SEMM, Enel-X, ENEL - drive, Enel Drive, Comune di Firenze, A2A, enel, Lidl, Iren, Enel Distribuzione, Emobitaly, E-Moving, - Duferco Energia, enelx, enel X, alperia, Stazione di ricarica per auto elettriche, IrenGo, Enelx, EnelX, - EVBOX, EVAD, ENI, DriWe, Atac, Amag, 'http://www.lampionet.it', evway, Tesla Motors (Destination Charging), - Tesla Motors, SCAME, Repower, LIDL, Enel spa, Enel X, ECO fuel, Comune di Vicenza, Comune di Albiate, - Charge&Go, COGESER, AcegasApsAmga, ATAC] + Evway, ENEL X, Hera / AcegasApsAmga, Enel-X, Duferco, BlueTorino, A22, Tesla, Etraction, SEMM, ENEL + drive, Enel Drive, Comune di Firenze, A2A, enel, Regione Umbria, Lidl, Iren, Enel Distribuzione, + Emobitaly, E-Moving, Duferco Energia, ASM Terni, enelx, enel X, alperia, Stazione di ricarica per auto + elettriche, IrenGo, Enelx, EnelX, EVBOX, EVAD, ENI, E-motion, DriWe, Atac, Amag, 'http://www.lampionet.it', + evway, Tesla Motors (Destination Charging), Tesla Motors, SCAME, Repower, LIDL, Ionity, Enel spa, Enel X, + ECO fuel, Comune di Vicenza, Comune di Albiate, Charge&Go, COGESER, BeCharge, AcegasApsAmga, ATAC] clothesContainerOperators: [Cannone, Caritas Ambrosiana, Humana, UIC, Aamps, Caritas, AMIU, Exodus, Umanitaria Padana onlus, Hera, Cooperativa Sociale Lavoro e Solidarietà, Comune di Vanzago, COSMARI, AMA] isAdvisorySpeedLimitKnown: true diff --git a/app/src/main/assets/country_metadata/JP.yml b/app/src/main/assets/country_metadata/JP.yml index 871eaf99d6..46f6ee2782 100644 --- a/app/src/main/assets/country_metadata/JP.yml +++ b/app/src/main/assets/country_metadata/JP.yml @@ -1,7 +1,7 @@ # Do not edit. Source files are in /res/country_metadata additionalStreetsignLanguages: [ja-Latn] atmOperators: [ゆうちょ銀行, みずほ銀行, 三井住友銀行, セブン銀行, 三菱東京UFJ銀行, 三菱UFJ銀行, りそな銀行, イオン銀行, 七十七銀行, 横浜銀行, 秋田銀行, 京都銀行, 北都銀行, 埼玉りそな銀行, - プロミス, 仙台銀行, 東京スター銀行, アイフル, 千葉銀行, JA, 滋賀銀行, 三井住友銀行／SMBC, 東北労働金庫, 京都中央信用金庫, アコム, 但陽信用金庫, 百十四銀行, 武蔵野銀行, + プロミス, 仙台銀行, アイフル, 東京スター銀行, 千葉銀行, JA, 滋賀銀行, 三井住友銀行／SMBC, 東北労働金庫, 京都中央信用金庫, アコム, 但陽信用金庫, 百十四銀行, 武蔵野銀行, 常陽銀行, 北洋銀行, 荘内銀行, 北海道銀行, レイク, 東邦銀行, 但馬信用金庫, 中国銀行, みちのく銀行, きのくに信用金庫, JAバンク, 徳島銀行, 岩手銀行, 但馬銀行, Seven Bank, 青森銀行, 福岡銀行, 池田泉州銀行, 京都信用金庫, 七十七銀行/77Bank, きらやか銀行, MUFG, 高知信用金庫, 足利銀行, 紀陽銀行, 広島銀行, 南都銀行／Nanto Bank, 十六銀行, 京葉銀行, 三菱東京UFJ, 三菱UFJ, 七十七銀行／77Bank, ローソン銀行, スルガ銀行, JP Bank, Community Bank, ATM, 高知銀行, diff --git a/app/src/main/assets/country_metadata/MN.yml b/app/src/main/assets/country_metadata/MN.yml index 2fc68a2fb6..db5aa759dd 100644 --- a/app/src/main/assets/country_metadata/MN.yml +++ b/app/src/main/assets/country_metadata/MN.yml @@ -1,6 +1,6 @@ # Do not edit. Source files are in /res/country_metadata -atmOperators: [Хаан банк, Khan Bank, Golomt Bank, Хаан банк АТМ, Хаан Банк, Хаан, ХХБ, Төрийн банк АТМ, Төрийн банк, - Капитал банк АТМ, Голомт банк, Голомт Банк, Голомт, zam, Ger, Aa] +atmOperators: [Хаан банк, Khan Bank, Голомт банк, Golomt Bank, Хаан банк АТМ, Хаан Банк, Хаан, ХХБ, Төрийн банк АТМ, + Төрийн банк, Капитал банк АТМ, Голомт Банк, Голомт, zam, Ger, Aa] isLivingStreetKnown: true mobileCountryCode: 428 officialLanguages: [mn] diff --git a/app/src/main/assets/country_metadata/NL.yml b/app/src/main/assets/country_metadata/NL.yml index 27b5fa66b0..0898cf21ec 100644 --- a/app/src/main/assets/country_metadata/NL.yml +++ b/app/src/main/assets/country_metadata/NL.yml @@ -7,10 +7,10 @@ atmOperators: [ING, Rabobank, ABN AMRO, ABN Amro, Geldmaat, ABN-AMRO, ING Bank, Sneek-ZuidwestFriesland, Rabobank Peelland Zuid, Rabobank Land van Cuijk en Maasduinen, Rabobank Hilversum-Vecht en Plassen, Rabobank Helmond, Rabobank Dommelstreek, Rabo, GWK Travelex, ABNAMRO, Yourcash, Rabobank Weerterland en Cranendonck, Rabobank Walcheren/ Noord-Beveland, Rabobank Venray, - Rabobank Twente Oost, Rabobank Noordenveld West Groningen, Rabobank Groene Hart Noord, Rabobank Centraal - Zuid-Limburg, Rabobank Breda, Rabobank Bommelerwaard, Rabobank Amerstreek, Rabobank Alkmaar e.o., - RABO, YourCash, Rabobank Zuidwest-Brabant, Rabobank Voorne-Putten Rozenburg, Rabobank Tilburg en omstreken, - Rabobank Terneuzen-Sas van Gent, Rabobank Salland, Rabobank Parkstad Limburg, Rabobank Leeuwarden-Noordwest + Rabobank Twente Oost, Rabobank Groene Hart Noord, Rabobank Centraal Zuid-Limburg, Rabobank Breda, Rabobank + Bommelerwaard, Rabobank Amerstreek, Rabobank Alkmaar e.o., RABO, YourCash, Rabobank Zuidwest-Brabant, + Rabobank Voorne-Putten Rozenburg, Rabobank Tilburg en omstreken, Rabobank Terneuzen-Sas van Gent, Rabobank + Salland, Rabobank Parkstad Limburg, Rabobank Noordenveld West Groningen, Rabobank Leeuwarden-Noordwest Friesland, Rabobank Hulst, Rabobank Haarlem en Omstreken, Rabobank Drechtsteden, Rabobank Den Haag en omgeving, Rabobank Alblasserwaard Noord en Oost, Rabo Bank, GWK, Rabobank Zuid-Holland Midden, Rabobank West-Brabant Noord, Rabobank Vijfheerenlanden, Rabobank Valkenswaard en Waalre, Rabobank Schagen-Wieringerland, @@ -24,9 +24,9 @@ atmOperators: [ING, Rabobank, ABN AMRO, ABN Amro, Geldmaat, ABN-AMRO, ING Bank, Rabobank Noordoostpolder-Urk, Rabobank Noordoost Friesland, Rabobank Noord-Holland Noord, Rabobank Noord Gooiland, Rabobank Maashorst, Rabobank Maas en Waal, Rabobank Lopikerwaard, Rabobank Kromme Rijnstreek, Rabobank Kop van Noord-Holland, Rabobank Katwijk, Rabobank Het Haringvliet, Rabobank - Het Groene Woud Zuid, Rabobank Graafschap-Zuid, Rabobank De Stellingwerven, Rabobank Borger-Klenckeland, - Rabobank Bodegraven-Woerden, Rabobank Bernheze Maasland, Rabobank Assen-Beilen, Rabobank Assen en Noord-Drenthe, - Rabobank Amstel en Vecht, Postbank, Albert Heijn, ABNAmro, ABN Ambro, ABN AMRO Bank] + Het Groene Woud Zuid, Rabobank Graafschap-Zuid, Rabobank Borger-Klenckeland, Rabobank Bodegraven-Woerden, + Rabobank Bernheze Maasland, Rabobank Assen-Beilen, Rabobank Assen en Noord-Drenthe, Rabobank Amstel + en Vecht, Postbank, Albert Heijn, ABNAmro, ABN Ambro, ABN AMRO Bank] chargingStationOperators: [Allego, NUON, Fastned, Nuon, EVBOX, Ecotap, Vattenfall, NewMotion, EVnetNL, Rotterdam Elektrisch, Qbuzz, allego, Pitpoint, Gemeente Rotterdam, gemeente Rotterdam, ecotap, EVBox, EV-Box, We Drive Solar, Liander, Havendienst Gemeent Alkmaar, e-laad, PitPoint, LastMileSolutions, EVnet, Terberg Telecom, New Motion, diff --git a/app/src/main/assets/country_metadata/PH.yml b/app/src/main/assets/country_metadata/PH.yml index 72f4045663..257d7c910a 100644 --- a/app/src/main/assets/country_metadata/PH.yml +++ b/app/src/main/assets/country_metadata/PH.yml @@ -1,11 +1,11 @@ # Do not edit. Source files are in /res/country_metadata -atmOperators: [BPI, BDO, Bank of the Philippine Islands, Metrobank, Land Bank of the Philippines, Landbank, RCBC, BDO - Unibank, PNB, Philippine National Bank, Security Bank, DBP, Luzon Development Bank, Landbank of - the Philippines, Land Bank, Rizal Commercial Banking Corporation, Philippine Savings Bank, PSBank, - Metropolitan Bank and Trust Company, Chinabank, Banco de Oro, One Network Bank, Land Bank ATM, China - Bank, UCPB, Security Bank Corporation, Development Bank of the Philippines, Allied Bank, MetroBank, - LandBank, Bank of Commerce, Banco De Oro, Union Bank of the Philippines, First Consolidated Bank, Euronet, - DBP ATM, Bank of the Philippine Island, AUB, security bank, Veterans Bank, Unionbank, Union Bank, Philippine +atmOperators: [BPI, BDO, Bank of the Philippine Islands, Metrobank, Land Bank of the Philippines, Landbank, BDO Unibank, + RCBC, PNB, Philippine National Bank, Security Bank, Luzon Development Bank, DBP, Landbank of the Philippines, + Metropolitan Bank and Trust Company, Land Bank, Rizal Commercial Banking Corporation, Philippine Savings + Bank, PSBank, Chinabank, Banco de Oro, One Network Bank, Land Bank ATM, China Bank, UCPB, Security + Bank Corporation, Development Bank of the Philippines, Allied Bank, MetroBank, LandBank, Bank of + Commerce, Banco De Oro, Union Bank of the Philippines, First Consolidated Bank, Euronet, DBP ATM, + Bank of the Philippine Island, AUB, security bank, Veterans Bank, Unionbank, Union Bank, Philippine Business Bank, PS Bank, Metrobank ATM, Landbank ATM, LANDBANK, Citibank, ChinaBank, Bank of the Philipine Islands, pnb, bdo, Veteran's Bank, Various Banks, United Coconut Planters Bank, UCPB Savings Bank, PBCOM, Maybank, LBP, Gretchen R. Leonardo, East West Banking Corporation, CitySavings Bank, diff --git a/app/src/main/assets/country_metadata/PK.yml b/app/src/main/assets/country_metadata/PK.yml index 184ec062ed..026804133b 100644 --- a/app/src/main/assets/country_metadata/PK.yml +++ b/app/src/main/assets/country_metadata/PK.yml @@ -1,9 +1,9 @@ # Do not edit. Source files are in /res/country_metadata -atmOperators: [HBL, UBL, Askari Bank, MCB, Habib Bank Limited, Meezan Bank, HBL ATM, NBP, Dubai Islamic Bank, Allied - Bank, ubl, Standard Chartered Bank, JS Bank, Hbl, Faysal Bank, Bank Islami, Bank Alfalah, Bank Al +atmOperators: [HBL, UBL, Askari Bank, MCB, Meezan Bank, HBL ATM, Habib Bank Limited, NBP, Allied Bank, ubl, Standard + Chartered Bank, JS Bank, Hbl, Faysal Bank, Dubai Islamic Bank, Bank Islami, Bank Alfalah, Bank Al Habib, Allied Bank Limited, Summit Bank, Soneri Bank, National Bank, Meezan Bank Limited, Habib - Metro Bank, Habib Bank, ATM, mohsin house, hbl atm, United Bank Limited, UBL ATM, National Bank - of Pakistan, NIB Bank, Habib Bank Ltd, Habib Bank ATM, Bank AL Habib, Askari bank, Allied bank] + Metro Bank, Habib Bank, ATM, mohsin house, hbl atm, UBL ATM, National Bank of Pakistan, NIB Bank, + Habib Bank Ltd, Habib Bank ATM, Bank AL Habib, Askari bank, Allied bank] isLeftHandTraffic: true mobileCountryCode: 410 officialLanguages: [ur, en, pa] diff --git a/app/src/main/assets/country_metadata/PL.yml b/app/src/main/assets/country_metadata/PL.yml index 21521942f5..c56700f630 100644 --- a/app/src/main/assets/country_metadata/PL.yml +++ b/app/src/main/assets/country_metadata/PL.yml @@ -2,7 +2,7 @@ atmOperators: [Euronet, PKO BP, Bank Millennium S.A., Planet Cash, BZ WBK, Santander, Bank Spółdzielczy, PKO, Pekao SA, PKO Bank Polski, SGB, ING Bank Śląski, Pekao, ING, Pekao S.A., Grupa BPS, BPS, Bank Pekao, PKO BP SA, Cash4You, BZWBK, Bank Zachodni WBK, SKOK, eCard, PKO SA, Euronet Polska Sp. z o.o., PKO S.A., - Bank Pekao SA, BGŻ, Millennium, Global Cash, Santander Bank Polska, PEKAO SA, PBS, euronet, PEKAO, + Bank Pekao SA, BGŻ, Millennium, Global Cash, Santander Bank Polska, euronet, PEKAO SA, PBS, PEKAO, Euronet Polska, WBK, PlanetCash, Planet cash, PeKaO S.A., PKO BP S.A., BGŻ BNP Paribas, mBank, Santander Bank Polska S.A., Eurobank, Bank Zachodni WBK S. A., Bank Pekao S.A., BS, BNP Paribas, Spółdzielcza Grupa Bankowa, Krakowski Bank Spółdzielczy, Millennium Bank, ING Bank, Bankomat PKO BP, Bankomat, diff --git a/app/src/main/assets/country_metadata/RU.yml b/app/src/main/assets/country_metadata/RU.yml index d2093c4e05..1d0b6c769a 100644 --- a/app/src/main/assets/country_metadata/RU.yml +++ b/app/src/main/assets/country_metadata/RU.yml @@ -1,9 +1,9 @@ # Do not edit. Source files are in /res/country_metadata -atmOperators: [Сбербанк, Промсвязьбанк, '"ПАО ""Сбербанк"""', Сбербанк России, ПАО Сбербанк, Газпромбанк, Альфа-Банк, - ВТБ, Санкт-Петербург, ВТБ24, Банк ВТБ (ПАО), Росбанк, '"ОАО ""Сбербанк России"""', Россельхозбанк, - Балтийский банк, Ак Барс Банк, Уралсиб, ВТБ 24, Банк Москвы, МДМ Банк, ТрансКредитБанк, АК БАРС БАНК, - ЮниКредит Банк, Киви, Райффайзенбанк, Райффайзен, Бинбанк, Санкт Петербург, Почта Банк, Челябинвестбанк, - '"ПАО ""МИнБанк"""', '"Банк ""Уралсиб"""', КУБ, Терминал QIWI, Возрождение, Банк Приморье, '"Банк ""Открытие"""', +atmOperators: [Сбербанк, Промсвязьбанк, '"ПАО ""Сбербанк"""', Сбербанк России, ПАО Сбербанк, Газпромбанк, ВТБ, Альфа-Банк, + Санкт-Петербург, ВТБ24, Банк ВТБ (ПАО), Росбанк, '"ОАО ""Сбербанк России"""', Россельхозбанк, Балтийский + банк, Ак Барс Банк, Уралсиб, Банк Москвы, ВТБ 24, МДМ Банк, ТрансКредитБанк, АК БАРС БАНК, ЮниКредит + Банк, Киви, Райффайзенбанк, Райффайзен, Бинбанк, Санкт Петербург, Почта Банк, Челябинвестбанк, '"ПАО + ""МИнБанк"""', '"Банк ""Уралсиб"""', КУБ, Терминал QIWI, Возрождение, Банк Приморье, '"Банк ""Открытие"""', УБРиР, ПАО «МИнБанк», ПриватБанк, Петрокоммерц, Открытие, Екатеринбургский муниципальный банк, СКБ-Банк, Запсибкомбанк, Плюс Банк, '"ОАО ""Альфа-Банк"""', Московский Индустриальный Банк, Крайинвестбанк, ПАО КБ «УБРиР», ВТБ-24, Аверс, Альфа-банк, сбербанк, ОАО «АК БАРС» Банк, Московский индустриальный банк, @@ -11,7 +11,7 @@ atmOperators: [Сбербанк, Промсвязьбанк, '"ПАО ""Сбер Сургутнефтегазбанк, Номос-Банк, АО «Райффайзенбанк», '"ПАО ""БАНК СГБ"""', Курскпромбанк, АКБ «РосЕвроБанк» (АО), Челиндбанк, МТС Банк, Банк Возрождение, Sberbank, '"ПАО ""Почта Банк"""', '"ПАО АКБ ""Авангард"""', Русский Стандарт, УРАЛСИБ, Московский кредитный банк, Тинькофф, ОТП Банк, Кредит Европа Банк, '"ПАО - ""Сбербанк России"""', Экспресс-волга банк, СКБ-банк, МКБ, '"ПАО Банк ""ФК Открытие"""', Совкомбанк, + ""Сбербанк России"""', Экспресс-волга банк, СКБ-банк, МКБ, Совкомбанк, '"ПАО Банк ""ФК Открытие"""', Райффайзен банк, Банк Зенит, Аккобанк, Траст, РайффайзенБанк, ПАО «Банк Уралсиб», ОАО «МДМ Банк», '"Банк ""Отрытие"""', ЮниКредит, Транскредитбанк, Тинькофф Банк, Севергазбанк, Кузнецкбизнесбанк, БинБанк, Банк Санкт-Петербург, Банк ЗЕНИТ, '"ОАО ""Московский кредитный банк"""'] diff --git a/app/src/main/assets/country_metadata/UA.yml b/app/src/main/assets/country_metadata/UA.yml index 187a93674f..7cf00ecf52 100644 --- a/app/src/main/assets/country_metadata/UA.yml +++ b/app/src/main/assets/country_metadata/UA.yml @@ -8,8 +8,8 @@ atmOperators: [ПриватБанк, Альфа-Банк, Ощадбанк, Пр Експрес-Банк, Брокбізнесбанк, Universal Bank, KredoBank, Crédit Agricole, Укрінбанк, УкрГазБанк, КредоБанк, Индустриалбанк, UniCredit, Raiffeisen Bank Aval, Privat Bank, '"АБ ""УКРГАЗБАНК"""'] chargingStationOperators: ['"Перша національна мережа електрозаправних комплексів ""Тока"""', Одеська міська рада, АвтоЭнтерпрайз, - ЕлектроДрайв, Autoenterprise, AutoEnterprise, Yasno, ElectroUA, Автоэнтерпрайз, Автоентерпрайз, Electro - UA, AutoEnterprise 201, АвтоЕнтерпрайз, Tesla Club Ukraine, Go To-U, AutoVolt] + ЕлектроДрайв, Autoenterprise, AutoEnterprise, Yasno, ElectroUA, Автоэнтерпрайз, Автоентерпрайз, Silver + Fox Energy, Electro UA, AutoEnterprise 201, АвтоЕнтерпрайз, Tesla Club Ukraine, Go To-U, AutoVolt] clothesContainerOperators: [Емаус-Оселя] isAdvisorySpeedLimitKnown: true isLivingStreetKnown: true diff --git a/app/src/main/assets/country_metadata/US-MI.yml b/app/src/main/assets/country_metadata/US-MI.yml index f936d88725..8630eee3e8 100644 --- a/app/src/main/assets/country_metadata/US-MI.yml +++ b/app/src/main/assets/country_metadata/US-MI.yml @@ -1,6 +1,6 @@ # Do not edit. Source files are in /res/country_metadata -atmOperators: [MSUFCU, Chase, Bank of America, Michigan State Federal Credit Union, MSU Federal Credit Union, Fifth - Third Bank, PNC Bank, Michigan Tech Employees Federal Credit Union, Michigan State University Federal - Credit Union, Wells Fargo, Lake Trust Credit Union, Chase Bank] -chargingStationOperators: [Tesla Motors, Michigan State University, Consumers Energy, NRG Energy, Lansing Board of Water and Light, +atmOperators: [MSUFCU, Chase, Bank of America, PNC Bank, Michigan State Federal Credit Union, MSU Federal Credit Union, + Fifth Third Bank, Michigan Tech Employees Federal Credit Union, Michigan State University Federal Credit + Union, Wells Fargo, Lake Trust Credit Union, Chase Bank] +chargingStationOperators: [Michigan State University, Tesla Motors, Consumers Energy, NRG Energy, Lansing Board of Water and Light, Chargepoint, Tanger Outlet Mall Howell, Hyatt Place, Celebration Cinema] diff --git a/app/src/main/assets/osmfeatures/ast.json b/app/src/main/assets/osmfeatures/ast.json index 88eb86858a..093d8dd6ef 100644 --- a/app/src/main/assets/osmfeatures/ast.json +++ b/app/src/main/assets/osmfeatures/ast.json @@ -2005,10 +2005,6 @@ "type/route/ferry": { "name": "Ruta de ferry" }, - "type/route/foot": { - "name": "Ruta a pie", - "terms": "sienda, PR, GR, ruta" - }, "type/route/hiking": { "name": "Ruta escursionista", "terms": "Senderismu, Escursionismu" diff --git a/app/src/main/assets/osmfeatures/ca.json b/app/src/main/assets/osmfeatures/ca.json index 59af3f922e..6078b03f0c 100644 --- a/app/src/main/assets/osmfeatures/ca.json +++ b/app/src/main/assets/osmfeatures/ca.json @@ -2157,9 +2157,6 @@ "type/route/ferry": { "name": "Ruta de ferri" }, - "type/route/foot": { - "name": "Ruta a peu" - }, "type/route/hiking": { "name": "Ruta senderista" }, diff --git a/app/src/main/assets/osmfeatures/cs.json b/app/src/main/assets/osmfeatures/cs.json index 1b1953d3d0..d765f23be4 100644 --- a/app/src/main/assets/osmfeatures/cs.json +++ b/app/src/main/assets/osmfeatures/cs.json @@ -200,10 +200,18 @@ "amenity/biergarten": { "name": "Pivní zahrada" }, + "amenity/binoculars": { + "name": "Namontovaný dalekohled", + "terms": "dalekohled,veřejný dalekohled,rozhled,výhled,vyhlídka,teleskop" + }, "amenity/boat_rental": { "name": "Půjčovna lodí", "terms": "půjčovna lodí,půjčovna loděk,půjčovna člunů" }, + "amenity/boat_storage": { + "name": "Místo pro uložení lodí", + "terms": "břeh,úschova lodí,uložení lodí mimo vodu,na souši,parkování na souši,prostor pro úschovu lodí" + }, "amenity/bureau_de_change": { "name": "Směnárna", "terms": "směnárna,směna peněz,výměna peněz,exchange,valuty,valuta" @@ -356,6 +364,10 @@ "amenity/fast_food/ice_cream": { "name": "zmrzlina" }, + "amenity/fast_food/juice": { + "name": "Čerstvé ovocné šťávy", + "terms": "džus, rychlé občerstvení,šťáva,džusárna,ovocné nápoje,pití" + }, "amenity/fast_food/kebab": { "name": "Kebab rychlé občerstvení" }, @@ -443,6 +455,10 @@ "amenity/loading_dock": { "name": "nakládací rampa" }, + "amenity/lounger": { + "name": "Lehátka", + "terms": "veřejná lehátka,lehátka,lehátko,křeslo,veřejné sezení,odpočinek,sedadlo,sezení" + }, "amenity/love_hotel": { "name": "Hodinový hotel" }, @@ -456,6 +472,10 @@ "amenity/money_transfer": { "name": "místo pro peněžní převody" }, + "amenity/mortuary": { + "name": "Márnice", + "terms": "márnice,místo pro zemřelé,hřbitov,pohřbívání,mrtví,zemřelí,pohřeb,hrobník" + }, "amenity/motorcycle_parking": { "name": "Parkování pro motorky", "terms": "parking,parkování,garáž,motorka,motocykl" @@ -1533,6 +1553,9 @@ "demolished/building": { "name": "čerstvě zbouraná budova" }, + "disused/amenity": { + "name": "Nepoužívané zařízení" + }, "disused/railway": { "name": "nepoužívaný železniční prvek" }, @@ -1634,6 +1657,10 @@ "golf/cartpath": { "name": "cesta pro golfová vozítka" }, + "golf/clubhouse": { + "name": "Golfová klubovna", + "terms": "golf,golfový klub,základna,budova,golfový areál" + }, "golf/driving_range": { "name": "Dojezd" }, @@ -2782,6 +2809,10 @@ "man_made/tower/communication": { "name": "Komunikační věž" }, + "man_made/tower/cooling": { + "name": "Chladící věž", + "terms": "chladící věž,elektrárna,JE,jaderná elektrárna,chlazení" + }, "man_made/tower/defensive": { "name": "opevněná věž" }, @@ -2823,6 +2854,10 @@ "man_made/windmill": { "name": "Větrný mlýn" }, + "man_made/windpump": { + "name": "Větrný mlýn (pumpa)", + "terms": "větrný mlýn,čerpání vody,pumpování vody,čerpání ropy,pumpování ropy,poháněné větrem,pumpa poháněná větrem,větrná pumpa,čerpadlo" + }, "man_made/works": { "name": "Továrna", "terms": "montáž,výroba,pivovar,auto,závod,továrna,zpracování,rafinerie" @@ -2898,6 +2933,10 @@ "name": "Vřesoviště", "terms": "vřesoviště,vřes" }, + "natural/hot_spring": { + "name": "Termální pramen", + "terms": "termální pramen,termální jezero, horký pramen,geotermální" + }, "natural/mud": { "name": "Bahno" }, @@ -3401,6 +3440,10 @@ "name": "Autobusová zastávka", "terms": "autobusová zastávka,nástupiště autobusu,autobusové nástupiště,místo pro čekání na autobus,autobus,bus,MHD,VHD,HD,hromadná doprava,veřejná doprava,městská hromadná doprava,nástupiště" }, + "public_transport/platform/bus_tram_point": { + "name": "Zastávka tramvaje a autobusu", + "terms": "tram,tramvaj,šalina,bus,autobus,mhd,hromadná doprava,veřejná doprava,VHD,veřejná hromadná doprava,zastávka,stanoviště,nástupiště,zastavení,zastávka tramvaje a autobusu,tramvajová a autobusová zastávka" + }, "public_transport/platform/ferry": { "name": "nástupní hrana přívozu" }, @@ -4314,6 +4357,9 @@ "name": "Vinotéka", "terms": "vinotéka,víno,vinárna,vinařství,vino" }, + "telecom": { + "name": "Telekomunikační prvek" + }, "telecom/data_center": { "name": "Datové centrum" }, @@ -4406,6 +4452,10 @@ "name": "Informační tabule", "terms": "Informační tabule" }, + "tourism/information/board/welcome_sign": { + "name": "Uvítací tabule", + "terms": "uvítací,vítající,značka,tabule,cedule,vítající značka,vítající tabule" + }, "tourism/information/guidepost": { "name": "Rozcestník" }, @@ -4512,22 +4562,10 @@ "name": "Značka začátek/konec obce", "terms": "dopravní značka,DZ,začátek obce,konec obce,obec,začátek území obce,vesnice,město,konec města,konec vesnice,začátek města,začátek vesnice,značka začátku obce,značka konce obce" }, - "traffic_sign/city_limit_vertex": { - "name": "Značka začátek/konec obce", - "terms": "dopravní značka,DZ,začátek obce,konec obce,obec,začátek území obce,vesnice,město,konec města,konec vesnice,začátek města,začátek vesnice,značka začátku obce,značka konce obce" - }, "traffic_sign/maxspeed": { "name": "Značka omezení rychlosti", "terms": "dopravní značka omezení rychlosti,dopravní značka maximální rychlosti,maximální rychlost,maximální povolená rychlost,dopravní značení,značka,cedule,dopravní cedule,silniční značení,DZ,doprava,omezení rychlosti,rychlostní limit,rychlostní omezení,značka rychlosti" }, - "traffic_sign/maxspeed_vertex": { - "name": "Značka omezení rychlosti", - "terms": "dopravní značka omezení rychlosti,dopravní značka maximální rychlosti,maximální rychlost,maximální povolená rychlost,dopravní značení,značka,cedule,dopravní cedule,silniční značení,DZ,doprava,omezení rychlosti,rychlostní limit,rychlostní omezení,značka rychlosti" - }, - "traffic_sign_vertex": { - "name": "Dopravní značka", - "terms": "dopravní značka,dopravní značení,značka,cedule,dopravní cedule,silniční značení,DZ,doprava" - }, "type/boundary": { "name": "Hranice", "terms": "hranice,hraniční,čára" @@ -4608,8 +4646,8 @@ "terms": "trajekt,trasa,linka,loď,trasa trajektu" }, "type/route/foot": { - "name": "Pěší trasa", - "terms": "pěší trasa,trasa pro pěší,turistická značka,turistická trasa,značka pro pěší,klub českých turistů,kčt" + "name": "Turistická trasa", + "terms": "pěší trasa,trasa pro pěší,turistická značka,turistická trasa,značka pro pěší,klub českých turistů,kčt,stezka pro pěší,turistická stezka" }, "type/route/hiking": { "name": "Turistická trasa", diff --git a/app/src/main/assets/osmfeatures/da.json b/app/src/main/assets/osmfeatures/da.json index 0efc68fe45..94fbddc4bc 100644 --- a/app/src/main/assets/osmfeatures/da.json +++ b/app/src/main/assets/osmfeatures/da.json @@ -162,6 +162,10 @@ "name": "Cafe", "terms": "Cafe, Café" }, + "amenity/cafe/coffee_shop": { + "name": "Kaffebar", + "terms": "kaffe,bar,cafe" + }, "amenity/car_pooling": { "name": "Samkørselsstation", "terms": "delebil,samkørsel,mødested,gomore,ride share" @@ -432,6 +436,10 @@ "name": "Politi", "terms": "Politistation, Politi" }, + "amenity/post_depot": { + "name": "Postsorteringsfacilitet", + "terms": "post,forsendelse,pakke,distribution,deopt" + }, "amenity/post_office": { "name": "Postkontor", "terms": "Posthus, Postkontor" @@ -460,6 +468,10 @@ "name": "Genbrugsplads", "terms": "Genbrugsplads" }, + "amenity/research_institute": { + "name": "Forskningsinstitutsområde", + "terms": "forskning,institut,universitet,udvikling,videnskab" + }, "amenity/restaurant": { "name": "Restaurant", "terms": "Restaurant, Spisested, Spisehus" @@ -601,6 +613,10 @@ "name": "Pantautomat", "terms": "pant,retur,flaske,tomra" }, + "amenity/vending_machine/bread": { + "name": "Brødsalgsautomat", + "terms": "brød,automat" + }, "amenity/vending_machine/cigarettes": { "name": "Cigaretautomat", "terms": "Cigaretautomat, Tobaksautomat,tobak,cigaret" @@ -799,7 +815,7 @@ }, "barrier/lift_gate": { "name": "Løftebom", - "terms": "Løftebom, Bom" + "terms": "bom,port,løfte,hæve" }, "barrier/retaining_wall": { "name": "Støttemur", @@ -809,6 +825,10 @@ "name": "Stente", "terms": "Stente" }, + "barrier/swing_gate": { + "name": "Svingbom", + "terms": "bom,sving,rotere,port," + }, "barrier/toll_booth": { "name": "Vejafgifthus", "terms": "Vejafgifthus, Betalingsanlæg" @@ -1244,10 +1264,22 @@ "emergency/destination": { "name": "Udrykningskørsel destination" }, + "emergency/fire_extinguisher": { + "name": "Brandslukker", + "terms": "pulver,brand,slukker,skum," + }, + "emergency/fire_hose": { + "name": "Brandslange", + "terms": "slange,brand,ild" + }, "emergency/fire_hydrant": { "name": "Brandhane", "terms": "Brandhane" }, + "emergency/landing_site": { + "name": "Redningslandingsplads", + "terms": "redning,nødhjælp,akut,læge,hospital," + }, "emergency/life_ring": { "name": "Redningskrans", "terms": "redningsbælte" @@ -1283,6 +1315,14 @@ "entrance": { "name": "Indgang/Udgang" }, + "entrance/emergency": { + "name": "Nødudgang", + "terms": "udgang,nød,redning,brand," + }, + "entrance/emergency_ward_entrance": { + "name": "Skadestueindgang", + "terms": "indgang,skadestue,akut,læge,hospital,hjælp" + }, "ford": { "name": "Vadested", "terms": "Vadested" @@ -1412,6 +1452,10 @@ "name": "Elevator", "terms": "paternoster" }, + "highway/emergency_bay": { + "name": "Nødvigespor", + "terms": "nødspor,spor,redning,akut,fare,havari" + }, "highway/footway": { "name": "Gangsti", "terms": "Gangsti" @@ -1868,6 +1912,10 @@ "name": "Hundepark", "terms": "Hundepark" }, + "leisure/firepit": { + "name": "Bålsted", + "terms": "lejrbål,bål,ild" + }, "leisure/fitness_centre": { "name": "Gym / Fitnesscenter", "terms": "Gym / Fitnesscenter, Fitnesscenter" @@ -1880,6 +1928,10 @@ "name": "Udendørs fitnessplads", "terms": "Udendørs fitnessplads, Naturfitnessplads" }, + "leisure/fitness_station/sign": { + "name": "Motionsredskabsinstruktionsskilt", + "terms": "motion,fitness,redskab,instruktion,skilt" + }, "leisure/garden": { "name": "Have", "terms": "Have" @@ -2497,6 +2549,10 @@ "name": "Statsligt kontor", "terms": "Statslig kontor, Styrelse" }, + "office/government/prosecutor": { + "name": "Offentlig anklager", + "terms": "anklager,anklagemyndighed,advokat,jura,stat" + }, "office/government/register_office": { "name": "Tinglysningskontor", "terms": "Tinglysningskontor" @@ -3459,10 +3515,6 @@ "name": "Hastighedsbegrænsningsskilt", "terms": "hastighed,fart,skilt,max,maks" }, - "traffic_sign/maxspeed_vertex": { - "name": "Hastighedsbegrænsningsskilt", - "terms": "hastighed,fart,skilt,max,maks" - }, "type/boundary": { "name": "Grænse", "terms": "Grænse" @@ -3529,10 +3581,6 @@ "name": "Færgerute", "terms": "Færgerute" }, - "type/route/foot": { - "name": "Vandrerute", - "terms": "Vandrerute, Hikingrute" - }, "type/route/hiking": { "name": "Vandrerute", "terms": "Vandrerute, Vandretur, Gårute" @@ -3600,6 +3648,10 @@ "name": "Søtankstation", "terms": "Søtankstation, Bunkerolie" }, + "waterway/lock_gate": { + "name": "Skibssluse", + "terms": "skib,sluse,port,kanal,hæve,sænke,hæveværk,skibsfartssluse" + }, "waterway/river": { "name": "Flod/å", "terms": "Flod, Å" diff --git a/app/src/main/assets/osmfeatures/de.json b/app/src/main/assets/osmfeatures/de.json index e5a81d9217..0a9bbf8aab 100644 --- a/app/src/main/assets/osmfeatures/de.json +++ b/app/src/main/assets/osmfeatures/de.json @@ -212,10 +212,18 @@ "name": "Biergarten", "terms": "Biergarten" }, + "amenity/binoculars": { + "name": "Stationäres Aussichtsfernrohr", + "terms": "Aussichtsfernrohr,Münzfernrohr,Fernrohr,Aussicht,Fernblick,Fernglas,Feldstecher,Refraktor,Teleskop,Aussichtswarte,Aussichtsplatform,Doppelfernrohr,Naturbeobachtung,Landschaftsbeobachtung,Spektiv" + }, "amenity/boat_rental": { "name": "Bootsvermietung", "terms": "Bootsverleih, Bootsvermietung" }, + "amenity/boat_storage": { + "name": "Bootslagerplatz", + "terms": "Marina, Trockendock, Bootshaus" + }, "amenity/bureau_de_change": { "name": "Geldwechselstube", "terms": "Wechselstube, Geldwechselgeschäft, Währungsumtauschgeschäft, Bargeldumtauschgeschäft" @@ -228,7 +236,7 @@ "terms": "Kaffee, Café, Kaffeehaus, Cafébar, Bistro, Teehaus, Teestube" }, "amenity/cafe/bubble_tea": { - "name": "Bubble Tea Cafe", + "name": "Bubble-Tea-Café", "terms": "Boba,Bubble Milch Tee, Perlenmilchtee, taiwanesisches Teegetränk, Tapioca" }, "amenity/cafe/coffee_shop": { @@ -236,7 +244,7 @@ "terms": "Americano, Gebräu, Kaffee, Café, Cappuccino, Kakao, Tropf, Espresso, heiße Getränke, Latte, Macchiato, Tee, Verlängerter, Brauner" }, "amenity/car_pooling": { - "name": "Car Pooling Station", + "name": "Car-Pooling-Station", "terms": "Car Sharing, Car Pooling, Mitfahren" }, "amenity/car_rental": { @@ -260,7 +268,7 @@ "terms": "Ladestation für Elektrofahrzeuge, Ladestation, E-Tankstelle, Stromtankstelle, Ladestation für Elektroautos, Plug-in Hybridfahrzeuge, Pedelecs und E-Bikes." }, "amenity/childcare": { - "name": "Kindergrippenbetreuung, Kindertagesstätte", + "name": "Kinderkrippenbetreuung, Kindertagesstätte", "terms": "Kinderkrippe, Kindergarten" }, "amenity/cinema": { @@ -378,7 +386,7 @@ "terms": "Fish & Chips Fast Food, Fish & Chips Stand, Fish & Chips Fast Takeaway" }, "amenity/fast_food/hot_dog": { - "name": "Hot Dog Stand", + "name": "Hot-Dog-Stand", "terms": "Frankfurter, Hotdog Stand, Sandwich, Würstel, Wiener" }, "amenity/fast_food/ice_cream": { @@ -487,6 +495,10 @@ "name": "Laderampe", "terms": "Tür, Ladenbucht, verschiffen, entladen, Lagerhaus" }, + "amenity/lounger": { + "name": "Liege", + "terms": "Sessel, Stuhl, Bank, Sitzbank" + }, "amenity/love_hotel": { "name": "Stundenhotel", "terms": "Stundenhotel, Liebeshotel" @@ -503,13 +515,17 @@ "name": "Geldtransferstation", "terms": "Geldtransferstation, Bargeldtransfer" }, + "amenity/mortuary": { + "name": "Leichenhaus", + "terms": "Krematorium,Bestattung,Leichenbestatter,Leichenschauhaus,Leichenhalle,Parentationshalle" + }, "amenity/motorcycle_parking": { "name": "Motorradparkplatz", "terms": "Motorrad-Parkplatz" }, "amenity/music_school": { "name": "Musikschule", - "terms": "Musikschule" + "terms": "Musikschule,Gitarre,Klavier,Geige,Schlagzeug,Musikunterricht" }, "amenity/nightclub": { "name": "Diskothek, Nachtklub", @@ -531,7 +547,7 @@ "terms": "Mehrstöckige Parkgarage,Parkhaus" }, "amenity/parking/park_ride": { - "name": "Park & Ride Platz", + "name": "Park & Ride-Platz", "terms": "Pendlerparkplatz, Park&Pool, Park&Ride, P+R, öffentlicher Verkehr, U-Bahn, Eisenbahnparkplatz" }, "amenity/parking/underground": { @@ -639,8 +655,8 @@ "terms": "Post, Postamt, Poststelle" }, "amenity/prep_school": { - "name": "Vorbereitungsschule", - "terms": "Vorbereitungsschule" + "name": "Nachhilfeanbieter", + "terms": "Vorbereitungsschule,Schülerhilfe,Hausaufgaben,Studienkreis,Repetitorium,Nachhilfe,Lernhilfe" }, "amenity/prison": { "name": "Gefängnisanlage", @@ -678,7 +694,7 @@ "name": "Recycling" }, "amenity/recycling/container/electrical_items": { - "name": "E-Schrott-Container", + "name": "Elektroschrottcontainer", "terms": "Elektromüllconainer, E-Schrott-Container" }, "amenity/recycling/container/green_waste": { @@ -750,11 +766,11 @@ "terms": "Nudel-Restaurant" }, "amenity/restaurant/pizza": { - "name": "Pizza Restaurant", + "name": "Pizzeria", "terms": "Pizza Restaurant" }, "amenity/restaurant/seafood": { - "name": "Meeresfrüchte Restaurant", + "name": "Meeresfrüchte-Restaurant", "terms": "Meeresfrüchte Restaurant" }, "amenity/restaurant/steakhouse": { @@ -762,7 +778,7 @@ "terms": "Steakhouse" }, "amenity/restaurant/sushi": { - "name": "Sushi Restaurant", + "name": "Sushi-Restaurant", "terms": "Sushi Restaurant" }, "amenity/restaurant/thai": { @@ -966,7 +982,7 @@ "terms": "Frauenhygiene-Automat" }, "amenity/vending_machine/food": { - "name": "Lebensmittel-Verkaufs-Automat ", + "name": "Lebensmittel-Verkaufsautomat ", "terms": "Lebensmittel-Verkaufs-Automat" }, "amenity/vending_machine/fuel": { @@ -1719,6 +1735,9 @@ "demolished/building": { "name": "kürzlich abgerissenes Gebäude" }, + "disused/amenity": { + "name": "nicht benutzte Einrichtung" + }, "disused/railway": { "name": "Stillgelegte Eisenbahnstrecken..." }, @@ -1832,6 +1851,10 @@ "name": "Golfwagenweg", "terms": "Golfwagenweg" }, + "golf/clubhouse": { + "name": "Golf Klubhaus", + "terms": "Klubhaus, Goldklubhaus, Golfhaus, Golfclub" + }, "golf/driving_range": { "name": "Golf Driving Range", "terms": "Golf Driving Range" @@ -1941,7 +1964,7 @@ "terms": "Logopäde, Sprachtherapeutin" }, "highway": { - "name": "Größere Straßen..." + "name": "Straßen/Wege..." }, "highway/bridleway": { "name": "Reitweg", @@ -2120,15 +2143,15 @@ "terms": "Hauptverbindungsstraßenanschluss, Bundessstraßenanschluss, Hauptverbindungsstraßenauffahrt, Hauptverbindungsstraßenabfahrt, Fernstraßenanschluss, Fernstraßenauffahrt, Fernstraßenabfahrt, Bundesstraßenanschluss, Bundesstraßenauffahrt, Bundesstraßenabfahrt, Auffahrt, Abfahrt" }, "highway/raceway": { - "name": "Motorsport Rennbahn", + "name": "Motorsport-Rennbahn", "terms": "Motorsport, Rennbahn, Formel 1, Auto, Kart" }, "highway/raceway/karting": { - "name": "Kartsport Rennbahn", + "name": "Kartsport-Rennbahn", "terms": "Kartsport, Gokart, Rennen, Motorsport, Rennbahn, Auto, Kart" }, "highway/raceway/motocross": { - "name": "Motocross Rennbahn", + "name": "Motocross-Rennbahn", "terms": "Offroad, Rennen, Motorrennen, Motocross, Motorrrad, Motorsport" }, "highway/residential": { @@ -2591,7 +2614,7 @@ "terms": "Tanzschule" }, "leisure/disc_golf_course": { - "name": "Discgolf Anlage", + "name": "Discgolfanlage", "terms": "Discgolf, Frisbee Golf, fliegendes Scheibengolf, Frolf, ultimative" }, "leisure/dog_park": { @@ -2730,7 +2753,7 @@ "terms": "American-Football-Platz" }, "leisure/pitch/australian_football": { - "name": "Australian Football Feld", + "name": "Australian-Football-Feld", "terms": "Australian Football Feld, Australischer Football Feld" }, "leisure/pitch/badminton": { @@ -2779,7 +2802,7 @@ }, "leisure/pitch/netball": { "name": "Korbball Platz", - "terms": "Korbball Platz" + "terms": "Korbball-Platz" }, "leisure/pitch/rugby_league": { "name": "Rugby-League-Feld", @@ -2897,7 +2920,7 @@ "name": "Künstliches..." }, "man_made/adit": { - "name": "Bergwerk - Stolleneingang", + "name": "Bergwerk-Stolleneingang", "terms": "Stollen (horizontaler Tunnel im Bergbau), Stollenmundloch" }, "man_made/antenna": { @@ -2993,7 +3016,7 @@ "terms": "Deckel, Ablauf, Loch, Regen Abwasser, Sturm" }, "man_made/manhole/gas": { - "name": "Wartungszugang zu Gas-Leitungen", + "name": "Wartungszugang zu Gasleitungen", "terms": "Deckel, Gas, Hitze, Loch, Wartungszugang" }, "man_made/manhole/power": { @@ -3005,7 +3028,7 @@ "terms": "Deckel, Loch, Abwasser, Wartung" }, "man_made/manhole/telecom": { - "name": "Wartungszugang zu Telekomunikationskabeln", + "name": "Wartungszugang zu Telekommunikationskabeln", "terms": "Kabel, Deckel, Loch, Telekom, Telefon, Wartung" }, "man_made/manhole/water": { @@ -3069,7 +3092,7 @@ "terms": "Unterirdische Pipeline" }, "man_made/pipeline/valve": { - "name": "Pipeline Ventil", + "name": "Pipeline-Ventil", "terms": "Öl, Gas, Wasser, Abwasser, Abwasserkanal" }, "man_made/pumping_station": { @@ -3124,6 +3147,10 @@ "name": "Kommunikationsturm", "terms": "Antenne, Mobilfunkmast, verankerter Mast, Mobilfunkturm, Radiofunkmast, Radiofunkturm, Fersehfunkmast, Fernsehfunkturm" }, + "man_made/tower/cooling": { + "name": "Kühlturm", + "terms": "Kraftwerk" + }, "man_made/tower/defensive": { "name": "Befestigter Turm", "terms": "Befestigter Turm" @@ -3172,6 +3199,10 @@ "name": "Windmühle", "terms": "Windmühle" }, + "man_made/windpump": { + "name": "Windpumpe", + "terms": "Wasserpumpe, Windmühle, Windpumpe, Aerorotor" + }, "man_made/works": { "name": "Fabrik", "terms": "Fabrik, Werk, Betrieb, Fabriksanlage, Produktionsstätte, Fertigungsanlage" @@ -3259,6 +3290,10 @@ "name": "Heidelandschaft", "terms": "Heidelandschaft, Strauchheiden" }, + "natural/hot_spring": { + "name": "Thermalquelle", + "terms": "Geothermiequelle, Thermalquelle, Heißwasserpool" + }, "natural/mud": { "name": "Schlamm", "terms": "Schlamm, Schlick, Morast" @@ -3503,11 +3538,11 @@ "terms": "Versicherungsbüro" }, "office/it": { - "name": "Informations-Technologie-Firma", + "name": "Informationstechnologie-Firma", "terms": "Informations-Technologie-Firma" }, "office/lawyer": { - "name": "Anwalt", + "name": "Rechtsanwaltsbüro", "terms": "Jurist, Advokat, Rechtsanwalt, Notar" }, "office/lawyer/notary": { @@ -3845,6 +3880,10 @@ "name": "Bushaltestelle (Wartebereich)", "terms": "Bushaltestelle (Wartebereich)" }, + "public_transport/platform/bus_tram_point": { + "name": "Straßenbahn und Bus Haltestelle", + "terms": "Bus, Straßenbahn, Haltestelle, öffentlicher Verkehr, Schienen, Tram, Bim, Transport" + }, "public_transport/platform/ferry": { "name": "Fährterminal (Wartebereich)", "terms": "Fährterminal (Wartebereich)" @@ -3881,8 +3920,8 @@ "name": "Bahnsteig (Wartebereich)" }, "public_transport/platform/tram": { - "name": "Straßen-Haltestelle (Wartebereich)", - "terms": "Straßen-Haltestelle (Wartebereich)" + "name": "Straßenbahn-Haltestelle (Wartebereich)", + "terms": "Straßenbahn-Haltestelle, Wartebereich, öffentlicher Verkehr, Schienen, Oberleitungsbus, Transport, Tram, Bim" }, "public_transport/platform/tram_point": { "name": "Straßen-Haltestelle (Wartebereich)", @@ -3992,7 +4031,7 @@ "name": "Eisenbahnen..." }, "railway/abandoned": { - "name": " Abgebaute Eisenbahnstrecke ", + "name": "Abgebaute Eisenbahnstrecke", "terms": "Abgebaute Eisenbahnstrecke, Verfallene Eisenbahn, Aufgegebene Bahnstrecke" }, "railway/buffer_stop": { @@ -4253,7 +4292,7 @@ "terms": "Autohändler, Autohaus" }, "shop/car/second_hand": { - "name": "Gerbrauchtwagenhandlung", + "name": "Gebrauchtwagenhandlung", "terms": "KFZ, Gebrauchtwagenzentrum, Gebrauchtwagenhändler, Gebrauchtwagenverkauf, Occasion, Jahreswagen, Altfahrzeug, PKW, Gebrauchtwagenmarkt, Autohandlung, Autohaus, Werkstatt, Second Hand" }, "shop/car_parts": { @@ -4297,7 +4336,7 @@ "terms": "Bekleidungs-Geschäft, Klamottenladen, Kleiderladen, Modegeschäft, Modehaus" }, "shop/clothes/second_hand": { - "name": "Second-Hand Bekleidungsgeschäft", + "name": "Second-Hand-Bekleidungsgeschäft", "terms": "Gebrauchtwaren, Gebrauchtkleidung, Vintage, secondhand, zweite Hand, Altkleider, Kleider, Kleidung, Klamotten, Mode" }, "shop/clothes/underwear": { @@ -4589,11 +4628,11 @@ }, "shop/music": { "name": "Musikgeschäft", - "terms": "Musikladen, Musikgeschäft, Plattenladen" + "terms": "Musikladen, Musikgeschäft, Plattenladen,CD,LP,Schallplatten,Kassetten,Vinyl" }, "shop/musical_instrument": { "name": "Musikinstrumentegeschäft", - "terms": "Musikinstrumentengeschäft,Instrumentenladen" + "terms": "Musikinstrumentengeschäft,Instrumentenladen,Noten,Gitarre,Schlagzeug,Partitur" }, "shop/newsagent": { "name": "Zeitschriftenhandel", @@ -4897,7 +4936,7 @@ "terms": "Camping Lager, Zeltplatz, Campingplatz" }, "tourism/camp_site/backcountry": { - "name": "Wildnis Campingplatz", + "name": "Wildnis-Campingplatz", "terms": "Alpines Camping, Backpacker Camping, Waldcamping, informelles Camping, primitives Camping" }, "tourism/camp_site/group_only": { @@ -4936,6 +4975,10 @@ "name": "Informationstafel", "terms": "Informationsbrett, Infotafel, Infobrett" }, + "tourism/information/board/welcome_sign": { + "name": "Willkommensschild", + "terms": "Neuer Ort" + }, "tourism/information/guidepost": { "name": "Wegweiser", "terms": "Hinweistafel, Schild, Beschilderung" @@ -5052,22 +5095,10 @@ "name": "Ortsschild", "terms": "Ortsschild" }, - "traffic_sign/city_limit_vertex": { - "name": "Ortsschild", - "terms": "Ortsschild" - }, "traffic_sign/maxspeed": { "name": "Höchstgeschwindigkeits-Schild", "terms": "Höchstgeschwindigkeits-Schild" }, - "traffic_sign/maxspeed_vertex": { - "name": "Höchstgeschwindigkeits-Schild", - "terms": "Höchstgeschwindigkeits-Schild" - }, - "traffic_sign_vertex": { - "name": "Verkehrszeichen", - "terms": "Verkehrsschild, Verkehrszeichen" - }, "type/boundary": { "name": "Grenze", "terms": "Grenze" @@ -5156,8 +5187,8 @@ "terms": "Fährlinie" }, "type/route/foot": { - "name": "Fußweg", - "terms": "Fußweg, Spazierweg" + "name": "Fußwegroute", + "terms": "Fußwegroute" }, "type/route/hiking": { "name": "Wanderweg", @@ -5172,7 +5203,7 @@ "terms": "Stadtbahnlinie" }, "type/route/monorail": { - "name": "Monorail Linie", + "name": "Einschienenbahn-Linie", "terms": "Monorail Route" }, "type/route/pipeline": { diff --git a/app/src/main/assets/osmfeatures/el.json b/app/src/main/assets/osmfeatures/el.json index 0449e28883..56ca11ed11 100644 --- a/app/src/main/assets/osmfeatures/el.json +++ b/app/src/main/assets/osmfeatures/el.json @@ -2250,7 +2250,7 @@ "terms": "Πλευρικά Κορήματα, Κολλούβιο" }, "natural/scrub": { - "name": "Θαμνότοπος" + "name": "Χαμηλή Βλάστηση" }, "natural/spring": { "name": "Πηγή", @@ -2529,6 +2529,12 @@ "name": "Σημείο", "terms": "Σημείο" }, + "power": { + "name": "Στοιχεία Ηλεκτρικού Ρεύματος" + }, + "power/cable": { + "name": "Καλώδιο Ρεύματος" + }, "power/cable/underground": { "name": "Υπόγεια Καλωδίωση Ρεύματος" }, @@ -2559,6 +2565,18 @@ "power/plant": { "name": "Ηλεκτρικός Σταθμός" }, + "power/plant/source/coal": { + "name": "Ηλεκτροπαραγωγικός Σταθμός Άνθρακα" + }, + "power/plant/source/gas": { + "name": "Ηλεκτροπαραγωγικός Σταθμός Άερίου" + }, + "power/plant/source/hydro": { + "name": "Υδροηλεκτρικός Σταθμός" + }, + "power/plant/source/nuclear": { + "name": "Πυρηνικός Ηλεκτροπαραγωγικός Σταθμός" + }, "power/plant/source/solar": { "name": "Ηλιακή Φάρμα" }, @@ -3398,18 +3416,9 @@ "traffic_sign/city_limit": { "name": "Σήμανση Ορίου Πόλης" }, - "traffic_sign/city_limit_vertex": { - "name": "Σήμανση Ορίου Πόλης" - }, "traffic_sign/maxspeed": { "name": "Πινακίδα Ορίου Ταχύτητας" }, - "traffic_sign/maxspeed_vertex": { - "name": "Πινακίδα Ορίου Ταχύτητας" - }, - "traffic_sign_vertex": { - "name": "Πινακίδα Σήμανσης ΚΟΚ" - }, "type/boundary": { "name": "Όριο", "terms": "Όριο, Σύνορο" @@ -3471,9 +3480,6 @@ "name": "Διαδρομή Πορθμείου", "terms": "Διαδρομή πορθμείου, Δρομολόγιο πορθμείου" }, - "type/route/foot": { - "name": "Διαδρομή Πεζοπορίας" - }, "type/route/hiking": { "name": "Διαδρομή Ορεινής Ανάβασης" }, diff --git a/app/src/main/assets/osmfeatures/en-GB.json b/app/src/main/assets/osmfeatures/en-GB.json index 792deaefff..9691782a32 100644 --- a/app/src/main/assets/osmfeatures/en-GB.json +++ b/app/src/main/assets/osmfeatures/en-GB.json @@ -323,7 +323,7 @@ "name": "Food Bank" }, "amenity/social_facility/group_home": { - "name": "Elderly Group Home" + "name": "Retirement Home" }, "amenity/social_facility/homeless_shelter": { "name": "Homeless Shelter" @@ -2465,9 +2465,6 @@ "type/route/ferry": { "name": "Ferry Route" }, - "type/route/foot": { - "name": "Foot Route" - }, "type/route/hiking": { "name": "Hiking Route" }, diff --git a/app/src/main/assets/osmfeatures/es.json b/app/src/main/assets/osmfeatures/es.json index 58094c1fa2..0d00eb3c02 100644 --- a/app/src/main/assets/osmfeatures/es.json +++ b/app/src/main/assets/osmfeatures/es.json @@ -212,10 +212,18 @@ "name": "Biergarten (Bar al aire libre)", "terms": "cerveza, bar, terraza, jardín, al aire libre, biergarten" }, + "amenity/binoculars": { + "name": "Binoculares montados", + "terms": "Visor de observación, largavista, binocular, telescopio, visor, catalejo, soporte de visualización" + }, "amenity/boat_rental": { "name": "Alquiler de barcos", "terms": "alquiler de botes" }, + "amenity/boat_storage": { + "name": "Almacenamiento de barcos", + "terms": "varadero, dique seco, puerto deportivo, almacén de barcos, almacenaje de barcos, barcos, embarcaciones" + }, "amenity/bureau_de_change": { "name": "Cambio de moneda", "terms": "cambio de divisas, dinero, divisas, banco, monedas, billetes, dolares, euros, libras, yenes, casa de cambio, moneda extranjera" @@ -420,7 +428,7 @@ "terms": "fuente, chorro, surtidor ornamental" }, "amenity/fuel": { - "name": "Gasolinera", + "name": "Estación de servicio / Gasolinera", "terms": "gasolinera, surtidor, estación de servicio, combustible" }, "amenity/gambling": { @@ -487,6 +495,10 @@ "name": "Muelle de carga", "terms": "puerto, puerta, almacén, almacen, envío, envio, descarga, bahía de carga, bahia" }, + "amenity/lounger": { + "name": "Sillón de jardín / Tumbona", + "terms": "asiento, silla, banco" + }, "amenity/love_hotel": { "name": "Hotel para parejas", "terms": "hotel para parejas, parejas, telo, albergue transitorio, hotel alojamiento, motel" @@ -503,8 +515,12 @@ "name": "Estación de transferencia de dinero", "terms": "giro postal, cheque, factura, moneda, finanzas, transferencia bancaria, cable, persona a persona, efectivo a efectivo, intercambio" }, + "amenity/mortuary": { + "name": "Morgue", + "terms": "morgue, depósito de cadáveres, crematorio, funeraria, casa conmemorativa, mortuorio, enterrador" + }, "amenity/motorcycle_parking": { - "name": "Aparcamiento de motocicletas", + "name": "Estacionamiento de motos", "terms": "motocicleta, moto, aparcamiento, parking, estacionamiento, parqueadero, parqueo, parqueadero de motocicletas, estacionamiento de motocicletas, parqueo de motocicletas" }, "amenity/music_school": { @@ -523,7 +539,7 @@ "name": "Residencia de ancianos" }, "amenity/parking": { - "name": "Aparcamiento / Estacionamiento", + "name": "Estacionamiento / Aparcamiento", "terms": "estacionamiento, playa de estacionamiento, aparcadero, aparcamiento, aparcamento, auto, vehículo" }, "amenity/parking/multi-storey": { @@ -543,7 +559,7 @@ "terms": "entrada, salida, aparcamiento, parking, aparcadero, estacionamiento, garaje, parqueadero, parqueo" }, "amenity/parking_space": { - "name": "Plaza de aparcamiento / estacionamiento", + "name": "Plaza de estacionamiento", "terms": "lugar, zona, área, plaza, coche, carro, auto, automóvil, vehículo, aparcamiento, parking, aparcadero, estacionamiento, parqueadero, parqueo" }, "amenity/parking_space/disabled": { @@ -830,8 +846,8 @@ "terms": "Banco de alimentos" }, "amenity/social_facility/group_home": { - "name": "Residencia de la tercera edad", - "terms": "Hogar de mayores, ancianos, residencia, tercera edad" + "name": "Residencia de personas mayores", + "terms": "Hogar de mayores, Residencia de personas mayores, ancianos, residencia, tercera edad, mayores, viejos, abuelos" }, "amenity/social_facility/homeless_shelter": { "name": "Refugio para personas sin hogar", @@ -1409,7 +1425,7 @@ "terms": "centro de negocios, bloque de oficinas" }, "building/pavilion": { - "name": "Edificio Pavilion" + "name": "Edificio pabellón" }, "building/public": { "name": "Edificio público", @@ -1637,8 +1653,8 @@ "terms": "yeso, albañil, obra, construcción" }, "craft/plumber": { - "name": "Fontanero", - "terms": "fontanero, fontanería, plomero, plomería, desatascador, tubero" + "name": "Fontanero / Plomero", + "terms": "fontanero, fontanería, plomero, plomería, desatascador, tubero,gásfiter,plomera,fontanera,gasfitero,gasfitera" }, "craft/pottery": { "name": "Fabricante de cerámica (alfarero)", @@ -1718,6 +1734,9 @@ "demolished/building": { "name": "Edificio recientemente demolido" }, + "disused/amenity": { + "name": "Servicio en desuso" + }, "disused/railway": { "name": "Elemento ferroviario en desuso" }, @@ -1831,6 +1850,10 @@ "name": "Sendero del carrito de golf", "terms": "Carrito, carro, golf, sendero" }, + "golf/clubhouse": { + "name": "Casa club de golf", + "terms": "casa club, casa club de golf, casa de golf, tienda profesional, clubhouse" + }, "golf/driving_range": { "name": "Driving range", "terms": "práctica, área, area, golf" @@ -2175,7 +2198,7 @@ "terms": "Acceso de emergencia" }, "highway/service/parking_aisle": { - "name": "Pasillo de aparcamiento / estacionamiento", + "name": "Pasillo de estacionamiento", "terms": "pasillo, coche, carro, auto, automóvil, vehículo, aparcamiento, parking, aparcadero, estacionamiento, garaje, parqueadero, parqueo" }, "highway/services": { @@ -3053,12 +3076,12 @@ "terms": "pozo, pozo petrolero, petróleo, plataforma de perforación, torre de perforación, perforación de petróleo, plataforma petrolera" }, "man_made/pier": { - "name": "Embarcadero", - "terms": "Pilote, Embarcadero, entarimado" + "name": "Muelle", + "terms": "atraque, muelle, embarcadero, paseo marítimo" }, "man_made/pier/floating": { "name": "Muelle flotante", - "terms": "muelle, embarcadero, paseo marítimo" + "terms": "muelle, embarcadero, paseo marítimo, balsa" }, "man_made/pipeline": { "name": "Tubería", @@ -3124,6 +3147,10 @@ "name": "Torre de comunicación", "terms": "antena, torre de transmisión, torre de telefonía celular, torre de telefonía móvil, mástil de comunicación, torre de comunicación, torre adaptada, torre de telefonía móvil, mástil de radio, torre de radio, torre de televisión, mástil de transmisión, torre de transmisión, torre de televisión" }, + "man_made/tower/cooling": { + "name": "Torre de refrigeración", + "terms": "planta de energía, central eléctrica, torre de enfriamiento, enfriamiento, refrigeración" + }, "man_made/tower/defensive": { "name": "Torre fortificada", "terms": "Torre defensiva, torre del castillo" @@ -3172,6 +3199,10 @@ "name": "Molino de viento", "terms": "viento, eólico, granja, rueda, molino, turbina, extraer agua, bombeo" }, + "man_made/windpump": { + "name": "Bomba de agua eólica", + "terms": "aerorotor, bomba de agua, molino de viento, bomba de viento, bombeo eólico" + }, "man_made/works": { "name": "Fábrica", "terms": "factoría, manofactura, industria, taller, ensamblaje, planta, materia prima, fabricado, producción, fabricación, ingenio, procesadora, refinería, cervecería, azucarera" @@ -3256,9 +3287,13 @@ "terms": "prado, pradera, pradería, pastizal, pastos, herbazal, majada, dehesa" }, "natural/heath": { - "name": "Brezal / Landa", + "name": "Brezal", "terms": "brezal, landa, jaral, matorral, llanura, páramo, meseta, arenal, estepa, planicie, descampado, escajo, tojo" }, + "natural/hot_spring": { + "name": "Fuente termal", + "terms": "manantial geotermal, piscina termal, aguas termales" + }, "natural/mud": { "name": "Lodo", "terms": "lodo, barro, charco, pantano" @@ -3522,7 +3557,7 @@ "terms": "periódico, diario, semanario, revista" }, "office/ngo": { - "name": "ONG", + "name": "Oficina de ONG", "terms": "ONG, organización no gubernamental, Oficina de la ONG" }, "office/notary": { @@ -3639,7 +3674,7 @@ }, "place/isolated_dwelling": { "name": "Vivienda aislada", - "terms": "Viviendas aisladas" + "terms": "Viviendas aisladas, aislada" }, "place/locality": { "name": "Paraje", @@ -3771,11 +3806,11 @@ "terms": "generador, turbina, molino de viento, viento" }, "power/line": { - "name": "Línea de alta tensión", + "name": "Cable de alta tensión", "terms": "energía, línea, eléctrica, líneas eléctricas, linea electrica, lineas electricas" }, "power/minor_line": { - "name": "Línea eléctrica de media tensión", + "name": "Cable de media tensión", "terms": "media tensión, baja tensión" }, "power/plant": { @@ -3845,6 +3880,10 @@ "name": "Parada de bus", "terms": "autobús, bus, colectivo, plataforma, transporte público" }, + "public_transport/platform/bus_tram_point": { + "name": "Parada de tranvía y autobús", + "terms": "autobús, bus, colectivo, tren ligero, plataforma, tránsito público, transporte público, carril, tranvía, tránsito, transporte, trole, trolebus" + }, "public_transport/platform/ferry": { "name": "Plataforma de ferry", "terms": "bote, muelle, transbordador, plataforma, transporte público, muelle" @@ -4478,7 +4517,7 @@ }, "shop/hardware": { "name": "Ferretería", - "terms": "ferretería, herramientas" + "terms": "ferretería, herramientas, herrajes" }, "shop/health_food": { "name": "Tienda de comida saludable", @@ -4937,6 +4976,10 @@ "name": "Tablero de información", "terms": "tabla, tablón, cuadro, cartel, información, informativo, información turística" }, + "tourism/information/board/welcome_sign": { + "name": "Cartel de bienvenida", + "terms": "bienvenida, bienvenido, nueva ubicación, nuevo lugar, lugar, ciudad, pueblo, comunidad" + }, "tourism/information/guidepost": { "name": "Poste guía", "terms": "poste indicador, cartel, información, dirección, indicación" @@ -5053,22 +5096,10 @@ "name": "Señal de límite de ciudad", "terms": "señal, ciudad, aldea, pueblo, límite, frontera, ruta" }, - "traffic_sign/city_limit_vertex": { - "name": "Señal de límite de ciudad", - "terms": "señal, ciudad, aldea, pueblo, límite, frontera, ruta" - }, "traffic_sign/maxspeed": { "name": "Señal de límite de velocidad", "terms": "señal, cartel, señalización, velocidad máxima" }, - "traffic_sign/maxspeed_vertex": { - "name": "Señal de límite de velocidad", - "terms": "señal, cartel, señalización, velocidad máxima" - }, - "traffic_sign_vertex": { - "name": "Señal de tránsito", - "terms": "señal, cartel, señalización, tráfico, ruta, autopista, tránsito" - }, "type/boundary": { "name": "Límite", "terms": "frontera, límite, confín, linde, divisoria, borde" @@ -5158,7 +5189,7 @@ }, "type/route/foot": { "name": "Ruta a pie", - "terms": "ruta, itinerario, rumbo, dirección, trayecto, peatonal, pie, senderismo , camino, derrotero, vía" + "terms": "ruta a pie, ruta para caminar, senderismo, caminata" }, "type/route/hiking": { "name": "Ruta de senderismo", diff --git a/app/src/main/assets/osmfeatures/fa.json b/app/src/main/assets/osmfeatures/fa.json index 877637c29f..305592163e 100644 --- a/app/src/main/assets/osmfeatures/fa.json +++ b/app/src/main/assets/osmfeatures/fa.json @@ -291,7 +291,7 @@ }, "amenity/community_centre": { "name": "مرکز اجتماع", - "terms": "فرهنگسرا" + "terms": "فرهنگسرا، کانون، رویداد، اجتماعات" }, "amenity/community_centre/lgbtq": { "name": "مرکز انجمن هم‌جنس‌گرایان", @@ -3650,13 +3650,16 @@ "terms": "مبلمان حمام" }, "shop/beauty": { - "name": "فروشگاه زیبایی" + "name": "سالن زیبایی", + "terms": "آرایشگاه" }, "shop/beauty/nails": { - "name": "سالن آرایش ناخن" + "name": "سالن آرایش ناخن", + "terms": "مانیکور، پدیکور، ناخن، کاشت ناخن، سالن زیبایی، آرایشگاه" }, "shop/beauty/tanning": { - "name": "سالن برنزه" + "name": "سالن برنزه", + "terms": "آرایشگاه، سالن زیبایی" }, "shop/bed": { "name": "فروشگاه کالای خواب/ تشک" @@ -3897,7 +3900,8 @@ "terms": "شکار" }, "shop/interior_decoration": { - "name": "فروشگاه تزئینات داخلی" + "name": "فروشگاه تزئینات داخلی", + "terms": "دکور، دکوراسیون، دکوراسیون داخلی، فروشگاه دکوراسیون داخلی، لوستر" }, "shop/jewelry": { "name": "جواهرفروشی" @@ -4263,18 +4267,9 @@ "traffic_sign/city_limit": { "name": "علائم محدودیت در شهر" }, - "traffic_sign/city_limit_vertex": { - "name": "علائم محدودیت در شهر" - }, "traffic_sign/maxspeed": { "name": "تابلو محدودیت سرعت" }, - "traffic_sign/maxspeed_vertex": { - "name": "تابلو محدودیت سرعت" - }, - "traffic_sign_vertex": { - "name": "علائم راهنمایی و رانندگی" - }, "type/boundary": { "name": "مرز", "terms": "حدود ، حاشیه ، سرحدات" @@ -4344,9 +4339,6 @@ "name": "مسیر فرابر", "terms": "مسیر دریایی, مسیر فری" }, - "type/route/foot": { - "name": "مسیر پیاده" - }, "type/route/hiking": { "name": "مسیر پیاده‌گردی", "terms": "مسیر پیاده, مسیر پیاده‌روی" diff --git a/app/src/main/assets/osmfeatures/fi.json b/app/src/main/assets/osmfeatures/fi.json index 2381aae288..72c4e26fd7 100644 --- a/app/src/main/assets/osmfeatures/fi.json +++ b/app/src/main/assets/osmfeatures/fi.json @@ -56,6 +56,9 @@ "name": "Naruhissi", "terms": "hissi, hiihtohissi, lasketteluhissi, laskettelu, naru, köysi, köysihissi" }, + "aeroway": { + "name": "Ilmailukohde" + }, "aeroway/aerodrome": { "name": "Lentokenttä", "terms": "lentokenttä, lentoasema, terminaali, lentokone, lentoterminaali" @@ -396,6 +399,9 @@ "amenity/money_transfer": { "name": "Rahansiirtopiste" }, + "amenity/mortuary": { + "name": "Ruumishuone" + }, "amenity/motorcycle_parking": { "name": "Moottoripyöräpysäköinti" }, @@ -703,6 +709,12 @@ "amenity/toilets/disposal/flush": { "name": "Vesivessa" }, + "amenity/toilets/disposal/pitlatrine": { + "name": "Huussi" + }, + "amenity/toilets/portable": { + "name": "Siirrettävä WC" + }, "amenity/townhall": { "name": "Kunnantalo", "terms": "kunnantalo, kaupungintalo, valtuusto," @@ -1026,6 +1038,9 @@ "name": "Keskeneräinen rakennus", "terms": "rakennus, rakennustyömaa, rakenteilla" }, + "building/cowshed": { + "name": "Navetta" + }, "building/detached": { "name": "Omakotitalo" }, @@ -1132,6 +1147,9 @@ "building/static_caravan": { "name": "Paikallaan pysyvä siirrettävä talo" }, + "building/sty": { + "name": "Sikala" + }, "building/temple": { "name": "Temppelirakennus" }, @@ -1167,6 +1185,9 @@ "craft": { "name": "Kädentaitoja vaativa kohde" }, + "craft/agricultural_engines": { + "name": "Maatalousmekaanikko" + }, "craft/basket_maker": { "name": "Koripaja", "terms": "kori, paju, pajukori, korivalmistaja, koripaja" @@ -1200,6 +1221,9 @@ "craft/chimney_sweeper": { "name": "Nuohooja" }, + "craft/cleaning": { + "name": "Siivouspalvelu" + }, "craft/clockmaker": { "name": "Kelloseppä" }, @@ -1242,6 +1266,9 @@ "craft/locksmith": { "name": "Lukkoseppä" }, + "craft/metal_construction": { + "name": "Metallityöntekijä" + }, "craft/painter": { "name": "Maalari", "terms": "maalaaja" @@ -1318,6 +1345,9 @@ "demolished/building": { "name": "Äskettäin purettu rakennus" }, + "disused/amenity": { + "name": "Poistunut palvelu" + }, "disused/railway": { "name": "Käytöstä poistettu rautatiekohde" }, @@ -1403,6 +1433,9 @@ "entrance/emergency": { "name": "Hätäuloskäynti" }, + "entrance/emergency_ward_entrance": { + "name": "Päivystyssisäänkäynti" + }, "ford": { "name": "Kahlauspaikka" }, @@ -1713,6 +1746,9 @@ "highway/tertiary_link": { "name": "Yhdystien ramppi" }, + "highway/toll_gantry": { + "name": "Avoin tietulli" + }, "highway/track": { "name": "Maatalous-/metsätie", "terms": "pikkutie, hiekkatie, metsätie, metsäkonetie, metsä, metsäkone, ura, ajoväylä" @@ -1931,6 +1967,9 @@ "name": "Laivastotukikohta", "terms": "sotilaallinen, sotilas, armeija, maanpuolustus, puolustus, puolustusvoimat, sodankäynti, sota, merivoimat, meri, rannikko, laivasto, laivat, laiva, sotalaiva, sotalaivat" }, + "landuse/military/obstacle_course": { + "name": "Sotilasesterata" + }, "landuse/military/range": { "name": "Sotilasampumarata", "terms": "ampumarata, rata, radat, ampumaradat, ampuminen, ase, harjoittelu, sotilaallinen, sotilas, armeija, maanpuolustus, puolustus, puolustusvoimat, sodankäynti, sota" @@ -2066,7 +2105,7 @@ "name": "Golfkenttä" }, "leisure/hackerspace": { - "name": "Koodausnurkkaus", + "name": "Hacklab", "terms": "hackerspace, hackspace, makerspace, hacklab, häckläb, ohjelmointi, ohjelmoija, koodaus, koodaaja, teknologia, rakentelu, värkkäys, värkkäily, paja, työpaja, tila, julkinen, labra, verstas, kaupunkiverstas" }, "leisure/horse_riding": { @@ -2202,6 +2241,9 @@ "name": "Uimahalli", "terms": "uimahalli, kylpylä, uima-allas, uintikeskus, uinti, uiminen, vesi, vesiurheilu, urheilu, vesiurheilukeskus, vesiurheiluhalli" }, + "leisure/sports_hall": { + "name": "Liikuntasali" + }, "leisure/stadium": { "name": "Stadion" }, @@ -2264,9 +2306,15 @@ "man_made/clearcut": { "name": "Avohakattu metsä" }, + "man_made/courtyard": { + "name": "Sisäpiha" + }, "man_made/crane": { "name": "Nosturi" }, + "man_made/cross": { + "name": "Risti" + }, "man_made/cutline": { "name": "Metsänraja", "terms": "hakkuuraja" @@ -2281,6 +2329,9 @@ "man_made/gasometer": { "name": "Kaasusäiliö" }, + "man_made/goods_conveyor": { + "name": "Tavaraliukuhihna" + }, "man_made/lighthouse": { "name": "Majakka" }, @@ -2339,6 +2390,9 @@ "man_made/pumping_station": { "name": "Pumppaamo" }, + "man_made/reservoir_covered": { + "name": "Peitetty tekojärvi" + }, "man_made/silo": { "name": "Siilo" }, @@ -2373,6 +2427,9 @@ "man_made/tower/communication": { "name": "Viestintätorni" }, + "man_made/tower/cooling": { + "name": "Jäähdytystorni" + }, "man_made/tower/defensive": { "name": "Vartiotorni" }, @@ -2466,6 +2523,9 @@ "natural/heath": { "name": "Nummi" }, + "natural/hot_spring": { + "name": "Kuuma lähde" + }, "natural/mud": { "name": "Muta" }, @@ -2921,6 +2981,9 @@ "name": "Linja-autopysäkki", "terms": "bussipysäkki, linja-autopysäkki, bussikatos, pysähtymispaikka, bussin pysähtymispaikka, linja-auton pysähtymispaikka, pysäkki, pysäkkisyvänne" }, + "public_transport/platform/bus_tram_point": { + "name": "Raitiotie- ja linja-autopysäkki" + }, "public_transport/platform/ferry": { "name": "Laivalaituri" }, @@ -3052,6 +3115,9 @@ "railway/construction": { "name": "Keskeneräinen rautatie" }, + "railway/crossing": { + "name": "Tasoristeys (kevyt liikenne)" + }, "railway/derail": { "name": "Raiteensulku" }, @@ -3064,6 +3130,9 @@ "railway/halt": { "name": "Seisake" }, + "railway/level_crossing": { + "name": "Tasoristeys (moottoriliikenne)" + }, "railway/light_rail": { "name": "Pikaraitiotie" }, @@ -3094,6 +3163,9 @@ "railway/rail/highspeed": { "name": "Suurnopeusrata" }, + "railway/railway_crossing": { + "name": "Raiteiden risteyskohta" + }, "railway/signal": { "name": "Rautatieopastin", "terms": "rautatie, juna, opastin, liikennevalo, signaali" @@ -3117,6 +3189,12 @@ "railway/tram": { "name": "Katuraitiotie" }, + "railway/tram_crossing": { + "name": "Raitiotien ja polun tasoristeys" + }, + "railway/tram_level_crossing": { + "name": "Raitiotien ja kadun tasoristeys" + }, "railway/tram_stop": { "name": "Katuraitiovaunun pysähtymiskohta" }, @@ -3133,6 +3211,9 @@ "seamark": { "name": "Merimerkintä" }, + "seamark/buoy_lateral": { + "name": "Kanavapoiju" + }, "seamark/buoy_lateral/green": { "name": "Vihreä poiju" }, @@ -3588,6 +3669,9 @@ "shop/supermarket": { "name": "Supermarketti" }, + "shop/supermarket/organic": { + "name": "Luomusupermarketti" + }, "shop/swimming_pool": { "name": "Uima-allasliike" }, @@ -3827,18 +3911,9 @@ "traffic_sign/city_limit": { "name": "Taajamaliikennemerkki" }, - "traffic_sign/city_limit_vertex": { - "name": "Taajamaliikennemerkki" - }, "traffic_sign/maxspeed": { "name": "Nopeusrajoitusliikennemerkki" }, - "traffic_sign/maxspeed_vertex": { - "name": "Nopeusrajoitusliikennemerkki" - }, - "traffic_sign_vertex": { - "name": "Liikennemerkki" - }, "type/boundary": { "name": "Raja" }, @@ -3848,6 +3923,12 @@ "type/connectivity": { "name": "Ajokaistajatkuvuus" }, + "type/destination_sign": { + "name": "Määränpääkyltti" + }, + "type/enforcement": { + "name": "Valvonta" + }, "type/enforcement/maxspeed": { "name": "Nopeuskamera" }, @@ -3970,7 +4051,7 @@ "name": "Oja" }, "waterway/dock": { - "name": "Telakka", + "name": "Telakka-allas", "terms": "laiva, laivanrakennus, laivateollisuus, teollisuus, rakentaminen, kuivatelakka, laivatelakka" }, "waterway/drain": { diff --git a/app/src/main/assets/osmfeatures/fr.json b/app/src/main/assets/osmfeatures/fr.json index ecb0ff69d7..a8cdd2dc24 100644 --- a/app/src/main/assets/osmfeatures/fr.json +++ b/app/src/main/assets/osmfeatures/fr.json @@ -460,6 +460,9 @@ "name": "Transfert d'argent", "terms": "transfert d'argent,western union,banque,argent,échange" }, + "amenity/mortuary": { + "name": "Morgue" + }, "amenity/motorcycle_parking": { "name": "Parking pour motocyclettes", "terms": "Parc à motos,Stationnement motos" @@ -2971,6 +2974,9 @@ "name": "Tour de communication", "terms": "tour de télécommunication,diffusion,antenne,téléphone portable,téléphone cellulaire,gsm,tour,radio,mât de transmission,pylône de transmission" }, + "man_made/tower/cooling": { + "name": "Tour aéroréfrigérante" + }, "man_made/tower/defensive": { "name": "Tour fortifiée", "terms": "Tour fortifiée,tour de chateau,tour de château,défense,tour défensive" @@ -3089,6 +3095,9 @@ "name": "Lande", "terms": "Bruyère" }, + "natural/hot_spring": { + "name": "Source chaude" + }, "natural/mud": { "name": "Boue", "terms": "Boue" @@ -3808,9 +3817,15 @@ "railway/monorail": { "name": "Rail pour monorail" }, + "railway/narrow_gauge": { + "name": "Voie étroite" + }, "railway/platform": { "name": "Quai de gare ferroviaire" }, + "railway/preserved": { + "name": "Chemin de fer touristique" + }, "railway/rail": { "name": "Rail pour train" }, @@ -4433,6 +4448,9 @@ "name": "Supermarché", "terms": "Supermarché" }, + "shop/supermarket/organic": { + "name": "Supermarché bio" + }, "shop/swimming_pool": { "name": "Magasin de matériel de piscine", "terms": "spa,cuve thermale,maintenance,piscine" @@ -4736,22 +4754,10 @@ "name": "Panneau de limite de commune", "terms": "limite de ville,ville,hameau,bord,fin de ville,début de ville" }, - "traffic_sign/city_limit_vertex": { - "name": "Panneau de limite de commune", - "terms": "limite de ville,ville,hameau,bord,fin de ville,début de ville" - }, "traffic_sign/maxspeed": { "name": "Panneau de limitation de vitesse", "terms": "limitation de vitesse,limite de vitesse,vitesse max,vitesse limite" }, - "traffic_sign/maxspeed_vertex": { - "name": "Panneau de limitation de vitesse", - "terms": "limitation de vitesse,limite de vitesse,vitesse max,vitesse limite" - }, - "traffic_sign_vertex": { - "name": "Panneau de signalisation", - "terms": "signalisation routière, panneau de signalisation" - }, "type/boundary": { "name": "Frontière", "terms": "Frontière" @@ -4827,10 +4833,6 @@ "name": "Itinéraire de ferry", "terms": "Route de traversier, Ligne de ferry" }, - "type/route/foot": { - "name": "Itinéraire pédestre", - "terms": "Sentier" - }, "type/route/hiking": { "name": "Itinéraire de randonnée", "terms": "Sentier pédestre" diff --git a/app/src/main/assets/osmfeatures/gl.json b/app/src/main/assets/osmfeatures/gl.json index be13c8de85..8316690bed 100644 --- a/app/src/main/assets/osmfeatures/gl.json +++ b/app/src/main/assets/osmfeatures/gl.json @@ -8,6 +8,9 @@ "name": "Panel publicitario", "terms": "panel, cartel, valo, valado, poste, piar, publicitario, publicidade, carteleira, propaganda" }, + "advertising/board": { + "name": "Taboleiro de anuncios" + }, "advertising/column": { "name": "Columna de publicidade", "terms": "columna, publicidade, anuncios, cilindro" @@ -127,7 +130,7 @@ "terms": "barbacoa, grella, asador, lume" }, "amenity/bench": { - "name": "Banco ou asento", + "name": "Banco", "terms": "asento,banco,bancada,banquillo,banqueta,banca" }, "amenity/bicycle_parking": { @@ -162,6 +165,9 @@ "name": "Alugueiro de embarcacións", "terms": "alugueiro, alugamento, locación, bote, barca, lancha, embarcación, embarcacións" }, + "amenity/boat_storage": { + "name": "Tenda de embarcacións" + }, "amenity/bureau_de_change": { "name": "Troco de divisas", "terms": "troco, cambio, divisa, moeda" @@ -229,7 +235,7 @@ }, "amenity/community_centre": { "name": "Centro comunitario", - "terms": "centro social, centro comunitario" + "terms": "centro social, centro comunitario, local social" }, "amenity/community_centre/lgbtq": { "name": "Centro comunitario LGBTQ+", @@ -297,11 +303,11 @@ "terms": "comida rápida, comida ferralla, comida lixo, comida preparada, pratos preparados, comida na rúa, comida de paso, hamburguesa, hotdog, pancho, polos fritidos, tacos, patacas fritidas, pizza, choripán, sandwitch, bocadillos, salchipapas, burrito, sopaipillas, quesadilla, nachos, arepa" }, "amenity/fast_food/burger": { - "name": "Comida rápida: Hamburguesa", + "name": "Comida rápida: Hamburguesas", "terms": "almorzo, cea, comedor, cea, xantar, grella, churrasco, comida, mesa, café, cafe" }, "amenity/fast_food/chicken": { - "name": "Comida rápida: Polo", + "name": "Comida rápida: Polos", "terms": "almorzo, cea, comedor, cea, xantar, grella, churrasco, comida, mesa, café, cafe" }, "amenity/fast_food/donut": { @@ -311,22 +317,25 @@ "name": "Comida rápida: Peixe e patacas fritidas" }, "amenity/fast_food/hot_dog": { - "name": "Comida rápida: Hot dog" + "name": "Comida rápida: Hot dogs" }, "amenity/fast_food/ice_cream": { - "name": "Comida rápida: Xeado" + "name": "Comida rápida: Xeados" + }, + "amenity/fast_food/juice": { + "name": "Comida rápida: Zumes" }, "amenity/fast_food/kebab": { - "name": "Comida rápida: Kebab" + "name": "Comida rápida: Kebabs" }, "amenity/fast_food/mexican": { "name": "Comida rápida: Mexicana" }, "amenity/fast_food/pizza": { - "name": "Comida rápida: Pizza" + "name": "Comida rápida: Pizzas" }, "amenity/fast_food/sandwich": { - "name": "Comida rápida: Sandwich" + "name": "Comida rápida: Sandwiches" }, "amenity/fire_station": { "name": "Parque de bombeiros", @@ -409,7 +418,7 @@ }, "amenity/monastery": { "name": "Área de mosteiro", - "terms": "mosteiro, área de mosteiro, igrexa, capela" + "terms": "mosteiro, área de mosteiro, igrexa, capela, adro, adral, atrio, igrexario" }, "amenity/money_transfer": { "name": "Estación de transferencia de diñeiro", @@ -542,6 +551,10 @@ "name": "Bar", "terms": "bar, café, cafetería, bebidas, alcohol, cervexa, bar de tapas, pinchos, alcol, furancho, cervexeria, cervexería, cervexaria, cervexaría, tapa, pincho, cerveceria, cervecería, pub inglés, pub irlandés" }, + "amenity/pub/irish": { + "name": "Pub irlandés", + "terms": "bar irlandés, local irlandés" + }, "amenity/pub/lgbtq": { "name": "Bar LGBTQ+", "terms": "bar gay, bar lésbico, bar lgbtq, bar lgbt, bar lgb, homosexual" @@ -580,8 +593,12 @@ "name": "Contedor de reciclaxe", "terms": "reciclaxe, colector, contenedor, contedor, lixo, basura, vidro, papel, carton" }, + "amenity/refugee_site": { + "name": "Campo de refuxiados" + }, "amenity/research_institute": { - "name": "Área de Instituto de Investigación" + "name": "Área de Instituto de Investigación", + "terms": "Centro de investigación, área de investigación, instituto de investigación, centro de innovación" }, "amenity/restaurant": { "name": "Restaurante", @@ -642,7 +659,8 @@ "name": "Restaurante vietnamita" }, "amenity/sanitary_dump_station": { - "name": "Eliminación de WC de caravanas" + "name": "Depósito sanitario para caravanas", + "terms": "desaugue, caravanas, desaugue de caravanas, cisterna, estanque" }, "amenity/school": { "name": "Área escolar", @@ -653,12 +671,12 @@ "terms": "abeiro, abrigo, refuxio, cuberto, pavillón, gazebo" }, "amenity/shelter/gazebo": { - "name": "Gazebo", - "terms": "gazebo,glorieta" + "name": "Acubillo", + "terms": "gazebo, acolleito, acubillo, abeiradoiro, refuxio" }, "amenity/shelter/lean_to": { "name": "Pendello", - "terms": "pendello" + "terms": "pendello, alboio, alpendre, cabanel, caustra, chapitel, cuberto, sobeira" }, "amenity/shelter/picnic_shelter": { "name": "Abeiro de pícnic", @@ -677,15 +695,16 @@ "terms": "área de fumadoiro, fumadoiro, fumar, área de fume, fume" }, "amenity/social_centre": { - "name": "Centro social" + "name": "Centro social", + "terms": "local social, centro comunitario" }, "amenity/social_facility": { "name": "Axuda Social", "terms": "servizos sociais, asistencia social" }, "amenity/social_facility/ambulatory_care": { - "name": "Ambulatory Care", - "terms": "atención ambulatoria, coidado ambulatorio" + "name": "Centro ambulatorio", + "terms": "ambulatorio, atención ambulatoria, coidado ambulatorio" }, "amenity/social_facility/food_bank": { "name": "Banco de Alimentos", @@ -699,7 +718,8 @@ "terms": "abeiro social, abeiro, refuxio social, refuxio, comedor social, albergue, centro, vadío, vagabundo, indixente, homeless" }, "amenity/social_facility/nursing_home": { - "name": "Residencia de Anciáns" + "name": "Residencia de Anciáns", + "terms": "xeriátrico, asilo, residencia de maiores, centro de coidados" }, "amenity/studio": { "name": "Estudio", @@ -722,7 +742,7 @@ "terms": "estudio de cine, estudio de cinema, produción de cine, producción, estudo de cine, produción de video, gravación de video, estudio de video, vídeo, rodaxe, plató, plato, prató, prato, rodar, cámara, camara" }, "amenity/taxi": { - "name": "Paraxe de taxi", + "name": "Parada de taxi", "terms": "taxi, parada, acopio de taxis, taxis, estacion, estación, carrera, final de carrera" }, "amenity/telephone": { @@ -739,14 +759,19 @@ }, "amenity/toilets": { "name": "Aseos", - "terms": "aseos, baños, WC" + "terms": "aseos, baños, WC, servizo, servizos, lavabo, latrina, retrete, váter, urinario, urinaria" }, "amenity/toilets/disposal/flush": { - "name": "Inodoros con cisterna" + "name": "Aseo con cisterna", + "terms": "aseos, aseo, baños, WC, cuarto de baño, servizo, servizos, lavabo, latrina, retrete, váter, urinario, urinaria" }, "amenity/toilets/disposal/pitlatrine": { "name": "Letrina de pozo" }, + "amenity/toilets/portable": { + "name": "Aseo portátil", + "terms": "aseos, aseo, baños, WC, cuarto de baño, servizo, servizos, lavabo, latrina, retrete, váter, urinario, urinaria" + }, "amenity/townhall": { "name": "Casa do Concello", "terms": "casa do concello, concello, consistorio, municipio, municipal, cabido" @@ -811,6 +836,9 @@ "amenity/vending_machine/ice_cream": { "name": "Expendedora de xeados" }, + "amenity/vending_machine/ice_cubes": { + "name": "Máquina expendedora de xeo" + }, "amenity/vending_machine/newspapers": { "name": "Expendedora de xornais", "terms": "expendedora, xornais, revistas, periódicos" @@ -962,7 +990,7 @@ }, "barrier/fence": { "name": "Valo", - "terms": "Valado, reixa, valo, cercado, alambrada, cerca" + "terms": "Valado, reixa, valo, cercado, alambrada, cerca, cerrado, cerrume, muro, peche, sebe" }, "barrier/fence/railing": { "name": "Reixa", @@ -1018,12 +1046,15 @@ "barrier/wall": { "name": "Muro" }, + "barrier/wall/noise_barrier": { + "name": "Barreira acústica" + }, "boundary": { "name": "Límite" }, "boundary/administrative": { "name": "Límite administrativo", - "terms": "límite administrativo, fronteira, término municipal" + "terms": "límite administrativo, fronteira, termo, termo municipal, término municipal" }, "bridge/support": { "name": "Piar de ponte", @@ -1042,11 +1073,11 @@ }, "building/barn": { "name": "Celeiro/Hórreo", - "terms": "celeiro, hórreo, cabazo, cabaceiro, cabaceira, piorno" + "terms": "celeiro, hórreo, cabazo, cabaceiro, cabaceira, piorno, barrela, barrelo, barreta, bastardo, combarro, cabaceira, cabaz, cabazo, calostra, calustra, caustra, piorno" }, "building/boathouse": { "name": "Pendello para embarcacións", - "terms": "pendello, botes, embarcacións, alboio, alpendre" + "terms": "pendello, botes, embarcacións, alboio, alpendre, caseta" }, "building/bungalow": { "name": "Bungaló" @@ -1056,7 +1087,7 @@ }, "building/cabin": { "name": "Cabana", - "terms": "casa, cabana, cabaña" + "terms": "casa, cabana, cabaña, casoupa, casoupo, chabola, barraca, cabanel, choza" }, "building/carport": { "name": "Cocheira cuberta" @@ -1116,7 +1147,8 @@ "name": "Invernadoiro" }, "building/hangar": { - "name": "Edificio do hangar" + "name": "Edificio do hangar", + "terms": "hangar, aeroporto, estacionamento, abrigo, avións, avions" }, "building/hospital": { "name": "Edificio de hospital" @@ -1126,25 +1158,30 @@ }, "building/house": { "name": "Casa", - "terms": "casa, vivenda" + "terms": "casa, vivenda, domicilio, morada, vivenda, lar, fogar, residencia" }, "building/houseboat": { "name": "Casa flotante", - "terms": "fogar, familia, residencia, vivenda, lar" + "terms": "fogar, familia, residencia, vivenda, lar, casa, vivenda, domicilio, morada, vivenda" }, "building/hut": { "name": "Refuxio", - "terms": "refuxio, choza, cabaña, cabana" + "terms": "refuxio, choza, cabana, cabaña, abeiradoiro, abeiro, abrigadoiro, abrigo, acolleito, acubillo" }, "building/industrial": { - "name": "Edificio industrial" + "name": "Edificio industrial", + "terms": "industria, industrial, nave, local, almacén" }, "building/kindergarten": { "name": "Edificio escolar infantil", "terms": "preescolar, xardín de infancia, guardería, infantil, párvulos, garderia, gardería, gardaria, parvulos, gardaría, párvulo, xardin de infancia, xardín infantil, xardin infantil, edificio, escola infantil, preescolar" }, "building/mosque": { - "name": "Edificio da mesquita" + "name": "Edificio da mesquita", + "terms": "templo, mezquita, musulmán" + }, + "building/office": { + "name": "Edificio de oficinas" }, "building/pavilion": { "name": "Edificio do pavillón" @@ -1158,20 +1195,24 @@ "terms": "residencial, vivenda, casa, apartamento, domicilio" }, "building/retail": { - "name": "Edificio de comercios" + "name": "Edificio de comercios", + "terms": "comercio, mercado,compra, tendas, negocio" }, "building/roof": { - "name": "Tellado" + "name": "Tellado", + "terms": "teito, lousado, tella, lousa" }, "building/ruins": { "name": "Edificio en ruínas", "terms": "ruina, ruinas, restos" }, "building/school": { - "name": "Edificio escolar" + "name": "Edificio escolar", + "terms": "escola, colexio, educación" }, "building/semidetached_house": { - "name": "Casa adosada" + "name": "Casa apegada", + "terms": "adosada, adosado, pegado, pegada, contínua" }, "building/service": { "name": "Edificio de servizo" @@ -1262,6 +1303,10 @@ "name": "Desenfeluxador", "terms": "feluxe, borra, borro, charrizo, cisco, parruma, sarrio, cheminea, chaminea, fumeira, fumeiro, fume, chimenea, fogón, hollín, limpiachimenea, limpeza de chemineas, deshollinador" }, + "craft/cleaning": { + "name": "Servizo de limpeza", + "terms": "limpeza, limpar, servizo, oficio" + }, "craft/clockmaker": { "name": "Reloxeiro", "terms": "reloxaría, reloxeiro, reloxo, tempo" @@ -1578,7 +1623,7 @@ "name": "Bus guiado" }, "highway/bus_stop": { - "name": "Paraxe de bus" + "name": "Parada de bus" }, "highway/corridor": { "name": "Corredor interior", @@ -1597,10 +1642,11 @@ }, "highway/crossing/unmarked": { "name": "Paso de peóns sen marcar", - "terms": "paso de peóns sen marcar" + "terms": "paso de peóns sen marcar, peonil, peonal" }, "highway/crossing/unmarked-raised": { - "name": "Paso de peóns sen marcar (Levantado)" + "name": "Paso de peóns sen marcar (Levantado)", + "terms": "peonil, peonal" }, "highway/crossing/zebra": { "name": "Paso de peóns marcado" @@ -1618,6 +1664,10 @@ "highway/cycleway/crossing": { "name": "Paso de bicicletas" }, + "highway/cycleway/crossing/bicycle_foot": { + "name": "Paso de peóns e de pista de ciclismo", + "terms": "peonil, peonal, ciclista, ciclismo, bicicleta" + }, "highway/cycleway/crossing/marked": { "name": "Paso de bicicletas marcado", "terms": "paso de bicicleta, cruzamento de carril bici, cruzamento de ciclovía, cruzamento de bicicleta, cruzamento de bici, cruzamento de senda ciclista" @@ -1631,7 +1681,7 @@ "terms": "montacargas, ascensor, elevador" }, "highway/emergency_bay": { - "name": "Lugar de paraxe de emerxencia", + "name": "Lugar de parada de emerxencia", "terms": "autopista, parada de emerxencia, autoestrada, autovía" }, "highway/footway": { @@ -1657,14 +1707,16 @@ "terms": "paso de cebra, cruzamento marcado, paso de peóns, lombo de burro, lombada, velocidade, calmador, redutor" }, "highway/footway/sidewalk": { - "name": "Beirarrúa" + "name": "Beirarrúa", + "terms": "calzada, paseo, berma" }, "highway/footway/unmarked": { "name": "Paso peonil sen marcar", "terms": "cruzamento sen marcar, paso de peóns sen marcar" }, "highway/footway/unmarked-raised": { - "name": "Paso de peóns sen marcar (Levantado)" + "name": "Paso de peóns sen marcar (Levantado)", + "terms": "peonil, peonal" }, "highway/footway/zebra": { "name": "Paso de peóns marcado" @@ -1937,16 +1989,19 @@ "terms": "predio, parcela, xardín comunitario, xardin, horta, horto, urbano, urbán, urbana, urbá, comunitaria, comunitario, leira" }, "landuse/aquaculture": { - "name": "Acuicultura" + "name": "Acuicultura", + "terms": "cría, crianza, cultivo, marisco, peixes, pescado, alga, algas, orgo, orgos, ouco, oucos, granxa, mar, auga" }, "landuse/basin": { - "name": "Conca" + "name": "Cunca" }, "landuse/brownfield": { - "name": "Soar urbanizado abandonado" + "name": "Soar urbanizado abandonado", + "terms": "terreo" }, "landuse/cemetery": { - "name": "Cemiterio" + "name": "Cemiterio", + "terms": "camposanto, necrópole, cementerio" }, "landuse/churchyard": { "name": "Adro" @@ -1964,10 +2019,11 @@ }, "landuse/farmland": { "name": "Terra de cultivo", - "terms": "terra de cultivo, leira, veiga, agro, eido" + "terms": "terra de cultivo, leira, veiga, agro, eido, pasto, agricultura, agro, eido, veiga, varcia, plantación" }, "landuse/farmyard": { - "name": "Granxa" + "name": "Granxa", + "terms": "facenda, explotación, agrícola" }, "landuse/flowerbed": { "name": "Xardín floral", @@ -1975,7 +2031,7 @@ }, "landuse/forest": { "name": "Bosque xestionado", - "terms": "talla, tala, bosque, madeira, árbore, arbore" + "terms": "talla, tala, bosque, madeira, árbore, arbore, monte" }, "landuse/garages": { "name": "Zona de garaxes privados", @@ -1983,7 +2039,7 @@ }, "landuse/grass": { "name": "Céspede", - "terms": "céspede, herba" + "terms": "céspede, herba, prado" }, "landuse/greenfield": { "name": "Soar urbanizábel", @@ -1994,26 +2050,27 @@ }, "landuse/harbour": { "name": "Peirao", - "terms": "peirao, porto, muelle" + "terms": "peirao, porto, molle, muelle, desembarcadoiro, embarcadoiro" }, "landuse/industrial": { "name": "Área industrial", "terms": "área industrial, parque industrial, industria, fábrica, area industrial, terreo industrial, poligono, polígono, fabrica, fábricas, industrial, zona industrial" }, "landuse/industrial/scrap_yard": { - "name": "Depósito de ferralla" + "name": "Depósito de ferralla", + "terms": "chatarra, ferragacho, vertedoiro" }, "landuse/industrial/slaughterhouse": { "name": "Matadoiro", - "terms": "matadoiro, carne, carnicería, carnizaría, becerro, polo, vaca, porco, aves de curral, curral" + "terms": "matadoiro, matachín, carne, carnicería, carnizaría, becerro, polo, vaca, porco, aves de curral, curral" }, "landuse/landfill": { "name": "Vertedoiro", - "terms": "vertedoiro, lixo, escombrera, basurero" + "terms": "vertedoiro, vertedeiro, lixo, escombreira, escombrera, basurero" }, "landuse/meadow": { "name": "Pradaría", - "terms": "prado, pasto, pradeira, herba" + "terms": "prado, pasto, pasteiro, pradeira, herba, varcia, veiga, varxa" }, "landuse/military": { "name": "Área militar", @@ -2040,7 +2097,7 @@ }, "landuse/orchard": { "name": "Área de froitais", - "terms": "froitais, froitas, pomar" + "terms": "froitais, froitas, pomar, árbores, maceira, pereira, pexego" }, "landuse/plant_nursery": { "name": "Viveiro de plantas", @@ -2051,7 +2108,7 @@ }, "landuse/quarry": { "name": "Canteira", - "terms": "canteira, pedra, minaría, mina, pedra, rocha, minerais" + "terms": "canteira, pedra, minaría, mina, pedra, rocha, minerais, pedreira, arguina" }, "landuse/railway": { "name": "Área ferroviaria" @@ -2078,7 +2135,7 @@ }, "landuse/vineyard": { "name": "Viña", - "terms": "viña, viñedo, uva" + "terms": "viña, viñedo, uva, videira, bacelar, bacelo" }, "landuse/winter_sports": { "name": "Área de deportes de inverno" @@ -2097,7 +2154,7 @@ "terms": "quiosco, templete, Quiosco de música, música, musica, palco, carpa" }, "leisure/beach_resort": { - "name": "Complexo turístico", + "name": "Estancia de praia", "terms": "resort, complexo, praia, complexo de praia, complexo hoteleiro, complejo hotelero, complexo hotelero" }, "leisure/bird_hide": { @@ -2105,8 +2162,8 @@ "terms": "observatorio, aves, paxaros" }, "leisure/bleachers": { - "name": "Chanzos", - "terms": "chanzos, banzos, bancada, gradas, multitude, banco, deportes, soporte, asento, asentos" + "name": "Bancadas", + "terms": "chanzos, banzos, bancada, gradas, multitude, banco, deportes, soporte, asento, asentos, tribuna" }, "leisure/bowling_alley": { "name": "Birlos", @@ -2114,7 +2171,7 @@ }, "leisure/common": { "name": "Terreo comunal", - "terms": "terras comunais, terreo comunal, comunal, terras comúns" + "terms": "tenza, tenzas, terras comunais, terreo comunal, comunal, terras comúns" }, "leisure/dance": { "name": "Sala de baile" @@ -2131,10 +2188,11 @@ "terms": "sala de escape, xogo de escape, escapar da habitación, sala de rompecabezas, crebacabezas, quebracabezas, sala de misións, escape room, sala de escape, cuarto de escape" }, "leisure/firepit": { - "name": "Pozo de lume" + "name": "Fogueira", + "terms": "pozo de lume, cacharela, cacheira, cachela, larada, lumarada, luminaria" }, "leisure/fishing": { - "name": "Lugar de pesca", + "name": "Couto de pesca", "terms": "lugar de pesca, pescador, pescar, pescantín" }, "leisure/fitness_centre": { @@ -2148,16 +2206,41 @@ "leisure/fitness_station": { "name": "Estación de ximnasia ao aire libre" }, + "leisure/fitness_station/balance_beam": { + "name": "Barra de equilibrio" + }, + "leisure/fitness_station/box": { + "name": "Barra de fitness" + }, + "leisure/fitness_station/horizontal_bar": { + "name": "Barra fixa horizontal" + }, + "leisure/fitness_station/horizontal_ladder": { + "name": "Escada horizontal" + }, + "leisure/fitness_station/hyperextension": { + "name": "Barra de extensións" + }, "leisure/fitness_station/parallel_bars": { "name": "Barras paralelas", "terms": "barra, exercicio, ximnasio, barras" }, + "leisure/fitness_station/push-up": { + "name": "Barra de flexións" + }, "leisure/fitness_station/rings": { - "name": "Aneis ou argolas para exercicio" + "name": "Argolas para exercicio", + "terms": "aneis de exercicio, argolas de exercicio" }, "leisure/garden": { "name": "Xardín" }, + "leisure/garden/botanical": { + "name": "Xardín botánico" + }, + "leisure/garden/community": { + "name": "Xardín comunitario" + }, "leisure/golf_course": { "name": "Campo de golf" }, @@ -2386,11 +2469,11 @@ }, "man_made/manhole/power": { "name": "Pozo de inspección de rede eléctrica", - "terms": "cuberta, buraco, burato, eléctrico, electricidade, pozo, inspección" + "terms": "cuberta, buraco, burato, eléctrico, electricidade, pozo, inspección, arqueta" }, "man_made/manhole/sewer": { "name": "Pozo de inspección de sumidoiro", - "terms": "cuberta, desagüe, buraco, burato, alcantarillado, pozo, inspección, sumidoiro, rede de sumidoiro, tapa de sumidoiro, inspeccion, auga, augas negras, alcantarilla, augas residuais, residual, refugallo, refugallos" + "terms": "cuberta, desagüe, buraco, burato, alcantarillado, pozo, inspección, sumidoiro, rede de sumidoiro, tapa de sumidoiro, inspeccion, auga, augas negras, alcantarilla, augas residuais, residual, refugallo, refugallos, arqueta" }, "man_made/manhole/telecom": { "name": "Pozo de inspección de telecomunicacións", @@ -2503,10 +2586,16 @@ "man_made/tunnel": { "name": "Área de túnel" }, + "man_made/utility_pole": { + "name": "Poste de servizos" + }, "man_made/wastewater_plant": { "name": "Depuradora de augas residuais", "terms": "depuradora, auga, planta depuradora, EDAR, augas residuais, saneamento, tratamento de augas residuais, depuración, PTAR" }, + "man_made/water_tap": { + "name": "Billa de auga" + }, "man_made/water_tower": { "name": "Torre de auga", "terms": "torre de auga, depósito de auga elevado, tanque de auga" @@ -2527,11 +2616,39 @@ "name": "Muíño de vento", "terms": "vento, eólico, granxa, roda, muíño, turbina, extraer auga, bombeo, muiño" }, + "man_made/windpump": { + "name": "Bomba eólica", + "terms": "bombeo eólico, muíño de vento, eólica" + }, "man_made/works": { - "name": "Fábrica" + "name": "Fábrica", + "terms": "factoría" + }, + "marker": { + "name": "Marco", + "terms": "marcador, indicador, placa, poste, fito, mollón, mouteira, marcote" + }, + "marker/utility": { + "name": "Identificador de servizo" + }, + "marker/utility/power": { + "name": "Indicador de distribución de enerxía" }, "military/bunker": { - "name": "Búnquer militar" + "name": "Búnker militar", + "terms": "Búnquer, búnquer militar, bunquer, casamata, refuxio, bombardeo" + }, + "military/checkpoint": { + "name": "Posto de control militar" + }, + "military/nuclear_explosion_site": { + "name": "Lugar de probas nucleares" + }, + "military/office": { + "name": "Oficina militar" + }, + "military/trench": { + "name": "Trincheira militar" }, "natural": { "name": "Elemento natural" @@ -2545,27 +2662,36 @@ "terms": "baía, baia, golfo, enseada, bahía, bahia, badia, abra, arnela, cala, enseada, golfo, rada" }, "natural/beach": { - "name": "Praia" + "name": "Praia", + "terms": "area, areal" }, "natural/cape": { - "name": "Cabo" + "name": "Cabo", + "terms": "extremo, punta, puntal, promontorio" }, "natural/cave_entrance": { "name": "Entrada de cova", "terms": "cova, gruta, caverna, entrada de cova, espenuca, pala, cafurna, furna, palafurna, lapa, pala, paleira, toba, tobal, tobeira, tobo, toco, toqueira, gorida, guarida, niño, buraca, burata, furoco, tumba, tomba" }, "natural/cliff": { - "name": "Cantil" + "name": "Cantil", + "terms": "acantilado" }, "natural/coastline": { "name": "Beiramar", - "terms": "liña de costa, costa, litoral, ribeira, beiramar" + "terms": "liña de costa, costa, litoral, ribeira, beiramar, mariña" }, "natural/fell": { - "name": "Outeiro" + "name": "Alto de montaña", + "terms": "fjall, outeiro, montaña, altos, cume, costa deforestada" + }, + "natural/geyser": { + "name": "Géyser", + "terms": "geyser, fonte, volcánico, volcánica" }, "natural/glacier": { - "name": "Glaciar" + "name": "Glaciar", + "terms": "glaciario" }, "natural/grassland": { "name": "Pradeira", @@ -2573,32 +2699,39 @@ }, "natural/heath": { "name": "Uceira", - "terms": "uceira, breixeira, moural, urceira, uzal, herba, arbustos, gamallos" + "terms": "uceira, breixeira, moural, urceira, uzal, herba, arbustos, gamallos, breixeira, moural, urceira, uzal, queiroa, queirogal" + }, + "natural/hot_spring": { + "name": "Augas termais", + "terms": "caldas, termas, hidrotermas, xeotermas, manancial" }, "natural/mud": { - "name": "Barro" + "name": "Barro", + "terms": "bulleiro, lama, lodo, trollo" }, "natural/peak": { "name": "Cumio", "terms": "pico, cumio, cume, montaña, monte, cúspide, bico, cima, cimeira, cimbra, curucho, curuto, petouto, pico, picoto, picouto, vértice" }, "natural/reef": { - "name": "Arrecife" + "name": "Arrecife", + "terms": "coral" }, "natural/ridge": { "name": "Crista", - "terms": "crista, cumieira, cumeira, cume, cumeada, tergo, serras, montañas, cresta, montaña, canto, crista elevada, bico, cima, cúspide, pico, petouto, picoto, picouto, cumio" + "terms": "crista, cumieira, cumeira, cume, cumeada, tergo, serras, serra, montañas, cresta, crista, montaña, canto, crista elevada, bico, cima, cúspide, pico, petouto, picoto, picouto, cumio, cordilleira, cadea" }, "natural/rock": { - "name": "Rocha incrustada", - "terms": "rocha, pedra, pena, penedo, roca, con, farallón" + "name": "Penas e grandes rochas", + "terms": "rocha, pedra, pena, penedo, roca, con, farallón, fragueiro, fragueira" }, "natural/saddle": { "name": "Paso de montaña", - "terms": "porto de montaña, paso de montaña" + "terms": "porto de montaña, paso de montaña, porto, paso, val de montaña, val, aba, estreito" }, "natural/sand": { - "name": "Area" + "name": "Area", + "terms": "areal, gran, xabre, sábrego" }, "natural/scree": { "name": "Pedregal", @@ -2606,14 +2739,19 @@ }, "natural/scrub": { "name": "Matogueira", - "terms": "matogueira, arbustos, toxeira, toxos, silveira, breña, coucheira, fraguiza, vedramio" + "terms": "matogueira, matagueira, arbustos, toxeira, toxos, silveira, breña, coucheira, fraguiza, vedramio, mato" + }, + "natural/shingle": { + "name": "Callao", + "terms": "canto rolado, canto, cantos, croio, croios, seixo, callaos, bocha, cañó, coio, croio, pelouro, riarengo, xoga, pedra, deposito de cantos, acumulación de cantos" }, "natural/shrub": { - "name": "Arbusto" + "name": "Arbusto", + "terms": "mato, matoxal, vexetación, leñosa, planta" }, "natural/spring": { "name": "Manancial", - "terms": "manancial, fonte, auga" + "terms": "manancial, fonte, auga, gurgullo, gurgullón, manancial, groto, illó, manancial" }, "natural/stone": { "name": "Pedra solta", @@ -2638,7 +2776,7 @@ "terms": "río, auga, lago, laguna, albufeira, ibón, lagoa, estanque, embalse, encoro, pantano, balsa, corpo de auga, augas, lámina de auga, poza de auga, charca, agua, regato, rego, pozo, poza, burgas, termas" }, "natural/water/basin": { - "name": "Conca" + "name": "Cunca" }, "natural/water/canal": { "name": "Área da canle" @@ -2649,15 +2787,15 @@ }, "natural/water/moat": { "name": "Foso", - "terms": "foso" + "terms": "foso, castelo, muralla, defensa, fortaleza" }, "natural/water/pond": { "name": "Estanque", - "terms": "auga, estanque, lagoa, charca" + "terms": "auga, estanque, lagoa, charca, encalco" }, "natural/water/reservoir": { "name": "Encoro", - "terms": "encoro, presa, embalse, estanque" + "terms": "encoro, presa, embalse, estanque, encalco, represa, vaira" }, "natural/water/river": { "name": "Área de río", @@ -2667,11 +2805,12 @@ "name": "Área do regato" }, "natural/water/wastewater": { - "name": "Conca de augas residuais", + "name": "Cunca de augas residuais", "terms": "bazofia, desperdicio, desproveito, reboutallo, sobra, varredura, refugo, excrementos, caca, feces, merda, refugallo, mierda, augas residuais, residuos, conca de asentamento, conca clarificadora, cuenca" }, "natural/wetland": { - "name": "Pantano" + "name": "Zona húmida", + "terms": "humidal, húmido, braña, lameiro, estuario, marisma, pantano, turbeira, mangleiro, esteiro" }, "natural/wood": { "name": "Bosque natural", @@ -2708,6 +2847,9 @@ "office/company": { "name": "Oficina corporativa" }, + "office/consulting": { + "name": "Oficina de consultoría" + }, "office/coworking": { "name": "Espacio de cotraballo" }, @@ -2754,6 +2896,9 @@ "name": "Oficina gobernamental", "terms": "oficina gobernamental, oficina do goberno" }, + "office/government/prosecutor": { + "name": "Fiscalía" + }, "office/government/register_office": { "name": "Oficina de rexistro civil" }, @@ -2807,6 +2952,9 @@ "name": "Oficina de investigación", "terms": "investigación, desenvolvemento, I+D, laboratorio" }, + "office/surveyor": { + "name": "Oficina de agrimensor" + }, "office/tax_advisor": { "name": "Oficina de xestor fiscal" }, @@ -2823,6 +2971,19 @@ "name": "Oficina de servizos públicos de auga", "terms": "servizo público, servicio público, publico, auga, agua, saneamento" }, + "piste/downhill": { + "name": "Pista de esquí de velocidade" + }, + "piste/ice_skate": { + "name": "Pista de patinaxe sobre xeo", + "terms": "pista de xeo, patinaxe sobre xeo, pistas, patíns, skates, xeo, pista, xelo" + }, + "piste/nordic": { + "name": "Pista de esquí de fondo" + }, + "piste/skitour": { + "name": "Pista de esquí de travesía" + }, "place": { "name": "Lugar" }, @@ -2966,13 +3127,13 @@ "name": "Plataforma de aeroporto" }, "public_transport/platform/aerialway_point": { - "name": "Paraxe / Plataforma de vía aérea" + "name": "Parada / Plataforma de avións" }, "public_transport/platform/bus": { "name": "Plataforma de bus" }, "public_transport/platform/bus_point": { - "name": "Paraxe de bus", + "name": "Parada de bus", "terms": "autobús, bus, colectivo, plataforma, transporte público, parada" }, "public_transport/platform/ferry": { @@ -2980,48 +3141,48 @@ "terms": "bote, muelle, transbordador, plataforma, transporte público, peirao, barco" }, "public_transport/platform/ferry_point": { - "name": "Paraxe / Plataforma de ferri" + "name": "Parada / Plataforma de ferri" }, "public_transport/platform/light_rail": { "name": "Plataforma de tren lixeiro" }, "public_transport/platform/light_rail_point": { - "name": "Paraxe / Plataforma de tren lixeiro" + "name": "Parada / Plataforma de tren lixeiro" }, "public_transport/platform/monorail": { "name": "Plataforma de monorraíl" }, "public_transport/platform/monorail_point": { - "name": "Paraxe / Plataforma de monorraíl" + "name": "Parada / Plataforma de monorraíl" }, "public_transport/platform/subway": { "name": "Plataforma de metro" }, "public_transport/platform/subway_point": { - "name": "Paraxe / Plataforma de metro" + "name": "Parada / Plataforma de metro" }, "public_transport/platform/train": { "name": "Plataforma de trens" }, "public_transport/platform/train_point": { - "name": "Paraxe / Plataforma de trens" + "name": "Parada / Plataforma de trens" }, "public_transport/platform/tram": { "name": "Plataforma de tranvía" }, "public_transport/platform/tram_point": { - "name": "Paraxe / Plataforma de tranvía", + "name": "Parada / Plataforma de tranvía", "terms": "eléctrico, tren lixeiro, plataforma, transporte público, ferrocarril, tranvía, pista, tránsito, transporte" }, "public_transport/platform/trolleybus": { - "name": "Paraxe / Plataforma de trolebús" + "name": "Parada / Plataforma de trolebús" }, "public_transport/platform/trolleybus_point": { - "name": "Paraxe de trolebús", + "name": "Parada de trolebús", "terms": "autobús, eléctrico, plataforma, transporte público, tranvía, sen rieles, trolley, trolebús, transporte, bus, trollei, trole, sen raís, bus, parada" }, "public_transport/platform_point": { - "name": "Paraxe / Plataforma de transporte público", + "name": "Parada / Plataforma de transporte público", "terms": "plataforma, transporte público, tránsito, transporte, parada" }, "public_transport/station": { @@ -3046,47 +3207,47 @@ "name": "Estación de tranvía" }, "public_transport/stop_area": { - "name": "Área de paraxe do transporte público", + "name": "Área de parada de transporte público", "terms": "transporte público, parada, punto de detención" }, "public_transport/stop_position": { - "name": "Ubicación de paraxe do transporte público", + "name": "Ubicación de parada de transporte público", "terms": "punto detención, transporte público, tránsito, transporte, aéreo, autobús, ferry, tren lixeiro, tranvía, tren, monorraíl, metro, trolebús, parada, bus, ferri" }, "public_transport/stop_position_aerialway": { - "name": "Ubicación de paraxe da vía aérea", + "name": "Lugar de parada de avións", "terms": "punto detención, transporte público, tránsito, transporte, teleférico, telecabina, góndola, transportador, parada" }, "public_transport/stop_position_bus": { - "name": "Punto de paraxe do autobús", + "name": "Lugar de parada de bus", "terms": "punto detención, transporte público, tránsito, transporte, autobús, bus, minibús, parada" }, "public_transport/stop_position_ferry": { - "name": "Ubicación de paraxe do ferri", + "name": "Lugar de parada de ferri", "terms": "punto detención, transporte público, tránsito, transporte, naval, marítimo, bote, barco, ferry, buque, lancha, muelle, dársena, ferri, peirao, parada" }, "public_transport/stop_position_light_rail": { - "name": "Ubicación de paraxe do tren lixeiro", + "name": "Lugar de parada de tren lixeiro", "terms": "punto detención, transporte público, tránsito, transporte, tren, ferrocarril, tren lixeiro, parada" }, "public_transport/stop_position_monorail": { - "name": "Ubicación de paraxe do monorraíl", + "name": "Lugar de parada de monorraíl", "terms": "punto detención, transporte público, tránsito, transporte, tren, ferrocarril, monorraíl, monocarril, bus, parada" }, "public_transport/stop_position_subway": { - "name": "Ubicación de paraxe do metro", + "name": "Lugar de parada de metro", "terms": "punto detención, transporte público, tránsito, transporte, tren, ferrocarril, metro, subterráneo, parada" }, "public_transport/stop_position_train": { - "name": "Ubicación de paraxe do tren", + "name": "Lugar de parada do tren", "terms": "punto detención, transporte público, tránsito, transporte, tren, ferrocarril, parada" }, "public_transport/stop_position_tram": { - "name": "Ubicación de paraxe do tranvía", + "name": "Lugar de parada de tranvía", "terms": "punto detención, transporte público, tránsito, transporte, tren, ferrocarril, tranvía, parada" }, "public_transport/stop_position_trolleybus": { - "name": "Ubicación de paraxe do trolebús", + "name": "Lugar de parada de trolebús", "terms": "punto detención, transporte público, tránsito, transporte, tren, ferrocarril, bus, autobús, trolebús, bus, parada" }, "railway": { @@ -3097,14 +3258,15 @@ "terms": "carris,ferrovia,fora de servizo,ferroviarias,ferroviarios,camiños de ferro,camiños-de-ferro,liña férrea,comboios,vía de tren, via, via de tren, ferrovia, ferrovía, ferrocarril, liña ferrea, via férrea, vía férrea, carris,ferrovia,ferroviarias,ferroviarios,camiños de ferro,camiños-de-ferro,liña férrea,comboios,vía de tren, via, via de tren, ferrovia, ferrovía, ferrocarril, liña ferrea, via férrea, vía férrea" }, "railway/buffer_stop": { - "name": "Toupeira (paraxe de buffer)", + "name": "Toupeira (parada de buffer)", "terms": "parachoques deslizante, tope, amortiguador, quitamedos, topera, topeira, toupeira" }, "railway/construction": { "name": "Ferrovía en construción" }, "railway/crossing": { - "name": "Paso a nivel peonil" + "name": "Ferrovía - Cruce de camiño", + "terms": "ferrocarril, tren, peonil, peonal" }, "railway/derail": { "name": "Calzo descarrilador" @@ -3120,7 +3282,8 @@ "name": "Estación de trens (Halt / Request)" }, "railway/level_crossing": { - "name": "Paso a nivel de estrada" + "name": "Ferrovía - Cruce de estrada", + "terms": "ferrocarril, tren, estrada" }, "railway/light_rail": { "name": "Ferrovía de tren lixeiro" @@ -3155,7 +3318,8 @@ "terms": "raíl, carril, camiño de ferro, ferrocarril, ferrovía, liña férrea, riel, tren, rail, vía, vía permanente, vía férrea, via, tren bala, tren rápido, tren de alta velocidade, HSR, velocidade alta, LAV, lav, AVE, ave, AVANT, avant" }, "railway/railway_crossing": { - "name": "Paso a nivel oblicuo" + "name": "Ferrovía - Cruce de ferrovía", + "terms": "ferrocarril, tren" }, "railway/signal": { "name": "Sinal ferroviario" @@ -3171,7 +3335,8 @@ "terms": "boca, entrada de metro, entrada de subte, entrada, ingreso, acceso, subte, subterráneo, subterraneo, metro, escaleiras, escadas, ascensor, boca de metro, entrada do metro, saída, saida, porta, entrada" }, "railway/switch": { - "name": "Agulla de ferrovía" + "name": "Agulla de ferrovía", + "terms": "desvío, ferrocarril, ferrovía" }, "railway/train_wash": { "name": "Instalación de lavado de trens" @@ -3180,8 +3345,14 @@ "name": "Vía de tranvía", "terms": "tranvía, tranvia, vía, via" }, + "railway/tram_crossing": { + "name": "Tranvía - cruce de camiño" + }, + "railway/tram_level_crossing": { + "name": "Tranvía - cruce de estrada" + }, "railway/tram_stop": { - "name": "Paraxe de tranvía" + "name": "Parada de tranvía" }, "relation": { "name": "Relación", @@ -3428,6 +3599,9 @@ "shop/laundry": { "name": "Lavandaría" }, + "shop/laundry/self_service": { + "name": "Lavandaría autoservizo" + }, "shop/leather": { "name": "Tenda de peles" }, @@ -3707,6 +3881,9 @@ "tourism/information/map": { "name": "Mapa" }, + "tourism/information/office": { + "terms": "centro de información, oficina turística" + }, "tourism/information/terminal": { "name": "Terminal de información" }, @@ -3716,6 +3893,9 @@ "tourism/museum": { "name": "Museo" }, + "tourism/museum/history": { + "name": "Museo de historia" + }, "tourism/picnic_site": { "name": "Merendeiro ou zona de pícnic", "terms": "picnic, esparcemento, merendeiro, sitio de picnic, lugar de picnic, zona de picnic" @@ -3771,26 +3951,30 @@ "traffic_sign/city_limit": { "name": "Sinal de límite de cidade" }, - "traffic_sign/city_limit_vertex": { - "name": "Sinal de límite de cidade" - }, "traffic_sign/maxspeed": { "name": "Sinal de límite da velocidade" }, - "traffic_sign/maxspeed_vertex": { - "name": "Sinal de límite da velocidade" - }, "type/boundary": { - "name": "Límite" + "name": "Límite", + "terms": "fronteira, raia" }, "type/boundary/administrative": { "name": "Límite administrativo" }, + "type/connectivity": { + "name": "Conexión vial" + }, + "type/destination_sign": { + "name": "Sinal de destino" + }, + "type/enforcement/maxspeed": { + "name": "Límite de velocidade controlado" + }, "type/multipolygon": { "name": "Multipolígono" }, "type/public_transport/stop_area_group": { - "name": "Grupo de área da paraxe de transporte", + "name": "Grupo de área de parada de transporte", "terms": "transporte público, parada, punto de detención" }, "type/restriction": { @@ -3817,6 +4001,9 @@ "type/restriction/only_straight_on": { "name": "Só cara adiante" }, + "type/restriction/only_u_turn": { + "name": "Só cambio de sentido" + }, "type/route": { "name": "Ruta" }, @@ -3833,9 +4020,6 @@ "name": "Liña de ferri", "terms": "ruta, rota, liña, ferri, itinerario, rumbo, dirección, traxecto, ferry, transbordador, buque, barco" }, - "type/route/foot": { - "name": "Roteiro a pé" - }, "type/route/hiking": { "name": "Roteiro de sendeirismo" }, @@ -3849,6 +4033,9 @@ "name": "Ruta de tubaxe", "terms": "ruta, rota, tubería, tubaría, gasoduto, oleoduto, conduto, cañería, duto, ducto, tubaxe, tubo" }, + "type/route/piste": { + "name": "Ruta / Pista de esquí" + }, "type/route/power": { "name": "Ruta de rede eléctrica", "terms": "liña de alta tensión, cable, cabo, electricidade, enerxía, rede elećtrica, liña electrica, ruta" @@ -3883,14 +4070,16 @@ "terms": "astillero, varadeiro, bote, lancha, embarcación, varadoiro, barco, barcos, embarcacion" }, "waterway/canal": { - "name": "Canle" + "name": "Canle", + "terms": "cal, caldeira, calexa, quenlla, cano, rego" }, "waterway/canal/lock": { "name": "Canle de esclusa", "terms": "canal, esclusa, canle" }, "waterway/dam": { - "name": "Encoro" + "name": "Encoro", + "terms": "encalco, embalse, presa, represa estanque, pantano, vaira" }, "waterway/ditch": { "name": "Birta" @@ -3903,7 +4092,8 @@ "terms": "drenaxe, sumidoiro, sumideiro, acougadoiro, desacougadoiro, pluviais, augas, chuvia, chuva, choiva, desagüe, sumidero, alcantarilla, alcantarillado, resumidero, gabia, foxo, foio, cuneta, focha, fochanca, focho, covo" }, "waterway/fish_pass": { - "name": "Paso de peixes" + "name": "Paso fluvial", + "terms": "canle fluvial, augas arriba, desove, paso de peixes, peixe, escada, piscícola, anguías, salmón, represa, reprodución" }, "waterway/fuel": { "name": "Gasolineira para embarcacións" @@ -3918,21 +4108,26 @@ }, "waterway/river": { "name": "Río", - "terms": "río, rio, regato, afluente, auga, regacho, vertente, agua, rama, arroio, curso, esteiro, estuario, foz, riachuelo, ribeira, corrente, curso de auga, auga, agua, beira, marxe" + "terms": "río, rio, regato, regacho, afluente, auga, regacho, vertente, agua, rama, arroio, curso, esteiro, estuario, foz, riachuelo, ribeira, corrente, curso de auga, auga, agua, beira, marxe" }, "waterway/riverbank": { "name": "Beira de río" }, "waterway/sanitary_dump_station": { - "name": "Inodoro para embarcacións" + "name": "Aseo para embarcacións", + "terms": "aseos, aseo, baños, WC, cuarto de baño, servizo, servizos, lavabo, latrina, retrete, váter, urinario, urinaria" }, "waterway/stream": { "name": "Regato", - "terms": "río, regato, rego, torrente, auga" + "terms": "río, regato, regacho, rego, torrente, auga" }, "waterway/stream_intermittent": { "name": "Regato intermitente" }, + "waterway/tidal_channel": { + "name": "Río de esteiro", + "terms": "canle, costeiro, rías, ría, mar, esteiro, estuario, mar, litoral, mariño, salgado, regado, rego, insua, salobre, marea, mangal" + }, "waterway/water_point": { "name": "Auga potábel para embarcacións", "terms": "auga potable, auga, agua, porto, embarcación, porto deportivo, mariña, marina, barco, paquebote, nave, paquete, lancha, peirao" diff --git a/app/src/main/assets/osmfeatures/hu.json b/app/src/main/assets/osmfeatures/hu.json index 30a25ea823..509fa10b32 100644 --- a/app/src/main/assets/osmfeatures/hu.json +++ b/app/src/main/assets/osmfeatures/hu.json @@ -3942,18 +3942,9 @@ "traffic_sign/city_limit": { "name": "Lakott terület határát jelző tábla" }, - "traffic_sign/city_limit_vertex": { - "name": "Lakott terület határát jelző tábla" - }, "traffic_sign/maxspeed": { "name": "Sebességkorlátozást jelző tábla" }, - "traffic_sign/maxspeed_vertex": { - "name": "Sebességkorlátozást jelző tábla" - }, - "traffic_sign_vertex": { - "name": "Jelzőtábla" - }, "type/boundary": { "name": "Határvonal", "terms": "Határ" @@ -4021,10 +4012,6 @@ "name": "Kompútvonal", "terms": "Kompjárat útvonal" }, - "type/route/foot": { - "name": "Gyalogos útvonal", - "terms": "Gyalog útvonal" - }, "type/route/hiking": { "name": "Turistaút", "terms": "Túraút, gyalogtúra" @@ -4109,7 +4096,7 @@ "terms": "üzemanyag,dízel,gázolaj,csónak,hajó, hajóbenzinkút, bunkerolaj" }, "waterway/lock_gate": { - "name": "Zsilip", + "name": "Zsilipkapu", "terms": "csatorna" }, "waterway/milestone": { diff --git a/app/src/main/assets/osmfeatures/in.json b/app/src/main/assets/osmfeatures/in.json index 371c31db4a..0f8a3c4105 100644 --- a/app/src/main/assets/osmfeatures/in.json +++ b/app/src/main/assets/osmfeatures/in.json @@ -1334,9 +1334,6 @@ "type/route/ferry": { "name": "Rute Feri" }, - "type/route/foot": { - "name": "Rute Jalan Kaki" - }, "type/route/hiking": { "name": "Rute Pendakian" }, diff --git a/app/src/main/assets/osmfeatures/it.json b/app/src/main/assets/osmfeatures/it.json index e4f28fac44..21b3749e87 100644 --- a/app/src/main/assets/osmfeatures/it.json +++ b/app/src/main/assets/osmfeatures/it.json @@ -11,10 +11,16 @@ "name": "Cartellone pubblicitario", "terms": "pubblicità,cartellone,promozione,propaganda,réclame,manifesto" }, + "advertising/board": { + "name": "Bacheca" + }, "advertising/column": { "name": "Espositore pubblicitario cilindrico", "terms": "espositore pubblicitario,espositori,cilindro,cilindrico,pubblicità,cartellone,totem" }, + "advertising/totem": { + "name": "Totem pubblicitario" + }, "aerialway": { "name": "Caratteristiche del trasporto a fune" }, @@ -30,10 +36,16 @@ "name": "Sciovia", "terms": "sci,teleferica,skilift,lift" }, + "aerialway/gondola": { + "name": "Cabinovia" + }, "aerialway/goods": { "name": "Teleferica", "terms": "funivia,cavo,gru,merci" }, + "aerialway/j-bar": { + "name": "Ski-lift" + }, "aerialway/magic_carpet": { "name": "Tapis roulant", "terms": "tappeto,scorrevole,mobile,magico,cintura,cinghia,nastro,snowboard,superficie,trasportatore" @@ -54,6 +66,9 @@ "name": "Manovia", "terms": "manovia" }, + "aerialway/t-bar": { + "name": "Ski-lift ad àncora" + }, "aerialway/zip_line": { "name": "Teleferica", "terms": "aereo,aerea,volo,volante,pista,corsia,volpe volante,vela,foefie,fune,tirolese,traverso,zipline,zip,corda" @@ -83,6 +98,10 @@ "aeroway/holding_position": { "name": "Circuito di attesa per aeromobili" }, + "aeroway/jet_bridge": { + "name": "Manicotto d’imbarco", + "terms": "pontile,passerella,imbarco,manicotto,passeggeri,portale,connettore,gate" + }, "aeroway/parking_position": { "name": "Posizione di parcheggio per aeromobili" }, @@ -90,6 +109,9 @@ "name": "Pista di decollo/atterraggio", "terms": "pista di atterraggio" }, + "aeroway/spaceport": { + "name": "Spazioporto" + }, "aeroway/taxiway": { "name": "Pista di rullaggio", "terms": "rullaggio,pista,aeroporto,manovra" @@ -175,10 +197,16 @@ "name": "Biergarten", "terms": "birreria,distesa,birra,alcol,bevuta" }, + "amenity/binoculars": { + "name": "Binocolo Montato" + }, "amenity/boat_rental": { "name": "Noleggio barche", "terms": "noleggio barche,noleggio,barche,porto,negozio" }, + "amenity/boat_storage": { + "name": "Rimessaggio Barche" + }, "amenity/bureau_de_change": { "name": "Cambiavalute", "terms": "cambi,ufficio cambi,cambio,valuta,cambiovaluta" @@ -190,6 +218,9 @@ "name": "Caffè", "terms": "bistrot,caffè,thè,te,bar,caffetteria" }, + "amenity/cafe/bubble_tea": { + "name": "Bubble Tea Caffetteria" + }, "amenity/cafe/coffee_shop": { "name": "Caffetteria" }, @@ -291,7 +322,8 @@ "terms": "dojo,karate,judo,arti marziali" }, "amenity/dressing_room": { - "name": "Camerino" + "name": "Camerino", + "terms": "camerino,cabina,cabina di prova" }, "amenity/drinking_water": { "name": "Fontanella", @@ -336,6 +368,10 @@ "amenity/fast_food/ice_cream": { "name": "Fast Food di gelati" }, + "amenity/fast_food/juice": { + "name": "Fast food di succhi di frutta", + "terms": "bar,caffè,caffetteria,bevande,frutta,bevuta,drink,succhi,frappé,frullati" + }, "amenity/fast_food/kebab": { "name": "Fast Food di kebab", "terms": "bar,colazione,caffè,mensa,cena,drivein,mangiare,grigliata,pranzo,tavolo,kebab,kebap,shawarma" @@ -371,6 +407,9 @@ "name": "Stazione di servizio", "terms": "distributore,gas, benzina,diesel,gpl,carburante,benzinaio,gasolio,nafta" }, + "amenity/gambling": { + "name": "Sala da Gioco" + }, "amenity/grave_yard": { "name": "Cimitero", "terms": "cimitero,tombe" @@ -563,6 +602,10 @@ "name": "Pub", "terms": "pub,birreria,locale" }, + "amenity/pub/irish": { + "name": "Pub irlandese", + "terms": "guinness,dublino,irlanda" + }, "amenity/pub/lgbtq": { "name": "Pub LGBTQ+", "terms": "gay pub,lesbica,lesbiche,lgbtq,lgb,bisex,omosessuale,trans,queen" @@ -589,6 +632,9 @@ "amenity/recycling/container/electrical_items": { "name": "Cassonetto per la raccolta di RAEE" }, + "amenity/recycling/container/green_waste": { + "name": "Contenitore dei rifiuti naturali" + }, "amenity/recycling_centre": { "name": "Centro di riciclaggio", "terms": "Centro riciclo" @@ -600,6 +646,9 @@ "amenity/refugee_site": { "name": "Campo profughi" }, + "amenity/research_institute": { + "name": "Istituto di ricerca" + }, "amenity/restaurant": { "name": "Ristorante", "terms": "bar,caffetteria,caffè,ristorante self-service,braceria,trattoria,negozio di ciambelle,bettola,griglieria,venditore di hamburger,venditore di hotdog,pizzeria" @@ -768,6 +817,9 @@ "name": "Latrina a fossa", "terms": "tazza,scarico,caduta,fossa,pozzo,buca,toilet,gabinetto,latrina" }, + "amenity/toilets/portable": { + "name": "WC portatile" + }, "amenity/townhall": { "name": "Municipio", "terms": "sala del comune,palazzo di governo,tribunale,municipio" @@ -794,10 +846,12 @@ "terms": "distributore automatico,macchinetta" }, "amenity/vending_machine/bottle_return": { - "name": "Macchina per il Reso delle Bottiglie" + "name": "Macchina per il reso delle bottiglie", + "terms": "reso bottiglie" }, "amenity/vending_machine/bread": { - "name": "Macchina di Vendita del Pane" + "name": "Macchina di vendita del pane", + "terms": "pane, baguette" }, "amenity/vending_machine/cigarettes": { "name": "Distributore automatico di sigarette", @@ -816,7 +870,8 @@ "terms": "distributore automatico,macchinetta,bevande,bottiglie,bottigliette" }, "amenity/vending_machine/eggs": { - "name": "Macchina di Vendita delle Uova" + "name": "Macchina di vendita delle uova", + "terms": "uova" }, "amenity/vending_machine/electronics": { "name": "Macchinetta accessori elettrici", @@ -941,6 +996,9 @@ "name": "Labirinto", "terms": "parco a tema,parco tematico,parco di divertimento,parco divertimenti,parco dei divertimenti,giostra,giostre,attrazione,divertimento,labirinto,dedalo" }, + "attraction/pirate_ship": { + "name": "Nave dei pirati" + }, "attraction/roller_coaster": { "name": "Montagne russe", "terms": "montagne russe,parco a tema,attrazioni,divertimento,divertimenti,giostra,luna park" @@ -1017,6 +1075,9 @@ "barrier/hedge": { "name": "Siepe" }, + "barrier/height_restrictor": { + "name": "Limitatore di altezza" + }, "barrier/kerb": { "name": "Cordolo", "terms": "bordo,marciapiede" @@ -1049,10 +1110,16 @@ "name": "Muro di contenimento", "terms": "Muro di contenimento" }, + "barrier/spikes": { + "name": "Striscia chiodata" + }, "barrier/stile": { "name": "Scaletta", "terms": "Scaletta" }, + "barrier/swing_gate": { + "name": "Sbarra a rotazione" + }, "barrier/toll_booth": { "name": "Casello", "terms": "Casello autostradale" @@ -1065,6 +1132,9 @@ "name": "Muro", "terms": "Muro" }, + "barrier/wall/noise_barrier": { + "name": "Barriera antirumore" + }, "boundary": { "name": "Confine" }, @@ -1076,7 +1146,7 @@ "name": "Supporto ponte" }, "bridge/support/pier": { - "name": "pilone" + "name": "Pilone" }, "building": { "name": "Edificio", @@ -1136,6 +1206,9 @@ "name": "Edificio in costruzione", "terms": "cantiere,struttura,in costruzione" }, + "building/cowshed": { + "name": "Stalla" + }, "building/detached": { "name": "Casa indipendente", "terms": "abitazione indipendente,indipendente" @@ -1305,6 +1378,10 @@ "name": "Mestiere", "terms": "artigianato, produzione locale" }, + "craft/agricultural_engines": { + "name": "Meccanico di motori agricoli", + "terms": "mietitrebbie,fattoria,equipaggiamento,attrezzi,mietitrici,mietitori,trattori" + }, "craft/basket_maker": { "name": "Cestaio", "terms": "Cestaio,Intrecciatore di vimini" @@ -1478,16 +1555,26 @@ "terms": "azienda vinicola, azienda vitivinicola" }, "cycleway/asl": { - "name": "Linea di Stop Avanzata" + "name": "Linea di Stop Avanzata", + "terms": "box di fermata avanzato,asl,box bici,cassetta per biciclette,stop biciclette" + }, + "demolished/building": { + "name": "Edificio demolito di recente" + }, + "disused/amenity": { + "name": "Servizio in disuso" + }, + "disused/railway": { + "name": "Elemento ferroviario in disuso" }, "disused/shop": { - "name": "Negozio in Disuso" + "name": "Negozio in disuso" }, "embankment": { "name": "Terrapieno" }, "emergency": { - "name": "Elementi di soccorso" + "name": "Elemento di soccorso" }, "emergency/ambulance_station": { "name": "Stazione ambulanze", @@ -1495,10 +1582,10 @@ }, "emergency/defibrillator": { "name": "Defibrillatore", - "terms": "dae,defibrillatore" + "terms": "dae,defibrillatore,aed" }, "emergency/designated": { - "name": "Accesso di emergenza designato" + "name": "Accesso di emergenza riservato" }, "emergency/destination": { "name": "Destinazione d'uso accesso di emergenza" @@ -1522,6 +1609,9 @@ "name": "Kit di primo soccorso", "terms": "bende,bendaggi,garze,cerotti,disinfettante,sterile,sterili,medicine,kit,pronto soccorso,medico,primo soccorso,soccorso" }, + "emergency/landing_site": { + "name": "Area di atterraggio elicotteri per emergenza" + }, "emergency/life_ring": { "name": "Salvagente", "terms": "boa di salvataggio,annegamento,giubbotto,salvataggio,ciambella" @@ -1682,9 +1772,12 @@ "name": "Logopedista", "terms": "voce,parola,linguaggio,comunicazione,terapista,terapia" }, + "highway": { + "name": "Elemento stradale" + }, "highway/bridleway": { "name": "Ippovia", - "terms": "ippovia, percorso per cavalli, percorso equestre" + "terms": "ippovia,percorso per cavalli,percorso equestre" }, "highway/bus_guideway": { "name": "Binario per autobus" @@ -1694,10 +1787,10 @@ }, "highway/construction": { "name": "Strada chiusa", - "terms": "chiusura,costruzione,strada chiusa,lavori in corso,lavori stradali" + "terms": "chiusura,costruzione,strada chiusa,lavori in corso,lavori stradali,strada in costruzione" }, "highway/corridor": { - "name": "Corridoio interno", + "name": "Corridoio", "terms": "corridoio" }, "highway/crossing": { @@ -1824,6 +1917,9 @@ "name": "Sentiero", "terms": "Sentiero" }, + "highway/path/boardwalk": { + "name": "Passerella di legno" + }, "highway/pedestrian_area": { "name": "Area pedonale", "terms": "piazza,piazza pedonale,centro,pedonale,area" @@ -2060,6 +2156,9 @@ "name": "Svincolo", "terms": "svincolo,uscita" }, + "landuse": { + "name": "Caratteristica di uso del terreno" + }, "landuse/aquaculture": { "name": "Acquacoltura", "terms": "pesci,crostacei,alghe,gambero,gamberi,gamberetti,aragoste,maricoltura,algacoltura,allevamento,molluschi,cozze,ostriche,orate" @@ -2096,6 +2195,9 @@ "name": "Fattoria", "terms": "Aia" }, + "landuse/flowerbed": { + "name": "Aiuola" + }, "landuse/forest": { "name": "Foresta gestita" }, @@ -2212,6 +2314,9 @@ "landuse/winter_sports": { "name": "Area sport invernali" }, + "leisure": { + "name": "Caratteristica di benessere" + }, "leisure/adult_gaming_centre": { "name": "Sala da gioco", "terms": "gioco d'azzardo,casinò,bisca" @@ -2258,6 +2363,9 @@ "leisure/escape_game": { "name": "Escape Room" }, + "leisure/firepit": { + "name": "Focolare" + }, "leisure/fishing": { "name": "Punto per la pesca", "terms": "pesca,pescatore,punto,pesce,esca" @@ -2504,6 +2612,9 @@ "name": "Linea", "terms": "Linea" }, + "man_made": { + "name": "Elementi creati dall’uomo" + }, "man_made/adit": { "name": "Cunicolo", "terms": "adito,miniera,ingresso" @@ -2527,6 +2638,9 @@ "name": "Bunker silo", "terms": "insilato,silaggio,stoccaggio,immagazzinamento,magazzino" }, + "man_made/cairn": { + "name": "Ometto di pietra" + }, "man_made/chimney": { "name": "Ciminiera", "terms": "torre,camino" @@ -2538,10 +2652,17 @@ "man_made/crane": { "name": "Gru" }, + "man_made/cross": { + "name": "Croce" + }, "man_made/cutline": { "name": "Linea di demarcazione", "terms": "Linea di taglio" }, + "man_made/dovecote": { + "name": "Colombaia", + "terms": "uccelli,volatili,colombe,colombara,piccioni,piccionaia" + }, "man_made/dyke": { "name": "Argine", "terms": "argine,terrapieno,rialzo" @@ -2558,6 +2679,10 @@ "name": "Gasometro", "terms": "gazometro" }, + "man_made/goods_conveyor": { + "name": "Trasporto di merce su nastro", + "terms": "nastro trasportatore,catena,cintura,rulli" + }, "man_made/lighthouse": { "name": "Faro", "terms": "Faro" @@ -2699,46 +2824,68 @@ "name": "Palo di Servizi Pubblici" }, "man_made/wastewater_plant": { - "name": "Impianto di depurazione delle acque" + "name": "Impianto di depurazione delle acque", + "terms": "impianto di trattamento acque,trattamento acque,depuratore,depurazione acque" }, "man_made/water_tap": { - "name": "Rubinetto dell'acqua" + "name": "Rubinetto dell'acqua", + "terms": "acqua potabile,rubinetto" }, "man_made/water_tower": { - "name": "Torre idrica" + "name": "Torre idrica", + "terms": "torre idrica,acquedotto" }, "man_made/water_well": { "name": "Pozzo", "terms": "Pozzo" }, "man_made/water_works": { - "name": "Impianto Idrico", + "name": "Impianto idrico", "terms": "Impianto idrico" }, "man_made/watermill": { - "name": "Mulino ad acqua" + "name": "Mulino ad acqua", + "terms": "mulino,mulino ad acqua" }, "man_made/windmill": { - "name": "Mulino a vento" + "name": "Mulino a vento", + "terms": "mulino,mulino a vento" }, "man_made/works": { "name": "Fabbrica", "terms": "industria,manifattura,officina,opificio,stabilimento,laboratorio" }, + "marker": { + "name": "Segnalatore", + "terms": "indicatore,segnalatore,marker,palo" + }, + "marker/utility": { + "name": "Segnalatore linea sotterranea", + "terms": "indicatore gasdotto,segnalatore gasdotto,segnalatore,indicatore,palo,utility marker" + }, + "marker/utility/power": { + "name": "Segnalatore rete elettrica", + "terms": "segnalatore rete elettrica,rete elettrica,palo,indicatore rete elettrica,cavo elettrico" + }, "military/bunker": { - "name": "Bunker militare" + "name": "Bunker militare", + "terms": "bunker,base,esercito" }, "military/checkpoint": { - "name": "Posto di Blocco Militare" + "name": "Posto di blocco militare", + "terms": "posto di blocco,militari,base,esercito" }, "military/nuclear_explosion_site": { - "name": "Sito esplosione nucleare" + "name": "Sito esplosione nucleare", + "terms": "esplosione,cratere,sito,nucleare" }, "military/office": { - "name": "Ufficio militare" + "name": "Ufficio militare", + "terms": "ufficio,militare,base" }, "military/trench": { - "name": "Trincea militare" + "name": "Trincea militare", + "terms": "trincea,guerra,buco," }, "natural": { "name": "Elemento naturale" @@ -2768,18 +2915,20 @@ "terms": "Rupe,parete,dirupo,scogliera,scogliera a picco" }, "natural/coastline": { - "name": "Linea di costa" + "name": "Linea di costa", + "terms": "spiaggia,costa" }, "natural/fell": { "name": "Prateria montana", "terms": "prati,pascoli,alpi,montagna,alta quota,incolti,tundra,erba,alpeggio,fieno" }, "natural/geyser": { - "name": "Geyser" + "name": "Geyser", + "terms": "geyser,gaiser,sorgente esplosiva,acque calde,vapore" }, "natural/glacier": { "name": "Ghiacciaio", - "terms": "Ghiacciaio" + "terms": "ghiacciaio" }, "natural/grassland": { "name": "Prateria", @@ -2787,14 +2936,19 @@ }, "natural/heath": { "name": "Brughiera", - "terms": "Brughiera" + "terms": "brughiera" + }, + "natural/hot_spring": { + "name": "Sorgente calda", + "terms": "sorgente geotermica,piscina termale,sorgente" }, "natural/mud": { "name": "Fango", "terms": "fango,fangoso,umido,bagnato,terra bagnata,melmoso,paludoso,palude" }, "natural/peak": { - "name": "Picco" + "name": "Picco", + "terms": "picco,cresta,corona,montagna,collina,pinnacolo,sommità" }, "natural/reef": { "name": "Scogliera", @@ -2805,10 +2959,11 @@ "terms": "cresta" }, "natural/rock": { - "name": "Masso" + "name": "Masso fissato", + "terms": "masso,pietra,roccia" }, "natural/saddle": { - "name": "Sella", + "name": "Valico", "terms": "passo,valico,sella,forcella" }, "natural/sand": { @@ -2820,18 +2975,28 @@ "terms": "ghiaione,frana,scarica,ghiaia,sassi,pietraia,sassaia,pietre" }, "natural/scrub": { - "name": "Boscaglia" + "name": "Boscaglia", + "terms": "cespuglio,boscaglia,arbusto" + }, + "natural/shingle": { + "name": "Spiaggia di ciottoli", + "terms": "ghiaia,ciottolato,sassi,spiaggia" }, "natural/shrub": { - "name": "Arbusto" + "name": "Arbusto", + "terms": "arbusto,cespuglio" }, "natural/spring": { "name": "Sorgente", - "terms": "Sorgente" + "terms": "sorgente" + }, + "natural/stone": { + "name": "Roccia non fissata", + "terms": "roccia,pietra" }, "natural/tree": { "name": "Albero", - "terms": "Albero" + "terms": "albero" }, "natural/tree_row": { "name": "Filare di alberi", @@ -3551,7 +3716,7 @@ "name": "Boutique" }, "shop/brewing_supplies": { - "name": "Negozio di Forniture per Birrerie" + "name": "Negozio di forniture per la produzione di birra" }, "shop/butcher": { "name": "Macellaio", @@ -3601,21 +3766,21 @@ }, "shop/chocolate": { "name": "Cioccolateria", - "terms": "Cioccolateria" + "terms": "cioccolateria,cacao" }, "shop/clothes": { "name": "Negozio di abbigliamento", - "terms": "Negozio vestiti" + "terms": "negozio vestiti,negozio di vestiti,abbigliamento" }, "shop/clothes/second_hand": { - "name": "Negozio di Abiti Usati" + "name": "Negozio di abiti usati" }, "shop/clothes/underwear": { "name": "Negozio di intimo", "terms": "boutique,negozio,reggiseni,boxer,mutande,fashion,lingerie,slip,calzini,intimo,body,pigiama,pijama,perizoma,camicia da notte" }, "shop/clothes/wedding": { - "name": "Negozio di Abiti per Matrimonio" + "name": "Negozio di abiti per matrimonio" }, "shop/coffee": { "name": "Negozio di caffè", @@ -3662,7 +3827,7 @@ "terms": "Negozio Fai da te" }, "shop/doors": { - "name": "Negozio di Porte" + "name": "Negozio di porte" }, "shop/dry_cleaning": { "name": "Lavanderia", @@ -3699,7 +3864,7 @@ "name": "Negozio di moda" }, "shop/fashion_accessories": { - "name": "Negozio di Accessori Moda" + "name": "Negozio di accessori di moda" }, "shop/fireplace": { "name": "Negozio di caminetti", @@ -3718,7 +3883,7 @@ "terms": "Corniceria" }, "shop/frozen_food": { - "name": "Negozio di Cibo Surgelato" + "name": "Negozio di cibo surgelato" }, "shop/fuel": { "name": "Negozio di carburanti" @@ -3781,7 +3946,7 @@ "terms": "Negozio Hi-Fi" }, "shop/hobby": { - "name": "Negozio di Hobbystica" + "name": "Negozio di hobbystica" }, "shop/houseware": { "name": "Casalinghi", @@ -3957,7 +4122,7 @@ "terms": "Negozio scarpe" }, "shop/spices": { - "name": "Negozio di Spezie" + "name": "Negozio di spezie" }, "shop/sports": { "name": "Negozio di articoli sportivi", @@ -4021,7 +4186,7 @@ "terms": "Agenzia di viaggi" }, "shop/trophy": { - "name": "Negozio di Coppe" + "name": "Negozio di coppe" }, "shop/tyres": { "name": "Gommista", @@ -4066,6 +4231,10 @@ "name": "Grossista", "terms": "Negozio di commercio all'ingrosso" }, + "shop/wigs": { + "name": "Negozio di parrucche", + "terms": "capelli,estensioni,parrucchino,toupet" + }, "shop/window_blind": { "name": "Negozio di tapparelle e serrande", "terms": "Serramenti" @@ -4255,20 +4424,9 @@ "name": "Segnale di inizio centro abitato", "terms": "paese,villaggio,case sparse,confine,bordo,strada,via" }, - "traffic_sign/city_limit_vertex": { - "name": "Segnale di inizio centro abitato", - "terms": "paese,villaggio,case sparse,confine,bordo,strada,via" - }, "traffic_sign/maxspeed": { "name": "Cartello di limite di velocità" }, - "traffic_sign/maxspeed_vertex": { - "name": "Cartello di limite di velocità" - }, - "traffic_sign_vertex": { - "name": "Segnale stradale", - "terms": "strada,carreggiata,segnale,cartello,pericolo,triangolo,precedenza,divieto,obbligo" - }, "type/boundary": { "name": "Confine", "terms": "Confine" @@ -4343,10 +4501,6 @@ "name": "Linea traghetti", "terms": "Itinerario traghetto" }, - "type/route/foot": { - "name": "Percorso pedonale", - "terms": "Itinerario pedonale" - }, "type/route/hiking": { "name": "Percorso escursionistico", "terms": "sentiero,escursione,gita,rotta,percorso,passeggiata,cammino" diff --git a/app/src/main/assets/osmfeatures/ja.json b/app/src/main/assets/osmfeatures/ja.json index d41bd9dcb2..97bb16a7e1 100644 --- a/app/src/main/assets/osmfeatures/ja.json +++ b/app/src/main/assets/osmfeatures/ja.json @@ -212,10 +212,18 @@ "name": "ビアガーデン", "terms": "ビアガーデン, ビアホール, ビール, 酒, 飲む, 呑む, 飲食店, アルコール" }, + "amenity/binoculars": { + "name": "双眼鏡", + "terms": "双眼鏡, 展望所, 眺望, 風景" + }, "amenity/boat_rental": { "name": "貸しボート", "terms": "貸しボート, ボート, 公園, 娯楽, レジャー, 舟, 池, 公園, 観光" }, + "amenity/boat_storage": { + "name": "ボート店", + "terms": "ボート店, お店, 店舗, ボートハウス" + }, "amenity/bureau_de_change": { "name": "両替所", "terms": "両替商, お金, 金融, 両替" @@ -484,8 +492,12 @@ "terms": "図書館, ライブラリ, ライブラリー, 教育, 本" }, "amenity/loading_dock": { - "name": "貨物の搬出入口", - "terms": "貨物の搬出入口, 貨物搬入口, 貨物積出口, 荷受, 荷出" + "name": "出入口（貨物）", + "terms": "貨物の搬出入口, 貨物搬入口, 貨物積出口, 荷受, 荷出, 貨物出口, 貨物入口, 出口, 入口, 出入口（貨物）" + }, + "amenity/lounger": { + "name": "サマーベッド", + "terms": "サンラウンジャー, 寝椅子, サマーベッド" }, "amenity/love_hotel": { "name": "ラブホテル", @@ -503,6 +515,10 @@ "name": "海外送金所", "terms": "海外送金所, 国際送金所, 送金, 金融, 振替, お金" }, + "amenity/mortuary": { + "name": "死体安置所", + "terms": "死体安置所, 遺体安置所, モルグ, 死体保管所, 死体置き場, 死体公示場, 霊安室" + }, "amenity/motorcycle_parking": { "name": "オートバイの駐車場", "terms": "バイクの駐車場, 二輪駐車場, 二輪駐輪場, 駐車場, 駐輪場, オートバイ, モーターサイクル" @@ -540,7 +556,7 @@ }, "amenity/parking_entrance": { "name": "出入口（駐車場）", - "terms": "駐車場の出入口, 自動車, 出入り口, 出入口, 駐車場" + "terms": "駐車場の出入口, 自動車, 出入り口, 出入口, 駐車場, 出口, 入口" }, "amenity/parking_space": { "name": "駐車区画（1台ごとの）", @@ -1719,6 +1735,9 @@ "demolished/building": { "name": "建物（取り壊し済み）" }, + "disused/amenity": { + "name": "閉鎖施設" + }, "disused/railway": { "name": "鉄道（廃棄済み）" }, @@ -1814,8 +1833,8 @@ "terms": "非常口, 出口, 緊急" }, "entrance/emergency_ward_entrance": { - "name": "救急外来入口", - "terms": "救急外来入口, 救急車搬送口, 急患, 救急車" + "name": "出入口（救急外来）", + "terms": "救急外来入口, 救急車搬送口, 急患, 救急車, 出入口（救急外来）, 出口, 入口" }, "ford": { "name": "洗い越し", @@ -1832,6 +1851,10 @@ "name": "ゴルフカート用の道", "terms": "ゴルフカート用の道, ゴルフ, ゴルフカート, ゴルフ場" }, + "golf/clubhouse": { + "name": "クラブハウス", + "terms": "クラブハウス, ゴルフ" + }, "golf/driving_range": { "name": "打ちっぱなし", "terms": "打ちっぱなし, ゴルフ, ゴルフ練習場, ゴルフ場, スポーツ, 打ちっ放し" @@ -3038,16 +3061,16 @@ "terms": "立坑, マインシャフト, 鉱山, 垂直坑道, 垂直坑" }, "man_made/monitoring_station": { - "name": "監視ステーション", - "terms": "監視ステーション" + "name": "観測点", + "terms": "観測点, 観測装置, アメダス, 水位計, 地震計, 測定局, 監視ステーション" }, "man_made/obelisk": { "name": "オベリスク", "terms": "オベリスク, 装飾的記念柱, 記念碑, 記念柱" }, "man_made/observatory": { - "name": "観測ドーム", - "terms": "観測ドーム, 観測所" + "name": "観測所", + "terms": "観測所, 測候所, 天文台, 観測ドーム" }, "man_made/petroleum_well": { "name": "油田", @@ -3106,8 +3129,8 @@ "terms": "監視カメラ, 監視" }, "man_made/survey_point": { - "name": "観測設備", - "terms": "観測設備, 観測地点, 測候所" + "name": "測量標", + "terms": "測量標, 三角点, 水準点, 電子基準点, 測量標識" }, "man_made/torii": { "name": "鳥居", @@ -3125,6 +3148,10 @@ "name": "塔（通信）", "terms": "塔（通信）, 通信塔, 塔, タワー" }, + "man_made/tower/cooling": { + "name": "冷却塔", + "terms": "冷却塔, 塔" + }, "man_made/tower/defensive": { "name": "防衛塔", "terms": "防衛塔" @@ -3173,6 +3200,10 @@ "name": "風車", "terms": "風車" }, + "man_made/windpump": { + "name": "水汲み風車", + "terms": "水汲み風車, 風車" + }, "man_made/works": { "name": "工場", "terms": "工場" @@ -3230,7 +3261,7 @@ }, "natural/cave_entrance": { "name": "出入口（洞窟）", - "terms": "洞窟の入口, 洞穴, 出入口, 出入り口" + "terms": "洞窟の入口, 洞穴, 出入口, 出入り口, 出口, 入口, 出入口（洞窟）" }, "natural/cliff": { "name": "崖", @@ -3260,6 +3291,10 @@ "name": "荒地", "terms": "荒地, 植物" }, + "natural/hot_spring": { + "name": "温泉（日本国外）", + "terms": "温泉（日本国外）, 温泉" + }, "natural/mud": { "name": "泥地", "terms": "泥地, 泥" @@ -3390,7 +3425,7 @@ }, "office/accountant": { "name": "会計事務所（主に法人向け）", - "terms": "会計事務所, 税理士, 税理士事務所, 会計士, 公認会計士" + "terms": "会計事務所, 会計士, 公認会計士" }, "office/administrative": { "name": "地方行政事務所" @@ -3558,8 +3593,8 @@ "terms": "測量会社" }, "office/tax_advisor": { - "name": "税金アドバイザー", - "terms": "税金アドバイザー, 節税アドバイザー" + "name": "税理士事務所", + "terms": "税理士事務所, 税理士, 税金アドバイザー, 節税アドバイザー" }, "office/telecommunication": { "name": "通信会社事務所", @@ -3846,6 +3881,10 @@ "name": "バス停", "terms": "バス停, バス停留所, 停留所, バス乗り場, BS, バスストップ" }, + "public_transport/platform/bus_tram_point": { + "name": "路面電車・バス停", + "terms": "電停, 停留所, 駅, 停車場, 路面電車, 路面電車停留所, のりば, 路面電車・バス停, バス停" + }, "public_transport/platform/ferry": { "name": "旅客船プラットホーム", "terms": "フェリー乗り場, フェリー, 港, 船着場, 船, 客船, 旅客船, フェリーターミナル, 舟, 連絡船, 渡し船, 渡船, のりば, ホーム, プラットホーム, 旅客船プラットホーム" @@ -4083,7 +4122,7 @@ }, "railway/subway_entrance": { "name": "出入口（地下鉄）", - "terms": "地下鉄の出入口, 出入り口, 出入口, 地下鉄, 出口, 入口" + "terms": "地下鉄の出入口, 出入り口, 出入口, 地下鉄, 出口, 入口, 出入口（地下鉄）" }, "railway/switch": { "name": "分岐器", @@ -4938,6 +4977,10 @@ "name": "観光情報掲示板", "terms": "情報掲示板, 案内, 観光, 観光案内, インフォメーション, 案内板, 観光情報, 掲示板, 案内地図, 地図, マップ" }, + "tourism/information/board/welcome_sign": { + "name": "歓迎案内板", + "terms": "歓迎案内板, 歓迎, ようこそ, 歓迎掲示板" + }, "tourism/information/guidepost": { "name": "道標", "terms": "道標, ガイドポスト, 案内" @@ -5054,22 +5097,10 @@ "name": "市町村境界標識", "terms": "市町村境界標識, 市町村界標識, 市町村境, 行政界" }, - "traffic_sign/city_limit_vertex": { - "name": "市町村境界標識", - "terms": "市町村境界標識, 市町村界標識, 市町村境, 行政界" - }, "traffic_sign/maxspeed": { "name": "速度制限標識", "terms": "速度制限標識, 速度制限" }, - "traffic_sign/maxspeed_vertex": { - "name": "速度制限標識", - "terms": "速度制限標識, 速度制限" - }, - "traffic_sign_vertex": { - "name": "交通標識", - "terms": "交通標識, 道路標識" - }, "type/boundary": { "name": "境界", "terms": "境界, 境界線" @@ -5158,8 +5189,8 @@ "terms": "フェリールート, 航路" }, "type/route/foot": { - "name": "徒歩ルート", - "terms": "徒歩ルート" + "name": "ウォーキングルート", + "terms": "歩行ルート, ウォーキングルート, ルート, 歩行経路, ウォーキング" }, "type/route/hiking": { "name": "ハイキングルート", diff --git a/app/src/main/assets/osmfeatures/ko.json b/app/src/main/assets/osmfeatures/ko.json index b13e14c5fd..73c2719d42 100644 --- a/app/src/main/assets/osmfeatures/ko.json +++ b/app/src/main/assets/osmfeatures/ko.json @@ -4153,18 +4153,9 @@ "traffic_sign/city_limit": { "name": "시 경계 표지판" }, - "traffic_sign/city_limit_vertex": { - "name": "시 경계 표지판" - }, "traffic_sign/maxspeed": { "name": "제한 속도 표지판" }, - "traffic_sign/maxspeed_vertex": { - "name": "제한 속도 표지판" - }, - "traffic_sign_vertex": { - "name": "교통 표지판" - }, "type/boundary": { "name": "경계", "terms": "경계" @@ -4231,9 +4222,6 @@ "type/route/ferry": { "name": "페리 노선" }, - "type/route/foot": { - "name": "도보 노선" - }, "type/route/hiking": { "name": "하이킹 노선" }, diff --git a/app/src/main/assets/osmfeatures/lt.json b/app/src/main/assets/osmfeatures/lt.json index 8e9f94c3b8..7faa827c70 100644 --- a/app/src/main/assets/osmfeatures/lt.json +++ b/app/src/main/assets/osmfeatures/lt.json @@ -1800,9 +1800,6 @@ "type/route/ferry": { "name": "Kelto maršrutas" }, - "type/route/foot": { - "name": "Pėsčiųjų maršrutas" - }, "type/route/hiking": { "name": "Žygių maršrutas" }, diff --git a/app/src/main/assets/osmfeatures/nl.json b/app/src/main/assets/osmfeatures/nl.json index f998c72bff..2919aa25a7 100644 --- a/app/src/main/assets/osmfeatures/nl.json +++ b/app/src/main/assets/osmfeatures/nl.json @@ -1,5 +1,8 @@ { "presets": { + "addr/interpolation": { + "name": "Adres interpolatie " + }, "address": { "name": "Adres", "terms": "contact,plaats,adresgegevens,straat,huisnummer" @@ -21,6 +24,9 @@ "advertising/totem": { "name": "Advertentiezuil" }, + "aerialway": { + "name": "Kabelbaanobjecten" + }, "aerialway/cable_car": { "name": "Kabelbaan met één of twee cabines", "terms": "skilift" @@ -69,6 +75,9 @@ "aerialway/zip_line": { "name": "Tokkelbaan" }, + "aeroway": { + "name": "Luchtvaartobjecten" + }, "aeroway/aerodrome": { "name": "Luchthaven", "terms": "vliegveld" @@ -88,6 +97,9 @@ "name": "Helipad", "terms": "helihaven,helikopterhaven,helikopterdek,landingsplaats" }, + "aeroway/holding_position": { + "name": "Vliegtuigwachtplaats" + }, "aeroway/jet_bridge": { "name": "Vliegtuigslurf" }, @@ -184,6 +196,9 @@ "name": "Biergarten", "terms": "bier,terras,café" }, + "amenity/binoculars": { + "name": "Vaste verrekijkers" + }, "amenity/boat_rental": { "name": "Bootverhuur", "terms": "boten,huren" @@ -199,6 +214,9 @@ "name": "Cafetaria", "terms": "cafetaria,tea-room,tearoom,tea room,koffiehuis,koffie,thee,vieruurtje,cake,taart" }, + "amenity/cafe/bubble_tea": { + "name": "Bubbelthee café" + }, "amenity/cafe/coffee_shop": { "name": "Koffiehuis" }, @@ -356,6 +374,9 @@ "amenity/fast_food/sandwich": { "name": "Broodjesfastfoodzaak" }, + "amenity/ferry_terminal": { + "name": "Veerbootterminal" + }, "amenity/fire_station": { "name": "Brandweerkazerne", "terms": "brandweerwagens,brandweerbasis,brandweerstation" @@ -402,6 +423,9 @@ "name": "Internetcafé", "terms": "cyberspace,cybercafé" }, + "amenity/karaoke_box": { + "name": "Karaokehokje" + }, "amenity/kindergarten": { "name": "Gebied van Crèche/Kleuterschool" }, @@ -698,10 +722,16 @@ "name": "Rookgebied", "terms": "rookzone,kankerzone,rookpaviljoen" }, + "amenity/social_centre": { + "name": "Buurthuis" + }, "amenity/social_facility": { "name": "Sociale Faciliteit", "terms": "OCMW,kansarmen,hulp,hulpcentrum" }, + "amenity/social_facility/ambulatory_care": { + "name": "Ambulante zorg" + }, "amenity/social_facility/food_bank": { "name": "Voedselbank", "terms": "voedselbank" @@ -939,6 +969,13 @@ "name": "Darkride", "terms": "spookhuis,thema-attractie" }, + "attraction/drop_tower": { + "name": "Vrije val", + "terms": "Valtoren" + }, + "attraction/kiddie_ride": { + "terms": "kinderattractie" + }, "attraction/log_flume": { "name": "Boomstammen" }, @@ -959,6 +996,9 @@ "attraction/summer_toboggan": { "name": "Zomerrodelbaan" }, + "attraction/swing_carousel": { + "name": "Zweefmolen" + }, "attraction/train": { "name": "Toeristentrein", "terms": "treintje" @@ -1262,7 +1302,7 @@ "terms": "hutje,tuinhuis" }, "building/stable": { - "name": "Stal", + "name": "Paardenstal", "terms": "dieren,paarden,vee,stalling" }, "building/stadium": { @@ -1314,6 +1354,9 @@ "name": "Vakmanschap", "terms": "stiel,kunde,handwerk" }, + "craft/agricultural_engines": { + "name": "Mechanieken voor landbouwmotoren" + }, "craft/basket_maker": { "name": "Mandenvlechter", "terms": "mand,vlecht,handwerk" @@ -1593,7 +1636,7 @@ "name": "Toegang voor hulpdiensten: ja" }, "entrance": { - "name": "Ingang/uitgang", + "name": "Ingang/Uitgang", "terms": "ingang,uitgang,deur" }, "entrance/emergency": { @@ -1618,6 +1661,9 @@ "name": "Golfcart pad", "terms": "handicart pad,golfbuggy pad" }, + "golf/driving_range": { + "name": "Driving range (golf)" + }, "golf/fairway": { "name": "Fairway", "terms": "golf" @@ -1630,6 +1676,9 @@ "name": "Golf Hole", "terms": "gat,doel" }, + "golf/lateral_water_hazard": { + "name": "Laterale waterhindernis" + }, "golf/path": { "name": "Golfwandelpad" }, @@ -2076,12 +2125,33 @@ "historic/wreck": { "name": "Scheepswrak" }, + "indoor": { + "name": "Object binnen in een gebouw" + }, "indoor/area": { "name": "Gebied binnen in een gebouw" }, "indoor/corridor": { "name": "Gang in een gebouw" }, + "indoor/corridor_line": { + "name": "Gang in een gebouw" + }, + "indoor/door": { + "name": "Binnendeur" + }, + "indoor/elevator": { + "name": "Liftschacht in een gebouw" + }, + "indoor/room": { + "name": "Kamer" + }, + "indoor/stairs": { + "name": "Trappengang in een gebouw" + }, + "indoor/wall": { + "name": "Binnenmuur" + }, "internet_access/wlan": { "name": "Wi-Fi-hotspot" }, @@ -2089,6 +2159,12 @@ "name": "Kruispunt", "terms": "kruising,toegangspunt,afslag,oprit,rotonde" }, + "landuse": { + "name": "Landgebruik" + }, + "landuse/allotments": { + "name": "Volkstuinen" + }, "landuse/aquaculture": { "name": "Aquacultuur", "terms": "viskweek,vissenboerderij,visboerderij,oesterkweek,algenkweek,algenboerderij,algenboerderij" @@ -2111,6 +2187,10 @@ "name": "Commercieel gebied", "terms": "kantoren,bedrijven,bedrijvenpark" }, + "landuse/construction": { + "name": "Bouwterrein", + "terms": "werfzone,werf" + }, "landuse/farm": { "name": "Landbouwgrond" }, @@ -2122,6 +2202,9 @@ "name": "Boerenerf", "terms": "boerderij,hoeve,landbouw,hofstee" }, + "landuse/flowerbed": { + "name": "Bloemenbed" + }, "landuse/forest": { "name": "Beheerd bos" }, @@ -2185,10 +2268,16 @@ "name": "Marinebasis", "terms": "militair,leger,zeemacht" }, + "landuse/military/obstacle_course": { + "name": "Militair hindernissenparcours" + }, "landuse/military/range": { "name": "Militair schietterrein", "terms": "oefenterrein,leger" }, + "landuse/military/training_area": { + "name": "Militair oefenterrein" + }, "landuse/orchard": { "name": "Boomgaard", "terms": "boomgaard" @@ -2233,6 +2322,12 @@ "name": "Wijngaard", "terms": "wijngaard" }, + "landuse/winter_sports": { + "name": "Gebied voor wintersport" + }, + "leisure": { + "name": "Vrijetijd" + }, "leisure/adult_gaming_centre": { "name": "Speelzaal (met kansspelmachines)", "terms": "casino,slot machine,slots,gokken,slotmachine" @@ -2272,10 +2367,22 @@ "name": "Dansschool", "terms": "dansonderwijs,dansconservatorium,conservatorium" }, + "leisure/disc_golf_course": { + "name": "Frisbeegolfparcours", + "terms": "Diskgolfparcours" + }, "leisure/dog_park": { "name": "Hondenpark", "terms": "losloopgebied voor honden" }, + "leisure/escape_game": { + "name": "Escaperoom", + "terms": "escape challenge,escape game,exit game,ontsnappingsspel,ontsnapkamer" + }, + "leisure/firepit": { + "name": "Vuurplaats", + "terms": "Vuurput" + }, "leisure/fishing": { "name": "Visstek", "terms": "visplaats,hengelplaats" @@ -2339,6 +2446,12 @@ "name": "Tuin", "terms": "openbare tuin,kruidentuin" }, + "leisure/garden/botanical": { + "name": "Botanische tuin" + }, + "leisure/garden/community": { + "name": "Volkstuin" + }, "leisure/golf_course": { "name": "Golfbaan", "terms": "golfterrein" @@ -2416,6 +2529,9 @@ "name": "Bowls-baan", "terms": "koersbal,bowls" }, + "leisure/pitch/chess": { + "name": "Groot schaakbord" + }, "leisure/pitch/cricket": { "name": "Cricketveld" }, @@ -2423,6 +2539,9 @@ "name": "Paardrijpiste", "terms": "bak,dressuur,paardenbak,manegebak" }, + "leisure/pitch/field_hockey": { + "name": "Veldhockeyveld" + }, "leisure/pitch/netball": { "name": "Netballveld" }, @@ -2434,6 +2553,9 @@ "name": "Rugby Union-veld", "terms": "rugby,american football,football" }, + "leisure/pitch/shuffleboard": { + "name": "Sjoelbak" + }, "leisure/pitch/skateboard": { "name": "Skatepark" }, @@ -2471,6 +2593,9 @@ "name": "Botenhelling", "terms": "trailerhelling,tewaterlating,te water laten,boot,helling,boothelling" }, + "leisure/slipway_point": { + "name": "Botenhelling" + }, "leisure/sports_centre": { "name": "Sportcentrum of -complex", "terms": "sportcentrum,sportcomplex,bloso" @@ -2482,10 +2607,16 @@ "name": "Zwembadfaciliteit", "terms": "zwemmen,waterbad,duiken" }, + "leisure/sports_hall": { + "name": "Sporthal" + }, "leisure/stadium": { "name": "Stadion", "terms": "arena" }, + "leisure/swimming_area": { + "name": "Natuurlijk zwemgebied" + }, "leisure/swimming_pool": { "name": "Zwembad", "terms": "zwemmen,water" @@ -2494,6 +2625,9 @@ "name": "Racepiste (niet-motorsport)", "terms": "stadion,stadium,fietsen,parcours,velodroom,pisterijden,baanwielrennen,skatebaan,skatepiste" }, + "leisure/track/cycling": { + "name": "Fietscircuit" + }, "leisure/track/horse_racing": { "name": "Paardenrenbaan", "terms": "hippodroom,paardenrennen" @@ -2502,6 +2636,9 @@ "name": "Hardloopbaan", "terms": "hardlooppiste,looppiste,atletiekpiste" }, + "leisure/trampoline_park": { + "name": "Trampolinepark" + }, "leisure/water_park": { "name": "Waterpretpark", "terms": "subtropisch zwembad,zwembad,duiken,zwemmen" @@ -2510,6 +2647,9 @@ "name": "Lijn", "terms": "anders,overige,iets anders,algemeen" }, + "man_made": { + "name": "Aangelegd" + }, "man_made/adit": { "name": "Horizontale mijn- of grotingang", "terms": "ingang,ondergronds,grot,mijn,adit" @@ -2518,6 +2658,9 @@ "name": "Antenne", "terms": "zender,ontvanger,radio,zendmast" }, + "man_made/beacon": { + "name": "Baken" + }, "man_made/beehive": { "name": "Bijenkorf" }, @@ -2525,9 +2668,15 @@ "name": "Golfbreker", "terms": "golven,havenbescherming,kustbescherming,stortsteengolfbreker,caissongolfbreker,drijvende golfbreker,palengolfbreker,havengolfbreker,strekdammen" }, + "man_made/bridge": { + "name": "Gebied van een brug" + }, "man_made/bunker_silo": { "name": "Bunkersilo" }, + "man_made/cairn": { + "name": "Cairn (steengraf)" + }, "man_made/chimney": { "name": "Industriële schoorsteen", "terms": "schoorsteen,schouw" @@ -2535,14 +2684,26 @@ "man_made/clearcut": { "name": "Gekapt bos" }, + "man_made/courtyard": { + "name": "Binnenplaats" + }, "man_made/crane": { "name": "Permanente kraan", "terms": "kraan,containerkraan,havenkraan" }, + "man_made/cross": { + "name": "Kruis" + }, "man_made/cutline": { "name": "Gerooide lijn", "terms": "scheidingslijn" }, + "man_made/dovecote": { + "name": "Duivenhok" + }, + "man_made/dyke": { + "name": "Dijk" + }, "man_made/embankment": { "name": "Dijk" }, @@ -2554,10 +2715,40 @@ "name": "Gashouder", "terms": "voorraadtank,gastank,gasopslagtank,oude gastank" }, + "man_made/goods_conveyor": { + "name": "Lopende band (goederen)", + "terms": "goederenrolband,goederenloopband" + }, + "man_made/groyne": { + "name": "Krib (dam)" + }, "man_made/lighthouse": { "name": "Vuurtoren", "terms": "lichtbaken" }, + "man_made/manhole": { + "name": "Putdeksel", + "terms": "riooldeksel" + }, + "man_made/manhole/drain": { + "name": "Straatkolk" + }, + "man_made/manhole/gas": { + "name": "Putdeksel voor gasvoorzieningen" + }, + "man_made/manhole/power": { + "name": "Putdeksel voor elektriciteitsvoorzieningen" + }, + "man_made/manhole/sewer": { + "name": "Riooldeksel", + "terms": "Putdeksel voor rioolvoorzieningen" + }, + "man_made/manhole/telecom": { + "name": "Putdeksel voor telecomvoorzieningen" + }, + "man_made/manhole/water": { + "name": "Putdeksel voor watervoorzieningen" + }, "man_made/mast": { "name": "Mast", "terms": "zendmast,antenne,zendtoren,gsm-mast,toren,communicatiemast,radiomast,tv-mast" @@ -2583,6 +2774,9 @@ "name": "Meetstation", "terms": "observatiestation,meetapparatuur,observatieapparatuur,weerstation,seismische sensor,luchtkwaliteitmeetstation,luchtmeetstation,gps-meetstation,gps-grondstation,gnss-station,gnss-grondstation" }, + "man_made/obelisk": { + "name": "Obelisk" + }, "man_made/observatory": { "name": "Observatorium", "terms": "sterrenwacht,astronomisch observatorium,meteorologisch observatorium" @@ -2606,10 +2800,17 @@ "man_made/pipeline/underground": { "name": "Ondergrondse pijpleiding" }, + "man_made/pipeline/valve": { + "name": "Klep (pijplijn)", + "terms": "aflsuitklep,ventiel" + }, "man_made/pumping_station": { "name": "Gemaal (waterpompstation)", "terms": "pompstation,waterpompstation" }, + "man_made/reservoir_covered": { + "name": "Overdekt reservoir" + }, "man_made/silo": { "name": "Silo", "terms": "veevoeder,graansilo" @@ -2618,6 +2819,12 @@ "name": "Opslagtank", "terms": "olietank,silo" }, + "man_made/storage_tank/water": { + "name": "Watertank" + }, + "man_made/street_cabinet": { + "name": "Straatkast" + }, "man_made/surveillance": { "name": "Bewaking", "terms": "bewakingscamera,cctv" @@ -2629,6 +2836,10 @@ "name": "Landmeetkundig referentiepunt", "terms": "geodesisch punt,geodesisch referentiepunt" }, + "man_made/torii": { + "name": "Torii", + "terms": "Japanse poort,vogelzitstok,Shintō schrijn" + }, "man_made/tower": { "name": "Toren" }, @@ -2638,16 +2849,28 @@ "man_made/tower/communication": { "name": "Communicatietoren" }, + "man_made/tower/defensive": { + "name": "Versterkte toren" + }, "man_made/tower/minaret": { "name": "Minaret" }, "man_made/tower/observation": { "name": "Observatietoren" }, + "man_made/tunnel": { + "name": "Gebied van een tunnel" + }, + "man_made/utility_pole": { + "name": "Paal voor nutsvoorzieningen" + }, "man_made/wastewater_plant": { "name": "Waterzuiveringsinstallatie", "terms": "waterzuiveringsstation,zuiveringsstation,WZI" }, + "man_made/water_tap": { + "name": "Waterkraan" + }, "man_made/water_tower": { "name": "Watertoren" }, @@ -2668,6 +2891,34 @@ "name": "Fabriek", "terms": "assemblage,brouwerij,autofabriek,productie,industrie,raffinaderij" }, + "marker": { + "name": "Markering" + }, + "marker/utility": { + "name": "Markering van nutsvoorzieningen" + }, + "marker/utility/power": { + "name": "Markering van elektriciteitsvoorzieningen" + }, + "military/bunker": { + "name": "Militaire bunker" + }, + "military/checkpoint": { + "name": "Militair controlepunt" + }, + "military/nuclear_explosion_site": { + "name": "Gebied van een nucleaire explosie" + }, + "military/office": { + "name": "Militair kantoor" + }, + "military/trench": { + "name": "Militaire gracht", + "terms": "Loopgraaf" + }, + "natural": { + "name": "Natuurlijk" + }, "natural/bare_rock": { "name": "Onbedekte rots", "terms": "rotsformatie,blote rots" @@ -2679,6 +2930,9 @@ "name": "Strand", "terms": "kust,zandstrand,duinen,steenstrand" }, + "natural/cape": { + "name": "Kaap" + }, "natural/cave_entrance": { "name": "Ingang van Grot", "terms": "spelonk" @@ -2695,6 +2949,9 @@ "name": "Fjell", "terms": "berggebied,lage bergen,berkenbos,Scandinavische bergen" }, + "natural/geyser": { + "name": "Geiser" + }, "natural/glacier": { "name": "IJsgletsjer", "terms": "gletsjer" @@ -2722,6 +2979,9 @@ "name": "Bergkam", "terms": "kam,bergtop,top" }, + "natural/rock": { + "name": "Rots (bevestigd)" + }, "natural/saddle": { "name": "Zadelpunt", "terms": "bergkam,kam,top,bergtop,pas,bergpas" @@ -2737,9 +2997,18 @@ "name": "Scrubland", "terms": "kreupelhout,ruigte,savanne,prairie,pampa" }, + "natural/shingle": { + "name": "Kiezelstrand" + }, + "natural/shrub": { + "name": "Scrubland" + }, "natural/spring": { "name": "Bron" }, + "natural/stone": { + "name": "Steen (niet bevestigd)" + }, "natural/tree": { "name": "Boom" }, @@ -2760,10 +3029,17 @@ "natural/water/basin": { "name": "Basin" }, + "natural/water/canal": { + "name": "Gebied van een kanaal" + }, "natural/water/lake": { "name": "Meer", "terms": "ven" }, + "natural/water/moat": { + "name": "Slotgracht", + "terms": "kasteelgracht,walgracht" + }, "natural/water/pond": { "name": "Vijver", "terms": "meer,ven,poel,plas" @@ -2772,10 +3048,22 @@ "name": "Reservoir", "terms": "waterbekken,bekken,waterreservoir" }, + "natural/water/river": { + "name": "Gebied van een rivier" + }, + "natural/water/stream": { + "name": "Gebied van een stroom" + }, + "natural/water/wastewater": { + "name": "Afvalwaterbassin" + }, "natural/wetland": { "name": "Moeras of drassig gebied", "terms": "drasland,moerassen en waterrijke gebieden,drassig gebied" }, + "natural/wood": { + "name": "Natuurlijk bos" + }, "network/type/node_network": { "name": "Knooppunt van recreatief netwerk" }, @@ -2810,6 +3098,10 @@ "name": "Kantoor van non-profitorganisatie", "terms": "non-profitorganisatiekantoor,ngo-kantoor,vzw-kantoor,verenigingskantoor,kantoor van vereniging zonder winstoogmerk,vereniging zonder winstoogmerk,kantoor van vzw,kantoor van ngo" }, + "office/bail_bond_agent": { + "name": "Borgtochtgeldschieter", + "terms": "bailbondsman" + }, "office/charity": { "name": "Kantoor van liefdadigheidsinstelling", "terms": "liefdadigheidsinstellingskantoor" @@ -2818,16 +3110,25 @@ "name": "Kantoor van bedrijf", "terms": "bedrijfskantoor,hoofdkwartier" }, + "office/consulting": { + "name": "Adviesbureau" + }, "office/coworking": { "name": "Coworking-kantoor", "terms": "samenwerken,coworking,coworking-kantoor,kantoor,gedeeld kantoor,coworking-plaats,coworking-omgeving" }, + "office/diplomatic": { + "name": "Diplomatisch kantoor" + }, "office/diplomatic/consulate": { "name": "Consulaat" }, "office/diplomatic/embassy": { "name": "Ambassade" }, + "office/diplomatic/liaison": { + "name": "Kantoor van een liaison" + }, "office/educational_institution": { "name": "Kantoor van onderwijsinstelling", "terms": "educatieve instelling,onderricht,onderwijsinstelling" @@ -2848,6 +3149,9 @@ "name": "Privékantoor van financiële instelling", "terms": "financieel kantoor" }, + "office/financial_advisor": { + "name": "Financieel adviseur" + }, "office/forestry": { "name": "Bosbeheerkantoor", "terms": "boswachtkantoor,kantoor van boswachters" @@ -2860,6 +3164,10 @@ "name": "Overheidskantoor", "terms": "overheidsdienst" }, + "office/government/prosecutor": { + "name": "Kantoor van de officier van justitie", + "terms": "openbaar aanklager,procureur des Konings,procureur-generaal,Openbaar Ministerie" + }, "office/government/register_office": { "name": "Burgerlijke stand", "terms": "dienst bevolking,bevolking,identiteitskaart,geboorte,trouwakte,trouw,huwelijk,burgerlijk,overlijdens,sterfte,scheiding,echtscheiding" @@ -2906,6 +3214,9 @@ "office/physician": { "name": "Arts" }, + "office/political_party": { + "name": "Kantoor van een politieke partij" + }, "office/private_investigator": { "name": "Kantoor van privédetective", "terms": "privédetectivekantoor,rechercheurskantoor,onderzoekerskantoor" @@ -2944,10 +3255,34 @@ "name": "Kantoor van watermaatschappij", "terms": "watermaatschappij*,waterleidingsmaatschappij*" }, + "piste/downhill": { + "name": "Ski afdaling" + }, + "piste/downhill/halfpipe": { + "name": "Halfpipe (wintersport)" + }, + "piste/hike": { + "name": "Sneewschoen- of winterwandelpad" + }, + "piste/ice_skate": { + "name": "Ijsschaatspiste" + }, + "piste/nordic": { + "name": "Langlaufpiste" + }, + "piste/piste": { + "name": "Wintersportpad" + }, "piste/skitour": { "name": "Toerskipad", "terms": "ski-alpinismepad,ski mountaineering,skilooppad,langlaufpiste" }, + "piste/sled": { + "name": "Sleepiste" + }, + "piste/sleigh": { + "name": "Arresleepiste" + }, "place": { "name": "Plaats" }, @@ -3006,6 +3341,9 @@ "name": "Dorp", "terms": "gehucht,woonkern,kern,buurt,buurtschap,vlek,kerkdorp,oort,gemeente" }, + "playground": { + "name": "Speeltuinuitrusting " + }, "playground/balance_beam": { "name": "Evenwichtsbalk als speeltuig", "terms": "balk,balanceerbalk" @@ -3018,6 +3356,9 @@ "name": "Mandschommel", "terms": "schommel" }, + "playground/climbing_frame": { + "name": "Klimweb" + }, "playground/cushion": { "name": "Springkussen" }, @@ -3032,6 +3373,9 @@ "name": "Speelplein-draaimolen", "terms": "draaimolentje,zwierder,molentje,ronddraaiend platform" }, + "playground/sandpit": { + "name": "Zandbak" + }, "playground/seesaw": { "name": "Wip" }, @@ -3045,10 +3389,22 @@ "playground/swing": { "name": "Schommel" }, + "playground/zipwire": { + "name": "Tokkelbaan" + }, "point": { "name": "Punt", "terms": "anders,overige,iets anders,algemeen" }, + "polling_station": { + "name": "Tijdelijk stembureau" + }, + "power": { + "name": "Stroomvoorziening" + }, + "power/cable": { + "name": "Elektriciteitskabel" + }, "power/cable/underground": { "name": "Ondergrondse hoogspanningskabel", "terms": "grondkabel,ondergrondse kabel,elektriciteitskabel,ondergrondse elektriciteitskabel,stroomkabel,ondergrondse stroomkabel" @@ -3084,6 +3440,24 @@ "name": "Gebied van elektriciteitscentrale", "terms": "elektriciteitscentrale,koolcentrale,kolencentrale,stoomcentrale,STEG-centrale,oliecentrale,gascentrale,biomassacentrale,geothermische centrale,waterkrachtcentrale,kerncentrale,krachtcentrale,energiecentrale" }, + "power/plant/source/coal": { + "name": "Steenkoolcentrale" + }, + "power/plant/source/gas": { + "name": "Gascentrale" + }, + "power/plant/source/hydro": { + "name": "Hydro-elektrische centrale" + }, + "power/plant/source/nuclear": { + "name": "Nucleaire centrale" + }, + "power/plant/source/solar": { + "name": "Zonnepark" + }, + "power/plant/source/wind": { + "name": "Windpark" + }, "power/pole": { "name": "Elektriciteitspaal", "terms": "stroom,laagspanning,laagspanningsleiding,elektriciteitsnet,elektriciteitskabel" @@ -3108,21 +3482,63 @@ "name": "Openbaarvervoershalte", "terms": "spoorwegperron,spoorwegplatform,treinperron,treinplatform,tramperron,tramhalte,tramplatform,metroperron,metrohalte,metroplatform,busperron,bushalte,busplatform,platform" }, + "public_transport/platform/aerialway": { + "name": "Kabelbaanperron" + }, + "public_transport/platform/aerialway_point": { + "name": "Kabelbaanhalte/-perron" + }, + "public_transport/platform/bus": { + "name": "Busperron" + }, "public_transport/platform/bus_point": { "name": "Bushalte" }, + "public_transport/platform/ferry": { + "name": "Ferryperron" + }, + "public_transport/platform/ferry_point": { + "name": "Ferryhalte/-perron" + }, + "public_transport/platform/light_rail": { + "name": "Lightrailperron" + }, + "public_transport/platform/light_rail_point": { + "name": "Lightrailhalte/-perron" + }, + "public_transport/platform/monorail": { + "name": "Monorailperron" + }, "public_transport/platform/monorail_point": { "name": "Monorailperron" }, "public_transport/platform/subway": { "name": "Metroperron" }, + "public_transport/platform/subway_point": { + "name": "Metrohalte/-perron" + }, + "public_transport/platform/train": { + "name": "Treinperron" + }, + "public_transport/platform/train_point": { + "name": "Train Stop / Platform" + }, "public_transport/platform/tram": { "name": "Tramperron" }, + "public_transport/platform/tram_point": { + "name": "Treinhalte/-perron" + }, + "public_transport/platform/trolleybus": { + "name": "Trolleybusperron" + }, "public_transport/platform/trolleybus_point": { "name": "Trolleybushalte" }, + "public_transport/platform_point": { + "name": "Openbaarvervoershalte/-perron" + }, "public_transport/station": { "name": "Openbaarvervoershalte" }, @@ -3132,6 +3548,9 @@ "public_transport/station_bus": { "name": "Busstation" }, + "public_transport/station_ferry": { + "name": "Ferry terminal" + }, "public_transport/station_light_rail": { "name": "Lightrailstation", "terms": "lichtspoorstation,tramtreinstation,sneltramstation,lichtgewichttreinstation,spoorwegstation" @@ -3195,6 +3614,9 @@ "public_transport/stop_position_trolleybus": { "name": "Trolleybusstopplaats" }, + "railway": { + "name": "Spoorwegvoorziening" + }, "railway/abandoned": { "name": "Voormalige spoorweg (sporen weggehaald)", "terms": "in onbruik geraakte spoorbaan,ongebruikte spoorweg,oude spoorweg,rails,oude rails,sporen,oude sporen,oude treinroute,treinroute,ongebruikte spoorweg,verloederde spoorweg" @@ -3203,6 +3625,12 @@ "name": "Stootblok", "terms": "stootjuk" }, + "railway/construction": { + "name": "Spoorweg in aanleg" + }, + "railway/crossing": { + "name": "Spoorwegovergang" + }, "railway/derail": { "name": "Ontspoorblok", "terms": "ontspoorinrichting,stopontspoorblok" @@ -3211,13 +3639,49 @@ "name": "Ongebruikte spoorweg (sporen nog aanwezig)", "terms": "in onbruik geraakte spoorbaan,verloederde spoorweg,oude spoorweg,voormalige spoorweg,rails,oude rails,sporen,oude sporen,oude treinroute,treinroute,voormalige spoorweg,verloederde spoorweg" }, + "railway/funicular": { + "name": "Kabelspoorweg" + }, "railway/halt": { - "name": "Treinstation op aanvraag" + "name": "Treinstation (op aanvraag)" + }, + "railway/level_crossing": { + "name": "Spoorwegovergang (weg)" + }, + "railway/light_rail": { + "name": "Lightrailspoor" }, "railway/milestone": { "name": "Afstandspaal aan spoorweg", "terms": "hectometerpaaltje aan spoorweg,kilometerpaaltje aan spoorweg,mijlpaal,spoorwegmijlpaal,spoorwegafstandspaal" }, + "railway/miniature": { + "name": "Minispoorweg" + }, + "railway/monorail": { + "name": "Rail van monorail" + }, + "railway/monorail/hanging": { + "name": "Hangende rails van monorail" + }, + "railway/narrow_gauge": { + "name": "Smalspoor" + }, + "railway/platform": { + "name": "Spoorperron" + }, + "railway/preserved": { + "name": "Erfgoed spoorweg" + }, + "railway/rail": { + "name": "Spoorweg" + }, + "railway/rail/highspeed": { + "name": "Hogesnelheidslijn" + }, + "railway/railway_crossing": { + "name": "Spoorwegovergang tussen meerdere sporen" + }, "railway/signal": { "name": "Spoorwegsein", "terms": "sein,treinsein" @@ -3225,6 +3689,9 @@ "railway/station": { "name": "Treinstation" }, + "railway/subway": { + "name": "Metrospoor" + }, "railway/subway_entrance": { "name": "Ingang van metrostation", "terms": "metro-ingang" @@ -3237,9 +3704,21 @@ "name": "Treinwasstraat", "terms": "train wash" }, + "railway/tram": { + "name": "Tramspoor" + }, + "railway/tram_crossing": { + "name": "Tramspoorwegovergang" + }, + "railway/tram_level_crossing": { + "name": "Tramspoorwegovergang (weg)" + }, "railway/tram_stop": { "name": "Tramhalte" }, + "railway/yard": { + "name": "Opstelterrein" + }, "relation": { "name": "Relatie", "terms": "relation" @@ -3281,6 +3760,9 @@ "name": "Slijterij", "terms": "alcoholwinkel" }, + "shop/anime": { + "name": "Anime-/Mangawinkel" + }, "shop/antiques": { "name": "Antiquair", "terms": "antiekwinkel" @@ -3333,6 +3815,9 @@ "name": "Fietswinkel", "terms": "fietsenwinkel" }, + "shop/boat": { + "name": "Bootwinkel" + }, "shop/bookmaker": { "name": "Bookmaker (gokkantoor)", "terms": "bookmaker" @@ -3344,18 +3829,31 @@ "shop/boutique": { "name": "Boetiek" }, + "shop/brewing_supplies": { + "name": "Winkel voor brouwbenodigdheden" + }, "shop/butcher": { "name": "Slagerij", "terms": "slagerij,beenhouwerij" }, + "shop/camera": { + "name": "Winkel voor camerabenodigdheden" + }, "shop/candles": { "name": "Kaarsenwinkel", "terms": "kaarsen,parafine,was,gezelligheid,lont" }, + "shop/cannabis": { + "name": "Cannabiswinkel", + "terms": "coffeeshop" + }, "shop/car": { "name": "Autoshowroom", "terms": "autodealer,autowinkel,toonzaal,autotoonzaal,garage,autogarage" }, + "shop/car/second_hand": { + "name": "Tweedehands autodealer" + }, "shop/car_parts": { "name": "Auto-onderdelenwinkel", "terms": "automaterialenwinkel,automaterialenhandel,auto-onderdelenhandel" @@ -3394,10 +3892,22 @@ "name": "Kledingzaak", "terms": "kledingwinkel,kledinghandel,kledij" }, + "shop/clothes/second_hand": { + "name": "Tweedehands kledingwinkel" + }, + "shop/clothes/underwear": { + "name": "Winkel voor ondergoed" + }, + "shop/clothes/wedding": { + "name": "Trouwkledingwinkel" + }, "shop/coffee": { "name": "Koffiewinkel", "terms": "koffiebonen,koffiemolen" }, + "shop/collector": { + "name": "Winkel voor verzamelobjecten" + }, "shop/computer": { "name": "Computerwinkel", "terms": "IT,ICT,hardware,software,electronica,laptop" @@ -3421,6 +3931,10 @@ "name": "Outdoorzaak", "terms": "kampeerzaak,landelijk,scoutingwinkel,jacht,ruiter,paardrijden,tuinmachines" }, + "shop/craft": { + "name": "Winkel voor schilder- en tekengereedschap", + "terms": "kunst*,verf*,kader,hobby,borstel" + }, "shop/curtain": { "name": "Gordijnenwinkel", "terms": "gordijnenwinkel,gordijnenzaak" @@ -3441,6 +3955,9 @@ "name": "Bouwmarkt, doe-het-zelfwinkel", "terms": "DHZ-winkel,DIY-winkel,kluswinkel" }, + "shop/doors": { + "name": "Deurenwinkem" + }, "shop/dry_cleaning": { "name": "Stomerij", "terms": "droogkuis,nieuwkuis" @@ -3449,6 +3966,9 @@ "name": "E-sigarettenwinkel", "terms": "e-cigarettewinkel" }, + "shop/electrical": { + "name": "Winkel voor elektriciteitsbenodigdheden" + }, "shop/electronics": { "name": "Huishoudtoestellen-/Witgoedwinkel", "terms": "huishoudelektro,witgoed,elektro,electro,wasmachine,keuken,vaatwasmachine,afwasmachine" @@ -3457,6 +3977,9 @@ "name": "Seksshop", "terms": "erotiek,sex shop" }, + "shop/erotic/lgbtq": { + "name": "LGBTQ+ erotische winkel" + }, "shop/fabric": { "name": "Stofwinkel", "terms": "kledij,naaien" @@ -3468,6 +3991,9 @@ "shop/fashion": { "name": "Modewinkel" }, + "shop/fashion_accessories": { + "name": "Modeaccessoirewinkel" + }, "shop/fireplace": { "name": "Haardwinkel", "terms": "kachelwinkel" @@ -3476,6 +4002,9 @@ "name": "Hengelsportwinkel", "terms": "visserswinkel,visserijwinkel,visgereiwinkel,netten,vislijnen" }, + "shop/flooring": { + "name": "Vloerwinkel" + }, "shop/florist": { "name": "Bloemenwinkel", "terms": "bloemist,bloemenzaak" @@ -3484,6 +4013,9 @@ "name": "Kaderwinkel", "terms": "schilderijen,kunst,kadrering" }, + "shop/frozen_food": { + "name": "Winkel voor bevroren voedsel" + }, "shop/fuel": { "name": "Tankstation", "terms": "benzinestation,dieselstation,brandstofstation" @@ -3507,6 +4039,9 @@ "name": "Gasflessenwinkel", "terms": "methaan,ethaan,propaan,butaan,gaswinkel,gastank,aardgas,lpg" }, + "shop/general": { + "name": "Algemene winkel" + }, "shop/gift": { "name": "Cadeauwinkel", "terms": "cadeauzaak,geschenkwinkel" @@ -3543,12 +4078,20 @@ "name": "Hifi-/Bruingoedwinkel", "terms": "audio,bruingoed,hifi,stereoinstallatie" }, + "shop/hobby": { + "name": "Hobbywinkel" + }, + "shop/household_linen": { + "name": "Winkel voor huishoudelijk linnen", + "terms": "lakens,dekens,vaatdoeken,handdoeken,washandjes,tafelkleden,bedovertrekken,gordijnen,tafelkleden,kussenslopen" + }, "shop/houseware": { "name": "Huisraadwinkel", "terms": "huiswaar,elektronica,meubilair,meubels,huishoudelijke elektronica,gebruiksvoorwerpen" }, "shop/hunting": { - "name": "Jachtwinkel" + "name": "Jachtwinkel", + "terms": "pijlen,bogen,kogels,kruisbogen,geweren,vallen" }, "shop/interior_decoration": { "name": "Binnenhuisdecoratiewinkel", @@ -3570,15 +4113,25 @@ "name": "Wasserette", "terms": "wassalon" }, + "shop/laundry/self_service": { + "name": "Wasserette met zelfbediening", + "terms": "wasserette,wasserij,wassalon" + }, "shop/leather": { "name": "Lederwinkel", "terms": "handtassen,leerwinkel,schoenen" }, + "shop/lighting": { + "name": "Verlichtingswinkel", + "terms": "TL-lampen,spaarlampen,halogeenlampen,LED-lampen,armaturen,lampen" + }, "shop/locksmith": { - "name": "Slotenmaker" + "name": "Slotenmaker", + "terms": "sleutels,slotenmaker,slot" }, "shop/lottery": { - "name": "Loterij" + "name": "Loterij", + "terms": "krasloten,loterij,lotto,gokken" }, "shop/mall": { "name": "Winkelcentrum", @@ -3591,16 +4144,24 @@ "shop/medical_supply": { "name": "Winkel voor Medische Hulpmiddelen" }, + "shop/military_surplus": { + "name": "Winkel voor militair overschot" + }, "shop/mobile_phone": { "name": "Mobieletelefoonwinkel", "terms": "gsm-winkel,telefoonwinkel,telefoonzaak,gsm-zaak,mobieltjeswinkel,mobieltjeszaak" }, + "shop/model": { + "name": "Modelwinkel", + "terms": "hobby,schaalmodellen,RC,model,modelbouw" + }, "shop/money_lender": { "name": "Particuliere Gelduitleendienst", "terms": "pandhuis,lommerd,lombard,kredietinstelling,lenen,geld,bank van lening" }, "shop/motorcycle": { - "name": "Motorwinkel" + "name": "Motorwinkel", + "terms": "motorfiets,moto,brommer" }, "shop/motorcycle_repair": { "name": "Motorreparatie" @@ -3628,6 +4189,9 @@ "name": "Winkel voor Benodigdheden voor Buitenactiviteiten", "terms": "trekking,fietsen,hike,gps,kamperen,tent" }, + "shop/outpost": { + "name": "Voorpost van een online retailer" + }, "shop/paint": { "name": "Verfwinkel", "terms": "verfhandel,verfzaak" @@ -3660,6 +4224,15 @@ "name": "Fotowinkel", "terms": "camera,film" }, + "shop/pottery": { + "name": "Winkel voor aardewerk" + }, + "shop/printer_ink": { + "name": "Winkel voor printerinkt" + }, + "shop/psychic": { + "name": "Medium (esoterie)" + }, "shop/pyrotechnics": { "name": "Vuurwerkwinkel", "terms": "vuurpijlen,buskruit,nieuwjaar" @@ -3672,6 +4245,9 @@ "name": "Religieuze winkel", "terms": "liturgisch centrum,kerk,godsdienstwinkel,kruisbeelden,souvenirwinkel" }, + "shop/rental": { + "name": "Verhuurwinkel" + }, "shop/scuba_diving": { "name": "Duikwinkel", "terms": "diepzeeduiken,duiken,duiksport,scuba" @@ -3687,10 +4263,16 @@ "name": "Naaiwinkel", "terms": "naaimachine,stofwinkel" }, + "shop/shoe_repair": { + "name": "Schoenenreparatiewinkel" + }, "shop/shoes": { "name": "Schoenenwinkel", "terms": "schoenenzaak,schoenenhandel" }, + "shop/spices": { + "name": "Winkel voor kruiden" + }, "shop/sports": { "name": "Sportzaak", "terms": "sportwinkel,sportkledij,sportattributen,sporttoebehoren,sportgerief" @@ -3706,6 +4288,12 @@ "name": "Supermarkt", "terms": "supermarkt,grootwarenhuis" }, + "shop/supermarket/organic": { + "name": "Organische supermarkt" + }, + "shop/swimming_pool": { + "name": "Winkel voor zwembadbenodigdheden" + }, "shop/tailor": { "name": "Kleermaker", "terms": "maatwerk,kleren,kledij,kostuum" @@ -3718,6 +4306,9 @@ "name": "Theewinkel", "terms": "theehuis" }, + "shop/telecommunication": { + "name": "Telecomwinkel" + }, "shop/ticket": { "name": "Ticketverkoop", "terms": "toegangskaartjes,ticketjes" @@ -3730,6 +4321,9 @@ "name": "Tabakwinkel", "terms": "sigarettenwinkel" }, + "shop/tool_hire": { + "name": "Gereedschapsverhuur" + }, "shop/toys": { "name": "Speelgoedwinkel", "terms": "speelgoedwinkel" @@ -3742,6 +4336,9 @@ "name": "Reisbureau", "terms": "reisbureau" }, + "shop/trophy": { + "name": "Trofeewinkel" + }, "shop/tyres": { "name": "Bandenwinkel" }, @@ -3782,6 +4379,9 @@ "name": "Groothandel", "terms": "groothandelszaak" }, + "shop/wigs": { + "name": "Pruikenwinkel" + }, "shop/window_blind": { "name": "Jaloeziewinkel", "terms": "zonwering,luiken,jaloezieën" @@ -3790,9 +4390,18 @@ "name": "Wijnhandel", "terms": "wijnwinkel,wijnproeverij,wijnzaak,wijnerij" }, + "telecom": { + "name": "Telecom-object" + }, "telecom/data_center": { "name": "Datacenter" }, + "telecom/exchange": { + "name": "Telefooncentrale" + }, + "tourism": { + "name": "Toerisme-object" + }, "tourism/alpine_hut": { "name": "Berghut" }, @@ -3833,10 +4442,19 @@ "name": "Toeristische attractie", "terms": "bezienswaardigheid,toeristische trekpleister,trekpleister" }, + "tourism/camp_pitch": { + "name": "Staplaats (camping)" + }, "tourism/camp_site": { "name": "Camping", "terms": "kamperen,kampeertenten,kampeerwagenpark" }, + "tourism/camp_site/backcountry": { + "name": "Off-piste camping" + }, + "tourism/camp_site/group_only": { + "name": "Groepcamping" + }, "tourism/caravan_site": { "name": "Caravan-/kampeerwagenterrein", "terms": "caravans,kampeerwagens,campers,motorhomes,mobilehomes,terrein voor kampeerwagens" @@ -3869,6 +4487,9 @@ "name": "Informatiebord", "terms": "uitlegbord,informatie" }, + "tourism/information/board/welcome_sign": { + "name": "Welkomstbord" + }, "tourism/information/guidepost": { "name": "Wandel-, fiets-, e.d. -wegwijzer", "terms": "wegwijzer,wandelroutewegwijzer,fietsroutewegwijzer,routewegwijzer,route,wandelwegwijzer,fietswegwijzer" @@ -3877,6 +4498,17 @@ "name": "Kaart", "terms": "plan,plattegrond,informatie" }, + "tourism/information/office": { + "name": "Toerismekantoor", + "terms": "bezoekerscentrum" + }, + "tourism/information/route_marker": { + "name": "Routemarkering", + "terms": "routebordje" + }, + "tourism/information/terminal": { + "name": "Informatieterminal" + }, "tourism/motel": { "name": "Motel", "terms": "motorhotel" @@ -3885,6 +4517,9 @@ "name": "Museum", "terms": "museum" }, + "tourism/museum/history": { + "name": "Museum over geschiedenis" + }, "tourism/picnic_site": { "name": "Picknickplek", "terms": "park" @@ -3912,6 +4547,12 @@ "tourism/zoo/petting": { "name": "Kinderboerderij" }, + "tourism/zoo/safari": { + "name": "Safaripark" + }, + "tourism/zoo/wildlife": { + "name": "Wildpark" + }, "traffic_calming": { "name": "Verkeersremmer", "terms": "drempel,heuvel,langzaam,snelheid" @@ -3957,22 +4598,10 @@ "name": "Verkeersbord stadsgrens", "terms": "plaats,dorp,nederzetting,grens,rand,bord stadsgrens" }, - "traffic_sign/city_limit_vertex": { - "name": "Verkeersbord stadsgrens", - "terms": "plaats,dorp,nederzetting,grens,rand,bord stadsgrens" - }, "traffic_sign/maxspeed": { "name": "Verkeersbord maximumsnelheid", "terms": "maximumsnelheid,maximale snelheid,snelheidslimietbord" }, - "traffic_sign/maxspeed_vertex": { - "name": "Verkeersbord maximumsnelheid", - "terms": "maximumsnelheidsbord,maximale snelheid,snelheidslimietbord" - }, - "traffic_sign_vertex": { - "name": "Verkeersbord", - "terms": "bord" - }, "type/boundary": { "name": "Grens" }, @@ -3980,12 +4609,24 @@ "name": "Bestuurlijke grens", "terms": "administratieve grens" }, + "type/connectivity": { + "name": "Rijstrookverbinding" + }, + "type/destination_sign": { + "name": "Bewegwijzeringsbord" + }, "type/enforcement": { "name": "Controle" }, + "type/enforcement/maxspeed": { + "name": "Controle op de snelheidslimiet" + }, "type/multipolygon": { "name": "Meervoudige polygoon" }, + "type/public_transport/stop_area_group": { + "name": "Groep van een haltecomplex" + }, "type/restriction": { "name": "Beperking" }, @@ -4041,8 +4682,7 @@ "terms": "ferrytraject,veerponttraject" }, "type/route/foot": { - "name": "Wandelroute", - "terms": "hikingroute,trekkingroute" + "name": "Wandelroute" }, "type/route/hiking": { "name": "Hikingtraject", @@ -4086,6 +4726,9 @@ "name": "Tramtraject", "terms": "tramroute" }, + "type/route/trolleybus": { + "name": "Trolleybusroute" + }, "type/route_master": { "name": "Openbaarvervoerstraject", "terms": "lijn,buslijn,tramlijn,metrolijn,treintraject,treinlijn" @@ -4098,6 +4741,9 @@ "name": "Waterloop", "terms": "waterweg,rivier,stroom,verloop,afwatering,beek,vaart,kanaal" }, + "waterway": { + "name": "Waterweg" + }, "waterway/boatyard": { "name": "Scheepswerf", "terms": "bootwerf,scheepsherstellingen,bootherstellingen,droogdok,bouwdok" @@ -4125,6 +4771,10 @@ "name": "Afvoer", "terms": "greppel,gracht" }, + "waterway/fish_pass": { + "name": "Vistrap", + "terms": "vispassage" + }, "waterway/fuel": { "name": "Maritiem tankstation", "terms": "schip,brandstof" @@ -4155,6 +4805,9 @@ "name": "Soms droge stroom", "terms": "stroom die soms droog straat,droge stroom,seizoensstroom,wadi,ford" }, + "waterway/tidal_channel": { + "name": "Getijdenkanaal" + }, "waterway/water_point": { "name": "Waterpunt voor boten", "terms": "drinkwatertank,watertank" diff --git a/app/src/main/assets/osmfeatures/no.json b/app/src/main/assets/osmfeatures/no.json index f1f6d365ed..0d4ac62876 100644 --- a/app/src/main/assets/osmfeatures/no.json +++ b/app/src/main/assets/osmfeatures/no.json @@ -625,15 +625,27 @@ "attraction/carousel": { "name": "Karusell" }, + "attraction/dark_ride": { + "name": "Spøkelsetog" + }, "attraction/log_flume": { "name": "Tømmerrenne" }, "attraction/maze": { "name": "Labyrint" }, + "attraction/river_rafting": { + "name": "Vannbane" + }, "attraction/roller_coaster": { "name": "Berg-og-dal-bane" }, + "attraction/summer_toboggan": { + "name": "Sommerkjelke" + }, + "attraction/swing_carousel": { + "name": "Svingkarusell" + }, "attraction/train": { "name": "Turisttog" }, @@ -643,9 +655,21 @@ "barrier": { "name": "Hinder" }, + "barrier/block": { + "name": "Barriereblokk" + }, + "barrier/bollard": { + "name": "Pullert" + }, + "barrier/bollard_line": { + "name": "Pullertrekke" + }, "barrier/border_control": { "name": "Grensekontroll" }, + "barrier/cattle_grid": { + "name": "Fanghekk" + }, "barrier/chain": { "name": "Kjede" }, @@ -682,9 +706,24 @@ "barrier/retaining_wall": { "name": "Støttemur" }, + "barrier/sally_port": { + "name": "Sortiport" + }, + "barrier/spikes": { + "name": "Spikermatte" + }, + "barrier/stile": { + "name": "Stente" + }, + "barrier/swing_gate": { + "name": "Svingport" + }, "barrier/toll_booth": { "name": "Bomstasjon" }, + "barrier/turnstile": { + "name": "Rotasjonsport" + }, "barrier/wall": { "name": "Mur" }, @@ -997,6 +1036,18 @@ "craft/winery": { "name": "Vingård" }, + "demolished/building": { + "name": "Nylig Revet Bygning" + }, + "disused/amenity": { + "name": "Nedlagt Bekvemmelighet" + }, + "disused/railway": { + "name": "Nedlagt Jernbane Funksjon" + }, + "disused/shop": { + "name": "Nedlagt Butikk" + }, "embankment": { "name": "Dike" }, @@ -1009,6 +1060,12 @@ "emergency/defibrillator": { "name": "Defibrillator" }, + "emergency/designated": { + "name": "Dedikert Nødtilgang " + }, + "emergency/fire_alarm": { + "name": "Brannalarm Telefonboks" + }, "emergency/fire_extinguisher": { "name": "Brannslukningsapparat" }, @@ -1027,6 +1084,12 @@ "emergency/lifeguard": { "name": "Livvakt" }, + "emergency/no": { + "name": "Nødtilgang Nei" + }, + "emergency/official": { + "name": "Offisiell Nødadgang" + }, "emergency/phone": { "name": "Nødtelefon" }, @@ -1042,6 +1105,9 @@ "entrance/emergency": { "name": "Nødutgang" }, + "entrance/emergency_ward_entrance": { + "name": "Inngang til legevakt" + }, "ford": { "name": "Vadested" }, @@ -2530,12 +2596,6 @@ "traffic_sign/maxspeed": { "name": "Fartsgrenseskilt" }, - "traffic_sign/maxspeed_vertex": { - "name": "Fartsgrenseskilt" - }, - "traffic_sign_vertex": { - "name": "Trafikkskilt" - }, "type/boundary": { "name": "Grense" }, @@ -2587,9 +2647,6 @@ "type/route/ferry": { "name": "Fergerute" }, - "type/route/foot": { - "name": "Gangrute" - }, "type/route/hiking": { "name": "Oppmerket sti" }, diff --git a/app/src/main/assets/osmfeatures/pl.json b/app/src/main/assets/osmfeatures/pl.json index e60e9bd4e0..4d47985712 100644 --- a/app/src/main/assets/osmfeatures/pl.json +++ b/app/src/main/assets/osmfeatures/pl.json @@ -202,7 +202,7 @@ }, "amenity/bicycle_rental": { "name": "Wypożyczalnia rowerów", - "terms": "wypożyczalnia" + "terms": "wypożyczalnia, rowery" }, "amenity/bicycle_repair_station": { "name": "Samoobsługowa stacja naprawy rowerów", @@ -212,10 +212,18 @@ "name": "Ogródek piwny", "terms": "ogródek piwny, bar plażowy, beach bar" }, + "amenity/binoculars": { + "name": "Lornetka", + "terms": "lornetka, luneta, punkt obserwacyjny, punkt widokowy" + }, "amenity/boat_rental": { "name": "Wypożyczalnia łodzi", "terms": "wynajem łodzi" }, + "amenity/boat_storage": { + "name": "Przechowalnia łodzi", + "terms": "przechowalnia łodzi, marina, łódź, łodzie" + }, "amenity/bureau_de_change": { "name": "Kantor", "terms": "wymiana walut" @@ -241,7 +249,7 @@ }, "amenity/car_rental": { "name": "Wypożyczalnia samochodów", - "terms": "wypożyczalnia samochodów" + "terms": "wypożyczalnia samochodów, samochody" }, "amenity/car_sharing": { "name": "Stacja miejskiej wypożyczalni samochodów", @@ -344,7 +352,7 @@ }, "amenity/driving_school": { "name": "Szkoła nauki jazdy", - "terms": "prawo jazdy" + "terms": "szkoła nauki jazdy, nauka jazdy, szkolenia kierowców, prawo jazdy" }, "amenity/embassy": { "name": "Ambasada/konsulat" @@ -384,6 +392,10 @@ "amenity/fast_food/ice_cream": { "name": "Bar z lodami" }, + "amenity/fast_food/juice": { + "name": "Bar z sokami/koktajlami", + "terms": "bar, kawiarnia, świeżo wyciskane soki, napoje, koktajle, smoothies" + }, "amenity/fast_food/kebab": { "name": "Bar z kebabem", "terms": "kebab, kebap, gyros, giros, shoarma, shaorma" @@ -483,6 +495,10 @@ "name": "Dok załadunkowy", "terms": "dok załadunkowy" }, + "amenity/lounger": { + "name": "Leżak", + "terms": "leżaki" + }, "amenity/love_hotel": { "name": "Love hotel", "terms": "love hotel,dla par,xxx,krótki pobyt" @@ -499,6 +515,10 @@ "name": "Placówka przekazów pieniężnych", "terms": "pieniądze, gotówka, Western Union" }, + "amenity/mortuary": { + "name": "Kostnica", + "terms": "kostnica, krematorium" + }, "amenity/motorcycle_parking": { "name": "Parking dla motocykli", "terms": "miejsce postojowe dla motocyklów" @@ -885,6 +905,10 @@ "name": "Latryna", "terms": "latryna, wychodek, sławojka" }, + "amenity/toilets/portable": { + "name": "Przenośna toaleta", + "terms": "przenośna toaleta" + }, "amenity/townhall": { "name": "Ratusz", "terms": "władze miasta,ratusz,urząd miasta,urząd gminy,starostwo" @@ -1711,6 +1735,9 @@ "demolished/building": { "name": "Niedawno wyburzony budynek" }, + "disused/amenity": { + "name": "Nieużywany obiekt/udogodnienie" + }, "disused/railway": { "name": "Nieużywany obiekt kolejowy" }, @@ -1824,6 +1851,10 @@ "name": "Ścieżka dla wózka golfowego", "terms": "droga, ścieżka dla wózka golfowego, wózek golfowy" }, + "golf/clubhouse": { + "name": "Klub golfowy", + "terms": "klub golfowy" + }, "golf/driving_range": { "name": "Strzelnica golfowa", "terms": "strzelnica golfowa" @@ -2551,8 +2582,8 @@ "terms": "salon gier, automaty wrzutowe, gry wideo, gry video, symulatory jazdy, symulatory jazdy, symulator lotu, pinball, wirtualna rzeczywistość, rzeczywistość wirtualna" }, "leisure/bandstand": { - "name": "Estrada", - "terms": "estrada,scena,występy" + "name": "Muszla koncertowa / estrada", + "terms": "muszla koncertowa, estrada, scena, arena, podium, występy, amfiteatr, trybuna, trybuny" }, "leisure/beach_resort": { "name": "Resort nadmorski", @@ -2832,7 +2863,7 @@ }, "leisure/sports_centre": { "name": "Centrum sportowe", - "terms": "centrum sportowe, ośrodek sportowy, ośrodek sportów, kompleks sportowy" + "terms": "centrum sportowe, ośrodek sportowy, ośrodek sportów, kompleks sportowy, klub sportowy" }, "leisure/sports_centre/climbing": { "name": "Ścianka wspinaczkowa", @@ -3015,7 +3046,7 @@ }, "man_made/mast/communication/mobile_phone": { "name": "Maszt telefonii komórkowej", - "terms": "antena,maszt komórkowy,maszt telefonii komórkowej,wieża telefonii komórkowej,maszt komunikacyjny,wieża komunikacyjna,maszt transmisyjny,wieża transmisyjna" + "terms": "antena,maszt komórkowy,maszt telefonii komórkowej,wieża telefonii komórkowej,maszt komunikacyjny,wieża komunikacyjna,maszt transmisyjny,wieża transmisyjna, bts" }, "man_made/mast/communication/radio": { "name": "Maszt radiowy", @@ -3115,7 +3146,11 @@ }, "man_made/tower/communication": { "name": "Wieża komunikacyjna", - "terms": "antena,wieża nadawcza,maszt telefoniczny,maszt komórkowy,maszt komunikacyjny,wieża komunikacyjna,maszt telefonii komórkowej,maszt radiowy,wieża radiowa,wieża telewizyjna,maszt transmisyjny,wieża transmisyjna,wieża tv" + "terms": "antena,wieża nadawcza,maszt telefoniczny,maszt komórkowy,maszt komunikacyjny,wieża komunikacyjna,maszt telefonii komórkowej,maszt radiowy,wieża radiowa,wieża telewizyjna,maszt transmisyjny,wieża transmisyjna,wieża tv, bts" + }, + "man_made/tower/cooling": { + "name": "Chłodnia kominowa", + "terms": "chłodnia kominowa, wieża chłodnicza, fabryka" }, "man_made/tower/defensive": { "name": "Wieża obronna", @@ -3165,6 +3200,10 @@ "name": "Wiatrak", "terms": "wiatrak" }, + "man_made/windpump": { + "name": "Pompa wiatrowa", + "terms": "pompa wiatrowa, pompa wodna, wiatrak" + }, "man_made/works": { "name": "Fabryka", "terms": "zakład produkcyjny" @@ -3252,6 +3291,10 @@ "name": "Wrzosowisko", "terms": "wrzosowisko, krzewy, krzewinki, zieleń" }, + "natural/hot_spring": { + "name": "Źródło termalne", + "terms": "źródło termalne, źródło ciepłe, źródło gorące, gorące źródło, gorące źródła, cieplica, cieplice" + }, "natural/mud": { "name": "Błoto", "terms": "błotne" @@ -3373,8 +3416,8 @@ "terms": "rekreacyjna trasa ponumerowanych węzłów" }, "noexit/yes": { - "name": "Brak przejścia/przejazdu", - "terms": "Brak przejścia/przejazdu" + "name": "Brak dalszej kontynuacji", + "terms": "Brak przejścia/przejazdu,koniec" }, "office": { "name": "Biuro", @@ -3838,6 +3881,10 @@ "name": "Przystanek autobusowy", "terms": "przystanek autobusowy, autobus" }, + "public_transport/platform/bus_tram_point": { + "name": "Przystanek tramwajowo-autobusowy", + "terms": "przystanek tramwajowo-autobusowy, przystanek tramwajowy, przystanek autobusowy, tramwaj, autobus" + }, "public_transport/platform/ferry": { "name": "Przystanek / Peron promu", "terms": "przystanek promu, peron, przystanek, prom, łódź, łódka, dok, port, nabrzeże, pomost, transport publiczny, transport, przewozy" @@ -4707,7 +4754,7 @@ }, "shop/storage_rental": { "name": "Przechowalnia rzeczy (długoterminowa)", - "terms": "przechowalnia rzeczy, magazyny samoobsługowe, wynajem magazynów" + "terms": "przechowalnia rzeczy, magazyny samoobsługowe, wynajem magazynów, komórki do wynajęcia, magazyny do wynajęcia" }, "shop/supermarket": { "name": "Supermarket", @@ -4930,6 +4977,10 @@ "name": "Tablica informacyjna", "terms": "informacja, obwieszczenia" }, + "tourism/information/board/welcome_sign": { + "name": "Tablica powitalna (miasta)", + "terms": "tablica powitalna miasta, witamy w mieście" + }, "tourism/information/guidepost": { "name": "Drogowskaz", "terms": "drogowskaz" @@ -5046,22 +5097,10 @@ "name": "Znak granicy miasta", "terms": "znak granicy miasta, granica miasta, granica miejscowości, znak drogowy" }, - "traffic_sign/city_limit_vertex": { - "name": "Znak granicy miasta", - "terms": "znak granicy miasta, granica miasta, granica miejscowości, znak drogowy" - }, "traffic_sign/maxspeed": { "name": "Znak ograniczenia prędkości", "terms": "znak ograniczenia prędkości, ograniczenie prędkości, maksymalna prędkość, znak drogowy" }, - "traffic_sign/maxspeed_vertex": { - "name": "Znak ograniczenia prędkości", - "terms": "znak ograniczenia prędkości, ograniczenie prędkości, maksymalna prędkość, znak drogowy" - }, - "traffic_sign_vertex": { - "name": "Znak drogowy", - "terms": "znak drogowy,droga,ulica" - }, "type/boundary": { "name": "Granica", "terms": "granica" @@ -5151,7 +5190,7 @@ }, "type/route/foot": { "name": "Trasa piesza", - "terms": "trasa piesza" + "terms": "trasa piesza, szlak pieszy" }, "type/route/hiking": { "name": "Szlak pieszy", diff --git a/app/src/main/assets/osmfeatures/pt-BR.json b/app/src/main/assets/osmfeatures/pt-BR.json index c6ef7a9a59..bc1129358a 100644 --- a/app/src/main/assets/osmfeatures/pt-BR.json +++ b/app/src/main/assets/osmfeatures/pt-BR.json @@ -16,7 +16,8 @@ "terms": "Quadro de notícias" }, "advertising/column": { - "name": "Coluna de publicidade" + "name": "Coluna de publicidade", + "terms": "Coluna de publicidade" }, "advertising/poster_box": { "name": "Caixa de pôster", @@ -66,8 +67,8 @@ "terms": "Telesqui de prato" }, "aerialway/pylon": { - "name": "Torre de Suporte de Teleférico", - "terms": "Torre de Suporte de Teleférico" + "name": "Torre de suporte de teleférico", + "terms": "Torre de suporte de teleférico" }, "aerialway/rope_tow": { "name": "Telecorda", @@ -93,7 +94,7 @@ "terms": "Plataforma de estacionamento" }, "aeroway/gate": { - "name": "Portão de Embarque", + "name": "Portão de embarque", "terms": "Portão de Embarque, Portão de desembarque, embarque, desembarque, aeroporto" }, "aeroway/hangar": { @@ -117,7 +118,7 @@ "terms": "Posição de estacionamento de aeronaves" }, "aeroway/runway": { - "name": "Pista de Pouso e Decolagem", + "name": "Pista de pouso e decolagem", "terms": "Pista de pouso e decolagem" }, "aeroway/spaceport": { @@ -125,11 +126,11 @@ "terms": "Base de lançamento espacial" }, "aeroway/taxiway": { - "name": "Pista de Taxiamento", + "name": "Pista de taxiamento", "terms": "Taxiway" }, "aeroway/terminal": { - "name": "Terminal de Aeroporto", + "name": "Terminal de aeroporto", "terms": "aeroporto, edifício, terminal aeroportuário, embarque, desembarque, viagem, turismo, avião, helicóptero" }, "aeroway/windsock": { @@ -151,15 +152,15 @@ "terms": "cruzar, gato, cão, cadela, cachorro, pet motel, reprodução de animais," }, "amenity/animal_shelter": { - "name": "Abrigo de Animais", + "name": "Abrigo de animais", "terms": "canil, cachorro, gato, pet" }, "amenity/arts_centre": { - "name": "Centro Cultural", + "name": "Centro cultural", "terms": "Centro de Artes, Artes, Centro Artístico, Teatro, Cinema, Espetáculo, Exposições, Galeria, Exposição, Cultura, Espaço Cultural, Pintura, Artes Plásticas" }, "amenity/atm": { - "name": "Caixa Eletrônico", + "name": "Caixa eletrônico", "terms": "caixa eletrônico, ATM, Banco, caixa automático, terminal bancário, terminal" }, "amenity/bank": { @@ -199,27 +200,35 @@ "terms": "Armazém de bicicletas" }, "amenity/bicycle_rental": { - "name": "Estação de Bicicletas Públicas", + "name": "Estação de bicicletas públicas", "terms": "Estação de Bicicletas Públicas, Compartilhamento de Bicicletas, Bike sharing, bicicletas comunitárias, bicicletas livres, bicicletas compartilhadas" }, "amenity/bicycle_repair_station": { - "name": "Estação de Reparo de Bicicletas", + "name": "Estação de reparo de bicicletas", "terms": "Bicicleta, Ciclismo, Reparo, Oficina de Bicicletas" }, "amenity/biergarten": { "name": "Biergarten", "terms": "cerveja, cerva, birra, cervejaria," }, + "amenity/binoculars": { + "name": "Binóculos montados", + "terms": "Binóculos montados" + }, "amenity/boat_rental": { - "name": "Aluguel de Barcos", - "terms": "Aluguel de Embarcações" + "name": "Aluguel de barcos", + "terms": "Aluguel de embarcações" + }, + "amenity/boat_storage": { + "name": "Armazenamento de barco", + "terms": "Armazenamento de barco" }, "amenity/bureau_de_change": { - "name": "Casa de Câmbio", + "name": "Casa de câmbio", "terms": "Moedas, Câmbio, Troca de valores," }, "amenity/bus_station": { - "name": "Terminal / Estação de Ônibus" + "name": "Terminal / Estação de ônibus" }, "amenity/cafe": { "name": "Cafeteria", @@ -246,7 +255,7 @@ "terms": "Estação de compartilhamento de carros" }, "amenity/car_wash": { - "name": "Lava a Jato", + "name": "Lava a jato", "terms": "Lavagem de Veículos, Lava jato, lava rápido, lava-a-jato, lava-jato" }, "amenity/casino": { @@ -258,23 +267,23 @@ "terms": "Estação de carregamento, Estação de Recarga, Estação de Carga Elétrica, Tomada de Cargamento, Tomada de Recarga" }, "amenity/childcare": { - "name": "Berçário ou Creche", + "name": "Berçário ou creche", "terms": "Berçário, Creche, Maternal, Jardim de infância, Cuidados infantis" }, "amenity/cinema": { "name": "Cinema", - "terms": "Cinema, Sala de Cinema" + "terms": "Cinema, Sala de cinema" }, "amenity/clinic": { - "name": "Clínica ou Posto de Saúde", + "name": "Clínica ou posto de saúde", "terms": "clínica, consultório, posto de saúde, unidade de saúde, unidade básica de saúde, ubs, pronto atendimento, enfermaria, doutor, médico, atendimento médico especializado, hospital" }, "amenity/clinic/abortion": { - "name": "Clínica de Aborto", + "name": "Clínica de aborto", "terms": "aborto, interrupção da gravidez" }, "amenity/clinic/fertility": { - "name": "Clínica de Fertilidade", + "name": "Clínica de fertilidade", "terms": "fertilidade, inseminação artificial, congelamento de esperma, fertilização in-vitro" }, "amenity/clock": { @@ -290,11 +299,11 @@ "terms": "Colégio técnico, Ensino profissionalizante, Educação profissional" }, "amenity/community_centre": { - "name": "Centro Comunitário", + "name": "Centro comunitário", "terms": "Centro comunitário, Salão de festas e eventos, centro social, associação de moradores" }, "amenity/community_centre/lgbtq": { - "name": "Centro Comunitário LGBTQ+", + "name": "Centro comunitário LGBTQ+", "terms": "Centro Comunitário LGBTQ+" }, "amenity/compressed_air": { @@ -302,7 +311,7 @@ "terms": "Ar Comprimido, calibragem, calibrar, pneu, bicicleta" }, "amenity/conference_centre": { - "name": "Centro de Convenções", + "name": "Centro de convenções", "terms": "Centro de Convenções" }, "amenity/courthouse": { @@ -321,7 +330,7 @@ "terms": "Dentista, Odontologista" }, "amenity/dive_centre": { - "name": "Centro de Mergulho", + "name": "Centro de mergulho", "terms": "Centro de Mergulho" }, "amenity/doctors": { @@ -338,17 +347,17 @@ }, "amenity/drinking_water": { "name": "Bebedouro", - "terms": "Água Potável, Bebedouro, fonte" + "terms": "Água potável, Bebedouro, fonte" }, "amenity/driving_school": { - "name": "Auto Escola", + "name": "Auto escola", "terms": "Escola de direção, escola de motoristas, auto-escola, autoescola" }, "amenity/embassy": { "name": "Embaixada" }, "amenity/events_venue": { - "name": "Local de Eventos", + "name": "Local de eventos", "terms": "Local de Eventos" }, "amenity/exhibition_centre": { @@ -364,7 +373,7 @@ "terms": "lanchonete, fast food, comida rápida, hambúrguer, restaurante, lanche" }, "amenity/fast_food/chicken": { - "name": "Frango Frito", + "name": "Frango frito", "terms": "frango, lanchonete, comida rápida, fast food, chicken fry" }, "amenity/fast_food/donut": { @@ -372,7 +381,7 @@ "terms": "donut fast food, donut, doughnut, dónute, rosca, rosquinha" }, "amenity/fast_food/fish_and_chips": { - "name": "Peixe e Batatas Fritas", + "name": "Peixe e batatas fritas", "terms": "lanchonete, comida rápida, fast food, restaurante, alimentação, peixe, fritas," }, "amenity/fast_food/hot_dog": { @@ -382,6 +391,10 @@ "amenity/fast_food/ice_cream": { "name": "Comida rápida de gelados" }, + "amenity/fast_food/juice": { + "name": "Casa de Sucos", + "terms": "suqueria, fast food, lanchonete, sucos, bebidas, sumo, frutas" + }, "amenity/fast_food/kebab": { "name": "Kebab", "terms": "lanchonete, comida rápida, fast food, restaurante, alimentação, kebab, shawarma, falafel, comida árabe, árabe" @@ -402,11 +415,11 @@ "name": "Terminal da balsa" }, "amenity/fire_station": { - "name": "Posto de Bombeiros", + "name": "Posto de bombeiros", "terms": "Posto de Bombeiros, Bombeiros, Central de Bombeiros, corpo de bombeiros" }, "amenity/food_court": { - "name": "Praça de Alimentação", + "name": "Praça de alimentação", "terms": "praça de alimentação, área de alimentação, comida, alimentação, restaurantes, lanchonete, comida rápida, fast food" }, "amenity/fountain": { @@ -414,7 +427,7 @@ "terms": "Fonte luminosa, Fonte Aquática" }, "amenity/fuel": { - "name": "Posto de Combustível", + "name": "Posto de combustível", "terms": "Posto de Gasolina, Combustíveis, Posto de Combustíveis, Combustível, Diesel, Gasolina, GNV, Etanol, Abastecimento, Carro" }, "amenity/gambling": { @@ -481,6 +494,10 @@ "name": "Doca de carregamento", "terms": "Doca de carregamento" }, + "amenity/lounger": { + "name": "Espreguiçadeira", + "terms": "Espreguiçadeira" + }, "amenity/love_hotel": { "name": "Motel", "terms": "hotel de beira de estrada, hotel, pousada, romântico, amor, love hotel" @@ -496,6 +513,10 @@ "name": "Estação de transferência de dinheiro", "terms": "Estação de transferência de dinheiro" }, + "amenity/mortuary": { + "name": "Necrotério", + "terms": "Necrotério" + }, "amenity/motorcycle_parking": { "name": "Estacionamento de motos", "terms": "Estacionamento de motocicletas, estacionamento de motos, estacionamento" @@ -560,19 +581,19 @@ "terms": "Cabine de foto" }, "amenity/place_of_worship": { - "name": "Local de Prática Religiosa", + "name": "Local de prática religiosa", "terms": "Local de Culto, Lugar de Adoração, Abadia, Basílica, Betel, Catedral, Mor, Capela, Igreja, Aprisco, Casa de Deus, Casa de oração, Casa de adoração, Mesquita, Oratório, Paróquia, Santuário, Sinagoga, Tabernáculo, Templo" }, "amenity/place_of_worship/buddhist": { - "name": "Templo Budista", + "name": "Templo budista", "terms": "Templo Budista" }, "amenity/place_of_worship/christian": { - "name": "Igreja Cristã", + "name": "Igreja cristã", "terms": "Igreja cristã, cristianismo" }, "amenity/place_of_worship/christian/jehovahs_witness": { - "name": "Salão do Reino das Testemunhas de Jeová", + "name": "Salão do reino das testemunhas de jeová", "terms": "Salão do Reino das Testemunhas de Jeová" }, "amenity/place_of_worship/christian/la_luz_del_mundo": { @@ -580,31 +601,31 @@ "terms": "A luz do templo mundial" }, "amenity/place_of_worship/christian/quaker": { - "name": "Casa de Reunião dos Amigos ", + "name": "Casa de reunião dos amigos ", "terms": "Casa de Reunião dos Amigos" }, "amenity/place_of_worship/hindu": { - "name": "Templo Hindu", + "name": "Templo hindu", "terms": "garbhargriha,mandir,mandu,puja,santuário,hinduísmo, templo" }, "amenity/place_of_worship/jewish": { - "name": "Sinagoga Judaica", + "name": "Sinagoga judaica", "terms": "Sinagoga judaica, judeus, judaísmo" }, "amenity/place_of_worship/muslim": { - "name": "Mesquita Muçulmana", + "name": "Mesquita muçulmana", "terms": "Mesquita muçulmana, islamismo, mosque" }, "amenity/place_of_worship/shinto": { - "name": "Santuário Xintoísta", + "name": "Santuário xintoísta", "terms": "templo, xintoísmo, kami, torii, portal, japonês" }, "amenity/place_of_worship/sikh": { - "name": "Templo Sique", + "name": "Templo sique", "terms": "sikhi, religião, siquismo, sikhismo, templo sikhi," }, "amenity/place_of_worship/taoist": { - "name": "Templo Taoísta", + "name": "Templo taoísta", "terms": "daoista, daoismo, Taoismo, tauismo, monastério, templo taoista, templo tauista," }, "amenity/planetarium": { @@ -628,7 +649,7 @@ "terms": "Escritório de classificação de correspondência" }, "amenity/post_office": { - "name": "Agência de Correios", + "name": "Agência de correios", "terms": "Correios, Encomendas, Transporte, Log, Cargas" }, "amenity/prep_school": { @@ -643,6 +664,10 @@ "name": "Bar / Boteco", "terms": "pub, botequim, boteco, buteco, bar, botequim, butequim, chopperia, choperia" }, + "amenity/pub/irish": { + "name": "Pub Irlândês", + "terms": "pub, irlanda, bar, irlandês, bebida" + }, "amenity/pub/lgbtq": { "name": "Pub LGBTQ+", "terms": "Pub LGBTQ+" @@ -656,7 +681,7 @@ "terms": "águas termais, fonte termal, onsen, banho turco, banho japonês, chuveiro público" }, "amenity/public_bookcase": { - "name": "Biblioteca ao Ar Livre", + "name": "Biblioteca ao ar livre", "terms": "Biblioteca ao Ar Livre, Biblioteca Pública" }, "amenity/ranger_station": { @@ -675,11 +700,11 @@ "terms": "Recipiente de resíduos verdes" }, "amenity/recycling_centre": { - "name": "Centro de Reciclagem", + "name": "Centro de reciclagem", "terms": "Material Reciclável, Dejetos, Material sólido, Reciclagem, Resíduos, lixo, vidro, garrafa, lata" }, "amenity/recycling_container": { - "name": "Container para Reciclagem", + "name": "Container para reciclagem", "terms": "reciclagem, lixo, lixeira, lata de reciclagem, lata de lixo, dejetos, resíduos, material reciclável" }, "amenity/refugee_site": { @@ -687,7 +712,7 @@ "terms": "Campo de refugiados" }, "amenity/research_institute": { - "name": "Área do Instituto de Pesquisa", + "name": "Área do instituto de pesquisa", "terms": "Área do Instituto de Pesquisa" }, "amenity/restaurant": { @@ -695,47 +720,47 @@ "terms": "Alimentação, Comida, Refeitório" }, "amenity/restaurant/american": { - "name": "Restaurante Americano", + "name": "Restaurante americano", "terms": "Restaurante Americano" }, "amenity/restaurant/asian": { - "name": "Restaurante Asiático", + "name": "Restaurante asiático", "terms": "Asiático, comida asiática, restaurante, ásia" }, "amenity/restaurant/chinese": { - "name": "Restaurante Chinês", + "name": "Restaurante chinês", "terms": "comida chinesa, yakisoba, lamen," }, "amenity/restaurant/french": { - "name": "Restaurante Francês", + "name": "Restaurante francês", "terms": "Restaurante Francês, comida francesa, frança, comida mediterrânea, restaurante mediterrâneo" }, "amenity/restaurant/german": { - "name": "Restaurante Alemão", + "name": "Restaurante alemão", "terms": "Comida Alemã, alemanha, restaurante, salsicha, cerveja" }, "amenity/restaurant/greek": { - "name": "Restaurante Grego", + "name": "Restaurante grego", "terms": "comida grega, comida mediterrânea, restaurante mediterrâneo" }, "amenity/restaurant/indian": { - "name": "Restaurante Indiano", + "name": "Restaurante indiano", "terms": "comida Indiana, índia, restaurante asiático, comida asiática," }, "amenity/restaurant/italian": { - "name": "Restaurante Italiano", + "name": "Restaurante italiano", "terms": "Restaurante italiano, comida italiana, macarrão, pasta, pizza" }, "amenity/restaurant/japanese": { - "name": "Restaurante Japonês", + "name": "Restaurante japonês", "terms": "comida Japonesa, sushi, temaki, teriaki," }, "amenity/restaurant/mexican": { - "name": "Restaurante Mexicano", + "name": "Restaurante mexicano", "terms": "comida Mexicana, tex-mex, nachos, guacamole, tortillas" }, "amenity/restaurant/noodle": { - "name": "Restaurante de Lámen", + "name": "Restaurante de lámen", "terms": "ramen, lamen, noodle," }, "amenity/restaurant/pizza": { @@ -755,19 +780,19 @@ "terms": "sushi, sashimi, comida japonesa, restaurante, alimentação, comida asiática, restaurante asiático, restaurante japonês" }, "amenity/restaurant/thai": { - "name": "Restaurante Tailandês", + "name": "Restaurante tailandês", "terms": "tailândia, comida tailandesa, comida asiática, restaurante asiático" }, "amenity/restaurant/turkish": { - "name": "Restaurante Turco", + "name": "Restaurante turco", "terms": "Restaurante, turquia, comida turca, kebab, falafel, shawarma, homus, tahine" }, "amenity/restaurant/vietnamese": { - "name": "Restaurante Vietnamita", + "name": "Restaurante vietnamita", "terms": "Restaurante, vietnã, restaurante asiático, comida asiática, alimentação," }, "amenity/sanitary_dump_station": { - "name": "Ponto de Descarga de Dejetos (para trailers)", + "name": "Ponto de descarga de dejetos (para trailers)", "terms": "Depósito de Toaletes de Trailers, depósito de banheiro de trailers, depósito sanitário, trailer, despejo de banheiro, despejo sanitário" }, "amenity/school": { @@ -775,7 +800,7 @@ "terms": "área escolar, terreno escolar, pátio escolar, colégio, ensino fundamental, ensino médio, educação, instituição de ensino" }, "amenity/shelter": { - "name": "Abrigo contra Intempéries", + "name": "Abrigo contra intempéries", "terms": "abrigo contra intempéries, abrigo, proteção da chuva" }, "amenity/shelter/gazebo": { @@ -806,7 +831,7 @@ "terms": "Centro social" }, "amenity/social_facility": { - "name": "Unidade de Assistência Social", + "name": "Unidade de assistência social", "terms": "Assistência Social, assistente social, Serviço Social" }, "amenity/social_facility/ambulatory_care": { @@ -826,7 +851,7 @@ "terms": "refúgio para desabrigados, abrigo para sem-teto, albergue, abrigo, mendigo, sopão, sem-teto" }, "amenity/social_facility/nursing_home": { - "name": "Casa de Repouso", + "name": "Casa de repouso", "terms": "Enfermagem, casa de saúde, lar de repouso, lar de idosos, asilo, lar de vida assistida, lar de saúde, casa de velhinhos," }, "amenity/studio": { @@ -854,7 +879,7 @@ "terms": "táxi, cooperativa" }, "amenity/telephone": { - "name": "Telefone Público", + "name": "Telefone público", "terms": "Telefone, Orelhão" }, "amenity/theatre": { @@ -866,11 +891,11 @@ "terms": "Anfiteatro" }, "amenity/toilets": { - "name": "Banheiros Públicos", + "name": "Banheiros públicos", "terms": "Banheiros, Sanitário, WC, Lavabo, Toalete" }, "amenity/toilets/disposal/flush": { - "name": "Banheiros com Descarga", + "name": "Banheiros com descarga", "terms": "Banheiro" }, "amenity/toilets/disposal/pitlatrine": { @@ -882,11 +907,11 @@ "terms": "Banheiro portátil" }, "amenity/townhall": { - "name": "Paço Municipal ou Prefeitura", + "name": "Paço municipal ou prefeitura", "terms": "Prefeitura" }, "amenity/townhall/city": { - "name": "Câmara Municipal", + "name": "Câmara municipal", "terms": "Câmara Municipal" }, "amenity/toy_library": { @@ -894,7 +919,7 @@ "terms": "Biblioteca de brinquedos" }, "amenity/university": { - "name": "Universidade ou Faculdade", + "name": "Universidade ou faculdade", "terms": "Área de Universidade, Faculdade, Área de Faculdade, Centro Universitário" }, "amenity/vacuum_cleaner": { @@ -906,7 +931,7 @@ "terms": "Inspeção veicular" }, "amenity/vending_machine": { - "name": "Máquina de Venda", + "name": "Máquina de venda", "terms": "Totem de vendas, Máquina de Venda Automática, Dispenser, Máquina Automática de Vendas" }, "amenity/vending_machine/bottle_return": { @@ -918,30 +943,30 @@ "terms": "Máquina de venda automática de pão" }, "amenity/vending_machine/cigarettes": { - "name": "Máquina de Venda de Cigarros", + "name": "Máquina de venda de cigarros", "terms": "cigarro, venda de cigarro" }, "amenity/vending_machine/coffee": { - "name": "Máquina de Venda de Café" + "name": "Máquina de venda de café" }, "amenity/vending_machine/condoms": { - "name": "Máquina de Venda de Preservativos", + "name": "Máquina de venda de preservativos", "terms": "máquina de venda de camisinhas, preservativos, camisinha" }, "amenity/vending_machine/drinks": { - "name": "Máquina de Venda de Bebidas", + "name": "Máquina de venda de bebidas", "terms": "Máquina de Venda de Bebidas, máquina de refrigerante, refrigerante, lata, latinha" }, "amenity/vending_machine/eggs": { - "name": "Máquina de venda automática de ovos", + "name": "Máquina de venda de ovos", "terms": "Máquina de venda automática de ovos" }, "amenity/vending_machine/electronics": { - "name": "Máquina de Venda de Eletrônicos", + "name": "Máquina de venda de eletrônicos", "terms": "Máquina de venda automática de eletrônicos" }, "amenity/vending_machine/elongated_coin": { - "name": "Máquina de Venda de Moedas Achatadas", + "name": "Máquina de venda de moedas achatadas", "terms": "Máquina de venda automática de moedas" }, "amenity/vending_machine/excrement_bags": { @@ -949,27 +974,27 @@ "terms": "Dispensador de saco de excrementos" }, "amenity/vending_machine/feminine_hygiene": { - "name": "Máquina de Vendas - Higiene Feminina", + "name": "Máquina de vendas de higiene feminina", "terms": "produtos de higiene feminina, camisinha, preservativo, absorvente, tampão, cuidados pessoais, higiene, mulher" }, "amenity/vending_machine/food": { - "name": "Máquina de Venda de Comida", + "name": "Máquina de venda de comida", "terms": "Máquina de venda automática de alimentos" }, "amenity/vending_machine/fuel": { - "name": "Bomba de Gasolina", + "name": "Bomba de gasolina", "terms": "bomba de gasolina,bomba de combustível,bomba de diesel,gasolina,combustível,propano,diesel,biodiesel" }, "amenity/vending_machine/ice_cream": { - "name": "Máquina de Venda de Sorvete", + "name": "Máquina de venda de sorvete", "terms": "Máquina de venda automática de sorvetes" }, "amenity/vending_machine/ice_cubes": { - "name": "Máquina de venda automática de gelo", + "name": "Máquina de venda de gelo", "terms": "Máquina de venda automática de gelo" }, "amenity/vending_machine/newspapers": { - "name": "Máquina de Venda de Jornais", + "name": "Máquina de venda de jornais", "terms": "jornais, revistas, venda de jornal, notícia, banca de jornal, periódicos, tabloides" }, "amenity/vending_machine/parcel_pickup": { @@ -985,15 +1010,15 @@ "terms": "máquina de vendas de bilhete de estacionamento, carro, bilhete de estacionamento" }, "amenity/vending_machine/public_transport_tickets": { - "name": "Máquina de Vendas de Bilhete de Transporte", + "name": "Máquina de vendas de bilhete de transporte", "terms": "Transporte público, ônibus, Trem, Metrô, Ticket, Bilhete" }, "amenity/vending_machine/stamps": { - "name": "Máquina de Venda de Selos", + "name": "Máquina de venda de selos", "terms": "Máquina de venda automática de postagem" }, "amenity/vending_machine/sweets": { - "name": "Máquina de Venda de Lanches", + "name": "Máquina de venda de lanches", "terms": "salgados, doces, petiscos, salgadinhos, snacks, chicletes, biscoitos, balas" }, "amenity/veterinary": { @@ -1013,11 +1038,11 @@ "terms": "lixo, resíduos, container de lixo" }, "amenity/waste_transfer_station": { - "name": "Estação de Transferência de Resíduos", + "name": "Estação de transferência de resíduos", "terms": "Transferência de lixo, Dejetos" }, "amenity/water_point": { - "name": "Torneira de Água Potável", + "name": "Torneira de água potável", "terms": "Água potável, Abastecimento" }, "amenity/watering_place": { @@ -1048,7 +1073,7 @@ "terms": "Cerca de animal" }, "attraction/big_wheel": { - "name": "Roda Gigante", + "name": "Roda gigante", "terms": "roda panorâmica, parque de diversões, brinquedo, parque temático" }, "attraction/bumper_car": { @@ -1064,11 +1089,11 @@ "terms": "maxambomba, trivoli, parque de diversões, cavalos" }, "attraction/dark_ride": { - "name": "Trem Fantasma", + "name": "Trem fantasma", "terms": "brinquedo, parque de diversões, terror, medo" }, "attraction/drop_tower": { - "name": "Torre de Queda Livre", + "name": "Torre de queda livre", "terms": "1" }, "attraction/kiddie_ride": { @@ -1091,7 +1116,7 @@ "terms": "Passeio pelas corredeiras do rio" }, "attraction/roller_coaster": { - "name": "Montanha Russa", + "name": "Montanha russa", "terms": "brinquedo, trem, trilhos, parque de diversão, parque de diversões, parque temático, aventura" }, "attraction/summer_toboggan": { @@ -1103,7 +1128,7 @@ "terms": "Carrossel de giro" }, "attraction/train": { - "name": "Trem Turístico", + "name": "Trem turístico", "terms": "parque temático, caminhão trem, trem da alegria, trem de passeio, trem para turismo" }, "attraction/water_slide": { @@ -1143,7 +1168,7 @@ "terms": "muralha, muro, parede" }, "barrier/cycle_barrier": { - "name": "Barreira para Bicicletas", + "name": "Barreira para bicicletas", "terms": "barreira para bicicletas, bloqueio para bicicletas" }, "barrier/ditch": { @@ -1154,7 +1179,7 @@ "name": "Entrada" }, "barrier/fence": { - "name": "Cerca ou Grade", + "name": "Cerca ou grade", "terms": "cerca, grade" }, "barrier/fence/railing": { @@ -1170,7 +1195,7 @@ "terms": "Mureta" }, "barrier/hedge": { - "name": "Cerca Viva", + "name": "Cerca viva", "terms": "Cerca viva" }, "barrier/height_restrictor": { @@ -1202,11 +1227,11 @@ "terms": "Porteira Giratória, quebra cabeça, quebra costela, passa um, passador, imbricação" }, "barrier/lift_gate": { - "name": "Cancela Elevatória", + "name": "Cancela elevatória", "terms": "cancela, barreira elevatória" }, "barrier/retaining_wall": { - "name": "Muro de Contenção", + "name": "Muro de contenção", "terms": "parede de retenção, barreira de retenção" }, "barrier/sally_port": { @@ -1218,15 +1243,15 @@ "terms": "Faixa de espigão, Espigões de trânsito, Picador de pneus,Ferrões, Ferrão, Dispositivo de esvaziamento de pneus" }, "barrier/stile": { - "name": "Travessia em Cerca/Muro", - "terms": "Passagem Fixa por Barreira" + "name": "Travessia em cerca/muro", + "terms": "Passagem fixa por barreira" }, "barrier/swing_gate": { "name": "Balanço de portão", "terms": "Balanço de portão" }, "barrier/toll_booth": { - "name": "Cabine de Pedágio", + "name": "Cabine de pedágio", "terms": "Pedágio" }, "barrier/turnstile": { @@ -1245,7 +1270,7 @@ "name": "Limite" }, "boundary/administrative": { - "name": "Limite Administrativo", + "name": "Limite administrativo", "terms": "Fronteira Administrativa, Limite Administrativo, Divisa" }, "bridge/support": { @@ -1296,7 +1321,7 @@ "terms": "Igreja, Edificação de Capela, Prédio de Capela, Capela, Lugar de Adoração, Religião, templo" }, "building/church": { - "name": "Edifício de Igreja", + "name": "Edifício de igreja", "terms": "Edifício de Igreja, igreja, paróquia, lugar de adoração, templo, capela, catedral, prédio de igreja" }, "building/civic": { @@ -1304,7 +1329,7 @@ "terms": "edifício cívico" }, "building/college": { - "name": "Edifício de Escola Técnica", + "name": "Edifício de escola técnica", "terms": "Colégio técnico, Ensino profissionalizante, Educação profissional, prédio de escola técnica" }, "building/commercial": { @@ -1335,7 +1360,7 @@ "terms": "Casa de fazenda" }, "building/farm_auxiliary": { - "name": "Edifício da Fazenda", + "name": "Edifício de fazenda", "terms": "Edifício da Fazenda" }, "building/garage": { @@ -1379,7 +1404,7 @@ "terms": "Cabana" }, "building/industrial": { - "name": "Edifício Industrial", + "name": "Edifício industrial", "terms": "Edifício Industrial, prédio industrial" }, "building/kindergarten": { @@ -1403,7 +1428,7 @@ "terms": "Edifício Público, prédio público" }, "building/residential": { - "name": "Edifício Residencial", + "name": "Edifício residencial", "terms": "Edifício Residencial, prédio residencial, apartamentos, condomínio" }, "building/retail": { @@ -1415,7 +1440,7 @@ "terms": "Telhado, Cobertura, teto" }, "building/ruins": { - "name": "Edifício em Ruínas", + "name": "Edifício em ruínas", "terms": "ruínas, edifício abandonado" }, "building/school": { @@ -1439,11 +1464,11 @@ "terms": "Estábulo" }, "building/stadium": { - "name": "Edifício de Estádio", + "name": "Edifício de estádio", "terms": "estádio, esportes, ginásio de esportes" }, "building/static_caravan": { - "name": "Casa Transportável", + "name": "Casa transportável", "terms": "Casa Transportável" }, "building/sty": { @@ -1455,7 +1480,7 @@ "terms": "Templo, igreja, lugar de adoração, capela, local sagrado" }, "building/terrace": { - "name": "Fileira de Casas", + "name": "Fileira de casas", "terms": "Fileira de Casas" }, "building/train_station": { @@ -1466,7 +1491,7 @@ "terms": "Edifício de transporte" }, "building/university": { - "name": "Edifício Universitário", + "name": "Edifício universitário", "terms": "Edifício Universitário, Faculdade, Edifício de Faculdade, prédio universitário, bloco universitário, prédio de faculdade, prédio de universidade, edifício de universidade" }, "building/warehouse": { @@ -1509,7 +1534,7 @@ "terms": "Serralheiro, Ferreiro" }, "craft/boatbuilder": { - "name": "Fabricante de Barcos", + "name": "Fabricante de barcos", "terms": "Barcos, Estaleiro, Veleiro" }, "craft/bookbinder": { @@ -1525,7 +1550,7 @@ "terms": "Carpinteiro, Marceneiro, marcenaria, Carpintaria" }, "craft/carpet_layer": { - "name": "Instalador de Carpete", + "name": "Instalador de carpete", "terms": "Colocador de Carpete, instalação" }, "craft/caterer": { @@ -1533,7 +1558,7 @@ "terms": "Fornecedor de Mantimentos, Aprovisionador, cozinheiro, encomenda, marmita, PF, refeição," }, "craft/chimney_sweeper": { - "name": "Limpador de Chaminé", + "name": "Limpador de chaminé", "terms": "limpador de chaminés, limpeza de chaminés, chaminés" }, "craft/cleaning": { @@ -1614,7 +1639,7 @@ "terms": "Fotógrafo" }, "craft/photographic_laboratory": { - "name": "Laboratório Fotográfico", + "name": "Laboratório fotográfico", "terms": "Laboratório Fotográfico" }, "craft/plasterer": { @@ -1634,7 +1659,7 @@ "terms": "Rigger" }, "craft/roofer": { - "name": "Reparador de Telhados", + "name": "Reparador de telhados", "terms": "Telheiro" }, "craft/saddler": { @@ -1642,7 +1667,7 @@ "terms": "Seleiro" }, "craft/sailmaker": { - "name": "Fabricante de Velas Náuticas", + "name": "Fabricante de velas náuticas", "terms": "Veleiro" }, "craft/sawmill": { @@ -1650,7 +1675,7 @@ "terms": "Serraria" }, "craft/scaffolder": { - "name": "Montador de Andaimes", + "name": "Montador de andaimes", "terms": "Montador de Andaimes" }, "craft/sculptor": { @@ -1689,7 +1714,7 @@ "terms": "Relógios, Relojoaria, relógio de pulso, Conserto de relógios, Reparos de relógios" }, "craft/window_construction": { - "name": "Fabricante de Janelas", + "name": "Fabricante de janelas", "terms": "Janeleiro" }, "craft/winery": { @@ -1703,6 +1728,9 @@ "demolished/building": { "name": "Edifício recentemente demolido" }, + "disused/amenity": { + "name": "Amenidade em desuso" + }, "disused/railway": { "name": "Recurso ferroviário em desuso" }, @@ -1713,10 +1741,10 @@ "name": "Aterro Elevado" }, "emergency": { - "name": "Recurso de Emergência" + "name": "Recurso de emergência" }, "emergency/ambulance_station": { - "name": "Posto de Ambulâncias", + "name": "Posto de ambulâncias", "terms": "Primeiros socorros, Parada de Ambulâncias, Garagem de Ambulâncias" }, "emergency/defibrillator": { @@ -1727,7 +1755,7 @@ "name": "Acesso de Emergência Designado" }, "emergency/destination": { - "name": "Acesso de Emergência como Destino" + "name": "Acesso de emergência como destino" }, "emergency/fire_alarm": { "name": "Caixa de chamada de alarme de incêndio", @@ -1769,10 +1797,10 @@ "name": "Acesso de Emergência Não Permitido" }, "emergency/official": { - "name": "Acesso de Emergência Oficial" + "name": "Acesso de emergência oficial" }, "emergency/phone": { - "name": "Telefone de Emergência", + "name": "Telefone de emergência", "terms": "Telefone de Emergência" }, "emergency/private": { @@ -1809,7 +1837,7 @@ "name": "Vau" }, "golf/bunker": { - "name": "Banco de Areia", + "name": "Banco de areia", "terms": "Bunker, Banco de Areia, Banca de Areia, Poça de Areia, Obstáculo de Areia" }, "golf/cartpath": { @@ -1857,7 +1885,7 @@ "terms": "posto de saúde, Unidade de Pronto Atendimento, Unidade Básica de Saúde, enfermaria, clínica, doutor, consultório médico, serviços médicos, serviço médico, serviço de saúde, atendimento médico, médico, médica, saúde, hospital, dentista, fisioterapia" }, "healthcare/alternative": { - "name": "Medicina Alternativa", + "name": "Medicina alternativa", "terms": "acupuntura, antroposofia, cinesiologia aplicada, aromaterapia, ayurveda, homeopatia, hidroterapia, hipnose, naturopatia, osteopatia, reflexologia, reiki, shiatsu, tradicional, tuiná, unani" }, "healthcare/alternative/chiropractic": { @@ -1869,7 +1897,7 @@ "terms": "audiólogo, fonoaudiólogo, ouvido, audição" }, "healthcare/birthing_center": { - "name": "Casa de Parto", + "name": "Casa de parto", "terms": "Centro de Parto Normal, Maternidade, Parto normal, parteira, obstetrícia, nascimento, hospital, clínica, saúde, bebê, infantil" }, "healthcare/blood_donation": { @@ -3109,6 +3137,10 @@ "name": "Torre de comunicação", "terms": "Torre de comunicação" }, + "man_made/tower/cooling": { + "name": "Torre de refrigeração", + "terms": "Torre de refrigeração" + }, "man_made/tower/defensive": { "name": "Torre fortificada", "terms": "Torre fortificada" @@ -3157,6 +3189,10 @@ "name": "Moinho de Vento", "terms": "moinho de vento, eólico, moinho, catavento" }, + "man_made/windpump": { + "name": "Moinho de vento", + "terms": "Moinho de vento" + }, "man_made/works": { "name": "Fábrica", "terms": "Fábrica, Planta de produção, chão de fábrica," @@ -3244,6 +3280,10 @@ "name": "Urzal", "terms": "Urzal, vegetação, arbustos, charneca" }, + "natural/hot_spring": { + "name": "Fonte termal", + "terms": "Fonte termal" + }, "natural/mud": { "name": "Lama", "terms": "solo, lamaçal, mangue, lama, cobertura de solo" @@ -3830,6 +3870,10 @@ "name": "Ponto de Ônibus", "terms": "Ponto de Ônibus, Parada de Ônibus" }, + "public_transport/platform/bus_tram_point": { + "name": "Ponto de bonde e ônibus", + "terms": "Ponto de bonde e ônibus" + }, "public_transport/platform/ferry": { "name": "Plataforma de Balsa", "terms": "Plataforma de Balsa" @@ -4920,6 +4964,10 @@ "name": "Painel de Informações", "terms": "Painel de Informações Turísticas" }, + "tourism/information/board/welcome_sign": { + "name": "Placa de boas vindas", + "terms": "Placa de boas vindas" + }, "tourism/information/guidepost": { "name": "Poste de Sinalização", "terms": "Poste de Informações Turísticas" @@ -5033,22 +5081,10 @@ "name": "Sinal de limite de cidade", "terms": "Sinal de limite de cidade" }, - "traffic_sign/city_limit_vertex": { - "name": "Sinal de limite de cidade", - "terms": "Sinal de limite de cidade" - }, "traffic_sign/maxspeed": { "name": "Sinal de limite de velocidade", "terms": "Sinal de limite de velocidade" }, - "traffic_sign/maxspeed_vertex": { - "name": "Sinal de limite de velocidade", - "terms": "Sinal de limite de velocidade" - }, - "traffic_sign_vertex": { - "name": "Sinal de trânsito", - "terms": "Sinal de trânsito" - }, "type/boundary": { "name": "Fronteira", "terms": "Fronteira" @@ -5137,8 +5173,8 @@ "terms": "Rota de Barco, Rota de Ferry, Ferry Boat" }, "type/route/foot": { - "name": "Rota de Pedestres", - "terms": "Rota de Caminhada" + "name": "Percurso de pedestre", + "terms": "Percurso de pedestre" }, "type/route/hiking": { "name": "Rota de Caminhada", diff --git a/app/src/main/assets/osmfeatures/pt.json b/app/src/main/assets/osmfeatures/pt.json index 02ab7f50fd..43102a0d85 100644 --- a/app/src/main/assets/osmfeatures/pt.json +++ b/app/src/main/assets/osmfeatures/pt.json @@ -212,10 +212,18 @@ "name": "Jardim de cerveja", "terms": "Jardim da Cerveja, esplanada,biergarten" }, + "amenity/binoculars": { + "name": "Binóculo panorâmico", + "terms": "miradouro,mirante,viewpoint,vista,panorâmica,telescópio,óculo,binóculos,observação,paisagem" + }, "amenity/boat_rental": { "name": "Aluguer de barcos", "terms": "boat rental, aluguer de barcos, aluguer, locação, barco, barcos, aluga, aluga-se" }, + "amenity/boat_storage": { + "name": "Depósito de barcos", + "terms": "barco,embarcação,embarcações,doca seca" + }, "amenity/bureau_de_change": { "name": "Agência de câmbio", "terms": "currency exchange, troca de dinheiro, câmbio, cambiar, cambista, dinheiro" @@ -268,7 +276,7 @@ "terms": "filme, filmes, cinema,hollywood" }, "amenity/clinic": { - "name": "Centro Clínico", + "name": "Centro de saúde / Clínica", "terms": "Clinic, Clínica, Centro de Saúde, Unidade de Saúde, Posto de Saúde, Unidade de Saúde Familiar, USF, Agrupamento de Centros de Saúde, ASF, Unidade Local de Saúde, Unidade Básica de Saúde, UBS,urgências,posto médico," }, "amenity/clinic/abortion": { @@ -487,6 +495,10 @@ "name": "Cais de carga", "terms": "Cargas,descargas,cargas e descargas,carregamento,doca de carga, carga rodoviária, descarga rodoviária" }, + "amenity/lounger": { + "name": "Espreguiçadeira", + "terms": "camilha,preguiceira,cama,recosto,lounger" + }, "amenity/love_hotel": { "name": "Motel para casais", "terms": "Motel" @@ -503,6 +515,10 @@ "name": "Serviço de transferência de dinheiro", "terms": "transferência de dinheiro, transferir dinheiro, envio de dinheiro, Western Union, MoneyGram, enviar dinheiro" }, + "amenity/mortuary": { + "name": "Morgue", + "terms": "necrotério,médico-legista" + }, "amenity/motorcycle_parking": { "name": "Parque de motas", "terms": "Estacionamento para motas, estacionamento para motociclos, estacionamento, motas,motociclos,parque de estacionamento,estacionar" @@ -1974,8 +1990,8 @@ "terms": "passadeira levantada, passadeira elevada,lomba,travessia,pedestre,peões" }, "highway/crossing/unmarked": { - "name": "Travessia sem marcas", - "terms": "passagem de pedestres não marcada, passadeira não marcada, passadeira sem marcas,atravessamento,pedestre,peões,passadeira" + "name": "Travessia sem marcações", + "terms": "passagem de pedestres não marcada, passadeira não marcada, passadeira sem marcas,atravessamento,pedestre,peões,passadeira,faixa de segurança" }, "highway/crossing/unmarked-raised": { "name": "Passadeira não marcada (elevada)", @@ -3125,6 +3141,10 @@ "name": "Torre de comunicação", "terms": "torre de telecomunicações, radiodifusão, antena, telefone celular, telefone móvel, torre, rádio, mastro de transmissão, pilão de transmissão,televisão,telecomunicações,telecomunicação,transmissão" }, + "man_made/tower/cooling": { + "name": "Torre de refrigeração", + "terms": "energia,vapor,calor,central,elétrica,arrefecimento,esfriamento,arrefecer,esfriar,nuclear" + }, "man_made/tower/defensive": { "name": "Torre fortificada", "terms": "fortified tower, bergfried, fortified defensive tower, keep, donjon, torre fortificada, torre da cerca, torre de menagem, torre de atalaia,baluarte,castelo" @@ -3173,6 +3193,10 @@ "name": "Moinho de vento", "terms": "Windmill,moinho,mó,vento,cereais" }, + "man_made/windpump": { + "name": "Bomba eólica", + "terms": "aerotor,bomba de água,moinho de vento,moinho eólico,vento,poço,catavento,bombear,bombeamento,torre,petróleo,gás" + }, "man_made/works": { "name": "Fábrica", "terms": "indústria,manofatura,manofaturação,fabrico,fabricar,works,edifício,refinaria,estrutura,fabricação,produção" @@ -3260,6 +3284,10 @@ "name": "Charneca", "terms": "heath,vegetação,urze,torga,quiroga,queiró,magoriça,tojal,urzal,plantas,área,zona,gândara,esteva,giestas,tojo" }, + "natural/hot_spring": { + "name": "Fonte termal", + "terms": "nascente,geotermal,geotérmica,geotermismo,água termal," + }, "natural/mud": { "name": "Lama", "terms": "terra molhada, lama, lamaçal, lameiros, lameiro, lameirão, lameirões, lamacento, lamacenta" @@ -3481,7 +3509,7 @@ }, "office/government": { "name": "Escritório governamental", - "terms": "government office, governo, estado, segurança social, dgv, instituto de emprego, instituto do emprego, centro de emprego, direcção-geral, direção-geral, çoja do cidadão" + "terms": "government office, governo, estado, segurança social, dgv, instituto de emprego, instituto do emprego, centro de emprego, direcção-geral, direção-geral, loja do cidadão" }, "office/government/prosecutor": { "name": "Gabinete de procuradoria", @@ -3846,6 +3874,10 @@ "name": "Paragem de autocarro", "terms": "paragem, paragem de autocarro, embarque, autocarro, machimbombo, toca-toca, otocarro, microlete, camionete, camioneta, carreira, ônibus" }, + "public_transport/platform/bus_tram_point": { + "name": "Paragem de autocarro e elétrico", + "terms": "autocarro,carreira,ônibus,parada,transporte,bonde" + }, "public_transport/platform/ferry": { "name": "Plataforma de ferry", "terms": "plataforma, ferry, paragem, estação de ferry, barco, atracadouro, atracagem, atracar, embarque, embarcar,travessia" @@ -4078,7 +4110,7 @@ "name": "Estação ferroviária" }, "railway/subway": { - "name": "Metropolitano", + "name": "Linha de metro", "terms": "metro, metropolitano, subterrâneo,subway,transportes públicos,carris,linha férrea,caminhos-de-ferro,caminhos de ferro,ferrovia" }, "railway/subway_entrance": { @@ -4938,6 +4970,10 @@ "name": "Painel de informação", "terms": "placa de informação, informação, informações, painel, placar, placard, placa, painel informativo,informações,turísticas,turismo,mapa,indicações,orientações" }, + "tourism/information/board/welcome_sign": { + "name": "Placa de boas-vindas", + "terms": "placard,board,outdoor,boas-vindas,bem-vindos,recepção,receção" + }, "tourism/information/guidepost": { "name": "Poste com direções", "terms": "poste de direções, poste com direções, poste com direções, direção, direção, direções, direções, sinalética, sinalética direções, destinos,indicações" @@ -5054,22 +5090,10 @@ "name": "Placa de limite de povoação", "terms": "limite da cidade, cidade, aldeia, borda, fim da cidade, início da cidade,rodoviária,estrada" }, - "traffic_sign/city_limit_vertex": { - "name": "Placa de limite de povoação", - "terms": "limite da cidade, cidade, aldeia, borda, fim da cidade, início da cidade,rodoviária,estrada" - }, "traffic_sign/maxspeed": { "name": "Sinal de limite de velocidade", "terms": "velocidade máxima, limite de velocidade,estrada,rodoviária" }, - "traffic_sign/maxspeed_vertex": { - "name": "Sinal de limite de velocidade", - "terms": "velocidade máxima, limite de velocidade,estrada,rodoviária" - }, - "traffic_sign_vertex": { - "name": "Sinal de trânsito", - "terms": "sinais de trânsito, sinal de estrada, sinalização,sinal rodoviário" - }, "type/boundary": { "name": "Fronteira", "terms": "limite,orla,divisão" @@ -5159,7 +5183,7 @@ }, "type/route/foot": { "name": "Rota pedestre", - "terms": "rota pedonal, percurso pedestre, percurso pedonal, circuito pedonal, peão" + "terms": "rota pedonal,percurso pedestre,percurso pedonal,circuito pedonal,circuito pedestre,percurso recomendado,pequena rota,grande rota,trekking,trail" }, "type/route/hiking": { "name": "Rota de caminhada", diff --git a/app/src/main/assets/osmfeatures/ru.json b/app/src/main/assets/osmfeatures/ru.json index 6ad18af022..c1c78a6c87 100644 --- a/app/src/main/assets/osmfeatures/ru.json +++ b/app/src/main/assets/osmfeatures/ru.json @@ -2154,10 +2154,12 @@ "terms": "Водозабор" }, "man_made/watermill": { - "name": "Водяная мельница" + "name": "Водяная мельница", + "terms": "вода,мельница,колесо" }, "man_made/windmill": { - "name": "Ветряная мельница" + "name": "Ветряная мельница", + "terms": "Ветер,мельница" }, "man_made/works": { "name": "Завод", @@ -2234,6 +2236,9 @@ "name": "Дикий кустарник", "terms": "Кустарник, Кусты, Кустовник, Подлесок, Лозняк, Чапыжник" }, + "natural/shrub": { + "name": "Куст" + }, "natural/spring": { "name": "Родник", "terms": "Ручей, Ключ, источник" @@ -2257,10 +2262,22 @@ "name": "Водоём", "terms": "Вода, Водоём" }, + "natural/water/basin": { + "name": "Бассейн", + "terms": "дренаж,переток,дождь,канава" + }, + "natural/water/canal": { + "name": "Канал", + "terms": "Судоходный канал, оросительный канал" + }, "natural/water/lake": { "name": "Озеро", "terms": "озеро" }, + "natural/water/moat": { + "name": "Ров", + "terms": "защитный ров,канава" + }, "natural/water/pond": { "name": "Пруд", "terms": "пруд" @@ -2269,6 +2286,18 @@ "name": "Водохранилище", "terms": "Водохранилище, Рукотворное озеро, Водоместилище," }, + "natural/water/river": { + "name": "Река", + "terms": "река,русло" + }, + "natural/water/stream": { + "name": "Ручей", + "terms": "Ручей,русло,поток" + }, + "natural/water/wastewater": { + "name": "Пруд отстойник", + "terms": "нечистоты, канализация, водоочистка, водосток, отстойник" + }, "natural/wetland": { "name": "Болото", "terms": "болото, заболоченная территория" @@ -3523,18 +3552,9 @@ "traffic_sign/city_limit": { "name": "Знак населённый пункт" }, - "traffic_sign/city_limit_vertex": { - "name": "Знак населённый пункт" - }, "traffic_sign/maxspeed": { "name": "Знак ограничения скорости" }, - "traffic_sign/maxspeed_vertex": { - "name": "Знак ограничения скорости" - }, - "traffic_sign_vertex": { - "name": "Дорожный знак" - }, "type/boundary": { "name": "Граница", "terms": "Граница" @@ -3598,10 +3618,6 @@ "name": "Паромный маршрут", "terms": "паром, паромная переправа" }, - "type/route/foot": { - "name": "Пешеходный маршрут", - "terms": "Пеший маршрут, Пешеходный маршрут" - }, "type/route/hiking": { "name": "Маршрут пешего туризма", "terms": "туризм, туристическая прогулка, маршрут" diff --git a/app/src/main/assets/osmfeatures/sk.json b/app/src/main/assets/osmfeatures/sk.json index b3b1e44356..bda3ce4771 100644 --- a/app/src/main/assets/osmfeatures/sk.json +++ b/app/src/main/assets/osmfeatures/sk.json @@ -3095,18 +3095,9 @@ "traffic_sign/city_limit": { "name": "Značka začiatku/konca obce" }, - "traffic_sign/city_limit_vertex": { - "name": "Značka začiatku/konca obce" - }, "traffic_sign/maxspeed": { "name": "Značka obmedzenia rýchlosti" }, - "traffic_sign/maxspeed_vertex": { - "name": "Značka obmedzenia rýchlosti" - }, - "traffic_sign_vertex": { - "name": "Dopravná značka" - }, "type/boundary": { "name": "Hranica", "terms": "hranica,štátna hranica,statna hranica,kraj,okres" @@ -3173,10 +3164,6 @@ "name": "Trajektová trasa", "terms": "Trajektova trasa,trajekt,linka,linka trajektu,trasa kompy" }, - "type/route/foot": { - "name": "Turistická trasa", - "terms": "turisticka trasa,pesia trasa,pešia trasa" - }, "type/route/hiking": { "name": "Turistická trasa", "terms": "turisticka trasa,hiking,trekking,trasa,trek,tura,túra,turistika" diff --git a/app/src/main/assets/osmfeatures/sv.json b/app/src/main/assets/osmfeatures/sv.json index 45bc04a7ed..b896924bb6 100644 --- a/app/src/main/assets/osmfeatures/sv.json +++ b/app/src/main/assets/osmfeatures/sv.json @@ -212,10 +212,18 @@ "name": "Ölträdgård", "terms": "ölträdgård, Biergarten, uteservering, servering, ölcafé, utecafé, trädgårdspub, utepub, pub, öl, sprit, utebar, trädgårdsbar, bar, krog" }, + "amenity/binoculars": { + "name": "Fast monterad kikare", + "terms": "Fast monterad kikare, kikare, teleskop, utsikt" + }, "amenity/boat_rental": { "name": "Båtuthyrning", "terms": "Båtuthyrning, båtlån, båtleasing, lånebåt, hyrbåt" }, + "amenity/boat_storage": { + "name": "Båtförvaring", + "terms": "Båtförvaring, båthus, torrdocka, marina, båtuppställning, uppställning, båt" + }, "amenity/bureau_de_change": { "name": "Växlingskontor", "terms": "Växlingskontor, växling, valuta, pengar, pengaväxling, resecheckar, pengaväxlare" @@ -487,6 +495,10 @@ "name": "Lastkaj", "terms": "lastkaj, lastbrygga, gods, lastning, utlastning, inlastning, dörr, frakt, fraktbrygga, lagerhus, lager" }, + "amenity/lounger": { + "name": "Solstol(ar)", + "terms": "Solstolar, stolar, bänkar, solning, soldäck" + }, "amenity/love_hotel": { "name": "Kärlekshotell", "terms": "Kärlekshotell, sexhotell, korttidshotell, hotell" @@ -503,6 +515,10 @@ "name": "Pengaöverföring", "terms": "Pengaöverföring, pengar, valuta, valutaöverföring, räkning, faktura, betalning, finans, kontanter, betalning, utbetalning, inbetalning" }, + "amenity/mortuary": { + "name": "Bårhus", + "terms": "bårhus, likbod, krematorium, begravningsbyrå, minneshem, begravningsplats, likförvaring, död, lik" + }, "amenity/motorcycle_parking": { "name": "Motorcykelparkering", "terms": "Motorcykelparkering, parkering motorcykel, ställplats, motorcykelställ, parkering, motorcykel, parkeringsplats, parkeringsplats motorcykel" @@ -1223,18 +1239,38 @@ "name": "Stödmur", "terms": "Stödmur, nivåskillnad" }, + "barrier/sally_port": { + "name": "Befäst entréport", + "terms": "Befäst entréport, borgport, slottsport, entréport, entré, port" + }, + "barrier/spikes": { + "name": "Spikremsa", + "terms": "Spikremsa, spikmatta, enkelriktning, stingers, stopppinnar, däckdeflationsanordning, däckförstörare, trafikspikar" + }, "barrier/stile": { "name": "Övergång", "terms": "Övergång, trappa" }, + "barrier/swing_gate": { + "name": "Svänggrind", + "terms": "Svänggrind, grind, bom, spärr, avspärrning" + }, "barrier/toll_booth": { "name": "Tullstation", "terms": "Tullstation, införselavgift, importavgift, skatt, tullhus, tullmyndighet, gränstull, tullkontroll, tullvisitation, vägavgift" }, + "barrier/turnstile": { + "name": "Vändkors", + "terms": "Vändkors, spärr, spärrkors" + }, "barrier/wall": { "name": "Mur", "terms": "Mur, vägg, murverk, skyddsvärn, befästning, hinder, barriär" }, + "barrier/wall/noise_barrier": { + "name": "Ljudbarriär", + "terms": "Ljudbarriär, akustisk barriär, ljudvägg, ljudhinder, akustiskt hinder, bullerskärm, bullerhinder, ljud, buller, akustik" + }, "boundary": { "name": "Gräns" }, @@ -1309,6 +1345,10 @@ "name": "Byggnad under uppförande", "terms": "Byggnad under konstruktion, Byggnad under uppförande, byggarbete, bygge, byggarbetsplats, byggnation, byggnadsplats" }, + "building/cowshed": { + "name": "Kostall", + "terms": "Ladugård, kostall, kalvar, kvigor, ko, tjurar, mjölk, mjölkstall" + }, "building/detached": { "name": "Fristående hus", "terms": "Villa, hus, småhus, enfamiljshus, enbostadshus, kåk, egnahem, fristående hus, friliggande hus, envåningshus, fristående villa, friliggande villa" @@ -1345,7 +1385,8 @@ "terms": "växthus, drivhus, orangeri, driveri, vinterträdgård, växtodling, blomsterhus, odlingshus" }, "building/hangar": { - "name": "Hangar" + "name": "Hangar", + "terms": "Hangarbyggnad, hangar, flyg, flygplan, flyggarage" }, "building/hospital": { "name": "Sjukhusbyggnad", @@ -1435,6 +1476,10 @@ "name": "Villavagn", "terms": "Villavagn, husvagn, campingvagn" }, + "building/sty": { + "name": "Svinstia", + "terms": "Svinstia, stia, svin, gris, sugga, kulting, bås, grisbås, grislada, grisladugård, svinladugård" + }, "building/temple": { "name": "Tempelbyggnad", "terms": "Tempelbyggnad, tempel, andaktsrum, bönhus, bönehus, böneplats, dyrkan, fristad, gud, guds hus, gudshus, helgedom, mission, religion, religiös, religiös anläggning, religiöst område, tempelområde, tillbedjan, tro" @@ -1477,6 +1522,10 @@ "name": "Hantverk", "terms": "Hantverk, skrå, slöjd, hantverkare" }, + "craft/agricultural_engines": { + "name": "Jordbruksmekaniker", + "terms": "Jordbruksmekaniker, Jordbruksmaskiner, skördetröskor, lantbruksmaskiner, skördare, traktorer, mekaniker, motormekaniker, jordbruk" + }, "craft/basket_maker": { "name": "Korgtillverkare", "terms": "Korgtillverkare, korg, korgtillverkning, korgflätning, Korgslöjd" @@ -1557,10 +1606,22 @@ "name": "Glasmästare", "terms": "glasblåsare, fönster, solskydd, glaskonst, glas, målat glas" }, + "craft/handicraft": { + "name": "Hantverksverkstad", + "terms": "Hantverksverkstad, Hantverkare, hantverk, konsthantverk, slöjd, handarbete, hantverk, snideri, sömnad, hemslöjd, vävning, textil, vävstuga, snickeri" + }, + "craft/hvac": { + "name": "Arbetsplats för värme, ventilation och luftkonditionering", + "terms": "HVAC, VVS, rörmokare, värme, ventilation, sanitet, avlopp, vatten, vattenförsörjning, styrsystem, övervakningssystem, inomhusklimat, energiförsörjning, tryckluft, gas, sprinkler, uppvärmning, installationsteknik, kyla, luftkonditionering, air condition, ventilation, luftkonditionering, AC" + }, "craft/insulator": { "name": "Isolering", "terms": "Isolering, isolerare, isolationsmaterial, värmeisolering, ljudisolering" }, + "craft/joiner": { + "name": "Finsnickare", + "terms": "Finsnickare, snickare, möbler, träarbetare, slöjd" + }, "craft/key_cutter": { "name": "Nyckeltillverkning", "terms": "Nyckeltillverkning, nyckel, nycklar, nyckelkopiering, nyckelring, nyckelringar, hänglås" @@ -1568,6 +1629,10 @@ "craft/locksmith": { "name": "Låssmed" }, + "craft/metal_construction": { + "name": "Metallarbete", + "terms": "Metallarbete, metallarbetare, kallbearbetning, metallindustri, svets, svetsare, svetsning" + }, "craft/painter": { "name": "Målare", "terms": "Målare, färg, målarmästare, måleri, måleriarbetare, lackering, penslar, tapeter, tapetserare, tapetsering" @@ -1629,7 +1694,8 @@ "terms": "Skomakare, skor" }, "craft/signmaker": { - "name": "Skyltmakare" + "name": "Skyltmakare", + "terms": "Skyltmakare, skyltar, skylttillverkare, neon, neonskyltar" }, "craft/stonemason": { "name": "Stenhuggare", @@ -1662,6 +1728,22 @@ "name": "Vinfabrik", "terms": "Vinfabrik, vineri, vinframställnig, vin, vinproduktion, Vinframställning" }, + "cycleway/asl": { + "name": "Cykelbox", + "terms": "Cykelbox, asl, cykelstopp, cykelstoppmarkering" + }, + "demolished/building": { + "name": "Nyligen riven byggnad" + }, + "disused/amenity": { + "name": "Oanvänd facilitet" + }, + "disused/railway": { + "name": "Oanvänt järnvägsobjekt" + }, + "disused/shop": { + "name": "Nedlagd affär" + }, "embankment": { "name": "Vägbank" }, @@ -1691,7 +1773,8 @@ "terms": "Brandsläckare, Brandpost, brand, vattenpost, brandsläckning, vattenpost, brandslang, eldsläckare, handbrandsläckare, skumsläckare, pulversläckare, vattensläckare, kolsyresläckare, koldioxidsläckare" }, "emergency/fire_hose": { - "name": "Brandslang" + "name": "Brandslang", + "terms": "Brandslang, brandpost, vattenpost, brandsläckning, brandsläckare, brand, eldsläckare" }, "emergency/fire_hydrant": { "name": "Brandpost", @@ -1701,6 +1784,10 @@ "name": "Första hjälpen", "terms": "Första hjälpen, första hjälpen kit, första hjälpen låda, förbandslåda, förband, bandage, plåster, plåster, sår, brännsår, sårvård" }, + "emergency/landing_site": { + "name": "Nödlandningsplats", + "terms": "Nödlandningsplats, helikopter, Helikopterplatta, Helipad" + }, "emergency/life_ring": { "name": "Livboj", "terms": "livboj, frälsarkrans, livräddningsboj, livräddning" @@ -1709,6 +1796,10 @@ "name": "Badvakt", "terms": "badvakt, livräddare, CPR, räddning, strandvakt, Lifeguard" }, + "emergency/mountain_rescue": { + "name": "Fjällräddning", + "terms": "fjällräddning, bergsräddning, räddning" + }, "emergency/no": { "name": "Åtkomst för utryckningsfordon – Nej" }, @@ -1741,6 +1832,10 @@ "name": "Nödutgång", "terms": "Nödutgång, branddörr, brandutgång, dörr, utgång" }, + "entrance/emergency_ward_entrance": { + "name": "Entré till akutmottagning", + "terms": "Entré till akutmottagning, akutmottagning, akuten, olycksmottagning, akutavdelning, ambulansmottagning" + }, "ford": { "name": "Vadställe", "terms": "Vadställe, vad, övergångsställe" @@ -1756,6 +1851,10 @@ "name": "Väg för golfbil", "terms": "golf, golfbana, Väg för golfbil, golfbil, gångväg, golfgångväg, stig, gång" }, + "golf/clubhouse": { + "name": "Golfklubbhus", + "terms": "Klubbhus, golfhus, fritid, golfklubbhus, golfklubb, kansli, golfkansli" + }, "golf/driving_range": { "name": "Driving Range", "terms": "golf, golfövning, driver, övning, Driving Range, drivingrange, driverang" @@ -1816,6 +1915,14 @@ "name": "Blodgivarcentral", "terms": "Blodgivarcentral, blodcentral, blodgivare, blodgivning, bloddonation, ge blod, donera blod, blodbank, blodtransfusion, aferes, plasmaferes, Plateletpheresis, stamcellsdonation" }, + "healthcare/counselling": { + "name": "Rådgivningscenter", + "terms": "Rådgivningscenter, rådgivning, sexrådgivning, sexualrådgivning, kostrådgivning" + }, + "healthcare/dentist/orthodontics": { + "name": "Ortodontist", + "terms": "Ortodontist, tandreglering, tandställning, tandvård, tand, tänder, tandläkare" + }, "healthcare/hospice": { "name": "Hospis (palliativ vård)", "terms": "Hospis, Palliativ vård, död, döende, terminalvård" @@ -1930,10 +2037,18 @@ "name": "Hiss", "terms": "Hiss" }, + "highway/emergency_bay": { + "name": "Nöduppställningsplats", + "terms": "Nöduppställningsplats, nödstopp, nödtelefon, Nödstoppplats, uppställning, stopp, haveri, motorstopp" + }, "highway/footway": { "name": "Gångväg", "terms": "gångväg, gc-väg, löparbana, motionsspår, promenad, gångbana" }, + "highway/footway/access_aisle": { + "name": "Åtkomstgång", + "terms": "Åtkomstgång, lastzoon, handikapparkeringsåtkomstzon, parkeringsgång, gångväg, rullstolsgång" + }, "highway/footway/conveying": { "name": "Rullande trottoar", "terms": "gångrullband, rullande gåband, rullande gångbana, rullande trottoar, rullband, Rullgångbana, rullramp, rulltrottoar, transportband, transportband för människor, transportband för personer" @@ -2003,7 +2118,12 @@ "name": "Stig", "terms": "Stig, gång, led, spår, vandringsled, vandra, vandring, promenad, löparbana, motionsspår" }, + "highway/path/boardwalk": { + "name": "Spång", + "terms": "Spång, brädväg, brädor, plankor, plankstig, stig, gångväg" + }, "highway/path/informal": { + "name": "Informell stig", "terms": "genväg, viltstig, kostig" }, "highway/pedestrian_area": { @@ -2046,6 +2166,10 @@ "name": "Okänd väg", "terms": "okänd väg, ospecificerad, okänd, obekant, främmande, outforskad" }, + "highway/road/bridge": { + "name": "Okänd vägbro", + "terms": "Okänd vägbro, bro, väg" + }, "highway/secondary": { "name": "Sekundär väg", "terms": "Sekundär väg, sekundärväg, länsväg, huvudväg" @@ -2110,6 +2234,10 @@ "name": "Anslutning, tertiär väg", "terms": "Anslutning, påfart, avfart, länsväg, huvudgata, tertiär väg" }, + "highway/toll_gantry": { + "name": "Portal för vägtull", + "terms": "Portal för vägtull, vägtullsportal, vägtull, portal, kamera för registreringsnummer, automatisk vägtull, tullportal, vägavgift, vägavgiftsportal, portal för vägavgift" + }, "highway/track": { "name": "Jordbruks-/skogsväg", "terms": "Bruksväg, traktorväg, skogsväg, åkerväg, virkesväg, timmerväg, traktor, skogsmaskin, åker, timmer, jordbruk, brandväg, brandgata, jordbruksväg" @@ -2122,6 +2250,10 @@ "name": "Trafiksignaler", "terms": "Trafikljus, trafiksignal, stoppljus, signalljus, ljus, stoppljus, trafikljus" }, + "highway/trailhead": { + "name": "Start av led", + "terms": "Start av led, ledstart, led, spårstart, vandring, vandringsstart, start av vandringsled, cykelled, start av cykelled" + }, "highway/trunk": { "name": "Stamväg", "terms": "stamväg, huvudväg, europaväg, riksväg, motortrafikled" @@ -2154,6 +2286,10 @@ "name": "Gränssten", "terms": "Gränssten, milsten, Gränsmärke, råmärke, gränsröse" }, + "historic/building": { + "name": "Historisk byggnad", + "terms": "Historisk byggnad, byggnad, historisk, historiskt, slott, sevärdighet, museum" + }, "historic/castle": { "name": "Slott", "terms": "Slott, borg, palats, resident, herrsäte, fästning" @@ -2194,6 +2330,10 @@ "name": "Monument", "terms": "monument, Minnesmärke, monument" }, + "historic/pillory": { + "name": "Historisk skampåle", + "terms": "Historisk skampåle, skampåle, attraktion, stupa, spöpåle" + }, "historic/ruins": { "name": "Ruiner", "terms": "Ruin, lämning, rest, husras, förfallen byggnad, ödehus" @@ -2259,6 +2399,10 @@ "landuse": { "name": "Markanvändning" }, + "landuse/allotments": { + "name": "Koloniområde", + "terms": "Kolonilott, lott, täppa, koloniträdgård, odlingslott, koloniområde" + }, "landuse/aquaculture": { "name": "Akvakultur", "terms": "Fiskodling, vattenbruk, akvakultur, fisk, skaldjur, alger, vattenväxter, utplantering av fisk, Ostronodling, musselodling, pärlodling, räkor" @@ -2296,6 +2440,10 @@ "name": "Bondgård", "terms": "Bondgård, gård, jordbruk, lantbruk, lantegendom, lantgård" }, + "landuse/flowerbed": { + "name": "Rabatt", + "terms": "Rabatt, plantering, blomträdgård, blommor, blomsterrabatt" + }, "landuse/forest": { "name": "Skog (brukad)", "terms": "Skog, skogsvård, skogsområde, skogstrakt, träd, skogsdunge, dunge, lund, skogsplantering, skogsplan, timmer" @@ -2360,10 +2508,18 @@ "name": "Marinbas", "terms": "Marinbas, marint förband, marinen, flottan, amfibiekåren, Kustartilleriet, flottilj, flottbas, örlogsbas" }, + "landuse/military/obstacle_course": { + "name": "Militär hinderbana", + "terms": "Militär hinderbana, militär, armé, militärbas, vakt, marin, Hinderbana, hoppbana, hinderlöpning, hinderlopp" + }, "landuse/military/range": { "name": "Militärt övningsområde", "terms": "Militärt övningsområde, övningsområde, skjutbana" }, + "landuse/military/training_area": { + "name": "Militärt övningsfält", + "terms": "militärt Övningsfält, övningsfällt, skjutbana, övningsområde, luftförsvar, armé, militärbas, träning, övning, trupp, krig" + }, "landuse/orchard": { "name": "Fruktodling", "terms": "Fruktodling, fruktträdgård, fruktträd, äppelträd" @@ -2414,6 +2570,9 @@ "name": "Vintersportområde", "terms": "Vintersportområde, vintersport, pist, pistområde, skidområde, skidbacke, skidort, snöbrädesområde, snowboardområde, skidor, alpint, snowboard, skidåkning" }, + "leisure": { + "name": "Fritidsobjekt" + }, "leisure/adult_gaming_centre": { "name": "Center för vuxenspel", "terms": "Center för vuxenspel, vuxenspel, spelmaskiner, spel, spelmaskin, flipperspel, flipper" @@ -2455,12 +2614,17 @@ "terms": "Dansskola, bugg, foxtrot, gamaldans, swing, jive, vals, dans, danskurs, dansutbildning, tiodans, salsa, tango" }, "leisure/disc_golf_course": { - "name": "Frisbeegolfbana" + "name": "Frisbeegolfbana", + "terms": "Frisbeegolfbana, Frisbee, Frisbeegolf, Frisbee golf" }, "leisure/dog_park": { "name": "Hundpark", "terms": "Hundpark, hundrastgård, hund, rastgård, hundgård, kennel" }, + "leisure/escape_game": { + "name": "Escape Room", + "terms": "Escape Room, quest room, escape game, rymningsspel, pusselrum" + }, "leisure/firepit": { "name": "Eldstad", "terms": "Eldstad, eldgrop, lägerplats, lägereld, brasa, grill, grillplats, grillning, eldning, campingbrasa" @@ -2529,6 +2693,14 @@ "name": "Trädgård", "terms": "Trädgård, park, plantering, örtgård, odlingslott, botanisk trädgård, botanisk, botanik, zoologisk trädgård" }, + "leisure/garden/botanical": { + "name": "Botanisk trädgård", + "terms": "Botanisk trädgård, trädgård, botanisk, botanik, växtsamling, ovanliga växter, park, plantering" + }, + "leisure/garden/community": { + "name": "Koloniområde", + "terms": "Kolonilott, lott, täppa, koloniträdgård, odlingslott, koloniområde" + }, "leisure/golf_course": { "name": "Golfbana", "terms": "Golfbana, golf, golfanläggning, golfcenter" @@ -2609,6 +2781,10 @@ "name": "Bowlsplan", "terms": "Bowls, Shortmat" }, + "leisure/pitch/chess": { + "name": "Stort schackbräde", + "terms": "Stort schackbräde, schackbräde, schack, schackbord, schackbräda, gårdsschack, parkschack, trädgårdsschack" + }, "leisure/pitch/cricket": { "name": "Cricketplan", "terms": "Cricket, Cricketplan, kricket, kricketplan" @@ -2618,10 +2794,12 @@ "terms": "ridning, rida, häst, Ridskola, hästridning, stall, ryttare, häst*, ridklubb, ridhus, dressyr, hästhoppning, trav, galopp" }, "leisure/pitch/field_hockey": { - "name": "Landhockeyplan" + "name": "Landhockeyplan", + "terms": "Landhockeyplan, Landhockey" }, "leisure/pitch/horseshoes": { - "name": "Kasta hästsko" + "name": "Kasta hästsko", + "terms": "Kasta hästsko, hästsko" }, "leisure/pitch/netball": { "name": "Nätbollsplan", @@ -2636,7 +2814,8 @@ "terms": "Rugby Union-plan, rugby union, rugby, rugger, rugby football, rugbyplan" }, "leisure/pitch/shuffleboard": { - "name": "Shuffleboardbana" + "name": "Shuffleboardbana", + "terms": "Shuffleboardbana, Shuffleboard, golvShuffleboard, bordsShuffleboard" }, "leisure/pitch/skateboard": { "name": "Skateboardpark", @@ -2694,10 +2873,18 @@ "name": "Badanläggning", "terms": "Badanläggning, badhall, simhall, simbassäng, bassäng, swimmingpool, pool, simning, badhus, motionssim, tävlingssim" }, + "leisure/sports_hall": { + "name": "Sporthall", + "terms": "Sporthall, idrottshall, gym, sportarena, inomhusidrott" + }, "leisure/stadium": { "name": "Stadium", "terms": "Stadium, arena" }, + "leisure/swimming_area": { + "name": "Naturbadområde", + "terms": "Naturbadområde, naturbad, bad, strand, badstrand, dyka, vatten, badsjö, klippbad" + }, "leisure/swimming_pool": { "name": "Simbassäng", "terms": "Simbassäng, bassäng, swimmingpool, pool, simning, simma" @@ -2707,7 +2894,8 @@ "terms": "Tävlingsbana, cykeltävling, cykellopp, hundkapplöpning, hästkapplöpning, galoppbana, travbana, löpbana, löpning, kapplöpningsbana, galoppbana" }, "leisure/track/cycling": { - "name": "Tävlingsbana (Cykel)" + "name": "Tävlingsbana (Cykel)", + "terms": "Cykelspår, cykelväg, cykelstig, cykel, cykelbana" }, "leisure/track/horse_racing": { "name": "Tävlingsbana (Hästkapplöpning)", @@ -2717,6 +2905,10 @@ "name": "Tävlingsbana (Löpning)", "terms": "Tävlingsbana, Löpning, kapplöpningsbana, löpbana, löparbana, sprint, språng, springa" }, + "leisure/trampoline_park": { + "name": "Trampolinpark", + "terms": "Trampolinpark, trampolin, studsmatta, hoppa, studsa" + }, "leisure/water_park": { "name": "Äventyrsbad / Vattenpark", "terms": "Äventyrsbad, Vattenpark, vattenlekpark, vattenland" @@ -2736,6 +2928,14 @@ "name": "Antenn", "terms": "Antenn, mast, sändning, mobil, mobilmast, kommunikation, radio, tv, radiomast, tv-mast, överföring" }, + "man_made/beacon": { + "name": "Fyrbåk", + "terms": "Fyrbåk, beacon, båk, fyr, vårdkase, sjömärke, ledfyr, böte" + }, + "man_made/beehive": { + "name": "Bikupa", + "terms": "Bikupa, bi, bifarm, honung, pollinering, pollinisation, bikupa" + }, "man_made/breakwater": { "name": "Vågbrytare", "terms": "Vågbrytare, pir, hamnarm, vågskydd, fördämning, hamnpir" @@ -2748,6 +2948,10 @@ "name": "Plansilo", "terms": "Plansilo, Ensilage, pressfoder, silo, lager, foder, djurfoder, spannmålslagring, spannmål, spannmålssilo,fodersilo" }, + "man_made/cairn": { + "name": "Stenröse", + "terms": "Stenröse, röse, stenhög, rös, stenrös, röjningsröse, gränsrösen, råmärken stenar, stenstapel" + }, "man_made/chimney": { "name": "Skorsten", "terms": "skorsten, rökgång" @@ -2756,14 +2960,30 @@ "name": "Kalhygge", "terms": "kalhygge, hygge, skog, timmer, träd, trä, Slutavverkning, avverkning, föryngringsyta, föryngringsavverkning, avskogning, skövlat skogsområde, avverkningsområde" }, + "man_made/courtyard": { + "name": "Innergård", + "terms": "innergård, torg, gård, gårdsplan, borggård, innetorg, inhägnad öppet område" + }, "man_made/crane": { "name": "Kran", "terms": "Kran, lyftkran, vinsch, travers, telfer" }, + "man_made/cross": { + "name": "Kors", + "terms": "Kors, krucifix, vägkors, pilgrim, kristet kors, kristendom, jesuskors" + }, "man_made/cutline": { "name": "Snittlinje i skog", "terms": "Snittlinje, skiljelinje, rågång, gränslinje, gräns, brandgata, skogssektion, skidspår, pipeline, rörgata, pipelinegata, jaktgata, skogsområde, domän" }, + "man_made/dovecote": { + "name": "Duvslag", + "terms": "Duvslag, duvor, duva, fåglar, fågel, duvbostad, fågelholk, brevduvor, duvhus" + }, + "man_made/dyke": { + "name": "Vall (mot vatten)", + "terms": "skyddsvall, vall, Fördämningsvall, flodvall. vattenvall, strandvall" + }, "man_made/embankment": { "name": "Vägbank", "terms": "Upphöjning, barnvall, vall, bank, Vägbank" @@ -2776,6 +2996,14 @@ "name": "Gasklocka", "terms": "Gasklocka, gasbehållare, gas, gasometer, cistern, gascistern, stadsgas, naturgas" }, + "man_made/goods_conveyor": { + "name": "Transportband", + "terms": "Transportband, Transportörsystem,  transportband, rullbanor, bandtransportörer och palltransportörsystem" + }, + "man_made/groyne": { + "name": "Hövd, vågbrytare vinkelrätt mot kusten", + "terms": "hövd, vågbrytare, pir, erosion, erosionsskydd" + }, "man_made/lighthouse": { "name": "Fyr", "terms": "Fyr, fyrtorn, fyrskepp" @@ -2784,6 +3012,30 @@ "name": "Gatubrunn", "terms": "Gatubrunn, brunn, dagvattenbrunn, dagvatten, avlopp, telekom, telefoni, manhålslucka, Brunnslock, manlucka, manhål, avloppsbrunn, a-brunn, Brandpost, Rensbrunn" }, + "man_made/manhole/drain": { + "name": "Dagvattenbrunn", + "terms": "Dagvattenbrunn, dagvatten, brunn, avrinning, regn, regnvatten, avlopp" + }, + "man_made/manhole/gas": { + "name": "Gatubrunn för gas", + "terms": "Manhålslucka för gas, gatubrunn, brunn, gas, manhålslucka, Brunnslock, manlucka, manhål, gas-brunn" + }, + "man_made/manhole/power": { + "name": "Manhålslucka för elkraft", + "terms": "Manhålslucka för elkraft, gatubrunn, brunn, el, elkraft, manhålslucka, Brunnslock, manlucka, manhål, el-brunn, ström" + }, + "man_made/manhole/sewer": { + "name": "Manhålslucka för avlopp", + "terms": "Manhålslucka för avlopp, gatubrunn, brunn, avlopp, manhålslucka, Brunnslock, manlucka, manhål, avloppsbrunn" + }, + "man_made/manhole/telecom": { + "name": "Manhålslucka för telekom", + "terms": "Manhålslucka för telekom, gatubrunn, brunn, telekom, tele, telefoni, manhålslucka, Brunnslock, manlucka, manhål, telekom-brunn, kabel, telekabel, telefon" + }, + "man_made/manhole/water": { + "name": "Manhålslucka för vattenförsörjning", + "terms": "Manhålslucka för vattenförsörjning, gatubrunn, brunn, vattenförsörjning, manhålslucka, Brunnslock, manlucka, manhål, vatenbrunn, dricksvatten, vatten, vattenförsörjning" + }, "man_made/mast": { "name": "Mast", "terms": "Mast, antenn, sändarmast, mobiltelefonmast, mobilmast, kommunikationsmast, kommunikationstorn, stagas torn, mobiltelefon torn, radiomast, tv-torn, tv-mast, överföringsmast, överföringstorn, antennbärare, sändarstation, slavsändare" @@ -2813,7 +3065,8 @@ "terms": "Mätstation, mätning, observation, väderstation, väder, jordbävning, seismologi, Seismolog, luftmätning, luftkvalité , luftkvalitet, gps, övervakningsstation, vattennivå, observationsrör, radon, ljud, trafik, trafikmätning" }, "man_made/obelisk": { - "name": "Obelisk" + "name": "Obelisk", + "terms": "Obelisk, pelare" }, "man_made/observatory": { "name": "Observatorium", @@ -2827,14 +3080,30 @@ "name": "Pir", "terms": "Pir , vågbrytare, hamnarm, hamnpir, kaj" }, + "man_made/pier/floating": { + "name": "Flytande pir", + "terms": "Flytande pir,pir, vågbrytare, hamnarm, hamnpir, kaj, brygga, flytande brygga, strandpromenad" + }, "man_made/pipeline": { "name": "Pipeline", "terms": "Pipeline, rörledning, ledning, oljeledning, avloppsledning, vattenledning" }, + "man_made/pipeline/underground": { + "name": "Underjordisk pipeline", + "terms": "Underjordisk pipeline, pipeline, underjordiskt rör, rör, olja, naturgas, gas, vatten, avlopp, oljepipeline, vattenrör, avloppsrör" + }, + "man_made/pipeline/valve": { + "name": "Kran till pipeline", + "terms": "Kran till pipeline, kran till rör, pipelinekran, pipelineventil, kran, ventil, olja, naturgas, gas, vatten, avlopp" + }, "man_made/pumping_station": { "name": "Pumpstation", "terms": "Pumpstation, pump, avloppspump, dräneringspump, vattenpump, oljepump, spillvattenspump, pumpaggregat" }, + "man_made/reservoir_covered": { + "name": "Övertäckt reservoir", + "terms": "Övertäckt reservoar, underjordisk reservoar, vattenreservoar, vattentank" + }, "man_made/silo": { "name": "Silo", "terms": "Ensilage, pressfoder, silo, lager, foder, djurfoder, spannmålslagring, spannmål, spannmålssilo,fodersilo" @@ -2847,6 +3116,10 @@ "name": "Vattentank", "terms": "Vattentank, cistern, vattentorn, vattencistern, vattenlager" }, + "man_made/street_cabinet": { + "name": "Teknikskåp", + "terms": "Kopplingsskåp, Gatuskåp, kabel-TV, kabeltv, övervakning, teknikskåp, telekommunikation, trafikljuskontroll, telefoni, elskåp, teleskåp" + }, "man_made/surveillance": { "name": "Övervakning", "terms": "Övervakning, övervakningskamera, övervakningsutrustning, kamera, bevakning, bevakningskamera, bevakning, bevakningskamera" @@ -2859,6 +3132,10 @@ "name": "Trianguleringspunkt", "terms": "Trianguleringspunkt, triangulering, kartritning, fixpunkt" }, + "man_made/torii": { + "name": "Torii", + "terms": "Torii, japansk port, Shinto shrine,  shintohelgedom, Jinja, fågelsittpinne" + }, "man_made/tower": { "name": "Torn", "terms": "torn, radiotorn" @@ -2871,6 +3148,14 @@ "name": "Kommunikationstorn", "terms": "radiomast, radiotorn, mast, antenn, mobilmast, mobilantenn, radioantenn, sändartorn, mobiltelefon, radiomast, TV-torn, TV-mast, radiosändning, kommunikationsmast, kommunikationstorn, transmissionsmast, överföringstorn, överföringsmast" }, + "man_made/tower/cooling": { + "name": "Kyltorn", + "terms": "Kyltorn, kraftverk, kraftstation, elkraftverk, elkraftstation, kärnkraftverk, kolkraftverk" + }, + "man_made/tower/defensive": { + "name": "Befäst torn", + "terms": "Befäst torn, försvarstorn, borgtorn, borg, torn, befästningstorn, befästning, försvar" + }, "man_made/tower/minaret": { "name": "Minaret", "terms": "Minaret, minâra, bönetorn, islam, muslim, moské, muezzin, böneutropare, Muaddhin" @@ -2879,6 +3164,10 @@ "name": "Utkikstorn", "terms": "Utkikstorn, utsiktstorn, observationstorn, utsiktspost, observationspost, brandtorn" }, + "man_made/tunnel": { + "name": "Tunnelområde", + "terms": "Tunnel, tunnelområde, underjordisk, underjordisk passage, underpassage" + }, "man_made/utility_pole": { "name": "El-/Telefonstolpe", "terms": "elstolpe, telefonstolpe, kraftledningsstolpe, stolpe, elledningsstolpe" @@ -2887,6 +3176,10 @@ "name": "Avloppsreningsverk", "terms": "Avloppsreningsverk, reningsverk, avloppsverk, avlopp, vattenreningsverk, vattenrening" }, + "man_made/water_tap": { + "name": "Vattenkran", + "terms": "Vattenkran, dricksvatten, kran, vatten, vattenfontän, vattenpunkt, vattenkälla" + }, "man_made/water_tower": { "name": "Vattentorn", "terms": "Vattentorn, vattenreservoar, vatten" @@ -2907,14 +3200,34 @@ "name": "Väderkvarn", "terms": "Väderkvarn, vindmölla, vädemölle, vindkraft, kvarn, mölla" }, + "man_made/windpump": { + "name": "Vindpump", + "terms": "Vindpump, aerorotor, vattenpump, väderkvarn, vindkraftverk, vindkraft, vind, pump, vattenpump" + }, "man_made/works": { "name": "Fabrik", "terms": "Fabrik, montering, bryggeri, bil, plast, bearbetning, tillverkning, raffinaderi, fabrikstillverkning, industri, verkstad, fabriksbyggnad, monteringsanläggning, bearbetningsanläggning, möbeltillverkning, oljeraffinaderi" }, + "marker": { + "name": "Markör", + "terms": "Markör, identifierare, märkning, platta, stolpe, post, skylt, milsten" + }, + "marker/utility": { + "name": "Markör av samhällsservice", + "terms": "Markör av samhällsservice, markör av gasledning, gas, identifierare, märkning, markör, platta, stolpe, post, skylt, oljemarkör, oljeledning, markör av oljeledning, rörmarkering, ledningsmarkering, ledningsmarkör" + }, + "marker/utility/power": { + "name": "Kraftledningsmarkör", + "terms": "Markör, identifierare, märkning, platta, stolpe, post, skylt, Kraftledningsmarkör, kraftledning, elledning, markör av kraftledning, markering av kraftledning" + }, "military/bunker": { "name": "Militär bunker", "terms": "militär bunker, bunker, flygförsvar, militär, arme, försvar, marin, flottan, krig" }, + "military/checkpoint": { + "name": "Militär kontrollpunkt", + "terms": "militär kontrollpunkt, Kontrollpunkt, kontrollstation, vägspärr, militär kontroll, luftvapen, luftförsvar, militär, armé, bas, flotta, marin, soldat, krig, försvar, trupp, vakt" + }, "military/nuclear_explosion_site": { "name": "Område för kärnvapenprov", "terms": "Område för kärnvapenprov, kärnvapenprov, kärnvapen, vapentest" @@ -2923,6 +3236,13 @@ "name": "Militärkontor", "terms": "militärkontor, flygvapen, armé, bas, värva, flotta, marin, rekrytera, rekrytering, soldat, krig, militär, försvar, befälskontor" }, + "military/trench": { + "name": "Militär skyttegrav", + "terms": "Militär skyttegrav, militärt dike, skyttevärn, värn" + }, + "natural": { + "name": "Naturobjekt" + }, "natural/bare_rock": { "name": "Kala klippor ", "terms": "kala klippor, klippor, häll, berghäll" @@ -2935,6 +3255,10 @@ "name": "Strand", "terms": "Strand, sandstrand, badstrand, grusstrand, badplats, strandlinje, badställe, flodstrand" }, + "natural/cape": { + "name": "Kap (stor udde)", + "terms": "kap, cape, udde, bukt, vik, kust, erosion" + }, "natural/cave_entrance": { "name": "Grottingång", "terms": "Grottingång, grotta, grottsystem, bergrum, berghåla, grottöppning, bergsöppning, grotthål" @@ -2951,6 +3275,10 @@ "name": "Fjäll", "terms": "Fjäll, trädgräns, högfjäll, fjällandskap" }, + "natural/geyser": { + "name": "Gejser", + "terms": "Gejser, källa, varmvatten, hydrogeologi, hydrotermisk explosion, ånga, het källa" + }, "natural/glacier": { "name": "Glaciär", "terms": "Glaciär, landis, ismassa, jökel, gletscher" @@ -2963,6 +3291,10 @@ "name": "Hed", "terms": "hed, äng, gräs, slättmark, slätt, tundra, stäpp, alvar, kalmark" }, + "natural/hot_spring": { + "name": "Het källa", + "terms": "het källa, termalkälla, Gejser" + }, "natural/mud": { "name": "Lera", "terms": "Lera, våtmark, sankmark och sumpmark, lerigt, gyttja, dy, sörja, gegga" @@ -2979,6 +3311,10 @@ "name": "Ås", "terms": "ås, höjd, bergsrygg, kam, kulle, krön, berg, bergsområde, högland, horst" }, + "natural/rock": { + "name": "Klippa/stenbumling fäst i berggrund", + "terms": "Klippa/stenbumling fäst i berggrund, klippa, sten, stenbumling, bumling, berggrund" + }, "natural/saddle": { "name": "Bergskam", "terms": "Bergskam, bergskrön, bergskrön, berg, dal, dalgång" @@ -2995,10 +3331,22 @@ "name": "busksnår", "terms": "busksnår, Buskskog, snår, sly" }, + "natural/shingle": { + "name": "Grus (singel)", + "terms": "Grus, singel, strand, småsten, flodbädd, rundade stenfragment, klapperstensfält, klappersten" + }, + "natural/shrub": { + "name": "Buskmark", + "terms": "Buskmark, buskar, buskage" + }, "natural/spring": { "name": "Källa", "terms": "källa, vattenställe, vattenhål, källsprång, källåder, källflöde, källdrag, springflöde" }, + "natural/stone": { + "name": "Klippa/stenbumling friliggande", + "terms": "Klippa/stenbumling friliggande, sten, stenbumling, klippa, friliggande sten" + }, "natural/tree": { "name": "Träd", "terms": "träd,trä,trädstam,stam,barrträd,lövträd,gran,ek,björk,stock" @@ -3031,6 +3379,10 @@ "name": "Sjö", "terms": "Sjö, insjö, innanhav, vattensamling, pöl, lagun, tjärn, göl, vatten" }, + "natural/water/moat": { + "name": "Vallgrav", + "terms": "vallgrav, kanal" + }, "natural/water/pond": { "name": "Tjärn", "terms": "damm, tjärn, göl, liten sjö, kvarndamm, tjärn" @@ -3047,6 +3399,10 @@ "name": "Bäckområde", "terms": "Bäckområde,vattendrag, bäck, dike, biflöde, flöde, ström, flod, flöde, rännil, biflod" }, + "natural/water/wastewater": { + "name": "Avloppsvattenbassäng", + "terms": "Avloppsvattenbassäng, avföring, skit, avloppsvatten, reningsverk, reningsbassäng, segmenteringsbassäng" + }, "natural/wetland": { "name": "Våtmark", "terms": "Våtmark, sankmark, myr, sump, kärr, mosse, torvmark, sumpmark, träsk, moras, mad" @@ -3055,6 +3411,10 @@ "name": "Naturskog", "terms": "naturskog, skog, Urskog, djungel, bush, regnskog, vildmark, träd" }, + "network/type/node_network": { + "name": "Nod i rekreationsvägsnätverk", + "terms": "Nod i rekreationsvägsnätverk, nodnätverk, cykelnätverk, cykelled, vandringsled, vandringsnätverk" + }, "noexit/yes": { "name": "Återvändsgata", "terms": "Återvändsgränd, blindgata återvändsgata, vägslut" @@ -3086,6 +3446,10 @@ "name": "Frivilligorganisation", "terms": "Frivilligorganisation, Frivillig, volontär, frivilligarbetare, biståndsarbetare, förening, ideell, icke vinstdrivande, organisation, samhälle" }, + "office/bail_bond_agent": { + "name": "Bail Bond-agent", + "terms": "Bail Bond-agent, borgen" + }, "office/charity": { "name": "Välgörenhetsorganisation", "terms": "Välgörenhetsorganisation, Välgörenhet, hjälpverksamhet, bistånd, biståndsorganisation" @@ -3094,15 +3458,29 @@ "name": "Företagskontor", "terms": "Företagskontor, kontor, företag, expedition, kundmottagning" }, + "office/consulting": { + "name": "Konsultkontor", + "terms": "Konsultkontor, konsult, konsulter, konsultföretag" + }, "office/coworking": { "name": "Dagkontor", "terms": "Dagkontor, lånekontor, fjärrarbetsplats, distansarbete, Coworking, Kontorsplats, kontorsarbetsplats, konferensrum, mötesrum, affärslounger, tillfällig arbetsplats, tillfälligt kontor, kontor" }, + "office/diplomatic": { + "name": "Diplomatkontor", + "terms": "Diplomatkontor, diplomat, ambassadör, statssändebud, envoyé, ambassad, ambassadkontor, konsulat" + }, "office/diplomatic/consulate": { - "name": "Konsulat" + "name": "Konsulat", + "terms": "Diplomatkontor, diplomat, ambassadör, statssändebud, envoyé, ambassad, ambassadkontor, konsulat" }, "office/diplomatic/embassy": { - "name": "Ambassad" + "name": "Ambassad", + "terms": "Diplomatkontor, diplomat, ambassadör, statssändebud, envoyé, ambassad, ambassadkontor, konsulat" + }, + "office/diplomatic/liaison": { + "name": "Kontaktkontor", + "terms": "Diplomatkontor, diplomat, ambassadör, statssändebud, envoyé, ambassad, ambassadkontor, konsulat, kontaktkontor, sambandsman, sambandsmän, sambandscentral" }, "office/educational_institution": { "name": "Utbildningskontor", @@ -3125,7 +3503,8 @@ "terms": "Bankkontor, finanskontor, ekonomi, finans, bank, ekonomisk" }, "office/financial_advisor": { - "name": "Finansiell rådgivare" + "name": "Finansiell rådgivare", + "terms": "Finansiell rådgivare, rådgivare, bankman, arv, sparande, aktier, pension, kapitalförvaltning, ekonomi, bank, ekonomisk, bankkontor, finanskontor" }, "office/forestry": { "name": "Skogsbolag", @@ -3139,6 +3518,10 @@ "name": "Myndighet", "terms": "Myndighet, myndighetskontor, statlig myndighet" }, + "office/government/prosecutor": { + "name": "Åklagarmyndighet", + "terms": "Åklagarmyndighet, åklagare, justitieminister, distriktsadvokat, åtal" + }, "office/government/register_office": { "name": "Registreringsbyrå", "terms": "Registreringsbyrå, borgerlig vigsel, stadshus, registrerade enhet, inskrivningskontor, registreringskontor, Folkbokföring, Skattemyndigheten, mantalslängder" @@ -3228,6 +3611,18 @@ "name": "Vattenleverantör", "terms": "Vattenleverantör, Dricksvatten, vattenbolag" }, + "piste/downhill": { + "name": "Utförsåkning", + "terms": "Utförsåkning, skidor, alpint, snowboard, pist, skidbacke, slalombacke" + }, + "piste/downhill/halfpipe": { + "name": "Halfpipe för vintersport", + "terms": "Utförsåkning, skidor, skida, alpint, snowboard, pist, skidbacke, slalombacke, halfpipe, half pipe, half-pipe, Halfpipe för vintersport, vintersport" + }, + "piste/hike": { + "name": "Snöskor- / vintervandring", + "terms": "Snöskorvandring, vintervandring, snöskor, vandring, pist, skidor, vandringsled" + }, "piste/ice_skate": { "name": "Skridskoled", "terms": "Skridskoled, skridskor, skridskobana, isbana, skridskorink, rink, is, skridskoåkning, pist" @@ -3329,6 +3724,10 @@ "name": "Korggunga", "terms": "Korggunga, korg, gunga, gungställning, kompisgunga, fågelbogunga, lekplats, lekområde, lekpark, lek" }, + "playground/climbing_frame": { + "name": "Klätterställning", + "terms": "Klätterställning, klättra, klättring, lekplats, lekområde, lekpark, lek" + }, "playground/cushion": { "name": "Hoppkudde", "terms": "hoppkudde, lekplats, lekområde, lekpark, lek" @@ -3345,6 +3744,10 @@ "name": "Karusell (lekplats)", "terms": "karusell, lekplats, lekområde, lekpark, lek" }, + "playground/sandpit": { + "name": "Sandlåda", + "terms": "sandlåda, sand, lekplats, lekområde, lekpark, lek" + }, "playground/seesaw": { "name": "Gungbräda", "terms": "gungbräda, lekplats, lekområde, lekpark, lek" @@ -3361,6 +3764,10 @@ "name": "Gungställning", "terms": "Gunga,Gungställning, lekplats, lekområde, lekpark, lek" }, + "playground/zipwire": { + "name": "Linbana (lekplats)", + "terms": "linbana, lekplats, lekområde, lekpark, lek" + }, "point": { "name": "Punkt", "terms": "Punkt, fläck, läge, ställe, plats" @@ -3455,6 +3862,14 @@ "name": "Transformator", "terms": "Transformator, nätstation, elomvandling" }, + "public_transport/platform": { + "name": "Plattform för kollektivtrafik", + "terms": "Plattform, väntplats, påstigningsplats, avsats, perrong, kollektivtrafik, transport, transit" + }, + "public_transport/platform/aerialway": { + "name": "Linbaneplattform", + "terms": "linbana, aerialway, Linbanehållplats, linbaneplattform, linbaneterminal, linbanestopp, hållplats, plattform, terminal, stopp, kollektivtrafik, linjetrafik, transit, transport" + }, "public_transport/platform/aerialway_point": { "name": "Hållplats / Plattform för linbana" }, @@ -3466,6 +3881,10 @@ "name": "Busshållplats", "terms": "Busstopp, busshållplats, buss, hållplats, anhalt, station, busstation," }, + "public_transport/platform/bus_tram_point": { + "name": "Spårvagns- & busstopp", + "terms": "Spårvagns- & busstopp, spårvagnstopp, spårvagnshållplats, busstopp, busshållplats, spårvagn, spårväg, spårvagn, spårvägshållplats, spårvagnsterminal, buss, hållplats, anhalt, station, busstation, plattform, kollektivtrafik, spår" + }, "public_transport/platform/ferry": { "name": "Färjeplattform", "terms": "färjeplattform, plattform, stopp, båtstopp, färjestopp, båthållplats, Färjeterminal, terminal, färja, båtterminal, båthållplats, Färjehållplats, Färjestation, båt, brygga, pir, kollektivtrafik, linjetrafik, station, transit, transport" @@ -3621,7 +4040,8 @@ "terms": "Stoppbock, Buffert, Buffertstopp, stoppblock" }, "railway/construction": { - "name": "Järnväg under konstruktion" + "name": "Järnväg under konstruktion", + "terms": "Järnväg under konstruktion, järnväg under byggnad, järnväg under uppförande, järnväg, byggarbete, bygge, byggarbetsplats, byggnation, byggnadsplats" }, "railway/crossing": { "name": "Järnvägskorsning (stig)", @@ -3635,6 +4055,10 @@ "name": "Oanvänd järnväg", "terms": "Oanvänd järnväg, övergiven järnväg, övergiven tågbana, oanvänd tågbana" }, + "railway/funicular": { + "name": "Bergbana ", + "terms": "Bergbana, linbana, klippbana" + }, "railway/halt": { "name": "Mindre järnvägshållplats" }, @@ -3658,6 +4082,10 @@ "name": "Monorail", "terms": "Monorail, enskensbana, balkbana, räls, spår, kollektivtrafik, linjetrafik, transport" }, + "railway/monorail/hanging": { + "name": "Hängande monorail-spår", + "terms": "Hängande monorail-spår, hängande järnväg, hängande enskensbana, hängande balkbana" + }, "railway/narrow_gauge": { "name": "Smalspårbana", "terms": "Smalspårbana, smalspår, smalspårig, smalspårig bana, smalspårig järnväg, järnväg" @@ -3665,6 +4093,10 @@ "railway/platform": { "name": "Järnvägsperrong" }, + "railway/preserved": { + "name": "Museijärnväg", + "terms": "Museijärnväg, historisk järnväg, historiskt tåg, bevarad järnväg, ångtåg, turisttåg, turistjärnväg" + }, "railway/rail": { "name": "Räls", "terms": "Räls, järnvägsspår, spår, bana" @@ -3673,6 +4105,10 @@ "name": "Höghastighetsbana", "terms": "Höghastighetsbana, snabbspår, höghastighet, Järnväg, snabbjärnväg, räls, järnvägsspår, spår, bana" }, + "railway/railway_crossing": { + "name": "Korsning järnväg/järnväg", + "terms": "Korsande järnvägsspår, diamantkorsning, korsning, järnvägskorsning, plankorsning, tågkorsning, järnväg-järnvägskorsning,spårkors, spårkryss" + }, "railway/signal": { "name": "Järnvägssignal", "terms": "järnvägssignal, signal, ljus, järnvägsljus, semafor, försignal, huvudsignal, dvärgsignal" @@ -3700,9 +4136,21 @@ "name": "Spårvägsspår", "terms": "spårvägsspår, Spårvagn, spårväg, motorvagn" }, + "railway/tram_crossing": { + "name": "Korsning spårvagn/gångväg", + "terms": "Korsande spårvagnsspår, korsande spårvägsspår, korsning, korsande, plankorsning, spårvagnskorsning, spårvägsskorsning" + }, + "railway/tram_level_crossing": { + "name": "Korsning spårvagn/väg", + "terms": "Korsande spårvagnsspår, korsande spårvägsspår, korsning, korsande, plankorsning, spårvagnskorsning, spårvägsskorsning" + }, "railway/tram_stop": { "name": "Stopposition för spårvagn" }, + "railway/yard": { + "name": "Godsbangård", + "terms": "Godsbangård, godsvagnstopp, godstågstation, järnvägsstation, järnvägsgård, bangård, rangerbangård, kombiterminal, Växlingsbangårdar" + }, "relation": { "name": "Relation", "terms": "Relation, relaterat, förbindelse, förhållande, samband, anknytning, koppling, kontext" @@ -3714,13 +4162,29 @@ "seamark": { "name": "Sjömärke" }, + "seamark/beacon_isolated_danger": { + "name": "Punktmärke", + "terms": "Punktmärke, iala" + }, + "seamark/beacon_lateral": { + "name": "Farledsmärke", + "terms": "Farledsmärke, fastmärke, lateralmärke, farledsmärke, farled, iala" + }, + "seamark/buoy_lateral": { + "name": "Farledsboj ", + "terms": "Farledsboj, boj, farled, lateralboj, farledsmärke, lateralmärke" + }, "seamark/buoy_lateral/green": { "name": "Grön prick", - "terms": "grön prick, lateralmärke, styrbordsmärke" + "terms": "grön prick, grön boj, lateralmärke, styrbordsmärke, flytande styrbordsmärke, iala" }, "seamark/buoy_lateral/red": { "name": "Röd prick", - "terms": "röd prick, lateralmärke, babordsmärke" + "terms": "röd prick, röd boj, lateralmärke, babordsmärke, flytande babordsmärke" + }, + "seamark/mooring": { + "name": "Förtöjning", + "terms": "Förtöjning, pollare, boj, förtöjningspåle, knap, krysshult, påle" }, "shop": { "name": "Affär", @@ -3734,6 +4198,10 @@ "name": "Vin-och-spritaffär", "terms": "Vinaffär, spritaffär, vin- och sprit, vin- och spritaffär, systemet, systembolaget, bolaget, alkohol, öl, vin, sprit" }, + "shop/anime": { + "name": "Anime/Manga-affär", + "terms": "Anime/Manga-affär, anime, manga, japan, cosplay, figurer, dakimakura" + }, "shop/antiques": { "name": "Antikaffär", "terms": "Antikaffär, antikshop, antikt, antikvitetsaffär, antikvariat" @@ -3801,10 +4269,18 @@ "shop/boutique": { "name": "Boutique (Dyra kläder och accessoarer)" }, + "shop/brewing_supplies": { + "name": "Affär för hembryggningstillbehör", + "terms": "Affär för hembryggningstillbehör, hembryggning, bryggning, vin, öl, vinbryggning, vintillverkning, ölbryggning, öltillverkning" + }, "shop/butcher": { "name": "Slaktare", "terms": "slaktare,kött,köttaffär,köttstyckare,charkuterist,charkuterihandlare,styckare,chark" }, + "shop/camera": { + "name": "Affär för kameratillbehör", + "terms": "Affär för kameratillbehör, kameratillbehör. kamera, kameratillbehöraffär, film, objektiv, linser, foto, fotografering" + }, "shop/candles": { "name": "Ljusaffär", "terms": "Ljusaffär, ljus, värmeljus, mysljus, stearinljus, ljusstakar" @@ -3817,6 +4293,10 @@ "name": "Bilhandlare", "terms": "Bilhandlare, bilsäljare, bilförsäljning, bilfirma, bilverkstad, bilreparatör, biltillbehör" }, + "shop/car/second_hand": { + "name": "Bilhandlare med begagnade bilar", + "terms": "Bilhandlare med begagnade bilar, bilar, begagnade bilar, begagnat" + }, "shop/car_parts": { "name": "Biltillbehör", "terms": "Bildelar, biltillbehör, reservdelar, bilreservdelar, motor" @@ -3857,14 +4337,26 @@ "name": "Klädaffär", "terms": "Klädaffär, kläder, klädbutik, ekipering" }, + "shop/clothes/second_hand": { + "name": "Affär med secondhandkläder", + "terms": "Affär för secondhandkläder, secondhandkläder, secondhand, kläder, klädbutik, blusar, klänningar, byxor, begagnade, skjortor, shorts, kjolar, byxor, kostymer" + }, "shop/clothes/underwear": { "name": "Underklädersaffär", "terms": "Underklädersaffär, underkläder, bh, trosor, kalsonger, mode, underklänning, sockar, strumpor, lingeri, damunderkläder" }, + "shop/clothes/wedding": { + "name": "Affär med bröllopskläder", + "terms": "Affär med bröllopskläder, brud, brudgum, brudtärna, smoking, frack, bröllopsklänning, brudklänning, bröllop, festkläder" + }, "shop/coffee": { "name": "Kaffeaffär", "terms": "kaffeaffär, kaffeböner, kaffebönor, kaffepulver, bryggkaffe, kaffe" }, + "shop/collector": { + "name": "Affär med samlarobjekt", + "terms": "Affär med samlarobjekt, antikviteter, mynt, samling, samlare, serier, dockor, figurer, Numismatik, mynt, medaljer, filateli, frimärken'" + }, "shop/computer": { "name": "Datorbutik", "terms": "Datorbutik, datoraffär, data, dator, datorer, datorhårdvara, datorprogram, datorförsäljning" @@ -3889,6 +4381,10 @@ "name": "Lanthandel", "terms": "Lanthandel, landet" }, + "shop/craft": { + "name": "Konst- & hantverksbutik", + "terms": "Konst, Konsthantverk, konstverk, hantverk, slöjd" + }, "shop/curtain": { "name": "Gardinaffär", "terms": "Gardinaffär, gardiner, draperier, drapera, fönster" @@ -3909,6 +4405,10 @@ "name": "Byggmarknad", "terms": "Byggmarknad, bygghandel, Gör-det-själv, gördetsjälv, gör det själv, byggvaruhus, indie, byggsatser, byggsats, verktyg, järnaffär, handverktyg, elverktyg, heminredning, inredning, byggmaterial" }, + "shop/doors": { + "name": "Affär med dörrar", + "terms": "Affär med dörrar, dörrar, dörr, dörrförsäljning, dörreparation, dörrepatör" + }, "shop/dry_cleaning": { "name": "Kemtvätt", "terms": "Kemtvättar, kemisk tvätt" @@ -3917,6 +4417,10 @@ "name": "Affär för elektroniska cigaretter", "terms": "Affär för elektroniska cigaretter, e-cigarett, elektrisk cigarett, elcigarett" }, + "shop/electrical": { + "name": "Affär med elutrustning", + "terms": "Affär med elutrustning, elutrustning, el, kabel, kablage, kablar, elektronik, fläkt, LED, belysning, amatur, kraft" + }, "shop/electronics": { "name": "Elektronikbutik", "terms": "Elektronikbutik, hemelektronik, TV, radio, dator, datorer, kylskåp, spisar, vitvaror, tvättmaskin, torktumlare, hushållsapparater, kablar, batterier, apparater, ljud" @@ -3940,6 +4444,10 @@ "shop/fashion": { "name": "Modebutik" }, + "shop/fashion_accessories": { + "name": "Affär för modeaccessoarer", + "terms": "Affär för modeaccessoarer, väskor, parfym, doft, hattar, smycken, handväskor, halsdukar, solglasögon, paraply, plånböcker, klockor, modeaccessoarer, accessoarer" + }, "shop/fireplace": { "name": "Kaminbutik", "terms": "eldstad, eldstäder, kamin, kakelugn, gaskamin" @@ -3948,6 +4456,10 @@ "name": "Fiskeaffär", "terms": "Fiskeaffär, fiskeutrustning, sommarfiske, vinterfiske, levande bete, bete, fiske, fiska, fisk, fiskare" }, + "shop/flooring": { + "name": "Affär för golv", + "terms": "golv, parkett, klinkergolv, golvläggning" + }, "shop/florist": { "name": "Florist", "terms": "Florist, blommor, blomförsäljning, bukett, blomsterbindare, blomsterhandlare" @@ -3956,6 +4468,10 @@ "name": "Ramaffär", "terms": "Ramaffär, ramar, inramning" }, + "shop/frozen_food": { + "name": "Affär för fryst mat", + "terms": "Fryst mat, frysmat, snabbmat, matlådor, fryst, frys, färdigmat, färdigrätt, färdigrätter, mat, lunch" + }, "shop/fuel": { "name": "Bränsleaffär", "terms": "Bränsleaffär, bränslebutik, bränsle, motorbränsle, kol, träkol, eldningsolja, motorbränsle, propan, LPG, fotogen" @@ -3968,6 +4484,10 @@ "name": "Möbelaffär", "terms": "Möbelaffär, möbelgrossist, möbelvaruhus, inredning, stolar, soffor, soffa, stol, bord, hylla" }, + "shop/games": { + "name": "Affär för brädspel", + "terms": "Affär för brädspel, brädspel, kortspel, tärningsspel, spelbutik, live action-rollspel, miniatyrer krigsspel, strategispel, spel, spelbutik" + }, "shop/garden_centre": { "name": "Trädgårdscenter", "terms": "Trädgårdscenter, plantskola, blommor, blomkrukor, krukväxter, buskar, träd, trädgårdsväxter, trädgård, trädgårdsverktyg, planteringsjord, jord, landskap, kompost, jord" @@ -4020,6 +4540,10 @@ "name": "Hobbyaffär", "terms": "Hobbyaffär, hobby, manga, model, modellbygge, modellflyg, modelljärnväg" }, + "shop/household_linen": { + "name": "Affär för hushållstextilier", + "terms": "Affär för hushållstextilier, textilier, linne, påslakan, bäddning, överkast, filtar, dukar, gardiner, näsdukar, servetter, örngott, kläder, lakan, handdukar, sängtextilier, hushållstextilier" + }, "shop/houseware": { "name": "Husgeråd", "terms": "husgeråd, köksredskap, bestick, porslin, prydnadsföremål, hem, hushåll" @@ -4032,6 +4556,10 @@ "name": "Inredningsaffär", "terms": "Inredningsaffär, inredning, dekoration" }, + "shop/jewelry": { + "name": "Juvelerare", + "terms": "Juvelerare, smycken, halsband, ring, ringar, örhänge, örhängen, klocka, klockor, guld, silver, diamant, pärla, pärlor, armband" + }, "shop/kiosk": { "name": "Kiosk", "terms": "Kiosk, gatukök, tidningar, godis, cigaretter, tobak, snus, dryck, läsk, butik, snabbmat, glass, korv" @@ -4042,7 +4570,11 @@ }, "shop/laundry": { "name": "Tvättinrättning", - "terms": "Tvättinrättning, tvätteri, tvättemat, tvättstuga, tvättautomat" + "terms": "Tvättinrättning, tvätteri, tvättemat, tvättomat, tvättstuga, tvättautomat, tvätt" + }, + "shop/laundry/self_service": { + "name": "Tvättinrättning med självbetjäning", + "terms": "Tvättinrättning med självbetjäning, Tvättinrättning, tvätteri, tvättemat, tvättstuga, tvättautomat, tvättomat, mynttvätt, tvätt" }, "shop/leather": { "name": "Läderaffär", @@ -4072,10 +4604,18 @@ "name": "Medicinsk utrustning ", "terms": "medicinsk utrustning, Träningsbollar, Bandage, Kryckor, ledstöd, Ortopedteknik, blodtrycksmätare, Glucometer,glukometer, hjälpmedel, rullstol" }, + "shop/military_surplus": { + "name": "Affär med militäröverskott", + "terms": "Affär med militäröverskott, militäröverskott, militärt överskott, överskottslagret, armé, militär, arméöverskott, marinöverskott, krigsöverskott, vapen, militärkläder, militärutrustning" + }, "shop/mobile_phone": { "name": "Mobiltelefoner", "terms": "Mobiltelefoner, mobiltelefon, mobiltelefoni, telefon, telefonbutik, mobiltelefonbutik" }, + "shop/model": { + "name": "Affär för byggmodeller", + "terms": "hobby, modellbyggnad, modellfigurer, modellpaket, modellbutik, skalmodeller, modellflyg, modellbåtar, modellbygge" + }, "shop/money_lender": { "name": "Långivare", "terms": "Långivare, utlåning, utlåningsinstitution, mikrolån, telefonlån, pantbank" @@ -4112,6 +4652,10 @@ "name": "Friluftsaffär", "terms": "Friluftsaffär, camping, campingutrustning, vandring, vandringsutrustning, tält, klätterutrustning, klättring, friluftsliv, uteliv" }, + "shop/outpost": { + "name": "Utlämning av online-beställningar", + "terms": "Utlämning av online-beställningar, online, internet, utlämning, paket, paketutlämning, posten" + }, "shop/paint": { "name": "Färgbutik", "terms": "Färgbutik, färg, målarfärg, målning" @@ -4144,10 +4688,18 @@ "name": "Fotoaffär ", "terms": "fotoaffär, bild, foto, video, fotografi, fotoredigering, framkallning, ram, kameratillbehör, kamera, kameror, filmkamera, fotokamera, konvertering, film" }, + "shop/pottery": { + "name": "Keramikaffär", + "terms": "Keramikaffär, keramik, krukor, vaser" + }, "shop/printer_ink": { "name": "Butik för skrivarbläck", "terms": "Butik för skrivarbläck, kopieringsbläck, skrivarbläck, faxbläck, bläck, skrivartoner, toner, skrivare, kopiator, fax" }, + "shop/psychic": { + "name": "Medium / Psykisk", + "terms": "Medium, Psykisk, spårdam, astrologi, kristallkula, spådom, seare, ande" + }, "shop/pyrotechnics": { "name": "Fyrverkerier", "terms": "fyrverkerier, smällare, tomtebloss, raketer, nyårsraketer, pyroteknik" @@ -4180,10 +4732,18 @@ "name": "Sybutik", "terms": "sybutik. sömnadsbutik, sy, sömnad, nå, tråd, tyg, garn, symaskin" }, + "shop/shoe_repair": { + "name": "Skomakare", + "terms": "Skomakare, skor, skoreparatör, skoreparation" + }, "shop/shoes": { "name": "Skoaffär", "terms": "Skoaffär, skor, skobutik" }, + "shop/spices": { + "name": "Affär för kryddor", + "terms": "Affär för kryddor, kryddor, chili, kanel, curry, ingefära, örter, peppar, saffran, salt, kryddbutik, kryddor, gurkmeja, wasabi" + }, "shop/sports": { "name": "Sportaffär", "terms": "Sportaffär, sportutrustning, sportkläder, träningskläder, träningsutrustning, träningsskor, löpskor" @@ -4197,9 +4757,13 @@ "terms": "Hyrlager, långtidslager, vinterförvaring, förråd, magasinera, Magasinering, förvaring, förrådsutrymme, båtförvaring, säsongsförvaring, möbelförvaring, bilförvaring, husvagnsförvaring" }, "shop/supermarket": { - "name": "Snabbköp", + "name": "Mataffär", "terms": "självbetjäningsbutik, självköp, supermarket, snabbköp, dagligvarubutik, affär, mataffär, livsmedel, livsmedelsbutik, mat" }, + "shop/supermarket/organic": { + "name": "Organisk mataffär", + "terms": "Organisk mataffär, organiskt, mataffär, snabbköp, supermarket, naturlig mat, mat, naturligt, organisk mat" + }, "shop/swimming_pool": { "name": "Butik för pooltillbehör", "terms": "Pooltillbehörsbutik, badtunna, poolbutik, poolutrustningsbutik, poolinstallationsbutik, poolunderhållsbutik, poolbutikleveransbutik´, poolinstallation, poolunderhåll, poolservice, pool, basäng, jacussy" @@ -4216,6 +4780,10 @@ "name": "Te-butik", "terms": "Te, the, te, påste, örtte, thé, teblad" }, + "shop/telecommunication": { + "name": "Telekombutik", + "terms": "Telekombutik, kommunikation, internetleverantör, isp, nätverk, telefon, röst, talkommunikation, tele, internet" + }, "shop/ticket": { "name": "Biljettförsäljning", "terms": "Biljettförsäljning, biljetter, biljettkassa, biljettsäljare, biljettkontor, biljettlucka, biljettåterförsäljare" @@ -4228,6 +4796,10 @@ "name": "Tobaksbutik", "terms": "Tobaksbutik, tobak, rökning, pipa, pipor, snus, cigaretter, cigarett, cigarr, cigarrer, röktillbehör" }, + "shop/tool_hire": { + "name": "Verktygsuthyrning", + "terms": "Verktygsuthyrning, uthyrning av verktyg, verktyg, byggmaskiner, byggverktyg, uthyrning, hyrning" + }, "shop/toys": { "name": "Leksaksaffär", "terms": "Leksaksaffär, leksaker, barnsaker" @@ -4240,6 +4812,10 @@ "name": "Resebyrå", "terms": "Resebyrå, reseagent, biljettförsäljning, charter, charterflyg, charterresa" }, + "shop/trophy": { + "name": "Affär för troféer", + "terms": "Affär för troféer, trofé, trofe, troféer, trofeer, priser, belöningar, utmärkelser, gravyrer, medaljer, plackat, trofébutik" + }, "shop/tyres": { "name": "Däckfirma", "terms": "Däckfirma, däckbyte, hjulbyte, däckförsäljning, hjulförsäljning, fälgar, däck, hjul, fälg, balansering," @@ -4283,6 +4859,10 @@ "name": "Grosistaffär", "terms": "grosist, Grosistaffär, Partihandel, grosshandel, grossistverksamhet, grosshandel, engros, mängdhandel, grossistlager, lagerklubb, grossistklubb" }, + "shop/wigs": { + "name": "Affär för peruker", + "terms": "Affär för peruker, peruker, hårförlängning, löshår, tupé" + }, "shop/window_blind": { "name": "Persienner", "terms": "Persienner, spjälgardin, jalusi, markis, rullgardin, spjäljalusi" @@ -4291,6 +4871,17 @@ "name": "Vinaffär", "terms": "Vinaffär, systembolaget, systemet, vin, vinförsäljning" }, + "telecom": { + "name": "Telekomobjekt" + }, + "telecom/data_center": { + "name": "Datacenter", + "terms": "Datacenter, datorsystem, datasystem, datalagring, informationsteknologi, IT, serverfarm, serverrum, serverhall, molnet, telekommunikation, it-center, datorcenter" + }, + "telecom/exchange": { + "name": "Telefonstation", + "terms": "telefonstation, telekommunikation, telefonväxel" + }, "tourism": { "name": "Turistobjekt" }, @@ -4346,6 +4937,14 @@ "name": "Campingplats", "terms": "Campingplats, camping, husvagn, tält, campinganläggning" }, + "tourism/camp_site/backcountry": { + "name": "Vildmarkscamping", + "terms": "Vildmarkscamping, friluftscamping, vildmark, enkel camping, naturcamping, campingplats, informell camping, primitiv camping" + }, + "tourism/camp_site/group_only": { + "name": "Gruppcampingplats", + "terms": "Gruppcampingplats, campingplats för grupp, lägerplats, campingplats, scoutcamping, ungdomscamping" + }, "tourism/caravan_site": { "name": "Ställplats", "terms": "Ställplats, campingplats, camping, husvagnscamping, husbilscamping, fricamping" @@ -4378,6 +4977,10 @@ "name": "Informationstavla", "terms": "Informationstavla, turistinformation, information, fakta, karta, historisk information, kollektivtrafik, avgång*" }, + "tourism/information/board/welcome_sign": { + "name": "Välkomstskylt", + "terms": "Välkomstskylt, skylt, välkommen, välkomna" + }, "tourism/information/guidepost": { "name": "Vägvisare", "terms": "Vägvisare, Guidepost, Vägmärke, stigvisning, vandringsskyllt" @@ -4386,6 +4989,10 @@ "name": "Karta", "terms": "Karta, navigering, industrikarta, vägkarta, *karta, informationstavla, information, cykelkarta, stadskarta" }, + "tourism/information/office": { + "name": "Turistbyrå", + "terms": "Turistbyrå, turistinformation, resebyrå, turistkontor, turist, turism, informationskontor, reseguide, turistinformationscenter, besökscenter, besöksinformationscenter, välkomstcenter" + }, "tourism/information/route_marker": { "name": "Spårmarkör", "terms": "Spårmarkör, ledmarkör, stigmarkör, ruttmarkör, spår, led, stig, rutt, ruttflagga, stenhög, vägmarkör, vandringsled, vandring, skoterled, skidled, ridled" @@ -4402,6 +5009,10 @@ "name": "Museum", "terms": "museum, samling, konstsamling, museibyggnad, vetenskap, historia, historik, historia, konst, arkeologi, utställning, galleri" }, + "tourism/museum/history": { + "name": "Historiskt museum", + "terms": "Historiskt museum, museum, historia, artefakter, diorama, utställningar, utställning, grund, hall, institution, historisk, stadsmuseum" + }, "tourism/picnic_site": { "name": "Picknickplats", "terms": "Picknickplats, rastplats, picknick, utflykt, camping, campingplats" @@ -4486,22 +5097,10 @@ "name": "Skyllt för tättbebyggt område", "terms": "Trafikskyllt, skyllt, vägskyllt, vägmärke, vägvisare, trafikmärke, Tättbebyggt område, stad, ort, tätort, stadsgräns, gräns" }, - "traffic_sign/city_limit_vertex": { - "name": "Skyllt för tättbebyggt område", - "terms": "Trafikskyllt, skyllt, vägskyllt, vägmärke, vägvisare, trafikmärke, Tättbebyggt område, stad, ort, tätort, stadsgräns, gräns" - }, "traffic_sign/maxspeed": { "name": "Hastighetsskylt", "terms": "Trafikskyllt, skyllt, vägskyllt, vägmärke, vägvisare, trafikmärke, Hastighetsskylt, Hastighetsbegränsning, fart, hastighet, maxhastighet, maxfart, hastighet, fart" }, - "traffic_sign/maxspeed_vertex": { - "name": "Hastighetsskylt", - "terms": "Trafikskyllt, skyllt, vägskyllt, vägmärke, vägvisare, trafikmärke, Hastighetsskylt, Hastighetsbegränsning, fart, hastighet, maxhastighet, maxfart, hastighet, fart" - }, - "traffic_sign_vertex": { - "name": "Vägmärke", - "terms": "Trafikskyllt, skyllt, vägskyllt, vägmärke, vägvisare, trafikmärke" - }, "type/boundary": { "name": "Gräns", "terms": "Gräns, gränslinje, administrativ gräns" @@ -4510,14 +5109,27 @@ "name": "Administrativ gräns", "terms": "Administrativ gräns, gräns, stat, territorium, administrativ enhet" }, + "type/connectivity": { + "name": "Filkoppling", + "terms": "Filkoppling, filer, sammankoppling av filer, vägfil, anslutning, filbyte" + }, + "type/destination_sign": { + "name": "Destinationsskylt", + "terms": "Destinationsskylt, vägvisning, vägvisare, skylt, destination, vägskylt" + }, "type/enforcement": { "name": "Trafiksäkerhetsutrustning", "terms": "Trafiksäkerhetsutrustning, trafiksäkerhet, övervakning, fartkontroll, hastighetskontroll, fartkamera, hastighetskamera," }, + "type/enforcement/maxspeed": { + "name": "Fartkamera", + "terms": "Fartkamera, trafiksäkerhetskamera, hastighetskamera, hastighet, fart, radar, Trafiksäkerhetsutrustning, trafiksäkerhet, övervakning, fartkontroll, hastighetskontroll" + }, "type/multipolygon": { "name": "Multipolygon" }, "type/public_transport/stop_area_group": { + "name": "Grupp av stopp för kollektivtrafik", "terms": "bytespunkt, transit, resecenter, station, terminal, byte, kollektivtrafik, linjetrafik, transport, hållplats, knutpunkt" }, "type/restriction": { @@ -4578,7 +5190,7 @@ }, "type/route/foot": { "name": "Vandringsled", - "terms": "Vandringsrutt, vandringsled, stig" + "terms": "Vandringsrutt, vandringsled, stig, gångrutt, gångled, vandring, gång" }, "type/route/hiking": { "name": "Vandringsled", @@ -4624,6 +5236,10 @@ "name": "Spårvagnsrutt", "terms": "Spårvagnsrutt, spårvagn, spårvagnsnät, spårvagnsräls, spårvagnsförbindelse" }, + "type/route/trolleybus": { + "name": "Trådbussrutt", + "terms": "Trådbussrutt, trådbuss, buss, bussrutt, kollektivtrafik, spårlös, spårvagn, vag, transit, transport" + }, "type/route_master": { "name": "Huvudrutt", "terms": "Huvudrutt, huvudförbindelse, huvudväg" @@ -4636,6 +5252,9 @@ "name": "Vattendrag", "terms": "Vattenväg, vattenflöde, vattendrag" }, + "waterway": { + "name": "Vattenvägobjekt" + }, "waterway/boatyard": { "name": "Båtvarv", "terms": "Båtvarv, varv, båtställplats, vinterförvaring,uppläggningsplats" @@ -4645,7 +5264,8 @@ "terms": "Kanal, vattenväg, vattenled" }, "waterway/canal/lock": { - "name": "Sluss" + "name": "Sluss", + "terms": "Sluss, kanalsluss, vattenlås, ränna, slusskammare, slussbassäng" }, "waterway/dam": { "name": "Fördämning", @@ -4663,10 +5283,18 @@ "name": "Dränering", "terms": "dränering, avrinning, dagvatten, dagvattenavrinning" }, + "waterway/fish_pass": { + "name": "Fisktrappa", + "terms": "Fisktrappa, ålstege, ålpassering, fiskstege, fiskvandring, fiskpassage, fisklås, fisksteg, fiskväg, fiskstege" + }, "waterway/fuel": { "name": "Sjömack", "terms": "Sjömack, båtmack, bränslestation, tankstation båtbensninmack, båtmensinstation" }, + "waterway/lock_gate": { + "name": "Slussport", + "terms": "Slussport, sluss, kanal" + }, "waterway/milestone": { "name": "Milsten vid vattendrag", "terms": "Milsten vid vattendrag, sjöfart, kilometerstolpe, kilometertavla, avståndsmärke, milsten, referenstavla, kilometerpåle" @@ -4690,6 +5318,10 @@ "name": "Periodiskt vattendrag", "terms": "Periodiskt vattendrag, tillfälligt vattendrag, periodiskt, tillfälligt, Arroyo, bäck, avrinning, dränering, översvämning, rännil, biflöde, vattendrag, dike, dagvatten, dränering, avrinning" }, + "waterway/tidal_channel": { + "name": "Tidvattenskanal", + "terms": "Tidvattenskanal, kust, tidvatten, marin, salt kärr, tidvattenbäck, tidvatten, tidvatteninlopp, vattenväg" + }, "waterway/water_point": { "name": "Dricksvatten för båt", "terms": "Dricksvatten för båt, Dricksvatten, vattenpåfyllning, vattentank" diff --git a/app/src/main/assets/osmfeatures/tr.json b/app/src/main/assets/osmfeatures/tr.json index 2feecdbef2..94bfefb0e7 100644 --- a/app/src/main/assets/osmfeatures/tr.json +++ b/app/src/main/assets/osmfeatures/tr.json @@ -8,6 +8,9 @@ "name": "Reklam Panosu", "terms": "Reklam Panosu, Bilbord" }, + "aerialway": { + "name": "Havayolu Özelliği" + }, "aerialway/cable_car": { "name": "Teleferik", "terms": "Teleferik" @@ -20,6 +23,9 @@ "name": "Kayak Teleferiği", "terms": "Kayak Teleferiği" }, + "aerialway/gondola": { + "name": "Gondol Kalkışı" + }, "aerialway/goods": { "name": "Taşıma Teleferiği", "terms": "Taşıma Teleferiği, Mal Teleferiği" @@ -44,10 +50,16 @@ "name": "Çekme Halat Teleferik", "terms": "Çekme Halat Teleferik" }, + "aerialway/t-bar": { + "name": "T-Bar Kalkışı" + }, "aeroway/aerodrome": { "name": "Havaalanı", "terms": "Havaalanı" }, + "aeroway/apron": { + "name": "Havaalanı Apronu" + }, "aeroway/gate": { "name": "Kapı", "terms": "Kapı" @@ -238,6 +250,9 @@ "name": "Fast Food", "terms": "Fast Food, Hazır Yiyecek" }, + "amenity/ferry_terminal": { + "name": "Feribot Terminali" + }, "amenity/fire_station": { "name": "İtfaiye", "terms": "İtfaiye" @@ -278,6 +293,9 @@ "name": "İnternet Kafe", "terms": "İnternet Kafe" }, + "amenity/kindergarten": { + "name": "Anaokulu Sahası" + }, "amenity/library": { "name": "Kütüphane", "terms": "Kütüphane" @@ -317,6 +335,9 @@ "amenity/parking/underground": { "name": "Yeraltı Park Yeri" }, + "amenity/parking_entrance": { + "name": "Kapalı Otopark Giriş / Çıkış" + }, "amenity/parking_space": { "name": "Park Yeri", "terms": "Park Yeri" @@ -538,6 +559,9 @@ "name": "İçecek Otomatı", "terms": "İçecek Otomatı" }, + "amenity/vending_machine/excrement_bags": { + "name": "Dışkı Torbası Dağıtıcı" + }, "amenity/vending_machine/feminine_hygiene": { "name": "Kadın Sağlık Otomatı", "terms": "Kadın Sağlık Otomatik Satış Makinası" @@ -546,6 +570,9 @@ "name": "Gazete Satış Makinası", "terms": "Gazete Satış Makinası, Gazete Otomatı" }, + "amenity/vending_machine/parcel_pickup_dropoff": { + "name": "Paket Alma / Bırakma Dolabı" + }, "amenity/vending_machine/parking_tickets": { "name": "Park Fişi Otomatı", "terms": "Park Fişi Otomatı" @@ -590,6 +617,9 @@ "name": "Alan", "terms": "Alan, Bölge" }, + "area/highway": { + "name": "Yol Alanı" + }, "attraction/amusement_ride": { "name": "Eğlence Yolculuğu" }, @@ -600,6 +630,9 @@ "name": "Dönme Dolap", "terms": "Dönme Dolap" }, + "attraction/bumper_car": { + "name": "Çarpışan Arabalar" + }, "attraction/bungee_jumping": { "name": "Bungee Jumping", "terms": "Bungee Jumping" @@ -800,6 +833,9 @@ "name": "Endüstriyel Bina", "terms": "Sanayi Binası" }, + "building/kindergarten": { + "name": "Anaokulu Bina" + }, "building/mosque": { "name": "Cami", "terms": "Cami" @@ -962,6 +998,12 @@ "name": "Camcı", "terms": "Camcı" }, + "craft/handicraft": { + "name": "El Sanatları Çalışma Alanı" + }, + "craft/hvac": { + "name": "ISH Çalışma Alanı" + }, "craft/insulator": { "name": "Kaloriferci", "terms": "Kaloriferci" @@ -973,6 +1015,9 @@ "craft/locksmith": { "name": "Anahtarcı" }, + "craft/metal_construction": { + "name": "Dökümcü" + }, "craft/painter": { "name": "Boyacı", "terms": "Boyacı" @@ -993,6 +1038,9 @@ "name": "Tesisatçı", "terms": "Tesisatçı, Su Tesisatçısı, Sıhhi Tesisatçı" }, + "craft/pottery": { + "name": "Çömlekçi" + }, "craft/rigger": { "name": "Kablocu", "terms": "Kablocu" @@ -1082,6 +1130,9 @@ "emergency/life_ring": { "name": "Can Simidi" }, + "emergency/mountain_rescue": { + "name": "Dağ Arama Kurtarma" + }, "emergency/no": { "name": "Acil Erişim Yok" }, @@ -1101,6 +1152,9 @@ "emergency/yes": { "name": "Acil Erişim" }, + "entrance": { + "name": "Giriş / Çıkış" + }, "ford": { "name": "Sığ Geçit, Akarsu Üzerinde Geçit Yeri", "terms": "Geçit, Sığ Yer" @@ -1242,6 +1296,9 @@ "name": "Yürüyüş Yolu", "terms": "Yürüyüş Yolu, Yaya Yolu" }, + "highway/footway/conveying": { + "name": "Yürüyen Bant" + }, "highway/footway/crossing": { "name": "Yaya Geçidi" }, @@ -1474,6 +1531,9 @@ "landuse": { "name": "Arazi Kullanım Özelliği" }, + "landuse/allotments": { + "name": "Bahçe Tahsisleri" + }, "landuse/aquaculture": { "name": "Su Kültürü", "terms": "Su Kültürü" @@ -1481,6 +1541,9 @@ "landuse/basin": { "name": "Havza" }, + "landuse/brownfield": { + "name": "Kahverengi Alan" + }, "landuse/cemetery": { "name": "Mezarlık", "terms": "Mezarlık" @@ -1509,6 +1572,9 @@ "landuse/forest": { "name": "Düzenlenmiş Orman" }, + "landuse/garages": { + "name": "Garaj Arazisi Kullanımı" + }, "landuse/grass": { "name": "Çimenlik", "terms": "Çimenlik, Yeşil Alan" @@ -1565,6 +1631,9 @@ "name": "Atış Sahası", "terms": "Atış Sahası, Poligon" }, + "landuse/military/training_area": { + "name": "Askeri Eğitim Alan" + }, "landuse/orchard": { "name": "Bağ", "terms": "Bağ, Bahçe, Bostan, Meyve Bahçesi" @@ -1639,6 +1708,33 @@ "name": "Açıkhava Spor Yeri", "terms": "Açıkhava Spor Yeri" }, + "leisure/fitness_station/box": { + "name": "Egzersiz Kutusu" + }, + "leisure/fitness_station/horizontal_bar": { + "name": "Egzersiz Yatay Bar" + }, + "leisure/fitness_station/hyperextension": { + "name": "Hiperekstansiyon İstasyonu" + }, + "leisure/fitness_station/parallel_bars": { + "name": "Paralel Çubuklar" + }, + "leisure/fitness_station/push-up": { + "name": "Push-Up İstasyonu" + }, + "leisure/fitness_station/rings": { + "name": "Egzersiz Halkaları" + }, + "leisure/fitness_station/sign": { + "name": "Egzersiz Talimatı İşareti" + }, + "leisure/fitness_station/sit-up": { + "name": "Sit-Up İstasyonu" + }, + "leisure/fitness_station/stairs": { + "name": "Egzersiz Merdivenleri" + }, "leisure/garden": { "name": "Bahçe", "terms": "Bahçe, Bostan, Park" @@ -1647,6 +1743,9 @@ "name": "Golf Sahası", "terms": "Golf Sahası" }, + "leisure/hackerspace": { + "name": "Bilgisayar Korsanı Alanı" + }, "leisure/horse_riding": { "name": "At Binicilik Spor Kulübü", "terms": "At Binicilik Spor Kulübü, Binicilik Spor Kulübü, At Binme Yeri" @@ -1697,6 +1796,9 @@ "name": "Sahil Voleybolu Sahası", "terms": "Sahil Voleybolu Sahası" }, + "leisure/pitch/boules": { + "name": "Boules/Bocce Kortu" + }, "leisure/pitch/bowls": { "name": "Açıkhava Top Oyun Sahası", "terms": "Açıkhava Top Oyun Sahası" @@ -1780,6 +1882,9 @@ "name": "Çizgi", "terms": "Çizgi" }, + "man_made": { + "name": "İnsan Yapımı Özellik" + }, "man_made/adit": { "name": "Tünel Girişi", "terms": "Tünel Girişi, Maden Girişi" @@ -1798,6 +1903,9 @@ "name": "Baca", "terms": "Baca" }, + "man_made/courtyard": { + "name": "Avlu" + }, "man_made/crane": { "name": "Vinç" }, @@ -1805,6 +1913,9 @@ "name": "Yangın Durduma Hattı", "terms": "Yangın Durduma Hattı" }, + "man_made/dovecote": { + "name": "Güvercinlik" + }, "man_made/embankment": { "name": "Toprak Dolgu" }, @@ -1816,6 +1927,9 @@ "name": "Gazölçer", "terms": "Gazölçer" }, + "man_made/groyne": { + "name": "Kemer Pervazı" + }, "man_made/lighthouse": { "name": "Deniz Feneri", "terms": "Deniz Feneri, Fener" @@ -1897,6 +2011,9 @@ "name": "Fabrika", "terms": "Fabrika, Sanayi" }, + "natural": { + "name": "Doğal Özellik" + }, "natural/bare_rock": { "name": "Kayalık Bölge", "terms": "Kayalık Bölge, Kayalar, Kaya Dizisi" @@ -1996,6 +2113,9 @@ "name": "Sulak Alan", "terms": "Sulak Alan, Sulak Arazi" }, + "natural/wood": { + "name": "Doğal Odun" + }, "noexit/yes": { "name": "Çıkış Yok", "terms": "Çıkış Yok" @@ -2124,6 +2244,9 @@ "office/physician": { "name": "Hekim" }, + "office/political_party": { + "name": "Siyasi Parti Ofisi" + }, "office/private_investigator": { "name": "Dedektif", "terms": "Dedektif Şubesi" @@ -2177,6 +2300,9 @@ "name": "Ada", "terms": "Ada" }, + "place/islet": { + "name": "Adacık" + }, "place/isolated_dwelling": { "name": "Mesken", "terms": "Mesken" @@ -2189,6 +2315,9 @@ "name": "Mahalle", "terms": "Mahalle" }, + "place/plot": { + "name": "Arsa" + }, "place/quarter": { "name": "Semt", "terms": "Mahalle, Muhit" @@ -2209,13 +2338,46 @@ "name": "Köy", "terms": "Köy" }, + "playground/balance_beam": { + "name": "Denge Aleti" + }, + "playground/basket_swing": { + "name": "Sepet Salıncak" + }, + "playground/climbing_frame": { + "name": "Tırmanma Çerçevesi" + }, + "playground/cushion": { + "name": "Zıplayan Minder" + }, + "playground/horizontal_bar": { + "name": "Barfiks Bar" + }, + "playground/rocker": { + "name": "Oyuncak At Binici" + }, + "playground/sandpit": { + "name": "Kum Havuzu" + }, + "playground/seesaw": { + "name": "Tahterevalli" + }, "playground/slide": { "name": "Kaydırak" }, + "playground/structure": { + "name": "Yapı" + }, + "playground/swing": { + "name": "Salıncak" + }, "point": { "name": "Nokta", "terms": "Nokta, Konum" }, + "power": { + "name": "Güç Özelliği" + }, "power/cable/underground": { "name": "Yeraltı Enerji Kablosu" }, @@ -2243,6 +2405,9 @@ "name": "Trafo", "terms": "Trafo" }, + "power/switch": { + "name": "Güç Düğmesi" + }, "power/tower": { "name": "Yüksek Gerilim Direği", "terms": "Yüksek Gerilim Direği" @@ -2251,6 +2416,9 @@ "name": "Transformatör", "terms": "Transformatör" }, + "public_transport/platform": { + "name": "Taşıma Platformu" + }, "public_transport/platform/bus": { "name": "Otobüs Platformu" }, @@ -2347,30 +2515,69 @@ "name": "Troleybüs Yolcu İndirme/Bindirme Noktası", "terms": "Raysız Tramvay Yol Üstü İndirme/Bindirme Noktası" }, + "railway": { + "name": "Demiryolu Özelliği" + }, "railway/abandoned": { "name": "Terk Edilmiş Demiryolu", "terms": "Terk Edilmiş Demiryolu" }, + "railway/crossing": { + "name": "Demiryolu-Yol Geçişi" + }, "railway/disused": { "name": "Kullanılmayan Demiryolu", "terms": "Kullanılmayan Demiryolu" }, + "railway/funicular": { + "name": "Füniküler Yolu" + }, + "railway/halt": { + "name": "Tren İstasyonu (Dur / İstek)" + }, + "railway/level_crossing": { + "name": "Demiryolu-Karayolu Geçişi" + }, + "railway/milestone": { + "name": "Demiryolu Kilometre Taşı" + }, + "railway/monorail": { + "name": "Tek Raylı Yol" + }, + "railway/narrow_gauge": { + "name": "Dar Demiryolu" + }, "railway/platform": { "name": "Tren Platformu" }, + "railway/rail": { + "name": "Tren Yolu" + }, "railway/signal": { "name": "Demiryolu Sinyali" }, "railway/station": { "name": "Tren İstasyonu" }, + "railway/subway": { + "name": "Metro Yolu" + }, "railway/subway_entrance": { "name": "Metro Girişi", "terms": "Metro Girişi" }, + "railway/switch": { + "name": "Demiryolu Makası" + }, "railway/train_wash": { "name": "Tren Yıkama" }, + "railway/tram": { + "name": "Tramvay Yolu" + }, + "railway/tram_stop": { + "name": "Tramvay Durma Yeri" + }, "railway/yard": { "name": "Demir Yolu Sahası" }, @@ -2386,10 +2593,16 @@ "name": "Dükkan", "terms": "Dükkan, Mağaza" }, + "shop/agrarian": { + "name": "Çiftlik Malzemeleri Dükkanı" + }, "shop/alcohol": { "name": "İçki Dükkanı", "terms": "İçki Dükkanı" }, + "shop/anime": { + "name": "Anime / Manga Dükkanı" + }, "shop/antiques": { "name": "Antika Dükkanı", "terms": "Antika Dükkanı" @@ -2521,6 +2734,9 @@ "name": "Kozmetik Mağazası", "terms": "Kozmetik Mağazası" }, + "shop/craft": { + "name": "El Sanatları Mağazası" + }, "shop/curtain": { "name": "Perde Mağazası", "terms": "Perde Mağazası" @@ -2631,6 +2847,9 @@ "shop/jewelry": { "name": "Kuyumcu" }, + "shop/kiosk": { + "name": "Büfe" + }, "shop/kitchen": { "name": "Mutfak Eşyaları Mağazası", "terms": "Mutfak Eşyaları Mağazası" @@ -2783,6 +3002,9 @@ "name": "Bilet Satıcısı", "terms": "Biletçi" }, + "shop/tiles": { + "name": "Karo Dükkanı" + }, "shop/tobacco": { "name": "Tütüncü", "terms": "Tütüncü" @@ -2791,6 +3013,9 @@ "name": "Oyuncak Mağazası", "terms": "Oyuncak Mağazası" }, + "shop/trade": { + "name": "Ticaret Mağazası" + }, "shop/travel_agency": { "name": "Turizm Acentası", "terms": "Turizm Acentası" @@ -2838,6 +3063,9 @@ "name": "Şarap Mağazası", "terms": "Şarap Mağazası" }, + "tourism": { + "name": "Turizm Özelliği" + }, "tourism/alpine_hut": { "name": "Dağ Evi", "terms": "Dağ Evi, Dağ Kulübesi, Baraka" @@ -2873,6 +3101,9 @@ "name": "Karavan Parkı", "terms": "Karavan Parkı" }, + "tourism/chalet": { + "name": "Tatil Kulübesi" + }, "tourism/gallery": { "name": "Sanat Galerisi", "terms": "Sanat Galerisi" @@ -2905,6 +3136,9 @@ "name": "Harita", "terms": "Harita" }, + "tourism/information/office": { + "name": "Misafir Merkezi" + }, "tourism/motel": { "name": "Motel", "terms": "Motel" @@ -2925,6 +3159,9 @@ "name": "Görüş Noktası", "terms": "Görüş Noktası, Bakış Noktası" }, + "tourism/wilderness_hut": { + "name": "Dağ kulübesi" + }, "tourism/zoo": { "name": "Hayvanat Bahçesi", "terms": "Hayvanat Bahçesi" @@ -2965,24 +3202,18 @@ "name": "Hız Şeridi", "terms": "Hız Şeridi" }, + "traffic_calming/table": { + "name": "Hız Tabelası" + }, "traffic_sign": { "name": "Trafik Tabelası" }, "traffic_sign/city_limit": { "name": "Şehir Sınırı Tabelası" }, - "traffic_sign/city_limit_vertex": { - "name": "Şehir Sınırı Tabelası" - }, "traffic_sign/maxspeed": { "name": "Hız Sınırı Tabelası" }, - "traffic_sign/maxspeed_vertex": { - "name": "Hız Sınırı Tabelası" - }, - "traffic_sign_vertex": { - "name": "Trafik Tabelası" - }, "type/boundary": { "name": "Sınır", "terms": "Sınır" @@ -3048,8 +3279,7 @@ "terms": "Feribot Güzergahı, Feribot Rotası" }, "type/route/foot": { - "name": "Yürüyüş Güzergahı", - "terms": "Yürüyüş Güzergahı, Yürüyüş Rotası" + "name": "Yürüyüş Rotası" }, "type/route/hiking": { "name": "Yürüyüş Güzergahı", @@ -3063,6 +3293,9 @@ "name": "Boru Hattı Güzergahı", "terms": "Boru Hattı Güzergahı, Boru Hattı Rotası" }, + "type/route/piste": { + "name": "Pist/Kayak Rotası" + }, "type/route/power": { "name": "Elektrik Hattı Güzergahı", "terms": "Elektrik Hattı Güzergahı, Elektrik Hattı Rotası" @@ -3071,6 +3304,9 @@ "name": "Yol Güzergahı", "terms": "Yol Güzergahı" }, + "type/route/subway": { + "name": "Metro Rotası" + }, "type/route/train": { "name": "Demiryolu Güzergahı", "terms": "Demiryolu Güzergahı, Tren Yolu Güzergahı, Demiryolu Rotası" @@ -3091,6 +3327,9 @@ "name": "Su Yolu", "terms": "Su Yolu, Akarsu" }, + "waterway": { + "name": "Suyolu Özelliği" + }, "waterway/boatyard": { "name": "Kayık İskelesi", "terms": "Kayık İskelesi, Bot İskelesi" diff --git a/app/src/main/assets/osmfeatures/uk.json b/app/src/main/assets/osmfeatures/uk.json index ecd872da3b..afb8e67e41 100644 --- a/app/src/main/assets/osmfeatures/uk.json +++ b/app/src/main/assets/osmfeatures/uk.json @@ -212,10 +212,18 @@ "name": "Пивний садок", "terms": "пиво,лавка,їжа,тепло,напої,beer,biergarten, відпочинок" }, + "amenity/binoculars": { + "name": "Стаціонарний бінокль", + "terms": "бінокль,труба,спостереження,підзорна,телескоп,туризм,крайовид" + }, "amenity/boat_rental": { "name": "Прокат човнів", "terms": "катамаран,прокат,човни,човен,лодка" }, + "amenity/boat_storage": { + "name": "Зберігання човнів", + "terms": "човен,лодка,станція,затока,сухий,док" + }, "amenity/bureau_de_change": { "name": "Обмін валют", "terms": "валюта,долар,євро,курс,біржа,банк,обміник,міняло,пункт" @@ -487,6 +495,10 @@ "name": "Вантажна рампа", "terms": "вантаж,рампа,погрузка,вигрузка,завантаження,розвантаження,товар,склад,доставка" }, + "amenity/lounger": { + "name": "Лежак", + "terms": "крісло,шезлонг,лавка" + }, "amenity/love_hotel": { "name": "Готель кохання", "terms": "love,готель,секс,стосунки,зустріч,пари" @@ -503,6 +515,10 @@ "name": "Грошові перекази", "terms": "гроші,перекази,обмін,готівка,чеки" }, + "amenity/mortuary": { + "name": "Морг", + "terms": "морг" + }, "amenity/motorcycle_parking": { "name": "Стоянка для мотоциклів", "terms": "стоянка,мотоцикл" @@ -1719,6 +1735,9 @@ "demolished/building": { "name": "Нещодавно знесена будівля" }, + "disused/amenity": { + "name": "Об’єкти інфраструктури (неробочі)" + }, "disused/railway": { "name": "Покинуті об’єкти залізниці" }, @@ -1832,6 +1851,10 @@ "name": "Доріжка для гольф-кара", "terms": "доріжка,машина,гольф,кар" }, + "golf/clubhouse": { + "name": "Клубний будинок гольфістів", + "terms": "гольф,офіс,клуб" + }, "golf/driving_range": { "name": "Тренувальний майданчик", "terms": "гольф,майданчик,тренування,свінг,удар" @@ -3125,6 +3148,10 @@ "name": "Вежа зв’язку", "terms": "вежа,щогла,зв'язок,тв,мобільний,радіо" }, + "man_made/tower/cooling": { + "name": "Градирня", + "terms": "електростанція,охолодження,вода,башта" + }, "man_made/tower/defensive": { "name": "Фортечна вежа", "terms": "донжон,вежа,башта,захист,фортеця,форт" @@ -3173,6 +3200,10 @@ "name": "Вітряний млин", "terms": "вітер,вітряк,млин,колесо,борошно" }, + "man_made/windpump": { + "name": "Вітронасос", + "terms": "вітряк,помпа,насос,вода" + }, "man_made/works": { "name": "Фабрика", "terms": "фабрика,завод,підприємство,виробництво,робота" @@ -3260,6 +3291,10 @@ "name": "Пустище/вересовище", "terms": "верес,пустище" }, + "natural/hot_spring": { + "name": "Термальні води", + "terms": "вода,гейзер,тепла,термальна,чан,купальня" + }, "natural/mud": { "name": "Багно", "terms": "багно,багнюка,грязь" @@ -3846,6 +3881,10 @@ "name": "Зупинка автобуса", "terms": "автобус,платформа,зупинка,транзит,громадський,транспорт,перевезення" }, + "public_transport/platform/bus_tram_point": { + "name": "Трамвайна/Автобусна зупинка", + "terms": "зупинка,трамвай,транспорт,громадський,вагон,рейки,автобус,платформа,транзит,громадський,транспорт,перевезення" + }, "public_transport/platform/ferry": { "name": "Поромна платформа", "terms": "пором,док,човен,пірс,платформа,зупинка,транзит,громадський,транспорт,перевезення" @@ -4938,6 +4977,10 @@ "name": "Інформаційний стенд", "terms": "інформація,стенд,дошка,схема,відомості,туризм,попередження" }, + "tourism/information/board/welcome_sign": { + "name": "Знак \"Вітаємо\"", + "terms": "знак,стела,інформація,дорога,населений пункт" + }, "tourism/information/guidepost": { "name": "Вказівник", "terms": "вказівник,маршрут,напрямок,мітка,туризм,тропа,шлях,рух,інформація" @@ -5054,22 +5097,10 @@ "name": "Знак Межа міста", "terms": "знак,місто,село,дорога,межа,кордон" }, - "traffic_sign/city_limit_vertex": { - "name": "Знак Межа міста", - "terms": "знак,місто,село,дорога,межа,кордон" - }, "traffic_sign/maxspeed": { "name": "Знак \"Обмеження швидкості\"", "terms": "обмеження,швидкість,максимальна,дорога,автомагістраль,шосе" }, - "traffic_sign/maxspeed_vertex": { - "name": "Знак обмеження швидкості", - "terms": "обмеження,швидкість,максимальна,дорога,автомагістраль,шосе" - }, - "traffic_sign_vertex": { - "name": "Дорожній знак", - "terms": "дорога,автобан,автомагістраль" - }, "type/boundary": { "name": "Кордон", "terms": "кордон,межа,поділ,країна" @@ -5159,7 +5190,7 @@ }, "type/route/foot": { "name": "Пішохідний маршрут", - "terms": "пішохідний маршрут,туризм,пішки" + "terms": "пішохідний,туристичний,маршрут,туризм" }, "type/route/hiking": { "name": "Туристичний маршрут", diff --git a/app/src/main/assets/osmfeatures/zh-CN.json b/app/src/main/assets/osmfeatures/zh-CN.json index 6008f5ce96..53edbd9d08 100644 --- a/app/src/main/assets/osmfeatures/zh-CN.json +++ b/app/src/main/assets/osmfeatures/zh-CN.json @@ -1345,7 +1345,7 @@ "terms": "粉刷匠" }, "craft/photographer": { - "name": "照相店", + "name": "摄影棚", "terms": "摄影师" }, "craft/photographic_laboratory": { @@ -3670,7 +3670,7 @@ }, "shop/photo": { "name": "照相馆", - "terms": "照相馆" + "terms": "照相馆,照片" }, "shop/printer_ink": { "name": "打印机墨水店" @@ -3987,12 +3987,6 @@ "traffic_sign/maxspeed": { "name": "限速标志" }, - "traffic_sign/maxspeed_vertex": { - "name": "限速标志" - }, - "traffic_sign_vertex": { - "name": "交通标志" - }, "type/boundary": { "name": "边界", "terms": "边界" @@ -4071,10 +4065,6 @@ "name": "渡轮航线", "terms": "渡轮航线" }, - "type/route/foot": { - "name": "步行线路", - "terms": "步行路线,路线,线路" - }, "type/route/hiking": { "name": "徒步线路", "terms": "远足线路,路线,线路,徒步,远足,远足路线,徒步路线" diff --git a/app/src/main/assets/osmfeatures/zh-HK.json b/app/src/main/assets/osmfeatures/zh-HK.json index 9ce3bf0aa5..e3962f0d76 100644 --- a/app/src/main/assets/osmfeatures/zh-HK.json +++ b/app/src/main/assets/osmfeatures/zh-HK.json @@ -2795,10 +2795,6 @@ "name": "渡輪航線", "terms": "Ferry Route,渡輪航線,航綫" }, - "type/route/foot": { - "name": "步行路綫", - "terms": "Foot Route,步行路線,行人路綫,行人路線" - }, "type/route/hiking": { "name": "遠足路綫", "terms": "Hiking Route,行山路綫,行山路線,遠足路線" diff --git a/app/src/main/assets/osmfeatures/zh-TW.json b/app/src/main/assets/osmfeatures/zh-TW.json index 58c6d02155..9954e6e90f 100644 --- a/app/src/main/assets/osmfeatures/zh-TW.json +++ b/app/src/main/assets/osmfeatures/zh-TW.json @@ -211,10 +211,18 @@ "name": "啤酒花園 ", "terms": "啤酒花園,屋外花園酒店" }, + "amenity/binoculars": { + "name": "固定式雙筒望遠鏡", + "terms": "固定式雙筒望遠鏡" + }, "amenity/boat_rental": { "name": "小艇出租", "terms": "租船處,小艇租賃" }, + "amenity/boat_storage": { + "name": "般隻停放處", + "terms": "般隻倉庫,般隻存放處" + }, "amenity/bureau_de_change": { "name": "外幣兌換", "terms": "錢幣兌換,貨幣兌換" @@ -486,6 +494,10 @@ "name": "裝卸碼頭", "terms": "裝卸碼頭" }, + "amenity/lounger": { + "name": "躺椅區", + "terms": "躺椅區,躺椅" + }, "amenity/love_hotel": { "name": "情趣旅館", "terms": "愛情旅館,情人旅館" @@ -502,6 +514,10 @@ "name": "匯款站", "terms": "匯款處" }, + "amenity/mortuary": { + "name": "太平間", + "terms": "太平間" + }, "amenity/motorcycle_parking": { "name": "機車停車場", "terms": "機車停車場,速克達停車場,摩托車停車場" @@ -1709,6 +1725,9 @@ "demolished/building": { "name": "最近拆除的建築物" }, + "disused/amenity": { + "name": "廢棄設施" + }, "disused/railway": { "name": "廢棄鐵軌圖徽" }, @@ -1821,6 +1840,10 @@ "name": "高爾夫球車道", "terms": "高爾夫球車道" }, + "golf/clubhouse": { + "name": "高爾夫俱樂部", + "terms": "高爾夫俱樂部" + }, "golf/driving_range": { "name": "高爾夫球練習場", "terms": "高爾夫球練習場,練習場" @@ -3112,6 +3135,10 @@ "name": "通訊塔", "terms": "無線通訊塔" }, + "man_made/tower/cooling": { + "name": "冷卻塔", + "terms": "冷卻塔" + }, "man_made/tower/defensive": { "name": "守衛塔", "terms": "槍塔,衛塔" @@ -3246,6 +3273,10 @@ "name": "矮灌木叢", "terms": "矮灌木叢" }, + "natural/hot_spring": { + "name": "溫泉", + "terms": "溫泉" + }, "natural/mud": { "name": "泥地", "terms": "泥地" @@ -3827,6 +3858,10 @@ "name": "公車站", "terms": "公車站" }, + "public_transport/platform/bus_tram_point": { + "name": "電車與公車站", + "terms": "電車與公車站" + }, "public_transport/platform/ferry": { "name": "渡輪月台", "terms": "渡輪月台" @@ -4916,6 +4951,10 @@ "name": "資訊告示牌", "terms": "資訊告示牌,告示牌,看版" }, + "tourism/information/board/welcome_sign": { + "name": "歡迎標誌", + "terms": "歡迎標誌" + }, "tourism/information/guidepost": { "name": "指示牌", "terms": "方向指引牌" @@ -5029,22 +5068,10 @@ "name": "城市限制標誌", "terms": "城市限制標誌" }, - "traffic_sign/city_limit_vertex": { - "name": "城市限制標誌", - "terms": "城市限制標誌" - }, "traffic_sign/maxspeed": { "name": "速限指標", "terms": "速限" }, - "traffic_sign/maxspeed_vertex": { - "name": "速限指標", - "terms": "速限" - }, - "traffic_sign_vertex": { - "name": "交通號誌", - "terms": "交通號誌" - }, "type/boundary": { "name": "邊界", "terms": "界線" diff --git a/app/src/main/assets/osmfeatures/zh.json b/app/src/main/assets/osmfeatures/zh.json index 1f8d05e95d..850d612590 100644 --- a/app/src/main/assets/osmfeatures/zh.json +++ b/app/src/main/assets/osmfeatures/zh.json @@ -675,9 +675,6 @@ "type/route/ferry": { "name": "渡轮航线" }, - "type/route/foot": { - "name": "步行路线" - }, "type/route/pipeline": { "name": "管道路线" }, diff --git a/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfos.java b/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfos.java index 435b64e7b9..6588d8c4c5 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfos.java +++ b/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfos.java @@ -114,25 +114,15 @@ private CountryInfo getDefault() private CountryInfo loadCountryInfo(String countryCodeIso3166) throws IOException { String filename = countryCodeIso3166+".yml"; - InputStream is = null; - try + try (InputStream is = assetManager.open(BASEPATH + File.separator + filename)) { - is = assetManager.open(BASEPATH + File.separator + filename); - Reader reader = new InputStreamReader(is, "UTF-8"); + Reader reader = new InputStreamReader(is, "UTF-8"); YamlReader yamlReader = new YamlReader(reader); yamlReader.getConfig().setPrivateFields(true); CountryInfo result = yamlReader.read(CountryInfo.class); result.countryCode = countryCodeIso3166.split("-")[0]; return result; } - finally - { - if(is != null) try - { - is.close(); - } - catch (IOException ignore) { } - } } /** Complement every declared field that is null in ´info´ with the field in ´with´ */ diff --git a/app/src/main/java/de/westnordost/streetcomplete/data/user/achievements/AchievementsModule.kt b/app/src/main/java/de/westnordost/streetcomplete/data/user/achievements/AchievementsModule.kt index b1433f29da..3f16178faf 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/data/user/achievements/AchievementsModule.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/data/user/achievements/AchievementsModule.kt @@ -12,11 +12,13 @@ object AchievementsModule { @Provides @Named("Achievements") fun achievements(): List = achievements @Provides @Named("QuestAliases") fun questAliases(): List> = questAliases + // list of quest synonyms (this alternate name is mentioned to aid searching for this code) private val questAliases = listOf( "AddAccessibleForPedestrians" to "AddProhibitedForPedestrians", "AddWheelChairAccessPublicTransport" to "AddWheelchairAccessPublicTransport", "AddWheelChairAccessToilets" to "AddWheelchairAccessToilets", "AddSidewalks" to "AddSidewalk", + "DetailRoadSurface" to "AddRoadSurface", "AddTrafficSignalsBlindFeatures" to "AddTrafficSignalsVibration", "AddSuspectedOneway" to "AddOneway" ) diff --git a/app/src/main/java/de/westnordost/streetcomplete/map/MapFragment.kt b/app/src/main/java/de/westnordost/streetcomplete/map/MapFragment.kt index d1b721b04c..5daa4a8e20 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/map/MapFragment.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/map/MapFragment.kt @@ -14,6 +14,7 @@ import android.view.ViewGroup import android.view.animation.AccelerateDecelerateInterpolator import android.view.animation.Interpolator import androidx.annotation.CallSuper +import androidx.appcompat.app.AlertDialog import androidx.core.content.edit import androidx.core.net.toUri import androidx.core.view.updateLayoutParams @@ -98,15 +99,26 @@ open class MapFragment : Fragment(), mapView = view.findViewById(R.id.map) mapView.onCreate(savedInstanceState) - openstreetmapLink.setOnClickListener { openUrl("https://www.openstreetmap.org/copyright") } + openstreetmapLink.setOnClickListener { showOpenUrlDialog("https://www.openstreetmap.org/copyright") } mapTileProviderLink.text = vectorTileProvider.copyrightText - mapTileProviderLink.setOnClickListener { openUrl(vectorTileProvider.copyrightLink) } + mapTileProviderLink.setOnClickListener { showOpenUrlDialog(vectorTileProvider.copyrightLink) } setupFittingToSystemWindowInsets() launch { initMap() } } + private fun showOpenUrlDialog(url: String) { + AlertDialog.Builder(requireContext()) + .setTitle(R.string.open_url) + .setMessage(url) + .setPositiveButton(android.R.string.ok) { _,_ -> + openUrl(url) + } + .setNegativeButton(android.R.string.cancel, null) + .show() + } + private fun openUrl(url: String): Boolean { val intent = Intent(Intent.ACTION_VIEW, url.toUri()) return tryStartActivity(intent) diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/QuestModule.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/QuestModule.kt index 0bee98029b..48591d7785 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/QuestModule.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/QuestModule.kt @@ -126,13 +126,12 @@ import javax.inject.Singleton AddRecyclingType(), AddRecyclingContainerMaterials(), AddSport(), - AddRoadSurface(), // used by BRouter, OsmAnd, OSRM, graphhopper, HOT map style + AddRoadSurface(), // used by BRouter, OsmAnd, OSRM, graphhopper, HOT map style... AddMaxSpeed(), // should best be after road surface because it excludes unpaved roads AddMaxHeight(), // OSRM and other routing engines AddRailwayCrossingBarrier(), // useful for routing AddPostboxCollectionTimes(), AddOpeningHours(featureDictionaryFuture), - DetailRoadSurface(), // used by BRouter, OsmAnd, OSRM, graphhopper AddBikeParkingCapacity(), // used by cycle map layer on osm.org, OsmAnd AddOrchardProduce(), AddBuildingType(), // because housenumber, building levels etc. depend on it @@ -146,7 +145,7 @@ import javax.inject.Singleton AddInternetAccess(), // used by OsmAnd AddParkingFee(), // used by OsmAnd AddMotorcycleParkingCapacity(), - AddPathSurface(), // used by OSM Carto, OsmAnd + AddPathSurface(), // used by OSM Carto, BRouter, OsmAnd, OSRM, graphhopper... AddTracktype(), // widely used in map rendering - OSM Carto, OsmAnd... AddMaxWeight(), // used by OSRM and other routing engines AddForestLeafType(), // used by OSM Carto diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddCyclewayPartSurface.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddCyclewayPartSurface.kt index 278cb96ace..9c8dd9166f 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddCyclewayPartSurface.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddCyclewayPartSurface.kt @@ -5,17 +5,24 @@ import de.westnordost.streetcomplete.data.meta.updateWithCheckDate import de.westnordost.streetcomplete.data.osm.osmquest.OsmFilterQuestType import de.westnordost.streetcomplete.data.osm.changes.StringMapChangesBuilder -class AddCyclewayPartSurface : OsmFilterQuestType() { +class AddCyclewayPartSurface : OsmFilterQuestType() { override val elementFilter = """ - ways with - ( - highway = cycleway + ways with ( + highway = cycleway or (highway ~ path|footway and bicycle != no) or (highway = bridleway and bicycle ~ designated|yes) ) and segregated = yes - and (!cycleway:surface or cycleway:surface older today -8 years) + and ( + !cycleway:surface + or cycleway:surface older today -8 years + or ( + cycleway:surface ~ paved|unpaved + and !cycleway:surface:note + and !note:cycleway:surface + ) + ) """ override val commitMessage = "Add path surfaces" override val wikiLink = "Key:surface" @@ -26,7 +33,17 @@ class AddCyclewayPartSurface : OsmFilterQuestType() { override fun createForm() = AddPathSurfaceForm() - override fun applyAnswerTo(answer: String, changes: StringMapChangesBuilder) { - changes.updateWithCheckDate("cycleway:surface", answer) + override fun applyAnswerTo(answer: SurfaceAnswer, changes: StringMapChangesBuilder) { + when (answer) { + is SpecificSurfaceAnswer -> { + changes.updateWithCheckDate("cycleway:surface", answer.value) + changes.deleteIfExists("cycleway:surface:note") + } + is GenericSurfaceAnswer -> { + changes.updateWithCheckDate("cycleway:surface", answer.value) + changes.addOrModify("cycleway:surface:note", answer.note) + } + } + changes.deleteIfExists("source:cycleway:surface") } } diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddFootwayPartSurface.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddFootwayPartSurface.kt index a5d026d2e5..fc60cf2205 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddFootwayPartSurface.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddFootwayPartSurface.kt @@ -5,16 +5,23 @@ import de.westnordost.streetcomplete.data.meta.updateWithCheckDate import de.westnordost.streetcomplete.data.osm.osmquest.OsmFilterQuestType import de.westnordost.streetcomplete.data.osm.changes.StringMapChangesBuilder -class AddFootwayPartSurface : OsmFilterQuestType() { +class AddFootwayPartSurface : OsmFilterQuestType() { override val elementFilter = """ - ways with - ( - highway = footway + ways with ( + highway = footway or (highway ~ path|cycleway|bridleway and foot != no) ) and segregated = yes - and (!footway:surface or footway:surface older today -8 years) + and ( + !footway:surface + or footway:surface older today -8 years + or ( + footway:surface ~ paved|unpaved + and !footway:surface:note + and !note:footway:surface + ) + ) """ override val commitMessage = "Add path surfaces" override val wikiLink = "Key:surface" @@ -25,7 +32,17 @@ class AddFootwayPartSurface : OsmFilterQuestType() { override fun createForm() = AddPathSurfaceForm() - override fun applyAnswerTo(answer: String, changes: StringMapChangesBuilder) { - changes.updateWithCheckDate("footway:surface", answer) + override fun applyAnswerTo(answer: SurfaceAnswer, changes: StringMapChangesBuilder) { + when(answer) { + is SpecificSurfaceAnswer -> { + changes.updateWithCheckDate("footway:surface", answer.value) + changes.deleteIfExists("footway:surface:note") + } + is GenericSurfaceAnswer -> { + changes.updateWithCheckDate("footway:surface", answer.value) + changes.addOrModify("footway:surface:note", answer.note) + } + } + changes.deleteIfExists("source:footway:surface") } } diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddPathSurface.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddPathSurface.kt index 47592a9698..92c8348de3 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddPathSurface.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddPathSurface.kt @@ -6,17 +6,23 @@ import de.westnordost.streetcomplete.data.meta.updateWithCheckDate import de.westnordost.streetcomplete.data.osm.osmquest.OsmFilterQuestType import de.westnordost.streetcomplete.data.osm.changes.StringMapChangesBuilder -class AddPathSurface : OsmFilterQuestType() { +class AddPathSurface : OsmFilterQuestType() { override val elementFilter = """ ways with highway ~ path|footway|cycleway|bridleway|steps and segregated != yes and access !~ private|no - and (!conveying or conveying = no) and (!indoor or indoor = no) + and (!conveying or conveying = no) + and (!indoor or indoor = no) and ( !surface or surface ~ ${ANYTHING_UNPAVED.joinToString("|")} and surface older today -4 years or surface older today -8 years + or ( + surface ~ paved|unpaved + and !surface:note + and !note:surface + ) ) """ /* ~paved ways are less likely to change the surface type */ @@ -36,7 +42,17 @@ class AddPathSurface : OsmFilterQuestType() { override fun createForm() = AddPathSurfaceForm() - override fun applyAnswerTo(answer: String, changes: StringMapChangesBuilder) { - changes.updateWithCheckDate("surface", answer) + override fun applyAnswerTo(answer: SurfaceAnswer, changes: StringMapChangesBuilder) { + when(answer) { + is SpecificSurfaceAnswer -> { + changes.updateWithCheckDate("surface", answer.value) + changes.deleteIfExists("surface:note") + } + is GenericSurfaceAnswer -> { + changes.updateWithCheckDate("surface", answer.value) + changes.addOrModify("surface:note", answer.note) + } + } + changes.deleteIfExists("source:surface") } } diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddPathSurfaceForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddPathSurfaceForm.kt index ad94da7b6c..cc8436d241 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddPathSurfaceForm.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddPathSurfaceForm.kt @@ -1,56 +1,35 @@ package de.westnordost.streetcomplete.quests.surface +import androidx.appcompat.app.AlertDialog import de.westnordost.streetcomplete.R -import de.westnordost.streetcomplete.quests.AGroupedImageListQuestAnswerFragment +import de.westnordost.streetcomplete.quests.AImageListQuestAnswerFragment import de.westnordost.streetcomplete.view.image_select.Item -import de.westnordost.streetcomplete.quests.surface.Surface.* -class AddPathSurfaceForm : AGroupedImageListQuestAnswerFragment() { +class AddPathSurfaceForm : AImageListQuestAnswerFragment() { + override val items: List> get() = + (PAVED_SURFACES + UNPAVED_SURFACES + GROUND_SURFACES).toItems() + + Item("paved", R.drawable.path_surface_paved, R.string.quest_surface_value_paved, null, listOf()) + + Item("unpaved", R.drawable.path_surface_unpaved, R.string.quest_surface_value_unpaved, null, listOf()) + + Item("ground", R.drawable.surface_ground, R.string.quest_surface_value_ground, null, listOf()) - override val topItems get() = - when (val pathType = determinePathType(osmElement!!.tags)) { - "bridleway" -> listOf( - DIRT, GRASS, SAND, - PEBBLES, FINE_GRAVEL, COMPACTED - ) - "path" -> listOf( - DIRT, PEBBLES, COMPACTED, - ASPHALT, FINE_GRAVEL, PAVING_STONES - ) - "footway" -> listOf( - PAVING_STONES, ASPHALT, CONCRETE, - COMPACTED, FINE_GRAVEL, DIRT - ) - "cycleway" -> listOf( - PAVING_STONES, ASPHALT, CONCRETE, - COMPACTED, WOOD, METAL - ) - "steps" -> listOf( - PAVING_STONES, ASPHALT, CONCRETE, - WOOD, SETT, UNHEWN_COBBLESTONE - ) - else -> throw IllegalStateException("Unexpected path type $pathType") - }.toItems() + override val itemsPerRow = 3 - override val allItems = listOf( - // except for different panorama images, should be the same as for the road quest, to avoid confusion - Item("paved", R.drawable.panorama_path_surface_paved, R.string.quest_surface_value_paved, null, PAVED_SURFACES.toItems()), - Item("unpaved", R.drawable.panorama_path_surface_unpaved, R.string.quest_surface_value_unpaved, null, UNPAVED_SURFACES.toItems()), - Item("ground", R.drawable.panorama_surface_ground, R.string.quest_surface_value_ground, null, GROUND_SURFACES.toItems()) - ) - - private fun determinePathType(tags: Map): String? { - val pathType = tags["highway"] - // interpret paths with foot/bicycle/horse=designated as... - if ("path" == pathType) { - if ("designated" == tags["bicycle"]) return "cycleway" - if ("designated" == tags["horse"]) return "bridleway" - if ("designated" == tags["foot"]) return "footway" + override fun onClickOk(selectedItems: List) { + val value = selectedItems.single() + if(value == "paved" || value == "unpaved") { + AlertDialog.Builder(requireContext()) + .setMessage(R.string.quest_surface_detailed_answer_impossible_confirmation) + .setPositiveButton(R.string.quest_generic_confirmation_yes) { + _, _ -> run { + DescribeGenericSurfaceDialog(requireContext()) { description -> + applyAnswer(GenericSurfaceAnswer(value, description)) + }.show() + } + } + .setNegativeButton(android.R.string.cancel, null) + .show() + return } - return pathType - } - - override fun onClickOk(value: String) { - applyAnswer(value) + applyAnswer(SpecificSurfaceAnswer(value)) } } diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddRoadSurface.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddRoadSurface.kt index 90dca1e759..c87bfc32b8 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddRoadSurface.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddRoadSurface.kt @@ -6,20 +6,23 @@ import de.westnordost.streetcomplete.data.meta.updateWithCheckDate import de.westnordost.streetcomplete.data.osm.osmquest.OsmFilterQuestType import de.westnordost.streetcomplete.data.osm.changes.StringMapChangesBuilder -class AddRoadSurface : OsmFilterQuestType() { +class AddRoadSurface : OsmFilterQuestType() { override val elementFilter = """ ways with highway ~ ${ROADS_WITH_SURFACES.joinToString("|")} - and ( - !surface - or surface ~ ${ANYTHING_UNPAVED.joinToString("|")} and surface older today -4 years - or surface older today -12 years - ) - and (access !~ private|no or (foot and foot !~ private|no)) + and ( + !surface + or surface ~ ${ANYTHING_UNPAVED.joinToString("|")} and surface older today -4 years + or surface older today -12 years + or ( + surface ~ paved|unpaved + and !surface:note + and !note:surface + ) + ) + and (access !~ private|no or (foot and foot !~ private|no)) """ - /* ~paved ways are less likely to change the surface type */ - - override val commitMessage = "Add road surfaces" + override val commitMessage = "Add road surface info" override val wikiLink = "Key:surface" override val icon = R.drawable.ic_quest_street_surface override val isSplitWayEnabled = true @@ -42,8 +45,18 @@ class AddRoadSurface : OsmFilterQuestType() { override fun createForm() = AddRoadSurfaceForm() - override fun applyAnswerTo(answer: String, changes: StringMapChangesBuilder) { - changes.updateWithCheckDate("surface", answer) + override fun applyAnswerTo(answer: SurfaceAnswer, changes: StringMapChangesBuilder) { + when(answer) { + is SpecificSurfaceAnswer -> { + changes.updateWithCheckDate("surface", answer.value) + changes.deleteIfExists("surface:note") + } + is GenericSurfaceAnswer -> { + changes.updateWithCheckDate("surface", answer.value) + changes.addOrModify("surface:note", answer.note) + } + } + changes.deleteIfExists("source:surface") } companion object { diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddRoadSurfaceForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddRoadSurfaceForm.kt index 10058fdd9b..012cba5049 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddRoadSurfaceForm.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddRoadSurfaceForm.kt @@ -1,26 +1,35 @@ package de.westnordost.streetcomplete.quests.surface +import androidx.appcompat.app.AlertDialog import de.westnordost.streetcomplete.R -import de.westnordost.streetcomplete.quests.AGroupedImageListQuestAnswerFragment +import de.westnordost.streetcomplete.quests.AImageListQuestAnswerFragment import de.westnordost.streetcomplete.view.image_select.Item -import de.westnordost.streetcomplete.quests.surface.Surface.* -class AddRoadSurfaceForm : AGroupedImageListQuestAnswerFragment() { +class AddRoadSurfaceForm : AImageListQuestAnswerFragment() { + override val items: List> get() = + (PAVED_SURFACES + UNPAVED_SURFACES + GROUND_SURFACES).toItems() + + Item("paved", R.drawable.surface_paved, R.string.quest_surface_value_paved, null, listOf()) + + Item("unpaved", R.drawable.surface_unpaved, R.string.quest_surface_value_unpaved, null, listOf()) + + Item("ground", R.drawable.surface_ground, R.string.quest_surface_value_ground, null, listOf()) - override val topItems get() = - // tracks often have different surfaces than other roads - if (osmElement!!.tags["highway"] == "track") - listOf(DIRT, GRASS, PEBBLES, FINE_GRAVEL, COMPACTED, ASPHALT).toItems() - else - listOf(ASPHALT, CONCRETE, SETT, PAVING_STONES, COMPACTED, DIRT).toItems() + override val itemsPerRow = 3 - override val allItems = listOf( - Item("paved", R.drawable.panorama_surface_paved, R.string.quest_surface_value_paved, null, PAVED_SURFACES.toItems()), - Item("unpaved", R.drawable.panorama_surface_unpaved, R.string.quest_surface_value_unpaved, null, UNPAVED_SURFACES.toItems()), - Item("ground", R.drawable.panorama_surface_ground, R.string.quest_surface_value_ground, null, GROUND_SURFACES.toItems()) - ) - - override fun onClickOk(value: String) { - applyAnswer(value) + override fun onClickOk(selectedItems: List) { + val value = selectedItems.single() + if(value == "paved" || value == "unpaved") { + AlertDialog.Builder(requireContext()) + .setMessage(R.string.quest_surface_detailed_answer_impossible_confirmation) + .setPositiveButton(R.string.quest_generic_confirmation_yes) { + _, _ -> run { + DescribeGenericSurfaceDialog(requireContext()) { description -> + applyAnswer(GenericSurfaceAnswer(value, description)) + }.show() + } + } + .setNegativeButton(android.R.string.cancel, null) + .show() + return + } + applyAnswer(SpecificSurfaceAnswer(value)) } } diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/DescribeGenericSurfaceDialog.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/DescribeGenericSurfaceDialog.kt new file mode 100644 index 0000000000..90f29054ad --- /dev/null +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/DescribeGenericSurfaceDialog.kt @@ -0,0 +1,42 @@ +package de.westnordost.streetcomplete.quests.surface + +import android.content.Context +import android.content.DialogInterface +import android.view.LayoutInflater +import android.widget.EditText +import androidx.appcompat.app.AlertDialog +import de.westnordost.streetcomplete.R + +class DescribeGenericSurfaceDialog( + context: Context, + onSurfaceDescribed: (txt: String) -> Unit +) : AlertDialog(context, R.style.Theme_Bubble_Dialog) { + val view = LayoutInflater.from(context).inflate(R.layout.quest_surface_detailed_answer_impossible, null) + val explanationInput = view.findViewById(R.id.explanationInput); + init { + setTitle(context.resources.getString(R.string.quest_surface_detailed_answer_impossible_title)) + + setButton( + DialogInterface.BUTTON_POSITIVE, + context.getString(android.R.string.yes) + ) { _, _ -> + val txt = explanationInput.text.toString().trim() + + if (txt.isEmpty()) { + Builder(context) + .setMessage(R.string.quest_surface_detailed_answer_impossible_description) + .setPositiveButton(android.R.string.ok, null) + .show() + } else { + onSurfaceDescribed(txt) + } + } + + setButton( + DialogInterface.BUTTON_NEGATIVE, + context.getString(android.R.string.cancel), + null as DialogInterface.OnClickListener? + ) + setView(view) + } +} diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/DetailRoadSurface.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/DetailRoadSurface.kt deleted file mode 100644 index dda8fe42bc..0000000000 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/DetailRoadSurface.kt +++ /dev/null @@ -1,54 +0,0 @@ -package de.westnordost.streetcomplete.quests.surface - -import de.westnordost.streetcomplete.R -import de.westnordost.streetcomplete.data.meta.ALL_ROADS -import de.westnordost.streetcomplete.data.osm.changes.StringMapChangesBuilder -import de.westnordost.streetcomplete.data.osm.osmquest.OsmFilterQuestType - - -class DetailRoadSurface : OsmFilterQuestType() { - - override val elementFilter = """ - ways with highway ~ ${ALL_ROADS.joinToString("|")} - and surface ~ paved|unpaved - and !surface:note - and segregated != yes - and (access !~ private|no or (foot and foot !~ private|no)) - """ - override val commitMessage = "More detailed road surfaces" - override val wikiLink = "Key:surface" - override val icon = R.drawable.ic_quest_street_surface_detail - - override fun getTitle(tags: Map): Int { - val hasName = tags.containsKey("name") - val isSquare = tags["area"] == "yes" - - return if (hasName) { - if (isSquare) - R.string.quest_surface_detailed_square_name_title - else - R.string.quest_surface_detailed_name_title - } else { - if (isSquare) - R.string.quest_surface_detailed_square_title - else - R.string.quest_surface_detailed_title - } - } - - override fun createForm() = DetailRoadSurfaceForm() - - override val isSplitWayEnabled = true - - override fun applyAnswerTo(answer: DetailSurfaceAnswer, changes: StringMapChangesBuilder) { - when(answer) { - is SurfaceAnswer -> { - changes.modify("surface", answer.value) - changes.deleteIfExists("source:surface") - } - is DetailingImpossibleAnswer -> { - changes.add("surface:note", answer.note) - } - } - } -} diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/DetailRoadSurfaceForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/DetailRoadSurfaceForm.kt deleted file mode 100644 index b4942a3b26..0000000000 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/DetailRoadSurfaceForm.kt +++ /dev/null @@ -1,96 +0,0 @@ -package de.westnordost.streetcomplete.quests.surface - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.EditText -import androidx.appcompat.app.AlertDialog -import de.westnordost.streetcomplete.R -import de.westnordost.streetcomplete.quests.AImageListQuestAnswerFragment -import de.westnordost.streetcomplete.quests.OtherAnswer -import de.westnordost.streetcomplete.util.TextChangedWatcher -import de.westnordost.streetcomplete.view.image_select.Item - -class DetailRoadSurfaceForm : AImageListQuestAnswerFragment() { - - override val items: List> - get() = if (osmElement!!.tags["surface"] == "paved") - (PAVED_SURFACES + UNPAVED_SURFACES + GROUND_SURFACES).toItems() - else - (UNPAVED_SURFACES + GROUND_SURFACES + PAVED_SURFACES).toItems() - - override val itemsPerRow = 3 - - override fun onClickOk(selectedItems: List) { - // must not happen in isInExplanationMode - applyAnswer(SurfaceAnswer(selectedItems.single())) - } - - private var isInExplanationMode = false - private var explanationInput: EditText? = null - - override val otherAnswers = listOf( - OtherAnswer(R.string.quest_surface_detailed_answer_impossible) { confirmSwitchToNoDetailedTagPossible() } - ) - - private fun setLayout(layoutResourceId: Int) { - val view = setContentView(layoutResourceId) - - explanationInput = view.findViewById(R.id.explanationInput) - explanationInput?.addTextChangedListener(TextChangedWatcher { checkIsFormComplete() }) - } - - private val explanation: String get() = explanationInput?.text?.toString().orEmpty().trim() - - override fun isFormComplete(): Boolean { - return if(isInExplanationMode) { - explanation.isNotEmpty() - } else { - super.isFormComplete() - } - } - - override fun onClickOk() { - if(isInExplanationMode) { - applyAnswer(DetailingImpossibleAnswer(explanation)) - } else { - super.onClickOk() - } - } - - private fun confirmSwitchToNoDetailedTagPossible() { - AlertDialog.Builder(requireContext()) - .setMessage(R.string.quest_surface_detailed_answer_impossible_confirmation) - .setPositiveButton(R.string.quest_generic_confirmation_yes) { - _, _ -> switchToExplanationLayout() - } - .setNegativeButton(android.R.string.cancel, null) - .show() - - } - - private fun switchToExplanationLayout() { - isInExplanationMode = true - setLayout(R.layout.quest_surface_detailed_answer_impossible) - } - - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - val view = super.onCreateView(inflater, container, savedInstanceState) - - isInExplanationMode = savedInstanceState?.getBoolean(IS_IN_EXPLANATION_MODE) ?: false - setLayout(if (isInExplanationMode) R.layout.quest_surface_detailed_answer_impossible else R.layout.quest_generic_list) - - return view - } - - override fun onSaveInstanceState(outState: Bundle) { - super.onSaveInstanceState(outState) - outState.putBoolean(IS_IN_EXPLANATION_MODE, isInExplanationMode) - } - - companion object { - private const val IS_IN_EXPLANATION_MODE = "is_in_explanation_mode" - } - -} diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/DetailSurfaceAnswer.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/DetailSurfaceAnswer.kt deleted file mode 100644 index 0e69bffc30..0000000000 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/DetailSurfaceAnswer.kt +++ /dev/null @@ -1,5 +0,0 @@ -package de.westnordost.streetcomplete.quests.surface - -sealed class DetailSurfaceAnswer -data class DetailingImpossibleAnswer(val note: String) : DetailSurfaceAnswer() -data class SurfaceAnswer(val value: String) : DetailSurfaceAnswer() diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/SurfaceAnswer.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/SurfaceAnswer.kt new file mode 100644 index 0000000000..98aed0d27e --- /dev/null +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/SurfaceAnswer.kt @@ -0,0 +1,5 @@ +package de.westnordost.streetcomplete.quests.surface + +sealed class SurfaceAnswer +data class GenericSurfaceAnswer(val value : String, val note: String) : SurfaceAnswer() +data class SpecificSurfaceAnswer(val value: String) : SurfaceAnswer() diff --git a/app/src/main/java/de/westnordost/streetcomplete/util/KryoSerializer.java b/app/src/main/java/de/westnordost/streetcomplete/util/KryoSerializer.java index 9c24b4eed8..5afe3c476b 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/util/KryoSerializer.java +++ b/app/src/main/java/de/westnordost/streetcomplete/util/KryoSerializer.java @@ -12,26 +12,26 @@ import javax.inject.Singleton; +import de.westnordost.osmapi.map.data.Element; import de.westnordost.osmapi.map.data.Fixed1E7LatLon; -import de.westnordost.streetcomplete.data.osm.splitway.SplitAtLinePosition; -import de.westnordost.streetcomplete.data.osm.splitway.SplitAtPoint; +import de.westnordost.osmapi.map.data.OsmLatLon; +import de.westnordost.osmapi.map.data.OsmRelationMember; +import de.westnordost.osmapi.notes.NoteComment; +import de.westnordost.osmapi.user.User; import de.westnordost.streetcomplete.data.osm.changes.StringMapChanges; import de.westnordost.streetcomplete.data.osm.changes.StringMapEntryAdd; import de.westnordost.streetcomplete.data.osm.changes.StringMapEntryDelete; import de.westnordost.streetcomplete.data.osm.changes.StringMapEntryModify; +import de.westnordost.streetcomplete.data.osm.splitway.SplitAtLinePosition; +import de.westnordost.streetcomplete.data.osm.splitway.SplitAtPoint; +import de.westnordost.streetcomplete.quests.LocalizedName; import de.westnordost.streetcomplete.quests.opening_hours.adapter.OffDaysRow; import de.westnordost.streetcomplete.quests.opening_hours.adapter.OpeningMonthsRow; import de.westnordost.streetcomplete.quests.opening_hours.adapter.OpeningWeekdaysRow; import de.westnordost.streetcomplete.quests.opening_hours.model.CircularSection; -import de.westnordost.osmapi.map.data.Element; -import de.westnordost.osmapi.map.data.OsmLatLon; -import de.westnordost.osmapi.map.data.OsmRelationMember; -import de.westnordost.osmapi.notes.NoteComment; -import de.westnordost.osmapi.user.User; import de.westnordost.streetcomplete.quests.opening_hours.model.Months; import de.westnordost.streetcomplete.quests.opening_hours.model.TimeRange; import de.westnordost.streetcomplete.quests.opening_hours.model.Weekdays; -import de.westnordost.streetcomplete.quests.LocalizedName; import de.westnordost.streetcomplete.quests.postbox_collection_times.WeekdaysTimesRow; @Singleton @@ -91,17 +91,18 @@ public class KryoSerializer implements Serializer @Override public byte[] toBytes(Object object) { - Output output = new Output(1024,-1); - kryo.get().writeObject(output, object); - output.close(); - return output.toBytes(); + try (Output output = new Output(1024, -1)) + { + kryo.get().writeObject(output, object); + return output.toBytes(); + } } @Override public T toObject(byte[] bytes, Class type) { - Input input = new Input(bytes); - T result = kryo.get().readObject(input, type); - input.close(); - return result; + try (Input input = new Input(bytes)) + { + return kryo.get().readObject(input, type); + } } } diff --git a/app/src/main/res/authors.txt b/app/src/main/res/authors.txt index 50e900f2f3..c0cbc97b64 100644 --- a/app/src/main/res/authors.txt +++ b/app/src/main/res/authors.txt @@ -33,13 +33,6 @@ fire_hydrant_wall.jpg CC-BY-SA 3.0 https://commons.wikimedia.org/w ic_link_cyclosm.xml CC-BY-SA by Lucas Verney ic_trophy.xml SIL OFL 1.1 Doug C. Hardester (https://materialdesignicons.com/icon/trophy-variant) -panorama_path_surface_paved... CC-BY 4.0 https://github.com/westnordost/StreetComplete/issues/133#issuecomment-393650654 (Bjorn Rasmussen) -panorama_path_surface_unpav... CC-BY 4.0 https://github.com/westnordost/StreetComplete/issues/133#issuecomment-393650654 (Bjorn Rasmussen) - -panorama_surface_ground.jpg CC-BY 3.0 https://commons.wikimedia.org/wiki/File:Dirt_Road,_Bulacan,_Philippines_-_panoramio.jpg -panorama_surface_paved.jpg CC0 https://www.goodfreephotos.com/united-states/indiana/hoosier-hill/hooiser-hill-road-near-the-top-indiana.jpg.php -panorama_surface_unpaved.jpg CC-BY 2.0 https://www.flickr.com/photos/ian_munroe/3633361321 - parking_type_multistorey.jpg CC-BY-SA 3.0 https://en.wikipedia.org/wiki/File:Hradec_Kr%C3%A1lov%C3%A9,_Resslova,_parkovac%C3%AD_d%C5%AFm.jpg parking_type_surface.jpg CC-BY-SA 3.0 https://wiki.openstreetmap.org/wiki/File:Car_park2.jpg parking_type_underground.jpg CC0 https://pixabay.com/de/tiefgarage-einfahrt-absch%C3%BCssig-273439/ @@ -119,12 +112,15 @@ surface_fine_gravel.jpg CC0 https://commons.wikimedia.org/w surface_grass.jpg CC-BY-SA 2.0 https://upload.wikimedia.org/wikipedia/commons/d/d9/Footpath_through_the_long_grass_near_Southorpe_Bottom_%28geograph_4621359%29.jpg (Richard Humphrey) surface_grass_paver.jpg Public Domain https://commons.wikimedia.org/wiki/File:Rasenpflasterstein_1.jpg (Immanuel Giel) surface_gravel.jpg CC-BY 3.0 https://commons.wikimedia.org/wiki/File:Gravel_at_the_top_of_Vidova_gora,_island_of_Bra%C4%8D,_Croatia.jpg (Ante Perkovic) +surface_ground.jpg CC-BY 3.0 https://commons.wikimedia.org/wiki/File:Dirt_Road,_Bulacan,_Philippines_-_panoramio.jpg surface_metal.jpg Public Domain https://commons.wikimedia.org/wiki/File:Metal_steel_surface.jpg (Titus Tscharntke) +surface_paved.jpg CC0 https://www.goodfreephotos.com/united-states/indiana/hoosier-hill/hooiser-hill-road-near-the-top-indiana.jpg.php surface_paving_stones.jpg CC-BY-SA 4.0 Tobias Zwick with modifications by Mateusz Konieczny surface_paving_stones_origi... CC-BY-SA 4.0 Tobias Zwick surface_pebblestone.jpg CC-BY-SA 2.0 https://wiki.openstreetmap.org/wiki/File:Dscf1829-800.jpg (FrankM) surface_sand.jpg CC-BY-SA 3.0 https://commons.wikimedia.org/wiki/File:2013-08-21_12_04_26_View_south_towards_Barnegat_Lighthouse_along_the_sand_road_to_Barnegat_Inlet_in_Island_Beach_State_Park.jpg (Famartin ) surface_sett.jpg CC-BY-SA 3.0 https://commons.wikimedia.org/wiki/File:Brusteinshalden.JPG (Øyvind Holmstad ) +surface_unpaved.jpg CC-BY 2.0 https://www.flickr.com/photos/ian_munroe/3633361321 surface_wood.jpg CC-BY-SA 4.0 https://commons.wikimedia.org/wiki/File:Wooden_Bridge_In_Midst_of_Kaziranga_Wild_life_Sanctuary.jpg (Pavan Goswami) tactile_paving_illustration... CC-BY 2.0 https://www.flickr.com/photos/jeanlouis_zimmermann/10072029534/in/album-72157635218804514/ diff --git a/app/src/main/res/drawable-hdpi/panorama_path_surface_paved.jpg b/app/src/main/res/drawable-hdpi/panorama_path_surface_paved.jpg deleted file mode 100644 index 8d08b97344..0000000000 Binary files a/app/src/main/res/drawable-hdpi/panorama_path_surface_paved.jpg and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/panorama_path_surface_unpaved.jpg b/app/src/main/res/drawable-hdpi/panorama_path_surface_unpaved.jpg deleted file mode 100644 index 88383452c9..0000000000 Binary files a/app/src/main/res/drawable-hdpi/panorama_path_surface_unpaved.jpg and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/panorama_surface_ground.jpg b/app/src/main/res/drawable-hdpi/panorama_surface_ground.jpg deleted file mode 100644 index a42e5ee977..0000000000 Binary files a/app/src/main/res/drawable-hdpi/panorama_surface_ground.jpg and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/panorama_surface_paved.jpg b/app/src/main/res/drawable-hdpi/panorama_surface_paved.jpg deleted file mode 100644 index ebfd71a577..0000000000 Binary files a/app/src/main/res/drawable-hdpi/panorama_surface_paved.jpg and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/panorama_surface_unpaved.jpg b/app/src/main/res/drawable-hdpi/panorama_surface_unpaved.jpg deleted file mode 100644 index a019d11a20..0000000000 Binary files a/app/src/main/res/drawable-hdpi/panorama_surface_unpaved.jpg and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/path_surface_paved.jpg b/app/src/main/res/drawable-hdpi/path_surface_paved.jpg new file mode 100644 index 0000000000..792b602c61 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/path_surface_paved.jpg differ diff --git a/app/src/main/res/drawable-hdpi/path_surface_unpaved.jpg b/app/src/main/res/drawable-hdpi/path_surface_unpaved.jpg new file mode 100644 index 0000000000..b8f79f27d6 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/path_surface_unpaved.jpg differ diff --git a/app/src/main/res/drawable-hdpi/surface_ground.jpg b/app/src/main/res/drawable-hdpi/surface_ground.jpg new file mode 100644 index 0000000000..92451809bb Binary files /dev/null and b/app/src/main/res/drawable-hdpi/surface_ground.jpg differ diff --git a/app/src/main/res/drawable-hdpi/surface_paved.jpg b/app/src/main/res/drawable-hdpi/surface_paved.jpg new file mode 100644 index 0000000000..4a8ad15c73 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/surface_paved.jpg differ diff --git a/app/src/main/res/drawable-hdpi/surface_unpaved.jpg b/app/src/main/res/drawable-hdpi/surface_unpaved.jpg new file mode 100644 index 0000000000..7e83ebadb6 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/surface_unpaved.jpg differ diff --git a/app/src/main/res/drawable-mdpi/path_surface_paved.jpg b/app/src/main/res/drawable-mdpi/path_surface_paved.jpg new file mode 100644 index 0000000000..9fb74604fa Binary files /dev/null and b/app/src/main/res/drawable-mdpi/path_surface_paved.jpg differ diff --git a/app/src/main/res/drawable-mdpi/path_surface_unpaved.jpg b/app/src/main/res/drawable-mdpi/path_surface_unpaved.jpg new file mode 100644 index 0000000000..ffe7b982e8 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/path_surface_unpaved.jpg differ diff --git a/app/src/main/res/drawable-mdpi/surface_ground.jpg b/app/src/main/res/drawable-mdpi/surface_ground.jpg new file mode 100644 index 0000000000..a1f68224b4 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/surface_ground.jpg differ diff --git a/app/src/main/res/drawable-mdpi/surface_paved.jpg b/app/src/main/res/drawable-mdpi/surface_paved.jpg new file mode 100644 index 0000000000..c963cac70b Binary files /dev/null and b/app/src/main/res/drawable-mdpi/surface_paved.jpg differ diff --git a/app/src/main/res/drawable-mdpi/surface_unpaved.jpg b/app/src/main/res/drawable-mdpi/surface_unpaved.jpg new file mode 100644 index 0000000000..79685b6154 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/surface_unpaved.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/path_surface_paved.jpg b/app/src/main/res/drawable-xhdpi/path_surface_paved.jpg new file mode 100644 index 0000000000..4f08fe54d6 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/path_surface_paved.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/path_surface_unpaved.jpg b/app/src/main/res/drawable-xhdpi/path_surface_unpaved.jpg new file mode 100644 index 0000000000..0dab792a0e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/path_surface_unpaved.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/surface_ground.jpg b/app/src/main/res/drawable-xhdpi/surface_ground.jpg new file mode 100644 index 0000000000..ba44327729 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/surface_ground.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/surface_paved.jpg b/app/src/main/res/drawable-xhdpi/surface_paved.jpg new file mode 100644 index 0000000000..c749bf9fc6 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/surface_paved.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/surface_unpaved.jpg b/app/src/main/res/drawable-xhdpi/surface_unpaved.jpg new file mode 100644 index 0000000000..ac7f59a1a2 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/surface_unpaved.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/path_surface_paved.jpg b/app/src/main/res/drawable-xxhdpi/path_surface_paved.jpg new file mode 100644 index 0000000000..91b2f43d34 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/path_surface_paved.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/path_surface_unpaved.jpg b/app/src/main/res/drawable-xxhdpi/path_surface_unpaved.jpg new file mode 100644 index 0000000000..2b27dda4f6 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/path_surface_unpaved.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/surface_ground.jpg b/app/src/main/res/drawable-xxhdpi/surface_ground.jpg new file mode 100644 index 0000000000..a1001d0500 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/surface_ground.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/surface_paved.jpg b/app/src/main/res/drawable-xxhdpi/surface_paved.jpg new file mode 100644 index 0000000000..5d41e3446d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/surface_paved.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/surface_unpaved.jpg b/app/src/main/res/drawable-xxhdpi/surface_unpaved.jpg new file mode 100644 index 0000000000..5707860ea5 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/surface_unpaved.jpg differ diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml index 3d4020da6c..90d5048995 100644 --- a/app/src/main/res/layout/fragment_map.xml +++ b/app/src/main/res/layout/fragment_map.xml @@ -26,7 +26,7 @@ android:shadowColor="@color/background" android:shadowRadius="6" android:text="@string/map_attribution_osm" - android:layout_alignParentRight="true" + android:layout_alignParentLeft="true" tools:ignore="RtlHardcoded" /> diff --git a/app/src/main/res/layout/quest_surface_detailed_answer_impossible.xml b/app/src/main/res/layout/quest_surface_detailed_answer_impossible.xml index 0905222036..8495b7c47c 100644 --- a/app/src/main/res/layout/quest_surface_detailed_answer_impossible.xml +++ b/app/src/main/res/layout/quest_surface_detailed_answer_impossible.xml @@ -5,7 +5,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:divider="@drawable/space_8dp" - android:showDividers="middle"> + android:showDividers="middle" + android:paddingLeft="@dimen/dialog_horizontal_margin" + android:paddingRight="@dimen/dialog_horizontal_margin" + >
  • new achievement graphics by Judith Gastell (melusine)
  • Map style update: Amongst other things, all housenumbers are now displayed again on the map, private roads are displayed as such and 3D buildings can be displayed more detailed
    • -
  • Fix tagging tactile paving on crosswalks on a resurvey (#2176, #2172), @by peternewman, @dbdean
    • +
  • Fix tagging tactile paving on crosswalks on a resurvey (#2176, #2172), by @peternewman, @dbdean
  • Other small fixes and enhancements (#2186, #2190, #2182, #2184, #2181, #2179, ...)
    • diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index dc7a4dd9f9..9945542f85 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2402,4 +2402,8 @@ Is the situation on this cycleway still the same? --> "Outdoorák" "Vyřešili jste %d úkolů užitečných pro lidi, co rádi chodí do přírody!" "Má tento přechod pro chodce ostrůvek?" + "Není tu žádná značka" + "Je rampa pro invalidní vozíky na mapě zobrazená jako samostatná cesta?" + "samostatná" + "Není samostatná" \ No newline at end of file diff --git a/app/src/main/res/values-cs/translation_info.xml b/app/src/main/res/values-cs/translation_info.xml index 3ddf070ea2..1953c600c1 100644 --- a/app/src/main/res/values-cs/translation_info.xml +++ b/app/src/main/res/values-cs/translation_info.xml @@ -1,4 +1,4 @@ - 99 + 100 diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index c26aa0adff..b81f9b1f10 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2136,4 +2136,8 @@ "Ύπαιθρο" "Λύσατε %d αναζητήσεις που είναι χρήσιμες για άτομα της υπαίθρου!" "Έχει νησίδα αυτή η διάβαση πεζών;" + "Δεν υπάρχει πινακίδα" + "Η ράμπα αναπηρικού αμαξίδιου εμφανίζεται ως ξεχωριστή διαδρομή στον χάρτη;" + "ξεχωριστή" + "όχι ξεχωριστή" \ No newline at end of file diff --git a/app/src/main/res/values-el/translation_info.xml b/app/src/main/res/values-el/translation_info.xml index 3ddf070ea2..1953c600c1 100644 --- a/app/src/main/res/values-el/translation_info.xml +++ b/app/src/main/res/values-el/translation_info.xml @@ -1,4 +1,4 @@ - 99 + 100 diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml index 7d7dabe833..624af81984 100644 --- a/app/src/main/res/values-en-rGB/strings.xml +++ b/app/src/main/res/values-en-rGB/strings.xml @@ -506,9 +506,6 @@ The info you enter is then directly added to the OpenStreetMap in your name, wit "Does the bus stop %s have a shelter?" - - "Does this toilet require a fee?" - "Does this bus stop have tactile pavings?" @@ -1178,9 +1175,6 @@ Otherwise, you can download another keyboard in the app store. Popular keyboards "What religion is represented at this shrine?" - - "Does it cost a fee to park here?" - "cycle lane (dashed markings)" diff --git a/app/src/main/res/values-en-rGB/translation_info.xml b/app/src/main/res/values-en-rGB/translation_info.xml index 1866093d40..2870f63b74 100644 --- a/app/src/main/res/values-en-rGB/translation_info.xml +++ b/app/src/main/res/values-en-rGB/translation_info.xml @@ -1,4 +1,4 @@ - 72 + 71 diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 23a46003da..8f73d2e77f 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2148,6 +2148,7 @@ päiviä"     "Historia" "Geologia" "Kasvit" + "Villieläimet" "Luonto (useita aiheita)" "Se on ilmoitustaulu" "Julkinen liikenne" @@ -2198,5 +2199,44 @@ päiviä"     "Kun automaattinen synkronointi ei ole käytössä, tehtäviä ei ladata automaattisesti. Voit tehdä tämän manuaalisesti käyttämällä \"%s\" -painiketta paikassa, jonka haluat ladata." "Auta kääntämään tämä sovellus" "%1$s on kääntänyt %2$d%%" + "Onko tämä yksisuuntainen tie? Mihin suuntaan?" + "Yksisuuntainen tähän suuntaan" + "Ei yksisuuntainen" + "Valitse merkki" + "Mihin suuntaan oon portaiden yläpää?" + "Tähän suuntaan ylös" + "Kuinka monta askelmaa tässä on?" "Onko täällä äänimerkkiä sokeille?" + "Onko näissä liikennevaloissa tuntoindikaattori sokeille ihmisille kertomaan milloin on turvallista ylittää tie?" + "Vihje: Yleensä kyse on värisevästä painikeesta tai pyörivästä kartiosta liikennevalopainikkeen alapuolella." + "Mikä on tämän linja-autopysäkin pysäkkinumero?" + "Mikä on tämän raitiovaunupysäkin pysäkkinumero? +" + + + "Pieni omakotitalo (kesämökki, loma-asunto yms..)" + "Millaisia esteitä käytetään tällä rautatien ylityspaikassa?" + "Ei esteitä" + "Onko näissä portaissa ramppia? Millainen?" + "Ei (käytettävää) ramppia" + "Polkupyöräramppi" + "Lastenrattaiden ramppi" + "Pyörätuoliramppi" + + + "Minkä operaattorin/pankin automaatti tämä on?" + "Mikä taho vastaanottaa tämän vaatekeräyksen lahjoitukset?" + "Kenen operoima latausasema tämä on?" + "Kiinnostaako mitä edistystä olemme saavuttaneet vuosien varrella? Vertaa miltä kartta näytti yli 10 vuotta sitten!" + "Aarrejahti" + "Löysit ja ratkaisit %d todella harvoin suoritettua tehtävää, onnittelut!" + "Kansalainen" + "Olet ratkaissut %d tehtävää, jotka ovat hyödyllisiä jokapäiväisessä elämässä kaupungissa!" + "Ulkona" + "Olet ratkaissut %d ulkoilijoille hyödyllistä tehtävää!" + "Onko tällä suojatiellä liikenteen jakaja?" + "Täällä ei ole merkkiä" + "Onko pyörätuoliramppi kuvattu erillisenä reittinä kartalla?" + "erillinen" + "ei erillisenä" \ No newline at end of file diff --git a/app/src/main/res/values-fi/translation_info.xml b/app/src/main/res/values-fi/translation_info.xml index 6e8116df47..3ddf070ea2 100644 --- a/app/src/main/res/values-fi/translation_info.xml +++ b/app/src/main/res/values-fi/translation_info.xml @@ -1,4 +1,4 @@ - 95 + 99 diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 4c5ece0b69..92194125fe 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2301,4 +2301,8 @@ Ces données sont essentielles non seulement pour le facteur mais aussi pour tou "En plein air" "Vous avez résolu %d quêtes utiles aux amateurs de plein air !" "Est ce que ce passage piéton est équipé d'une île de refuge ?" + "Il n'y a pas de panneau" + "Y a t'il une rampe pour fauteuils roulants représentée comme une voie séparée sur la carte ?" + "Séparée" + "Non séparée" \ No newline at end of file diff --git a/app/src/main/res/values-fr/translation_info.xml b/app/src/main/res/values-fr/translation_info.xml index 3ddf070ea2..1953c600c1 100644 --- a/app/src/main/res/values-fr/translation_info.xml +++ b/app/src/main/res/values-fr/translation_info.xml @@ -1,4 +1,4 @@ - 99 + 100 diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 2a477a0896..4a98785ba9 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -2387,4 +2387,8 @@ Ten en conta que esta aplicación pregunta polo número de enderezo dun edificio "Ó ar libre" "Resolviches %d tarefas útiles ó ar libre (exteriores)!" "Este paso de peóns ten unha illa (refuxio) de separación?" + "Non hai sinal" + "A rampla para cadeiras de rodas amósase coma unha vía separada no mapa?" + "separada" + "non separada" \ No newline at end of file diff --git a/app/src/main/res/values-gl/translation_info.xml b/app/src/main/res/values-gl/translation_info.xml index 3ddf070ea2..1953c600c1 100644 --- a/app/src/main/res/values-gl/translation_info.xml +++ b/app/src/main/res/values-gl/translation_info.xml @@ -1,4 +1,4 @@ - 99 + 100 diff --git a/app/src/main/res/values-hr/translation_info.xml b/app/src/main/res/values-hr/translation_info.xml new file mode 100644 index 0000000000..036b84eeda --- /dev/null +++ b/app/src/main/res/values-hr/translation_info.xml @@ -0,0 +1,4 @@ + + + 57 + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 87cd4301cc..96e696a978 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -260,7 +260,7 @@ "ha diverse forme" - "Auto-Sync" + "Sincronizzazione automatica" "Rimpicciolisci" @@ -290,13 +290,13 @@ Tuttavia, prima di caricare le modifiche, l’app fa una verifica su un <a hr </p>"     - "Attivo" + "Attivata" - "Solo con WiFi" + "Solo con Wi-Fi" - "Spento" + "Disattivata" "Che superficie ha questa tratto di strada?" @@ -691,7 +691,7 @@ Altrimenti, è possibile scaricare un'altra tastiera nell'archivio di app. Le ta "Vedi la <a href=\"https://github.com/westnordost/StreetComplete/graphs/contributors\">lista completa su GitHub</a>." - "Vedi il <a href=\"https://poeditor.com/join/project/IE4GC127Ki\">progetto su POEditor</a> per la lista completa." + "Vedi il <a href=\"https://poeditor.com/join/project/IE4GC127Ki\">progetto su POEditor</a> per la lista completa." "Traduzioni" @@ -996,7 +996,7 @@ Altrimenti, è possibile scaricare un'altra tastiera nell'archivio di app. Le ta "Seleziona le missioni" - "Abilitato" + "Attivate" "Tipo di ricerca" @@ -2345,7 +2345,7 @@ riconoscimento"     "La fermata del bus %s ha una panchina?" "C’è un libro di vetta su %s?" "Questo defibrillatore (DAE) è all’interno di un edificio?" - "Con auto-sync disabilitato, le missioni non vengono scaricate automaticamente . Per farlo manualmente, usa il pulsante “%s” nel menu nel luogo dove vuoi scaricarle." + "Con la sincronizzazione automatica disattivata, le missioni non vengono scaricate automaticamente. Per farlo manualmente, usa il pulsante “%s” nel menù, nella posizione dove vuoi scaricarle." "Aiuta a tradurre questa app" "%1$s è tradotto %2$d%%" "È una strada a senso unico? In quale direzione?" @@ -2380,4 +2380,8 @@ riconoscimento"     "All'aria aperta" "Hai svolto %d missioni utili per chi ama stare all'aria aperta!" "Questo attraversamento pedonale ha un'isola di traffico?" + "Non c'è alcun cartello" + "La rampa per la sedia a rotelle è visualizzata sulla mappa come una via alternativa?" + "è alternativa" + "non è alternativa" \ No newline at end of file diff --git a/app/src/main/res/values-it/translation_info.xml b/app/src/main/res/values-it/translation_info.xml index 3ddf070ea2..1953c600c1 100644 --- a/app/src/main/res/values-it/translation_info.xml +++ b/app/src/main/res/values-it/translation_info.xml @@ -1,4 +1,4 @@ - 99 + 100 diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 36112236c9..317c5bb937 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2356,4 +2356,32 @@ Let op dat deze app alleen naar het huisnummer van een gebouw vraagt nadat zijn "Zijn er hier geluidsignalen voor blinden?" "Hebben deze stoplichten een voelbare indicatie voor blinden wanneer ze veilig over kunnen steken?" "Vaak is dit een trillende knop of ronddraaiende kegel aan de onderkant van de stoplichtknop." + "Wat is het referentienummer van deze bushalte?" + "Wat is het referentienummer van deze tramhalte?" + "klein vrijstaand huis (zomerhuisje, vakantiehuisje, hut ...)" + "Welke slagbomen worden bij deze spoorwegovergang gebruikt?" + "Geen slagbomen" + "Heeft deze trap een helling? Welke soort?" + "Geen (bruikbare) helling" + "Helling voor fietsen" + "Helling voor wandelwagens" + "Helling voor rolstoelen" + "Van welke bank is deze geldautomaat?" + "Welke organisatie zamelt hier gebruikte kleding in?" + "Welk bedrijf exploiteert dit oplaadpunt?" + "Ontdek kaarten van de binnenkant van winkelcentra, stations, enz." + "Benieuwd naar de vooruitgang die we de afgelopen jaren gemaakt hebben? Vergelijk met hoe de kaart er meer dan 10 jaar geleden uit zag!" + "Op jacht naar de schat" + "Je hebt %d vragen gevonden en beantwoordt die zelden opgelost worden, gefelciteerd!" + "Burger" + "Je hebt %d vragen beantwoordt die nuttig zijn voor het dagelijks leven in de stad." + "In de vrije natuur" + + + "Je hebt %d vragen opgelost die nuttig zijn voor mensen in de vrije natuur!" + "Heeft deze oversteekplaats een vluchtheuvel?" + "Er is geen bord" + "Is de rolstoelhelling apart aangegeven op de kaart?" + "apart" + "niet apart" \ No newline at end of file diff --git a/app/src/main/res/values-nl/translation_info.xml b/app/src/main/res/values-nl/translation_info.xml index 5b0ce213bb..1953c600c1 100644 --- a/app/src/main/res/values-nl/translation_info.xml +++ b/app/src/main/res/values-nl/translation_info.xml @@ -1,4 +1,4 @@ - 97 + 100 diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 5e72efec30..a668c0e148 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -2148,4 +2148,8 @@ Observe que este aplicativo solicita o número da casa de uma construção somen "Ao ar livre" "Você resolveu %d missões úteis para pessoas ao ar livre!" "Esta faixa de pedestres tem uma ilha?" + "Não há placa" + "A rampa para cadeiras de rodas é exibida como uma maneira separada no mapa?" + "separado" + "não separado" \ No newline at end of file diff --git a/app/src/main/res/values-pt-rBR/translation_info.xml b/app/src/main/res/values-pt-rBR/translation_info.xml index 3ddf070ea2..1953c600c1 100644 --- a/app/src/main/res/values-pt-rBR/translation_info.xml +++ b/app/src/main/res/values-pt-rBR/translation_info.xml @@ -1,4 +1,4 @@ - 99 + 100 diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 89120b8524..b277365ec4 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1840,6 +1840,7 @@ "Номер не виден" + "Изображенная дорога повернута так же, как и дорога в месте метки на карте" "Что здесь можно оставить на переработку?" @@ -2241,9 +2242,12 @@ " <p>Данные, показываемые в вашем профиле, собираются из публично доступной истории правок OpenStreetMap и затем размещаются на моем сервере.</p> " + "Вы можете сделать это позже в окне профиля" + "Иллюстраторы" "Проекты, сделанные для StreetComplete" + "Основные участники" "Ваша статистика синхронизируется. Проверьте ее тут позднее." "Рейтинг в %2$s: %1$d" "по стране" @@ -2251,17 +2255,24 @@ "Общий рейтинг" "Рейтинг в %s" "Активных дней" + "Уровни достижения" "К какой улице относится дом %s?" + "Не принадлежит названной улице" "Название места" "Нажмите на дорогу к которой относится объект или введите название улицы в поле ввода:" "масло для приготовления пищи" "моторное масло" + "<p>Для отображения карты, векторные тайлы из %1$s. Прочтите <a href=\"%2$s\">политику конфиденциальности </a> для большей информации </p>" "Спонсоры" "История" "Геология" "Растения" + "Дикая природа" + "Природа" "Это доска объявлений" "Общественный транспорт" + "Какая информация на этой доске объявлений" + "Да, отображены раздельно на карте" "Это карта" "Это только карта и ничего более?" "Различные покрытия..." diff --git a/app/src/main/res/values-ru/translation_info.xml b/app/src/main/res/values-ru/translation_info.xml index 695f1ce1ee..21904d059d 100644 --- a/app/src/main/res/values-ru/translation_info.xml +++ b/app/src/main/res/values-ru/translation_info.xml @@ -1,4 +1,4 @@ - 92 + 93 diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 2a9e8be9b1..39c842d709 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2317,6 +2317,8 @@ nivåer"     "Är dessa öppettider för %s fortfarande korrekta?" "Är dessa öppettider för %1$s (%2$s) fortfarande korrekta?" "Är dessa öppettider fortfarande korrekta (%s)?" + "Lägg till lediga dagar" + "Ledig dag" "Inte angivet" "Är det fortfarande cykelvägsituationen här?" "Är %1$s (%2$s) tillgänglig med rullstol?" @@ -2365,4 +2367,8 @@ nivåer"     "Utomhus" "Du löste %d uppdrag som är användbara för friluftsmänniskor!" "Har detta övergångsställe en ö?" + "Det finns ingen skylt" + "Visas rullstolsrampen som en separat väg på kartan?" + "separat" + "inte separat" \ No newline at end of file diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index a45050be17..c0d3ff49b5 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -235,6 +235,7 @@ "Çalışma saatlerini açıkla" + "Kısa ve öz olun, tercihen tabeladaki ifadeyi girin, örneğin \"randevu ile\". Açılış saati ile ilgili bir bilgilendirmenin olmaması, bir açılış saati olmadığı anlamına gelmez." "Bu bina kaç katlı?" @@ -377,6 +378,7 @@ Haritayı görüntülemek için vektör karoları, anonim olan <a href=\"http "Bu binanın kapı numarası kaç?" + "OpenStreetMap anketör uygulaması." "StreetComplete ile OpenStreetMap'ın geliştirilmesine yardımcı olun! @@ -513,6 +515,8 @@ Girdiğiniz bilgiler başka bir düzenleyici kullanmak zorunda kalmaksızın ad "Bu tuvalet ücretli mi?" + "Bu otobüs durağında kabartmalı/hisli kaldırımlar var mı?" + "Bu yaya geçidinin her iki tarafında da kabartmalı/hisli kaldırımlar var mı?" "Bunu yerinde kontrol ettiğinden emin misin?" @@ -562,6 +566,7 @@ Tüm cadde boyunca vurgulanan bölüm için geçerli hiçbir işaret yoksa, vars "Buz Pateni" "Raket tenisi" + "Gal oyunları" "Ayak voleybolu" @@ -868,6 +873,7 @@ Tüm cadde boyunca vurgulanan bölüm için geçerli hiçbir işaret yoksa, vars "Domates" + "Areca fıstığı" "Tatlı biber" @@ -1166,6 +1172,7 @@ Tüm cadde boyunca vurgulanan bölüm için geçerli hiçbir işaret yoksa, vars "bisiklet şeridi (kesik işaretler)" + "Kesilmemiş parke taşı/Arnavut Kaldırımı" "Buraya kimlerin park edebileceği sınırlandırılmış mı?" @@ -1181,6 +1188,7 @@ Tüm cadde boyunca vurgulanan bölüm için geçerli hiçbir işaret yoksa, vars "Bu yaya caddesinin adı ne?" + "Bu meydanın yüzeyi nedir?" "Zamana ve güne bağlı…" @@ -1224,6 +1232,7 @@ Tüm cadde boyunca vurgulanan bölüm için geçerli hiçbir işaret yoksa, vars "Burasi ne tarz bir bisiklet park alani ?" + "bisiklet öneri şeridi" "Bu posta kutusunun, posta toplama sureleri ne zaman?" @@ -1249,6 +1258,7 @@ Tüm cadde boyunca vurgulanan bölüm için geçerli hiçbir işaret yoksa, vars "Bu bina tamamlandı mı?" + "Asla % olarak gösterme" "Bu dinlenme yerinde tuvalet bulunmakta midir?" @@ -1401,18 +1411,22 @@ Tüm cadde boyunca vurgulanan bölüm için geçerli hiçbir işaret yoksa, vars "Otopark binası" + "Bir çiftlikte" "Çiftlik Evi" + "Bir çiftlikte konut binası" "Çiftlik binası" + "Bir çiftlikte konut olmayan herhangi bir bina" "Yeşil Ev" "Diğer" + "Kulübe" "Kulübe" @@ -1622,6 +1636,11 @@ Tüm cadde boyunca vurgulanan bölüm için geçerli hiçbir işaret yoksa, vars "Her ikisi de mevcuttur. " + "Lütfen daha fazla yakınlaştırın" + "Buradaki patikanın yüzeyi nedir?" + "Bu tramvay durağında kabartmalı/hisli kaldırımlar var mı?" + "Buradaki ağırlık sınırı nedir?" + "Bu ağırlık mantıksız görünüyor. Doğru olduğundan emin misin?" "İşaret farklı görünüyor…" @@ -1706,9 +1725,20 @@ Tüm cadde boyunca vurgulanan bölüm için geçerli hiçbir işaret yoksa, vars "Neler yeni?" + "Bu uygulamayı oyla" + "Google Play'de" + "Bağış yap" + "Minnettarlığınızı gösterin! ❤️" "Uygulamamızı desteklemeyi düşündüğünüz için teşekkür ederiz! Mevcut bağışları görmek ve bağışyapmak için ilgili platforma dokunun:" + "Profilim" + "Giriş Yap" + "Çıkış Yap" + "OSM Profili" + "İleri" + "OpenStreetMap'e hoşgeldin" + "özgür dünya haritası wikisi." "%1$s – %2$s, %3$s" "%1$s – %2$s (%3$s), %4$s" "Ev ismi %s:" diff --git a/app/src/main/res/values-tr/translation_info.xml b/app/src/main/res/values-tr/translation_info.xml index 7c792a90e7..36c2b1735e 100644 --- a/app/src/main/res/values-tr/translation_info.xml +++ b/app/src/main/res/values-tr/translation_info.xml @@ -1,4 +1,4 @@ - 69 + 73 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5302ede5ab..656a64814e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -131,7 +131,7 @@ "How many levels does this building part have?" "What basic shape does this building’s roof have?" "Select one:" - "Show more…" + "Show more…" "It has several different shapes" "What sport is played here?" "Not any specific sport" @@ -280,7 +280,7 @@ The info you enter is then directly added to the OpenStreetMap in your name, wit "Specifically these" "General purpose" "You selected many sports" - "Does this restroom require a fee?" + "Do you have to pay to use this restroom?" "Does this restroom have a baby changing table?" "Does %s have a baby changing table?" "Is this stretch of way lit?" @@ -523,7 +523,7 @@ Otherwise, you can download another keyboard in the app store. Popular keyboards Caodaism Chinese folk religion What religion is represented at this shrine? - Does it cost a fee to park here? + Do you have to pay to park here? Unhewn cobblestone Is it restricted who may park here? It is private @@ -586,7 +586,7 @@ Otherwise, you can download another keyboard in the app store. Popular keyboards Houseboat Bungalow small detached house (summer house, holiday cottage, cabin …) - Static caravan + Mobile home Commercial building building where people work, shop or do any other commercial activities @@ -738,7 +738,7 @@ Otherwise, you can download another keyboard in the app store. Popular keyboards "Please zoom in further" These are quite a few splits. You can always further split up the way later. You can also do this later on the profile screen. - Does it cost a fee to enter %s? + Do you need to pay to enter %s? Is this laundry a self service laundry? Do these steps have a handrail? Do these steps have a ramp? What kind? @@ -917,10 +917,6 @@ Otherwise, you can download another keyboard in the app store. Popular keyboards Multiple surfaces… Are you sure that it is impossible to specify the surface? Note the \"Differs along the way\" answer option that allows you to cut the way where the surface changes. Please use \"Can\'t say\" if there is a single surface but it is not available as an answer. Please briefly specify the nature of the surface here, for example \"sandy with patches of cobblestone\". The text length is limited to 255 characters. - "What specific surface does the road %s have here?" - "What specific surface does the square %s have here?" - "What specific surface does this piece of road have?" - "What specific surface does this square have here?" house name %s: conscription number %1$s, orientation number %2$s: conscription number %s: @@ -929,4 +925,6 @@ Otherwise, you can download another keyboard in the app store. Popular keyboards Is this defibrillator (AED) inside a building? "Does this pedestrian crossing have an island?" + Describe surface + Open URL diff --git a/metadata/hr/full_description.txt b/metadata/hr/full_description.txt new file mode 100644 index 0000000000..7e747f9259 --- /dev/null +++ b/metadata/hr/full_description.txt @@ -0,0 +1,5 @@ +Pomozite poboljšati OpenStreetMap pomoću StreetCompletea! + +Ova aplikacija pronalazi nepotpune i proširive podatke u vašoj blizini i prikazuje ih na karti kao oznake. Svaka od njih je rješiva odgovorom na jednostavno pitanje kako biste dopunili informacije na licu mjesta. + +Podaci koje unesete se izravno dodaju u OpenStreetMap pod vašim imenom, bez potrebe za korištenjem drugog uređivača. \ No newline at end of file diff --git a/metadata/tr/short_description.txt b/metadata/tr/short_description.txt index 99964bd689..eb9f58ec1c 100644 --- a/metadata/tr/short_description.txt +++ b/metadata/tr/short_description.txt @@ -1 +1 @@ -OpenStreetMap surveyor uygulaması \ No newline at end of file +OpenStreetMap anketör uygulaması. \ No newline at end of file diff --git a/res/country_metadata/atmOperators.yml b/res/country_metadata/atmOperators.yml index 35c4d14cec..7574271bee 100644 --- a/res/country_metadata/atmOperators.yml +++ b/res/country_metadata/atmOperators.yml @@ -180,7 +180,7 @@ AR: - BERSA # 2 - BBVA Banco Francés # 2 AT: - - Raiffeisen # 71 + - Raiffeisen # 72 - Raiffeisenbank # 65 - Volksbank # 40 - Sparkasse # 31 @@ -534,6 +534,7 @@ BD: - Dutch Bangla Bank Fast Track ডাচ বাংলা ব্যাংক ফাস্ট ট্র্যাক # 2 - Dutch Bangla Bank ATM ডাচ বাংলা ব্যাংক এটিএম # 2 - Dhaka Bank Limited ATM # 2 + - Dhaka Bank ATM # 2 - DBBL atm # 2 - DBBL ATM ডিবিবিএল এটিএম # 2 - City Bank Limited # 2 @@ -541,7 +542,7 @@ BD: - Bank Asia Limited ATM ব্যাংক এশিয়া লিমিটেড এটিএম # 2 - BRAC Bank ATM # 2 BE: - - BNP Paribas Fortis # 44 + - BNP Paribas Fortis # 43 - KBC # 26 - Argenta # 23 - BeoBank # 21 @@ -574,7 +575,7 @@ BG: - ОББ # 16 - FIBank # 13 - Postbank # 12 - - Банка ДСК # 10 + - Банка ДСК # 11 - Райфайзенбанк # 8 - Unicredit Bulbank # 8 - Централна кооперативна банка # 7 @@ -583,10 +584,10 @@ BG: - UniCredit Bulbank # 7 - UniCredit # 7 - ЦКБ # 6 + - Райфайзен Банк # 6 - ПИБ # 6 - Raiffeisenbank # 6 - DSK Bank # 6 - - Райфайзен Банк # 5 - Райфайзен # 5 - Пощенска банка # 5 - Raiffeisen # 5 @@ -629,7 +630,7 @@ BJ: - Bank of Africa # 2 - BOA # 2 BN: - - BIBD # 10 + - BIBD # 9 - Baiduri Bank # 8 - Standard Chartered # 5 - TAIB # 4 @@ -690,7 +691,7 @@ BR: - Santander # 23 - Banrisul # 21 - Tecnologia Bancária S.A. # 20 - - Banco 24H # 18 + - Banco 24H # 19 - Banrisul S.A. # 16 - Banco24horas # 16 - 24 Horas # 13 @@ -897,7 +898,7 @@ CH: - PostFinance # 167 - Postfinance # 135 - Credit Suisse # 69 - - UBS # 68 + - UBS # 67 - Zürcher Kantonalbank # 63 - Raiffeisenbank # 46 - ZKB # 37 @@ -1132,7 +1133,7 @@ CN-ZJ: - BNB # 2 - Agricultural Bank of China # 2 CO: - - Bancolombia # 187 + - Bancolombia # 189 - Davivienda # 75 - Servibanca # 59 - BBVA # 44 @@ -1228,13 +1229,13 @@ CY: CZ: - Česká spořitelna # 461 - ČSOB # 284 - - Komerční banka # 237 + - Komerční banka # 238 - Pharro # 201 - Euronet # 76 - Česká Spořitelna # 66 - Raiffeisenbank # 41 - - KB # 40 - Air Bank # 40 + - KB # 39 - GE Money Bank # 35 - Komerční Banka # 34 - Moneta # 32 @@ -1281,18 +1282,18 @@ CZ: - ERA # 2 - Airbank a.s. # 2 DE: - - Sparkasse # 775 - - Postbank # 654 + - Sparkasse # 774 + - Postbank # 656 - Euronet # 409 - Volksbank # 318 - - Deutsche Bank # 205 + - Deutsche Bank # 206 - ING-DiBa # 118 - Commerzbank # 118 - Berliner Sparkasse # 89 - Raiffeisenbank # 84 - - Berliner Volksbank # 79 + - Berliner Volksbank # 80 - Sparkasse Aachen # 71 - - Bankhaus August Lenz # 67 + - Bankhaus August Lenz # 68 - ING DiBa # 66 - Sparda-Bank # 62 - Hamburger Sparkasse # 55 @@ -1304,7 +1305,7 @@ DE: - Sparkasse Marburg-Biedenkopf # 46 - Sparkasse Bremen # 46 - Kreissparkasse # 44 - - HypoVereinsbank # 42 + - HypoVereinsbank # 43 - VR-Bank # 41 - ING # 41 - Sparkasse Göttingen # 40 @@ -1341,7 +1342,6 @@ DE: - Degussa Bank # 19 - Volksbank Dessau-Anhalt eG # 18 - Sparkasse Hanauerland # 18 - - Sparkasse Bielefeld # 18 - Kreissparkasse Köln # 18 - Kreissparkasse Böblingen # 18 - IC Cash Services GmbH # 18 @@ -1350,15 +1350,16 @@ DE: - BW-Bank # 18 - Volksbank Krefeld eG # 17 - Stadtsparkasse # 17 + - Sparkasse Bielefeld # 17 - ING-Diba # 17 - Stadt-Sparkasse Solingen # 16 - Sparkasse Mainz # 16 - Sparkasse Hanau # 16 - Ostsächsische Sparkasse Dresden # 16 + - Nord-Ostsee Sparkasse # 16 - Targobank # 15 - Sparkasse Bodensee # 15 - Sparkasse Bayreuth # 15 - - Nord-Ostsee Sparkasse # 15 - Förde Sparkasse # 15 - Deutsche Post # 15 - Cardpoint GmbH # 15 @@ -1366,7 +1367,6 @@ DE: - Volks- und Raiffeisenbank # 14 - Taunus Sparkasse # 14 - Sparkasse Westholstein # 14 - - Sparkasse Vorpommern # 14 - Sparkasse Saarbrücken # 14 - Sparkasse Mittelthüringen # 14 - Sparkasse LeerWittmund # 14 @@ -1375,6 +1375,7 @@ DE: - IC Cash # 14 - Volksbank Kraichgau eG # 13 - Sparkasse Witten # 13 + - Sparkasse Vorpommern # 13 - Sparkasse Nürnberg # 13 - Sparkasse Gießen # 13 - Postbank AG # 13 @@ -1392,6 +1393,7 @@ DE: - Sparkasse Emden # 12 - Sparkasse Dortmund # 12 - Raiffeisenbank Oldenburg eG # 12 + - Nord-Ostsee-Sparkasse # 12 - Volksbank Reutlingen # 11 - VR-Bank Bad Hersfeld-Rotenburg eG # 11 - Stadtsparkasse Wuppertal # 11 @@ -1401,6 +1403,7 @@ DE: - Sparkasse Mittelsachsen # 11 - Sparkasse Hildesheim # 11 - Sparkasse Hannover # 11 + - Landessparkasse zu Oldenburg # 11 - Kreissparkasse Reutlingen # 11 - Kreissparkasse Ostalb # 11 - Kreissparkasse Ludwigsburg # 11 @@ -1415,7 +1418,6 @@ DE: - Sparkasse Darmstadt # 10 - ReiseBank AG # 10 - Ostsächsische Sparkasse # 10 - - Landessparkasse zu Oldenburg # 10 - Kreissparkasse Waiblingen # 10 - Kreissparkasse Esslingen-Nürtingen # 10 - Ing-DiBa # 10 @@ -1435,7 +1437,6 @@ DE: - Sparkasse Düsseldorf # 9 - Sparkasse Duisburg # 9 - Santander # 9 - - Nord-Ostsee-Sparkasse # 9 - Nassauische Sparkasse # 9 - Landesbank Baden-Württemberg # 9 - Kreissparkasse Gelnhausen # 9 @@ -1564,9 +1565,9 @@ ES: - Liberbank # 17 - Abanca # 17 - Deutsche Bank # 13 + - ABANCA # 13 - Euro 6000 # 12 - Caixabank # 12 - - ABANCA # 12 - Servired # 11 - Popular # 11 - BBK # 10 @@ -1599,10 +1600,8 @@ ES: - Euro Automatic Cash # 3 - Caja rural # 3 - Caja Madrid # 3 - - Caja Granada # 3 - Caja España # 3 - Caja Cantabria # 3 - - Caixa Galicia # 3 - BancaMarch # 3 - BANTIERRA # 3 - BANKIA # 3 @@ -1618,8 +1617,10 @@ ES: - Caja Rural de Soria # 2 - Caja Rural de Salamanca # 2 - Caja Rural de Extremadura # 2 + - Caja Granada # 2 - Caixa bank # 2 - Caixa Penedès # 2 + - Caixa Galicia # 2 - Caixa Catalunya # 2 - Caixa # 2 - CAIXABANK # 2 @@ -1705,12 +1706,12 @@ FO: - Bank Nordik # 2 FX: - La Banque Postale # 865 - - Crédit Agricole # 683 + - Crédit Agricole # 684 - Société Générale # 401 - - Caisse d'Épargne # 324 - - LCL # 299 + - Caisse d'Épargne # 323 + - LCL # 300 - Crédit Mutuel # 289 - - BNP Paribas # 287 + - BNP Paribas # 288 - CIC # 249 - Banque Populaire # 191 - La Poste # 98 @@ -1781,7 +1782,7 @@ GB: - Clydesdale Bank # 46 - Bank of Scotland # 40 - Ulster Bank # 39 - - Tesco Bank # 33 + - Tesco Bank # 34 - Danske Bank # 30 - Sainsburys # 29 - Co-operative Bank # 29 @@ -1821,6 +1822,7 @@ GB: - natwest # 5 - link # 5 - barclays # 5 + - The Royal Bank of Scotland # 5 - Sainsburys Bank # 5 - One Stop # 5 - Cooperative # 5 @@ -1830,7 +1832,6 @@ GB: - sainsburys # 4 - bankmachine # 4 - Travelex # 4 - - The Royal Bank of Scotland # 4 - The Co-operative Group # 4 - The Co-Operative Bank # 4 - Royal Mail # 4 @@ -2073,7 +2074,7 @@ HU: - Euronet # 25 - Erste # 23 - K&H Bank # 20 - - OTP Bank Nyrt. # 17 + - OTP Bank Nyrt. # 18 - CIB # 13 - Erste Bank Hungary Zrt. # 12 - UniCredit Bank # 10 @@ -2235,7 +2236,7 @@ ID: - ATM BNI 46 # 2 IE: - Bank of Ireland # 143 - - AIB # 136 + - AIB # 137 - Ulster Bank # 85 - Permanent TSB # 18 - Euronet # 3 @@ -2441,9 +2442,9 @@ IN-KA: - Andhra Bank ATM # 2 - AXIS Bank ATM # 2 IN-KL: - - SBI # 106 + - SBI # 105 - State Bank of India # 75 - - Federal Bank # 72 + - Federal Bank # 73 - SBI ATM # 54 - South Indian Bank # 47 - Canara Bank # 32 @@ -2458,11 +2459,11 @@ IN-KL: - SBT # 13 - Canara Bank ATM # 12 - ICICI Bank # 11 - - FEDERAL BANK # 11 - south indian bank # 10 - canara bank # 10 - State Bank # 10 - HDFC Bank # 10 + - FEDERAL BANK # 10 - ATM # 10 - Union Bank # 9 - State Bank of Travancore # 9 @@ -2489,7 +2490,6 @@ IN-KL: - Union Bank ATM # 4 - Syndicate Bank # 4 - State bank # 4 - - SOUTH INDIAN BANK # 4 - Indian Overseas Bank # 4 - IOB ATM # 4 - Dhanalakshmi Bank # 4 @@ -2501,6 +2501,7 @@ IN-KL: - canara bank ATM # 3 - atm # 3 - State bank of India # 3 + - SOUTH INDIAN BANK # 3 - SBI atm # 3 - PNB # 3 - Kerala Gramin Bank # 3 @@ -2524,6 +2525,7 @@ IN-KL: - Union Bank Of India ATM # 2 - UNION BANK # 2 - Tamilnad Mercantile Bank # 2 + - TDCB ATM # 2 - State bank of india # 2 - State Bank of India (SBI) # 2 - State Bank ATM & CDM # 2 @@ -2675,7 +2677,7 @@ IN-MP: - Bank of Maharashtra # 2 - Bandhan Bank # 2 IN-NL: - - SBI # 20 + - SBI # 21 - Vijaya # 2 - Axis # 2 IN-OR: @@ -2826,18 +2828,19 @@ IN-TN: - ATM # 2 IN-UP: - State Bank of India # 10 - - HDFC Bank # 8 - - SBI # 5 + - HDFC Bank # 9 + - Axis Bank # 7 + - SBI # 6 - Punjab National Bank # 5 - ICICI Bank # 5 - Bank of Baroda # 5 - - Axis Bank # 5 - PNB # 4 - ICICI # 3 - state bank of india # 2 - Union Bank of India # 2 - State Bank of India (SBI) # 2 - State Bank # 2 + - HDFC # 2 - Bank of Baroda ATM # 2 - Ballia # 2 - Axis Bank ATM # 2 @@ -2895,17 +2898,17 @@ IR: - بانک تجارت # 60 - بانک مسکن # 55 - بانک انصار # 50 - - بانک رفاه # 35 + - بانک رفاه # 36 - بانک سامان # 31 + - بانک کشاورزی # 30 - بانک پاسارگاد # 30 - - بانک کشاورزی # 29 - خودپرداز بانک ملی # 26 - بانک قوامین # 24 - خودپرداز بانک ملت # 20 - پست بانک # 18 + - خودپرداز بانک صادرات # 17 - خودپرداز بانک سپه # 17 - بانک ملی ایران # 17 - - خودپرداز بانک صادرات # 16 - خودپرداز بانک تجارت # 15 - بانک اقتصاد نوین # 15 - بانک پارسیان # 14 @@ -2992,7 +2995,7 @@ IS: - Landsbanki Íslands # 2 - Landsbanki # 2 IT: - - Poste Italiane # 346 + - Poste Italiane # 361 - Unicredit # 82 - Intesa Sanpaolo # 48 - Monte dei Paschi di Siena # 41 @@ -3184,22 +3187,22 @@ JP: - りそな銀行 # 49 - イオン銀行 # 48 - 七十七銀行 # 40 - - 横浜銀行 # 33 + - 横浜銀行 # 34 - 秋田銀行 # 29 - 京都銀行 # 21 - 北都銀行 # 20 - 埼玉りそな銀行 # 19 - プロミス # 19 - 仙台銀行 # 16 + - アイフル # 16 - 東京スター銀行 # 15 - - アイフル # 15 - 千葉銀行 # 14 - JA # 14 - 滋賀銀行 # 13 - 三井住友銀行／SMBC # 13 - 東北労働金庫 # 12 - 京都中央信用金庫 # 12 - - アコム # 11 + - アコム # 12 - 但陽信用金庫 # 10 - 百十四銀行 # 9 - 武蔵野銀行 # 9 @@ -3601,7 +3604,7 @@ MA: - banque populaire # 2 - BMCE BANK # 2 MD: - - Victoriabank # 35 + - Victoriabank # 33 - Moldindconbank # 29 - Агропромбанк # 25 - Moldova Agroindbank # 18 @@ -3713,6 +3716,7 @@ MM: MN: - Хаан банк # 8 - Khan Bank # 4 + - Голомт банк # 3 - Golomt Bank # 3 - Хаан банк АТМ # 2 - Хаан Банк # 2 @@ -3721,7 +3725,6 @@ MN: - Төрийн банк АТМ # 2 - Төрийн банк # 2 - Капитал банк АТМ # 2 - - Голомт банк # 2 - Голомт Банк # 2 - Голомт # 2 - zam # 2 @@ -3858,11 +3861,11 @@ NI: - Bampro # 2 - ATM BAC # 2 NL: - - ING # 347 - - Rabobank # 272 + - ING # 346 + - Rabobank # 273 - ABN AMRO # 168 - ABN Amro # 56 - - Geldmaat # 51 + - Geldmaat # 53 - ABN-AMRO # 34 - ING Bank # 32 - SNS # 27 @@ -3901,7 +3904,6 @@ NL: - Rabobank Walcheren/ Noord-Beveland # 5 - Rabobank Venray # 5 - Rabobank Twente Oost # 5 - - Rabobank Noordenveld West Groningen # 5 - Rabobank Groene Hart Noord # 5 - Rabobank Centraal Zuid-Limburg # 5 - Rabobank Breda # 5 @@ -3916,6 +3918,7 @@ NL: - Rabobank Terneuzen-Sas van Gent # 4 - Rabobank Salland # 4 - Rabobank Parkstad Limburg # 4 + - Rabobank Noordenveld West Groningen # 4 - Rabobank Leeuwarden-Noordwest Friesland # 4 - Rabobank Hulst # 4 - Rabobank Haarlem en Omstreken # 4 @@ -3974,7 +3977,6 @@ NL: - Rabobank Het Haringvliet # 2 - Rabobank Het Groene Woud Zuid # 2 - Rabobank Graafschap-Zuid # 2 - - Rabobank De Stellingwerven # 2 - Rabobank Borger-Klenckeland # 2 - Rabobank Bodegraven-Woerden # 2 - Rabobank Bernheze Maasland # 2 @@ -4173,21 +4175,21 @@ PH: - BDO # 77 - Bank of the Philippine Islands # 65 - Metrobank # 52 - - Land Bank of the Philippines # 43 + - Land Bank of the Philippines # 45 - Landbank # 39 + - BDO Unibank # 27 - RCBC # 26 - - BDO Unibank # 26 - PNB # 23 - Philippine National Bank # 16 - Security Bank # 14 + - Luzon Development Bank # 14 - DBP # 14 - - Luzon Development Bank # 13 - Landbank of the Philippines # 12 + - Metropolitan Bank and Trust Company # 10 - Land Bank # 10 - Rizal Commercial Banking Corporation # 9 - Philippine Savings Bank # 9 - PSBank # 9 - - Metropolitan Bank and Trust Company # 9 - Chinabank # 9 - Banco de Oro # 9 - One Network Bank # 8 @@ -4242,18 +4244,18 @@ PK: - HBL # 27 - UBL # 16 - Askari Bank # 12 - - MCB # 10 - - Habib Bank Limited # 8 + - MCB # 9 - Meezan Bank # 7 - HBL ATM # 7 + - Habib Bank Limited # 6 - NBP # 5 - - Dubai Islamic Bank # 5 - Allied Bank # 5 - ubl # 4 - Standard Chartered Bank # 4 - JS Bank # 4 - Hbl # 4 - Faysal Bank # 4 + - Dubai Islamic Bank # 4 - Bank Islami # 4 - Bank Alfalah # 4 - Bank Al Habib # 4 @@ -4267,7 +4269,6 @@ PK: - ATM # 3 - mohsin house # 2 - hbl atm # 2 - - United Bank Limited # 2 - UBL ATM # 2 - National Bank of Pakistan # 2 - NIB Bank # 2 @@ -4277,11 +4278,11 @@ PK: - Askari bank # 2 - Allied bank # 2 PL: - - Euronet # 2712 + - Euronet # 2710 - PKO BP # 529 - Bank Millennium S.A. # 217 - Planet Cash # 195 - - BZ WBK # 162 + - BZ WBK # 161 - Santander # 147 - Bank Spółdzielczy # 145 - PKO # 116 @@ -4291,7 +4292,7 @@ PL: - ING Bank Śląski # 53 - Pekao # 46 - ING # 43 - - Pekao S.A. # 36 + - Pekao S.A. # 37 - Grupa BPS # 36 - BPS # 31 - Bank Pekao # 29 @@ -4309,9 +4310,9 @@ PL: - Millennium # 16 - Global Cash # 15 - Santander Bank Polska # 14 + - euronet # 13 - PEKAO SA # 13 - PBS # 13 - - euronet # 12 - PEKAO # 12 - Euronet Polska # 12 - WBK # 11 @@ -4496,25 +4497,25 @@ RS-KM: - Pcb # 2 - NLB # 2 RU: - - Сбербанк # 3371 + - Сбербанк # 3374 - Промсвязьбанк # 1561 - - '"ПАО ""Сбербанк"""' # 1300 + - '"ПАО ""Сбербанк"""' # 1299 - Сбербанк России # 902 - ПАО Сбербанк # 778 - Газпромбанк # 601 + - ВТБ # 456 - Альфа-Банк # 456 - - ВТБ # 454 - Санкт-Петербург # 338 - - ВТБ24 # 327 + - ВТБ24 # 326 - Банк ВТБ (ПАО) # 325 - Росбанк # 232 - '"ОАО ""Сбербанк России"""' # 217 - - Россельхозбанк # 195 + - Россельхозбанк # 196 - Балтийский банк # 171 - Ак Барс Банк # 166 - Уралсиб # 158 - - ВТБ 24 # 134 - Банк Москвы # 134 + - ВТБ 24 # 133 - МДМ Банк # 132 - ТрансКредитБанк # 129 - АК БАРС БАНК # 121 @@ -4580,8 +4581,8 @@ RU: - Экспресс-волга банк # 22 - СКБ-банк # 22 - МКБ # 22 + - Совкомбанк # 21 - '"ПАО Банк ""ФК Открытие"""' # 21 - - Совкомбанк # 20 - Райффайзен банк # 20 - Банк Зенит # 20 - Аккобанк # 20 @@ -4692,7 +4693,7 @@ SD: - Faisal Islamic Bank ATM # 2 - Faisal Islamic Bank # 2 SE: - - Swedbank # 99 + - Swedbank # 98 - Bankomat AB # 57 - Nordea # 54 - SEB # 39 @@ -5078,17 +5079,17 @@ TZ: - Exim Bank # 2 - Barclays Bank # 2 UA: - - ПриватБанк # 1555 - - Альфа-Банк # 731 - - Ощадбанк # 308 + - ПриватБанк # 1553 + - Альфа-Банк # 730 + - Ощадбанк # 307 - Приватбанк # 273 - - Райффайзен Банк Аваль # 248 + - Райффайзен Банк Аваль # 249 - УкрСиббанк # 108 - Укрсиббанк # 71 - ПУМБ # 65 - Аваль # 52 - Укрексімбанк # 51 - - Укргазбанк # 45 + - Укргазбанк # 47 - Кредобанк # 45 - Укрсоцбанк # 33 - Privatbank # 32 @@ -5149,7 +5150,7 @@ UA-40: - Банк ЧБРР # 2 UA-43: - Генбанк # 354 - - РНКБ # 289 + - РНКБ # 290 - АБ Россия # 31 - Севастопольский Морской Банк # 17 - Крайинвестбанк # 16 @@ -5416,7 +5417,7 @@ US-MA: - Citizens Bank # 6 - Chase # 5 - Bank Of America # 5 - - Santander # 3 + - Santander # 4 - Florence Savings Bank # 3 - Sovereign Bank # 2 - Eastern Bank # 2 @@ -5435,10 +5436,10 @@ US-MI: - MSUFCU # 29 - Chase # 11 - Bank of America # 5 + - PNC Bank # 4 - Michigan State Federal Credit Union # 4 - MSU Federal Credit Union # 4 - Fifth Third Bank # 4 - - PNC Bank # 3 - Michigan Tech Employees Federal Credit Union # 3 - Michigan State University Federal Credit Union # 3 - Wells Fargo # 2 diff --git a/res/country_metadata/chargingStationOperators.yml b/res/country_metadata/chargingStationOperators.yml index aedad8b0a9..4f289c7256 100644 --- a/res/country_metadata/chargingStationOperators.yml +++ b/res/country_metadata/chargingStationOperators.yml @@ -135,7 +135,7 @@ AX: BA: - City # 2 BE: - - Allego # 112 + - Allego # 113 - Blue Corner # 28 - Ionity # 12 - allego # 9 @@ -148,6 +148,7 @@ BE: - Colruyt # 4 - Bluecorner # 4 - smoov allego # 3 + - Lidl # 3 - BlueCorner # 3 - smoov # 2 - charge.brussels # 2 @@ -156,11 +157,11 @@ BE: - Pitpoint Brussels # 2 - Partago # 2 - ORES # 2 - - Lidl # 2 - Eoly # 2 - EV-Box # 2 - De Lijn # 2 - BlueConnect # 2 + - Audi # 2 - Allegro # 2 BG: - ОП „Общински паркинги и синя зона“ - Варна # 7 @@ -186,9 +187,9 @@ BY: - Беларуснафта # 2 - Eleven # 2 CA-BC: - - Flo # 8 + - Flo # 11 + - ChargePoint # 5 - BC Hydro # 5 - - ChargePoint # 4 - Tesla # 3 - Chargepoint # 3 - City of Maple Ridge / ChargePoint # 2 @@ -214,7 +215,7 @@ CA-ON: - Bingemans # 2 - Bank of Nova Scotia # 2 CA-PE: - - Flo # 2 + - Flo # 3 - Delta Prince Edward # 2 CA-QC: - Le Circuit Électrique # 48 @@ -265,6 +266,7 @@ CH: - greenmotion # 3 - ewl # 3 - evpass.ch # 3 + - energie360° # 3 - eCarup # 3 - Renault # 3 - Raiffeisen # 3 @@ -283,7 +285,6 @@ CH: - groupe e # 2 - groupe # 2 - ewz # 2 - - energie360° # 2 - elmoove # 2 - ee-en.ch # 2 - eCarUp # 2 @@ -342,7 +343,7 @@ CO: CR: - Estación de Recarga # 3 CZ: - - ČEZ # 68 + - ČEZ # 69 - ČEZ (CCS/CHAdeMO/Mennekes type2) # 38 - PRE # 26 - EVMAPA # 16 @@ -366,25 +367,25 @@ CZ: - InChaNet # 2 - EVmapa (Mennekes type 2) # 2 DE: - - Stromnetz Hamburg # 502 + - Stromnetz Hamburg # 503 - Stadtwerke München # 377 - EnBW # 347 - innogy # 194 - RWE # 156 - Allego # 110 - - allego # 84 + - allego # 85 - RWE-Effizienz # 79 - Innogy # 75 - E-WALD GmbH # 72 - LEW # 57 - - EWE # 55 + - EWE # 56 - SWU Stadtwerke Ulm/Neu-Ulm GmbH # 50 - Tesla # 46 - EnBW Energie Baden-Württemberg AG # 46 - be emobil # 45 - NEW # 45 - Kaufland # 45 - - Lidl # 43 + - Lidl # 44 - Tank & Rast # 40 - e-regio GmbH & Co. KG # 37 - Vattenfall # 32 @@ -396,7 +397,7 @@ DE: - Tesla Motors Inc. # 31 - E.ON # 31 - Tesla Motors # 30 - - FairEnergie GmbH # 29 + - FairEnergie GmbH # 30 - ENSO Energie Sachsen Ost AG # 29 - DREWAG - Stadtwerke Dresden GmbH # 29 - Aldi Süd # 29 @@ -411,9 +412,9 @@ DE: - E-Werk Mittelbaden # 23 - Stadtwerke Leipzig # 22 - Mainova # 22 + - Energie Baden-Württemberg AG # 22 - innogy eMobility Solutions GmbH # 21 - IKEA # 21 - - Energie Baden-Württemberg AG # 21 - Stadtwerke Osnabrück # 20 - RheinEnergie # 20 - Kreiswerke Main-Kinzig GmbH # 20 @@ -423,27 +424,27 @@ DE: - wallbe # 19 - Stadtwerke Witten # 19 - Regensburger Energie- und Wasserversorgung AG & Co KG # 19 + - Fastned # 19 - eins energie in sachsen # 18 - Stadtwerke Düsseldorf # 18 - NewMotion # 18 - envia M # 17 - - eE4mobile eG # 17 + - Stadtwerke Bielefeld # 17 - STAWAG # 17 - - Fastned # 17 - EWR # 17 - enviaM # 16 + - eE4mobile eG # 16 - Stadtwerke Tübingen # 16 - Stadtwerke Speyer GmbH # 16 - ladenetz.de # 15 - TheNewMotion # 15 - - Stadtwerke Bielefeld # 15 + - SWB # 15 - Edeka # 15 - Bauhaus # 15 - Süwag Energie AG # 14 - Stawag # 14 - Stadtwerke Marburg # 14 - Stadtwerke Bochum # 14 - - SWB # 14 - Porsche # 14 - DREWAG - Stadtwerke Dresden # 14 - Bayernwerk AG # 14 @@ -497,6 +498,7 @@ DE: - enercity # 9 - emma # 9 - SÜC Energie und H2O GmbH # 9 + - Stadtwerke Göttingen # 9 - Stadtwerke Baden-Baden # 9 - RWE / DEW21 # 9 - Pfalzwerke AG # 9 @@ -592,12 +594,12 @@ FI: - Helsingin Energia # 2 - Charge&Drive # 2 FX: - - Bouygues Énergies et Services # 841 + - Bouygues Énergies et Services # 843 - Izivia # 591 - Freshmile # 401 - Clem # 124 - Sodetrel Mobilité # 115 - - Mouv Élec Var # 110 + - Mouv Élec Var # 111 - Sodetrel # 101 - SEDI # 97 - EneRSIEIL # 95 @@ -610,8 +612,8 @@ FX: - Tesla Motors # 67 - SIPLEC # 61 - SYME05 # 56 + - Ionity # 55 - Séolis # 51 - - Ionity # 51 - Morbihan énergies # 44 - SEY 78 # 43 - Renault # 40 @@ -664,7 +666,7 @@ FX: - CAPP # 5 GB: - Ecotricity # 69 - - Source London # 47 + - Source London # 48 - Pod Point # 34 - Tesla Motors Inc. # 27 - Tesla # 25 @@ -826,8 +828,8 @@ IS: - Ísorka # 2 - Orka Náttúrunnar # 2 IT: - - Enel # 194 - - Enel X # 161 + - Enel # 198 + - Enel X # 162 - a2a # 26 - Alperia # 24 - ENEL # 21 @@ -838,24 +840,26 @@ IT: - Evway # 12 - ENEL X # 12 - Hera / AcegasApsAmga # 10 + - Enel-X # 9 - Duferco # 8 - BlueTorino # 8 - A22 # 8 - Tesla # 7 - Etraction # 7 - SEMM # 6 - - Enel-X # 6 - ENEL drive # 6 - Enel Drive # 5 - Comune di Firenze # 5 - A2A # 5 - enel # 4 + - Regione Umbria # 4 - Lidl # 4 - Iren # 4 - Enel Distribuzione # 4 - Emobitaly # 4 - E-Moving # 4 - Duferco Energia # 4 + - ASM Terni # 4 - enelx # 3 - enel X # 3 - alperia # 3 @@ -866,6 +870,7 @@ IT: - EVBOX # 3 - EVAD # 3 - ENI # 3 + - E-motion # 3 - DriWe # 3 - Atac # 3 - Amag # 3 @@ -876,6 +881,7 @@ IT: - SCAME # 2 - Repower # 2 - LIDL # 2 + - Ionity # 2 - Enel spa # 2 - Enel X # 2 - ECO fuel # 2 @@ -883,6 +889,7 @@ IT: - Comune di Albiate # 2 - Charge&Go # 2 - COGESER # 2 + - BeCharge # 2 - AcegasApsAmga # 2 - ATAC # 2 JP: @@ -912,14 +919,14 @@ LV: MK: - EVN # 16 MX: - - Servicio de Transportes Eléctricos de la Ciudad de México # 2 + - Servicio de Transportes Eléctricos de la Ciudad de México # 3 NL: - - Allego # 176 + - Allego # 179 - NUON # 98 - Fastned # 95 - Nuon # 71 - EVBOX # 24 - - Ecotap # 19 + - Ecotap # 20 - Vattenfall # 18 - NewMotion # 16 - EVnetNL # 16 @@ -981,7 +988,7 @@ NL: NO: - Fortum # 297 - Grønn Kontakt # 182 - - Oslo kommune # 167 + - Oslo kommune # 166 - BKK # 56 - Grønn kontakt # 43 - Q-Park # 28 @@ -1252,7 +1259,7 @@ SK: - EvMapa # 2 - BMW T.O.B. # 2 TR: - - SHARZ # 135 + - SHARZ # 134 - VOLTRUN # 28 - ZES # 21 - Sharz # 7 @@ -1274,11 +1281,12 @@ UA: - АвтоЭнтерпрайз # 11 - ЕлектроДрайв # 9 - Autoenterprise # 9 - - AutoEnterprise # 8 + - AutoEnterprise # 9 - Yasno # 6 - ElectroUA # 6 - Автоэнтерпрайз # 5 - Автоентерпрайз # 4 + - Silver Fox Energy # 3 - Electro UA # 3 - AutoEnterprise 201 # 3 - АвтоЕнтерпрайз # 2 @@ -1381,8 +1389,8 @@ US-MD: US-ME: - Tesla Motors # 5 US-MI: - - Tesla Motors # 14 - Michigan State University # 12 + - Tesla Motors # 8 - Consumers Energy # 6 - NRG Energy # 3 - Lansing Board of Water and Light # 3 diff --git a/res/country_metadata/clothesContainerOperators.yml b/res/country_metadata/clothesContainerOperators.yml index df7f596153..80aceced1e 100644 --- a/res/country_metadata/clothesContainerOperators.yml +++ b/res/country_metadata/clothesContainerOperators.yml @@ -94,8 +94,8 @@ DE: - GEB # 114 - ALBA Braunschweig GmbH # 106 - Humana # 104 + - Malteser # 98 - Stadtreinigung Hamburg # 97 - - Malteser # 97 - Stadt Karlsruhe # 70 - AHE;Deutsches Rotes Kreuz # 64 - Abfallwirtschaftsgesellschaft Wuppertal # 54 @@ -118,24 +118,25 @@ DE: - Step # 23 - Malteser Hilfsdienst e.V. # 22 - Landkreis Prignitz # 22 - - Berlin-Textilrecycling # 21 - Remondis # 20 - Malteser Hilfsdienst # 20 - FWS # 20 - CityGreenPoint # 20 + - Berlin-Textilrecycling # 20 - aha Zweckverband Abfallwirtschaft Region Hannover # 19 - Stadt Stuttgart # 19 - TEXAID # 18 + - Bayerisches Rotes Kreuz # 17 - Aktex Rohstoff-Recycling Nord # 17 - Diakoniewerk Essen # 16 - - Bayerisches Rotes Kreuz # 16 + - Abfall- und Wertstofflogistik Neuss GmbH (AWL) # 15 - Retextil Recycling International # 14 - - Abfall- und Wertstofflogistik Neuss GmbH (AWL) # 14 - Isevtex # 13 - AWISTA # 13 - AHG alpha Handelskontor # 13 - AHA # 13 - unknown # 12 + - ZKE # 12 - Veolia # 12 - Kolpingwerk # 12 - HeDi # 12 @@ -143,20 +144,20 @@ DE: - DRK Kreisverband Bonn e.V. # 12 - Brotex # 12 - AWM # 12 - - ZKE # 11 - Däsa Wiederverwertungs GmbH # 11 - Altkleiderfirma Nargül # 11 - illegal # 10 - Textil-Recycling Nord # 10 - RS # 10 - Kolping Recycling GmbH # 10 + - Deutsches Rotes Kreuz e.V. # 10 - TEXAID Deutschland GmbH # 9 - Stadt Karlsruhe Amt für Abfallwirtschaft # 9 - - Deutsches Rotes Kreuz e.V. # 9 - DRK-Kreisverband Trier-Saarburg e.V. # 9 - Bera Textilrecycling # 9 - Baliz Textilwerke # 9 - Akza Textilrecycling # 9 + - SP Textilverwertung # 8 - Neue Arbeit Lahr # 8 - Hoppe # 8 - HUMANA Kleidersammlung GmbH # 8 @@ -165,8 +166,8 @@ DE: - AWISTA GmbH # 8 - AHE;Deutsches Rotes Kreuz;Ruhrtalengel # 8 - aha # 7 + - TEXAID Collection GmbH # 7 - TEXAID Collection # 7 - - SP Textilverwertung # 7 - Retextil # 7 - Maltheser Hilfsdienst # 7 - Johanniter # 7 @@ -174,7 +175,6 @@ DE: - Diakonisches Werk Kassel # 7 - Deutsche Lebens-Rettungs-Gesellschaft e.V. # 7 - DESWOS # 7 - - TEXAID Collection GmbH # 6 - Stadtreinigung Leipzig # 6 - SOEX # 6 - Haytex Textilrecycling # 6 @@ -227,13 +227,13 @@ FI: - Suomen Pakkauskierrätys RINKI Oy # 2 - Auringonnousu # 2 FX: - - Le Relais # 649 + - Le Relais # 650 - Toulouse Métropole # 231 - AMOS # 33 - Actifrip # 25 - Chrysalide Ressourcerie # 24 - CCPRO # 21 - - Solidarité Textiles # 17 + - Solidarité Textiles # 18 - Eco-Emballages # 17 - Next Textiles Association # 11 - SITCOM - Côte sud des Landes # 10 @@ -287,7 +287,7 @@ GB: - Salvation Army # 12 - The Fire Fighters Charity # 9 - Brighton & Hove City Council # 9 - - The Salvation Army # 6 + - The Salvation Army # 7 - British Heart Foundation # 6 - Scope # 5 - Rushcliffe Borough Council # 5 @@ -297,6 +297,7 @@ GB: - South Norfolk Council # 3 - Cancer Fund for Children # 3 - traid # 2 + - The Firefighters Charity # 2 - TRAID # 2 - Severn Waste Services # 2 - Oxfam # 2