From d1eb98d641f6def409a47606896e2e758c549751 Mon Sep 17 00:00:00 2001 From: Yannik Bloscheck Date: Fri, 16 Jan 2026 16:20:07 +0100 Subject: [PATCH] [types] Use new subtypes structure for benches (without a backrest) Signed-off-by: Yannik Bloscheck Co-authored-by: Yannik Bloscheck Co-committed-by: Yannik Bloscheck --- android/sdk/src/main/res/values-de/types_strings.xml | 2 +- android/sdk/src/main/res/values/types_strings.xml | 2 +- data/categories-strings/ar.json/localize.json | 2 +- data/categories-strings/bg.json/localize.json | 2 +- data/categories-strings/cs.json/localize.json | 2 +- data/categories-strings/da.json/localize.json | 2 +- data/categories-strings/de.json/localize.json | 2 +- data/categories-strings/el.json/localize.json | 2 +- data/categories-strings/en.json/localize.json | 2 +- data/categories-strings/es.json/localize.json | 2 +- data/categories-strings/et.json/localize.json | 2 +- data/categories-strings/eu.json/localize.json | 2 +- data/categories-strings/fa.json/localize.json | 2 +- data/categories-strings/fi.json/localize.json | 2 +- data/categories-strings/fr.json/localize.json | 2 +- data/categories-strings/hi.json/localize.json | 2 +- data/categories-strings/hu.json/localize.json | 2 +- data/categories-strings/id.json/localize.json | 2 +- data/categories-strings/it.json/localize.json | 2 +- data/categories-strings/ja.json/localize.json | 2 +- data/categories-strings/ko.json/localize.json | 2 +- data/categories-strings/lv.json/localize.json | 2 +- data/categories-strings/mr.json/localize.json | 2 +- data/categories-strings/nb.json/localize.json | 2 +- data/categories-strings/nl.json/localize.json | 2 +- data/categories-strings/pl.json/localize.json | 2 +- data/categories-strings/pt-BR.json/localize.json | 2 +- data/categories-strings/pt.json/localize.json | 2 +- data/categories-strings/ro.json/localize.json | 2 +- data/categories-strings/ru.json/localize.json | 2 +- data/categories-strings/sk.json/localize.json | 2 +- data/categories-strings/sr.json/localize.json | 2 +- data/categories-strings/sv.json/localize.json | 2 +- data/categories-strings/sw.json/localize.json | 2 +- data/categories-strings/th.json/localize.json | 2 +- data/categories-strings/tr.json/localize.json | 2 +- data/categories-strings/uk.json/localize.json | 2 +- data/categories-strings/vi.json/localize.json | 2 +- data/categories-strings/zh-Hans.json/localize.json | 2 +- data/categories-strings/zh-Hant.json/localize.json | 2 +- data/styles/default/include/priorities_4_overlays.prio.txt | 4 +++- data/styles/outdoors/include/priorities_4_overlays.prio.txt | 4 +++- data/subtypes.csv | 3 ++- .../Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings | 2 +- .../LocalizedStrings/en-GB.lproj/LocalizableTypes.strings | 2 +- .../Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings | 2 +- 46 files changed, 51 insertions(+), 46 deletions(-) diff --git a/android/sdk/src/main/res/values-de/types_strings.xml b/android/sdk/src/main/res/values-de/types_strings.xml index 261a97167..1b1a4c8ce 100644 --- a/android/sdk/src/main/res/values-de/types_strings.xml +++ b/android/sdk/src/main/res/values-de/types_strings.xml @@ -25,7 +25,7 @@ Bankfiliale Grillstelle Sitzbank - Sitzbank ohne Rückenlehne + Ohne Rückenlehne Fahrradständer Bootsverleih Fahrradverleih diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml index 6c3e52890..2c243496e 100644 --- a/android/sdk/src/main/res/values/types_strings.xml +++ b/android/sdk/src/main/res/values/types_strings.xml @@ -27,7 +27,7 @@ Bar Barbecue Grill Bench - Backless Bench + Without Backrest Bicycle Parking Covered Bicycle Parking Boat Rental diff --git a/data/categories-strings/ar.json/localize.json b/data/categories-strings/ar.json/localize.json index d8c311cb3..b0e744711 100644 --- a/data/categories-strings/ar.json/localize.json +++ b/data/categories-strings/ar.json/localize.json @@ -116,7 +116,7 @@ "historic-wayside_cross": "صليب مسيحي", "historic-wayside_shrine": "ضريح", "leisure-garden": "بستان|مناظر|سياحة|حديقة", -"amenity-bench|amenity-bench-backless": "مقعد طويل|مصطبة", +"amenity-bench": "مقعد طويل|مصطبة", "amenity-bicycle_rental": "تأجير دراجات", "amenity-bicycle_repair_station": "تصليح الدراجات|اصلاح الدراجات|صيانة الدراجات|تصليح عجل|اصلاح عجل", "amenity-car_sharing": "مشاركة السيارة|تقاسم السيارة", diff --git a/data/categories-strings/bg.json/localize.json b/data/categories-strings/bg.json/localize.json index 2efbc4b42..3dfc4b176 100644 --- a/data/categories-strings/bg.json/localize.json +++ b/data/categories-strings/bg.json/localize.json @@ -116,7 +116,7 @@ "historic-wayside_shrine": "Крайпътно светилище", "leisure-dog_park": "Кучешка зона|домашни любимци", "leisure-garden": "3Градина", -"amenity-bench|amenity-bench-backless": "Пейка|скамейка", +"amenity-bench": "Пейка|скамейка", "amenity-bicycle_rental": "велосипеди|колелета|под наем", "amenity-car_sharing": "Споделяне|автомобил|кола|превоз", "amenity-car_rental": "Кола|под наем|рент а кар|автопаркинг", diff --git a/data/categories-strings/cs.json/localize.json b/data/categories-strings/cs.json/localize.json index f230931d2..ee7e25afa 100644 --- a/data/categories-strings/cs.json/localize.json +++ b/data/categories-strings/cs.json/localize.json @@ -117,7 +117,7 @@ "historic-wayside_shrine": "Drobná sakrální památka", "leisure-dog_park": "3Psí hřiště", "leisure-garden": "2Zahrada|zajímavost", -"amenity-bench|amenity-bench-backless": "Lavička", +"amenity-bench": "Lavička", "amenity-bicycle_rental": "2Půjčovna kol|4jízdní kolo|3kolo|3pronájem|3nájemné", "amenity-bicycle_repair_station": "Oprava jízdních kol|4jízdní kolo|3kolo|Oprava", "amenity-car_sharing": "Sdílení aut", diff --git a/data/categories-strings/da.json/localize.json b/data/categories-strings/da.json/localize.json index 389fcca7e..13882fbc0 100644 --- a/data/categories-strings/da.json/localize.json +++ b/data/categories-strings/da.json/localize.json @@ -115,7 +115,7 @@ "historic-wayside_cross": "Kors ved vejsiden", "historic-wayside_shrine": "Skrin ved vejsiden", "leisure-garden": "2Have", -"amenity-bench|amenity-bench-backless": "Bænk", +"amenity-bench": "Bænk", "amenity-bicycle_rental": "4Cykeludlejning|udlejning|cykel", "amenity-bicycle_repair_station": "4Cykel reparation", "amenity-car_sharing": "Delebiler", diff --git a/data/categories-strings/de.json/localize.json b/data/categories-strings/de.json/localize.json index aa23781cf..145c32f0d 100644 --- a/data/categories-strings/de.json/localize.json +++ b/data/categories-strings/de.json/localize.json @@ -125,7 +125,7 @@ "historic-wayside_shrine": "4Bildstock|4Marterl|4Wegstock|4Helgenstöckli", "leisure-dog_park": "4Hundezone|4Hundeauslaufzone|4Hundeauslauffläche|5Hunde|5Hundepark|U+1F436|U+1F415|U+1F9AE|U+1F429", "leisure-garden": "2Garten", -"amenity-bench|amenity-bench-backless": "4Sitzbank|4Parkbank", +"amenity-bench": "4Sitzbank|4Parkbank", "amenity-bicycle_rental": "4Fahrradverleih|4Fahrrad|4Fahrradvermietung|4Radfahren|4Radverleih|3Velo|3Veloverleih|3Velovermietung|5Verleih|5Vermietung|U+1F6B2|U+1F510|U+1F6B4|U+1F6B5", "amenity-bicycle_repair_station": "4Fahrradreparatur|4Radservicestation|4Radreparatur|Velomechaniker|Veloreparatur|U+1F6B2|U+1F527|U+1F529|U+26D3|U+1FA9B|U+1F6DE", "amenity-car_sharing": "4Carsharing|4Car-Sharing|4Carsharing-Dienste|5Auto teilen|4Auto|5Fahrgemeinschaft|4Mitfahrzentrale|U+1F690|U+1F697|U+1F698|U+1F699|U+1F6FB|U+1F46B|U+1F465", diff --git a/data/categories-strings/el.json/localize.json b/data/categories-strings/el.json/localize.json index fccd7c43c..8a9730451 100644 --- a/data/categories-strings/el.json/localize.json +++ b/data/categories-strings/el.json/localize.json @@ -116,7 +116,7 @@ "historic-wayside_cross": "Σταυρός στην άκρη του δρόμου", "historic-wayside_shrine": "Εικονοστάσιο στην άκρη του δρόμου", "leisure-garden": "Κήπος αναψυχής|αξιοθέατα", -"amenity-bench|amenity-bench-backless": "Παγκάκι", +"amenity-bench": "Παγκάκι", "amenity-bicycle_rental": "Ενοικιάσεις ποδηλάτων|δίκυκλο|ποδήλατο|ενοικιάσεις", "amenity-car_sharing": "Παραχώρηση αυτοκινήτου", "amenity-car_rental": "Ενοικίαση αυτοκινήτου|αυτοκίνητο|ενοικιάσεις|κοινή χρήση", diff --git a/data/categories-strings/en.json/localize.json b/data/categories-strings/en.json/localize.json index 96f71ffdb..eb8b42730 100644 --- a/data/categories-strings/en.json/localize.json +++ b/data/categories-strings/en.json/localize.json @@ -132,7 +132,7 @@ "leisure-dance|@category_entertainment": "4Dance|Dancing school", "leisure-garden": "3Garden", "leisure-firepit": "5Firepit", -"amenity-bench|amenity-bench-backless": "Bench", +"amenity-bench": "Bench", "amenity-boat_rental": "4Boat rental|boat|boats|3Rental", "amenity-bicycle_rental": "4Bicycle rental|cycling|cycle|bike|3Rental|U+1F6B2|U+1F6B4|U+1F6B5|bicycle hire|bike rental", "amenity-bicycle_repair_station": "4Bicycle repair station|cycle|bike|4repair of bicycles", diff --git a/data/categories-strings/es.json/localize.json b/data/categories-strings/es.json/localize.json index 412d1e4c7..7542c96c7 100644 --- a/data/categories-strings/es.json/localize.json +++ b/data/categories-strings/es.json/localize.json @@ -124,7 +124,7 @@ "leisure-dance|@category_entertainment": "4Baile|Escuela de baile|4Danza|Escuela de danza", "leisure-garden": "2Jardín", "leisure-firepit": "3Fogón|Fogata", -"amenity-bench|amenity-bench-backless": "Asiento|3Banco de sentarse", +"amenity-bench": "Asiento|3Banco de sentarse", "amenity-bicycle_rental": "3Alquiler de bicicletas|4bicicleta|alquiler|Alquiler de bicis|Bicicletas|Bicis|Ciclismo", "amenity-bicycle_repair_station": "4Reparación de bicicletas|Reparación de bicis|Bicicletas|Bicis", "amenity-car_sharing": "Coche compartido|4carsharing", diff --git a/data/categories-strings/et.json/localize.json b/data/categories-strings/et.json/localize.json index 5ba68ddd1..d8f02272f 100644 --- a/data/categories-strings/et.json/localize.json +++ b/data/categories-strings/et.json/localize.json @@ -121,7 +121,7 @@ "historic-wayside_shrine": "Teeäärne pühakoht", "leisure-dog_park": "3Koerte ala|koerte park", "leisure-garden": "3Aed", -"amenity-bench|amenity-bench-backless": "Pink", +"amenity-bench": "Pink", "amenity-bicycle_rental": "Jalgrataste laenutus", "amenity-bicycle_repair_station": "Jalgrataste remondipunkt", "amenity-car_sharing": "Auto jagamine", diff --git a/data/categories-strings/eu.json/localize.json b/data/categories-strings/eu.json/localize.json index baeed6406..f599515f4 100644 --- a/data/categories-strings/eu.json/localize.json +++ b/data/categories-strings/eu.json/localize.json @@ -115,7 +115,7 @@ "historic-wayside_cross": "Bideko gurutze", "historic-wayside_shrine": "Bide bazterreko baseliza", "leisure-garden": "2Lorategia|Lorategi", -"amenity-bench|amenity-bench-backless": "Bankua", +"amenity-bench": "Bankua", "amenity-bicycle_rental": "Bizikleta alokairua|4bizikleta|3alokairua", "amenity-car_sharing": "Partekatu autoa", "amenity-car_rental": "3Autoa alokairua|alokairua", diff --git a/data/categories-strings/fa.json/localize.json b/data/categories-strings/fa.json/localize.json index 4b800d68f..b133f076d 100644 --- a/data/categories-strings/fa.json/localize.json +++ b/data/categories-strings/fa.json/localize.json @@ -115,7 +115,7 @@ "historic-wayside_cross": "صلیب کنار راه", "historic-wayside_shrine": "حرم کنار راه", "leisure-garden": "باغ تفریحی|گردشگری", -"amenity-bench|amenity-bench-backless": "سَکو|نیمکت", +"amenity-bench": "سَکو|نیمکت", "amenity-bicycle_rental": "مکان اجاره دوچرخه", "amenity-bicycle_repair_station": "تعمیر دوچرخه", "amenity-car_rental": "مکان اجاره ماشین", diff --git a/data/categories-strings/fi.json/localize.json b/data/categories-strings/fi.json/localize.json index 8961619d3..78fddee08 100644 --- a/data/categories-strings/fi.json/localize.json +++ b/data/categories-strings/fi.json/localize.json @@ -115,7 +115,7 @@ "historic-wayside_shrine": "Tienvarren pyhäkkö", "leisure-dog_park": "Koirapuisto", "leisure-garden": "Puutarha", -"amenity-bench|amenity-bench-backless": "Penkki", +"amenity-bench": "Penkki", "amenity-bicycle_rental": "Polkupyöränvuokraus", "amenity-bicycle_repair_station": "Polkupyörän korjaus", "amenity-car_sharing": "Autojen yhteiskäyttö", diff --git a/data/categories-strings/fr.json/localize.json b/data/categories-strings/fr.json/localize.json index 9f4c4ebed..2d9e07e66 100644 --- a/data/categories-strings/fr.json/localize.json +++ b/data/categories-strings/fr.json/localize.json @@ -121,7 +121,7 @@ "historic-wayside_shrine": "Oratoire", "leisure-dog_park": "Parc canin|Espace sans laisse", "leisure-garden": "2Jardin", -"amenity-bench|amenity-bench-backless": "Banc", +"amenity-bench": "Banc", "amenity-bicycle_rental": "Location de vélos|vélo|bicyclette|3location", "amenity-bicycle_repair_station": "Réparation de vélos|vélo|bicyclette|réparation", "amenity-car_sharing": "Station d'autopartage|auto-partage", diff --git a/data/categories-strings/hi.json/localize.json b/data/categories-strings/hi.json/localize.json index 7d44e872e..ae437fb59 100644 --- a/data/categories-strings/hi.json/localize.json +++ b/data/categories-strings/hi.json/localize.json @@ -96,7 +96,7 @@ "historic-wayside_shrine": "5रास्ते का तीर्थ", "leisure-dog_park": "श्वान पार्क", "leisure-garden": "बाग", -"amenity-bench|amenity-bench-backless": "बेंच", +"amenity-bench": "बेंच", "amenity-bicycle_rental": "4साइकिल किराए के लिए", "amenity-bicycle_repair_station": "4साइकिल मरम्मत स्टेशन", "amenity-car_sharing": "3गाड़ी साँझा", diff --git a/data/categories-strings/hu.json/localize.json b/data/categories-strings/hu.json/localize.json index a6ab6b852..37140f625 100644 --- a/data/categories-strings/hu.json/localize.json +++ b/data/categories-strings/hu.json/localize.json @@ -116,7 +116,7 @@ "historic-wayside_cross": "Útszéli kereszt", "historic-wayside_shrine": "Útmenti szentély|Szentély", "leisure-garden": "2Kert", -"amenity-bench|amenity-bench-backless": "Pad", +"amenity-bench": "Pad", "amenity-bicycle_rental": "4Kerékpárkölcsönző|kerékpár|3bérlés|U+1F6B2|U+1F6B4|U+1F6B5|Kölcsönző", "amenity-bicycle_repair_station": "4Kerékpár javítás|kerékpár", "amenity-car_sharing": "Gépjárműmegosztás|U+1F697|U+1F698|U+1F699|telekocsi", diff --git a/data/categories-strings/id.json/localize.json b/data/categories-strings/id.json/localize.json index f376994ac..2f8c25ce1 100644 --- a/data/categories-strings/id.json/localize.json +++ b/data/categories-strings/id.json/localize.json @@ -114,7 +114,7 @@ "historic-wayside_cross": "Salib di pinggir jalan", "historic-wayside_shrine": "Kuil di pinggir jalan", "leisure-garden": "Situs arkeologi", -"amenity-bench|amenity-bench-backless": "Bangku panjang", +"amenity-bench": "Bangku panjang", "amenity-bicycle_rental": "Penyewaan Sepeda", "amenity-car_sharing": "Berbagi mobil", "amenity-car_rental": "4Rental mobil", diff --git a/data/categories-strings/it.json/localize.json b/data/categories-strings/it.json/localize.json index 58569df67..fe119fef2 100644 --- a/data/categories-strings/it.json/localize.json +++ b/data/categories-strings/it.json/localize.json @@ -116,7 +116,7 @@ "historic-wayside_cross": "Crocifisso", "historic-wayside_shrine": "Edicola votiva", "leisure-garden": "2Giardino", -"amenity-bench|amenity-bench-backless": "Panchina|panca", +"amenity-bench": "Panchina|panca", "amenity-bicycle_rental": "Noleggio biciclette|4bicicletta|bici|3noleggio", "amenity-bicycle_repair_station": "Riparazione di biciclette|4bicicletta|bici", "amenity-car_sharing": "3Car Sharing", diff --git a/data/categories-strings/ja.json/localize.json b/data/categories-strings/ja.json/localize.json index c4938772c..acdc29279 100644 --- a/data/categories-strings/ja.json/localize.json +++ b/data/categories-strings/ja.json/localize.json @@ -117,7 +117,7 @@ "historic-wayside_shrine": "歴史的な祠", "leisure-dog_park": "ドッグラン", "leisure-garden": "1庭園|庭|園", -"amenity-bench|amenity-bench-backless": "ベンチ|縁台|椅子", +"amenity-bench": "ベンチ|縁台|椅子", "amenity-bicycle_rental": "レンタサイクル|自転車|自転車レンタル|貸し自転車|貸自転車|1レンタル", "amenity-bicycle_repair_station": "自転車修理", "amenity-car_sharing": "カーシェアリング", diff --git a/data/categories-strings/ko.json/localize.json b/data/categories-strings/ko.json/localize.json index 40d3d2ed7..fb2f527de 100644 --- a/data/categories-strings/ko.json/localize.json +++ b/data/categories-strings/ko.json/localize.json @@ -116,7 +116,7 @@ "historic-wayside_shrine": "길가의 신사", "leisure-dog_park": "개 놀이 공원|도그 파크", "leisure-garden": "가든|정원", -"amenity-bench|amenity-bench-backless": "벤치", +"amenity-bench": "벤치", "amenity-bicycle_rental": "자전거 대여소|자전거 대여", "amenity-bicycle_repair_station": "자전거 수리", "amenity-car_sharing": "카 셰어링|카 쉐어링|자동차 공유|차 공유|카셰어링", diff --git a/data/categories-strings/lv.json/localize.json b/data/categories-strings/lv.json/localize.json index 10fca156c..ff3c5b1ee 100644 --- a/data/categories-strings/lv.json/localize.json +++ b/data/categories-strings/lv.json/localize.json @@ -113,7 +113,7 @@ "historic-wayside_shrine": "Ceļmalas svētnīca", "leisure-dog_park": "Suņu laukums|suņu parks", "leisure-garden": "dārzs", -"amenity-bench|amenity-bench-backless": "Sols|soliņš", +"amenity-bench": "Sols|soliņš", "amenity-bicycle_rental": "4Velonoma|velosipēdu noma|divriteņu noma|4noma|U+1F6B2|U+1F6B4|U+1F6B5", "amenity-bicycle_repair_station": "Veloremonta stacija|Veloremonta punkts|divriteņu remonts|velosipēdu remonts|veloremonts", "amenity-car_sharing": "Automobiļu koplietošana|auto koplietošana|automašīnu koplietošana|koplietošana|automobilis|U+1F697|U+1F698|U+1F699|", diff --git a/data/categories-strings/mr.json/localize.json b/data/categories-strings/mr.json/localize.json index c600213b0..22303ef20 100644 --- a/data/categories-strings/mr.json/localize.json +++ b/data/categories-strings/mr.json/localize.json @@ -111,7 +111,7 @@ "historic-wayside_cross": "ख्रिश्चन क्रॉस", "historic-wayside_shrine": "देवस्थान", "leisure-garden": "बाग", -"amenity-bench|amenity-bench-backless": "बाक", +"amenity-bench": "बाक", "amenity-bicycle_rental": "भाड्याची सायकल", "amenity-car_sharing": "कार पूल|कार शेअर", "amenity-car_rental": "भाड्याने गाडी", diff --git a/data/categories-strings/nb.json/localize.json b/data/categories-strings/nb.json/localize.json index 844c43521..b848e1733 100644 --- a/data/categories-strings/nb.json/localize.json +++ b/data/categories-strings/nb.json/localize.json @@ -115,7 +115,7 @@ "historic-wayside_cross": "Veikantkors", "historic-wayside_shrine": "Helligdom ved veikanten", "leisure-garden": "Hage", -"amenity-bench|amenity-bench-backless": "Benk", +"amenity-bench": "Benk", "amenity-bicycle_rental": "Sykkelutleie", "amenity-car_sharing": "3Bildeling", "amenity-car_rental": "Bilutleie", diff --git a/data/categories-strings/nl.json/localize.json b/data/categories-strings/nl.json/localize.json index 62368ff00..a6b4648ab 100644 --- a/data/categories-strings/nl.json/localize.json +++ b/data/categories-strings/nl.json/localize.json @@ -118,7 +118,7 @@ "historic-wayside_shrine": "Kruisbeeld", "leisure-dog_park": "4Hondenpark|Hondengebied", "leisure-garden": "2Tuin", -"amenity-bench|amenity-bench-backless": "Zitbank|bankje", +"amenity-bench": "Zitbank|bankje", "amenity-bicycle_rental": "5Fietsverhuur|fietsen|fiets|3Verhuur|fietsenhuur", "amenity-bicycle_repair_station": "5Fietsenreparatie|fiets|4reparatie van fietsen", "amenity-car_sharing": "5Autodelen|autodelen|auto|delen", diff --git a/data/categories-strings/pl.json/localize.json b/data/categories-strings/pl.json/localize.json index f38dc046f..5005f5600 100644 --- a/data/categories-strings/pl.json/localize.json +++ b/data/categories-strings/pl.json/localize.json @@ -120,7 +120,7 @@ "leisure-dance|@category_entertainment": "Taniec|Szkoła tańca", "leisure-garden": "2Ogród", "leisure-firepit": "Palenisko|miejsce na ognisko", -"amenity-bench|amenity-bench-backless": "Ławka", +"amenity-bench": "Ławka", "amenity-bicycle_rental": "4Wynajem rowerów|4rower|3Wynajem", "amenity-bicycle_repair_station": "Stacja naprawy rowerów", "amenity-car_sharing": "Współdzielenie samochodów|Wypożyczanie samochodów|samochód", diff --git a/data/categories-strings/pt-BR.json/localize.json b/data/categories-strings/pt-BR.json/localize.json index de157fe14..31d92e947 100644 --- a/data/categories-strings/pt-BR.json/localize.json +++ b/data/categories-strings/pt-BR.json/localize.json @@ -95,7 +95,7 @@ "historic-aircraft|@category_tourism": "Aeronave histórica|Avião histórico", "leisure-dog_park": "Parque canino|Parque para cães|Parque para cachorros", "leisure-garden": "2Jardim|lazer", -"amenity-bench|amenity-bench-backless": "Assento|Banco de praça", +"amenity-bench": "Assento|Banco de praça", "amenity-bicycle_rental": "Aluguel de bicicletas|4bicicleta|3aluguel", "amenity-bicycle_repair_station": "Oficina de bicicletas|4bicicleta", "amenity-car_sharing": "Compartilhamento de carro", diff --git a/data/categories-strings/pt.json/localize.json b/data/categories-strings/pt.json/localize.json index e6622ac23..31213982b 100644 --- a/data/categories-strings/pt.json/localize.json +++ b/data/categories-strings/pt.json/localize.json @@ -117,7 +117,7 @@ "historic-wayside_shrine": "Alminhas", "leisure-dog_park": "Parque canino|Parque para cães", "leisure-garden": "2Jardim", -"amenity-bench|amenity-bench-backless": "2Assento|3Banco", +"amenity-bench": "2Assento|3Banco", "amenity-bicycle_rental": "Aluguer de bicicletas|4bicicleta|3aluguar", "amenity-bicycle_repair_station": "Conserto de bicicleta|4bicicleta", "amenity-car_sharing": "Partilha de carro", diff --git a/data/categories-strings/ro.json/localize.json b/data/categories-strings/ro.json/localize.json index 03a098f4b..6e4f35337 100644 --- a/data/categories-strings/ro.json/localize.json +++ b/data/categories-strings/ro.json/localize.json @@ -113,7 +113,7 @@ "historic-tomb|@category_tourism": "Mormânt", "historic-wayside_cross": "Troiță", "historic-wayside_shrine": "Altarul de la marginea drumului", -"amenity-bench|amenity-bench-backless": "Banchetă|Bancă|Bancă parc", +"amenity-bench": "Banchetă|Bancă|Bancă parc", "amenity-bicycle_rental": "4Închiriere biciclete|4Biciclete", "amenity-car_sharing": "3Car Sharing", "amenity-car_rental": "Închiriere mașini", diff --git a/data/categories-strings/ru.json/localize.json b/data/categories-strings/ru.json/localize.json index 815718db2..17aa67c6d 100644 --- a/data/categories-strings/ru.json/localize.json +++ b/data/categories-strings/ru.json/localize.json @@ -121,7 +121,7 @@ "historic-wayside_shrine": "Святыня", "leisure-dog_park": "Место для выгула собак|3выгул собак|Площадка для собак|4Собачья площадка", "leisure-garden": "Сад", -"amenity-bench|amenity-bench-backless": "Скамейка|лавка", +"amenity-bench": "Скамейка|лавка", "amenity-bicycle_rental": "4Велопрокат|велосипед|прокат|4прокат велосипедов|велосипед аренда|велосипед напрокат", "amenity-bicycle_repair_station": "4Велоремонт|велосипед|ремонт|ремонт велосипедов", "amenity-car_sharing": "3Каршеринг|аренда машин|аренда", diff --git a/data/categories-strings/sk.json/localize.json b/data/categories-strings/sk.json/localize.json index bc2ec0886..3c856773a 100644 --- a/data/categories-strings/sk.json/localize.json +++ b/data/categories-strings/sk.json/localize.json @@ -116,7 +116,7 @@ "historic-wayside_cross": "Prícestný kríž", "historic-wayside_shrine": "Svätyňa pri ceste", "leisure-garden": "2Záhrada", -"amenity-bench|amenity-bench-backless": "Lavička", +"amenity-bench": "Lavička", "amenity-bicycle_rental": "2Požičovňa bicyklov|bicykle|požičovňa", "amenity-car_sharing": "Zdieľanie automobilov", "amenity-car_rental": "3Autopožičovňa|požičovňa áut", diff --git a/data/categories-strings/sr.json/localize.json b/data/categories-strings/sr.json/localize.json index 30552eb40..42fe1cf38 100644 --- a/data/categories-strings/sr.json/localize.json +++ b/data/categories-strings/sr.json/localize.json @@ -86,7 +86,7 @@ "historic-cannon": "Топ|Top", "leisure-dog_park": "Парк за псе|Park za pse", "leisure-garden": "Башта|Bašta", -"amenity-bench|amenity-bench-backless": "Клупа|Klupa", +"amenity-bench": "Клупа|Klupa", "amenity-bicycle_rental": "Изнајмљивање бицикала|Iznajmljivanje bicikala", "amenity-bicycle_repair_station": "7Станица за поправку бицикала", "amenity-car_rental": "Рентакар|Изнајмљивање аутомобила|Rentakar|Iznajmljivanje automobila", diff --git a/data/categories-strings/sv.json/localize.json b/data/categories-strings/sv.json/localize.json index 4cd3dfcfb..2170dd309 100644 --- a/data/categories-strings/sv.json/localize.json +++ b/data/categories-strings/sv.json/localize.json @@ -116,7 +116,7 @@ "historic-wayside_cross": "Korset vid vägkanten", "historic-wayside_shrine": "Helgedom vid vägkanten", "leisure-garden": "2Trädgård", -"amenity-bench|amenity-bench-backless": "Bänk", +"amenity-bench": "Bänk", "amenity-bicycle_rental": "4Cykeluthyrning|cykel|cykel|3uthyrning", "amenity-car_sharing": "Samåkning", "amenity-car_rental": "3Biluthyrning|bilpool|bil|uthyrning|delning", diff --git a/data/categories-strings/sw.json/localize.json b/data/categories-strings/sw.json/localize.json index 3fb14aff6..808d37cac 100644 --- a/data/categories-strings/sw.json/localize.json +++ b/data/categories-strings/sw.json/localize.json @@ -77,7 +77,7 @@ "historic-wayside_cross": "Msalaba wa njiani", "historic-wayside_shrine": "Kaburi la njia", "leisure-garden": "Bustani", -"amenity-bench|amenity-bench-backless": "Benchi", +"amenity-bench": "Benchi", "amenity-bicycle_rental": "Kodi ya baiskeli|baiskeli|kodi", "amenity-car_sharing": "Kushiriki Gari", "amenity-car_rental": "Kodi ya gari|gari|kodi", diff --git a/data/categories-strings/th.json/localize.json b/data/categories-strings/th.json/localize.json index 0600df0a2..fc2f1ef0d 100644 --- a/data/categories-strings/th.json/localize.json +++ b/data/categories-strings/th.json/localize.json @@ -115,7 +115,7 @@ "historic-wayside_cross": "ทางข้าม", "historic-wayside_shrine": "ศาลเจ้าข้างทาง", "leisure-garden": "2สวน", -"amenity-bench|amenity-bench-backless": "ม้านั่ง", +"amenity-bench": "ม้านั่ง", "amenity-bicycle_rental": "4จักรยานให้เช่า|4จักรยาน|บริการรถเช่า", "amenity-car_sharing": "การใช้รถร่วมกัน", "amenity-car_rental": "3รถยนต์|บริการรถเช่า", diff --git a/data/categories-strings/tr.json/localize.json b/data/categories-strings/tr.json/localize.json index 2633ff5d0..5ad6cc91f 100644 --- a/data/categories-strings/tr.json/localize.json +++ b/data/categories-strings/tr.json/localize.json @@ -122,7 +122,7 @@ "historic-wayside_shrine": "Yol üstünde türbe|yol üstü türbe|yol kenarı türbe|yol kenarında türbe", "leisure-dog_park": "3Köpek parkı", "leisure-garden": "2Bahçe", -"amenity-bench|amenity-bench-backless": "Bank", +"amenity-bench": "Bank", "amenity-bicycle_rental": "Bisiklet kiralama|4Bisiklet", "amenity-bicycle_repair_station": "4Bisiklet tamiri|4Bisiklet|Bisiklet tamircisi", "amenity-car_sharing": "Araç Paylaşımı|ortak araç", diff --git a/data/categories-strings/uk.json/localize.json b/data/categories-strings/uk.json/localize.json index 0c882af85..a709985fc 100644 --- a/data/categories-strings/uk.json/localize.json +++ b/data/categories-strings/uk.json/localize.json @@ -117,7 +117,7 @@ "historic-wayside_cross": "Християнський хрест", "historic-wayside_shrine": "Святиня", "leisure-garden": "3Садок", -"amenity-bench|amenity-bench-backless": "Лавка", +"amenity-bench": "Лавка", "amenity-bicycle_rental": "4Велопрокат|велосипед|3прокат", "amenity-bicycle_repair_station": "4Велоремонт|велосипед|ремонт|ремонт велосипедів", "amenity-car_sharing": "3Каршерінг", diff --git a/data/categories-strings/vi.json/localize.json b/data/categories-strings/vi.json/localize.json index 9889d8426..48031efe3 100644 --- a/data/categories-strings/vi.json/localize.json +++ b/data/categories-strings/vi.json/localize.json @@ -114,7 +114,7 @@ "historic-wayside_cross": "Đường chéo", "historic-wayside_shrine": "Đền thờ", "leisure-garden": "Điểm khảo cổ", -"amenity-bench|amenity-bench-backless": "Xe đạp", +"amenity-bench": "Xe đạp", "amenity-bicycle_rental": "Cho thuê xe đạp", "amenity-car_sharing": "Chia sẻ Xe", "amenity-car_rental": "Ô tô", diff --git a/data/categories-strings/zh-Hans.json/localize.json b/data/categories-strings/zh-Hans.json/localize.json index 380c0d37e..4f9e841a5 100644 --- a/data/categories-strings/zh-Hans.json/localize.json +++ b/data/categories-strings/zh-Hans.json/localize.json @@ -116,7 +116,7 @@ "historic-wayside_cross": "路旁十字架", "historic-wayside_shrine": "路旁神龛", "leisure-garden": "2花园|景点", -"amenity-bench|amenity-bench-backless": "长凳", +"amenity-bench": "长凳", "amenity-bicycle_rental": "1自行车租赁", "amenity-bicycle_repair_station": "1自行车修理", "amenity-car_sharing": "拼车点", diff --git a/data/categories-strings/zh-Hant.json/localize.json b/data/categories-strings/zh-Hant.json/localize.json index 380bdfc47..c3b0facee 100644 --- a/data/categories-strings/zh-Hant.json/localize.json +++ b/data/categories-strings/zh-Hant.json/localize.json @@ -116,7 +116,7 @@ "historic-wayside_cross": "路旁十字架", "historic-wayside_shrine": "路旁神龕", "leisure-garden": "1花園|旅遊景點", -"amenity-bench|amenity-bench-backless": "1長板凳|板凳|長椅|長椅子|條凳", +"amenity-bench": "1長板凳|板凳|長椅|長椅子|條凳", "amenity-bicycle_rental": "1自行車出租|腳踏車|單車|租金|租錢", "amenity-bicycle_repair_station": "1自行車修理", "amenity-car_sharing": "汽車共用", diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 8ce552e7c..566d77704 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -2438,8 +2438,10 @@ building-address # caption z16- man_made-telescope-optical # icon z17- (also has caption(optional) z17-) === -9970 -amenity-bench # icon z18- (also has caption(optional) z19-) amenity-bench-backless # icon z18- (also has caption(optional) z19-) +=== -9979 + +amenity-bench # icon z18- (also has caption(optional) z19-) amenity-lounger # icon z18- (also has caption(optional) z19-) amenity-waste_disposal # icon z18- (also has caption(optional) z18-) emergency-access_point # icon z18- (also has caption(optional) z18-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 614f21c30..9df9bf7cd 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -2444,8 +2444,10 @@ building-address # caption z16- man_made-telescope-optical # icon z17- (also has caption(optional) z17-) === -9970 -amenity-bench # icon z18- (also has caption(optional) z19-) amenity-bench-backless # icon z18- (also has caption(optional) z19-) +=== -9979 + +amenity-bench # icon z18- (also has caption(optional) z19-) amenity-lounger # icon z18- (also has caption(optional) z19-) amenity-waste_disposal # icon z18- (also has caption(optional) z18-) emergency-access_point # icon z18- (also has caption(optional) z18-) diff --git a/data/subtypes.csv b/data/subtypes.csv index 9aa1d4fd9..e3afd1a65 100644 --- a/data/subtypes.csv +++ b/data/subtypes.csv @@ -1,2 +1,3 @@ Types;Related Subtypes -amenity|charging_station;amenity|charging_station|motorcar,amenity|charging_station|motorcycle,amenity|charging_station|bicycle,amenity|charging_station|small,amenity|charging_station|carless \ No newline at end of file +amenity|charging_station;amenity|charging_station|motorcar,amenity|charging_station|motorcycle,amenity|charging_station|bicycle,amenity|charging_station|small,amenity|charging_station|carless +amenity|bench;amenity|bench|backless \ No newline at end of file diff --git a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings index d4c91aee7..4a65e3e19 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings @@ -24,7 +24,7 @@ "type.amenity.bar" = "Bar"; "type.amenity.bbq" = "Grillstelle"; "type.amenity.bench" = "Sitzbank"; -"type.amenity.bench.backless" = "Sitzbank ohne Rückenlehne"; +"type.amenity.bench.backless" = "Ohne Rückenlehne"; "type.amenity.bicycle_parking" = "Fahrradständer"; "type.amenity.boat_rental" = "Bootsverleih"; "type.amenity.bicycle_rental" = "Fahrradverleih"; diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings index 943fdbbc7..6e1cb34ba 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings @@ -24,7 +24,7 @@ "type.amenity.bar" = "Bar"; "type.amenity.bbq" = "Barbecue Grill"; "type.amenity.bench" = "Bench"; -"type.amenity.bench.backless" = "Backless Bench"; +"type.amenity.bench.backless" = "Without Backrest"; "type.amenity.bicycle_parking" = "Bicycle Parking"; "type.amenity.boat_rental" = "Boat Rental"; "type.amenity.bicycle_rental" = "Bicycle Rental"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index 4cf4b7be3..1c25d8f3f 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -28,7 +28,7 @@ "type.amenity.bar" = "Bar"; "type.amenity.bbq" = "Barbecue Grill"; "type.amenity.bench" = "Bench"; -"type.amenity.bench.backless" = "Backless Bench"; +"type.amenity.bench.backless" = "Without Backrest"; "type.amenity.bicycle_parking" = "Bicycle Parking"; "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking"; "type.amenity.boat_rental" = "Boat Rental";