diff --git a/android/app/src/main/res/values/types_strings.xml b/android/app/src/main/res/values/types_strings.xml index cbadf0b85..eaa3ea1c4 100644 --- a/android/app/src/main/res/values/types_strings.xml +++ b/android/app/src/main/res/values/types_strings.xml @@ -85,6 +85,7 @@ Kindergarten Library Loading Dock + Luggage Locker Marketplace Motorcycle Parking Nightclub diff --git a/data/categories.txt b/data/categories.txt index 90517efd0..2b934af99 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -8956,7 +8956,46 @@ uk:Мінігольф zh-Hans:迷你高尔夫 leisure-escape_game -en:4Escape Room|Escape Game +en:4Escape Room|Escape Game|quest +ar:غرفة الهروب +be:4Квест-пакой +bg:Ескейп стая +ca:Escape room +cs:Úniková místnost +da:Escape room +de:Escape room +el:Δωμάτιο απόδρασης +es:Escape room +et:Põgenemistuba +eu:Ihes gela +fa:اتاق فرار +fi:Pakohuone +fr:Salle d'évasion +he:חדר בריחה +hi:एस्केप रूम +hu:Szabadulószoba +id:Ruang petualangan +it:Escape room +ja:脱出ゲーム +ko:방탈출 +lv:Kvestu istaba +mr:एस्केप रूम +nb:Escape room +nl:Escaperoom +pl:Pokój zagadek +pt:Sala de fuga +pt-BR:Sala de fuga +ro:Cameră de evadare +ru:4Квест-комната +sk:Úniková miestnosť +sv:Escaperoom +sw:Chumba cha kutoroka +th:ห้องเกมปริศนา +tr:Kaçış odası +uk:4Квест-кімната +vi:Phòng giải đố +zh-Hans:密室逃脱 +zh-Hant:密室逃脫 leisure-hackerspace en:4Hackerspace @@ -18955,3 +18994,45 @@ zh-Hant:義大利麵 attraction-amusement_ride|attraction-carousel|attraction-roller_coaster|attraction-maze|attraction-historic|attraction-big_wheel|attraction-bumper_car|@category_children en:Attraction ru:Аттракцион + +amenity-luggage_locker +en:Luggage|locker|storage +ar:خزانة الأمتعة +be:5Камера захоўвання|шафка|4багаж +bg:Багажно шкафче +ca:Armari d'equipatge +cs:Skříňka na zavazadla +da:Bagageskab +de:Gepäckschließfach +el:Θυρίδα αποσκευών +es:Consigna de equipajes +et:Pagasiruum +eu:Ekipajearen aldagela +fa:قفل چمدان +fi:Matkatavaralokero +fr:Consigne à bagages +he:ארון המזוודות +hi:सामान लॉकर +hu:Poggyászmegőrző +id:Loker Bagasi +it:Armadietto per i bagagli +ja:荷物ロッカー +ko:수하물 보관함 +lv:Bagāžas skapītis +mr:सामान लॉकर +nb:Bagasjeskap +nl:Bagagekluis +pl:Schowek na bagaż +pt:Cacifo para bagagens +pt-BR:Armário de bagagem +ro:Dulap pentru bagaje +ru:5Камера хранения|4багаж +sk:Skrinka na batožinu +sv:Bagageförvaring +sw:Locker ya mizigo +th:ตู้เก็บกระเป๋า +tr:Bagaj Dolabı +uk:5Камера схову|4багаж +vi:Tủ khóa hành lý +zh-Hans:行李寄存柜 +zh-Hant:行李寄存櫃 diff --git a/data/editor.config b/data/editor.config index b5ea552c5..3a1da5727 100644 --- a/data/editor.config +++ b/data/editor.config @@ -1090,6 +1090,7 @@ + diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index e4703a517..f5a7c5c11 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1750,3 +1750,4 @@ amenity|bicycle_parking|covered;[amenity=bicycle_parking][covered=yes];;;;1625; post_office|post_partner;1626; amenity|ranger_station;1627; leisure|escape_game;1628; +amenity|luggage_locker;1629; diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt index 0b085b5e2..01e3a2f15 100644 --- a/data/replaced_tags.txt +++ b/data/replaced_tags.txt @@ -196,3 +196,5 @@ attraction=train : attraction=amusement_ride attraction=swing_carousel : attraction=amusement_ride attraction=drop_tower : attraction=amusement_ride attraction=dark_ride : attraction=amusement_ride + +amenity=left_luggage : amenity=luggage_locker diff --git a/data/styles/default/dark/symbols/luggage_locker-m.svg b/data/styles/default/dark/symbols/luggage_locker-m.svg new file mode 100644 index 000000000..8eae1e0ef --- /dev/null +++ b/data/styles/default/dark/symbols/luggage_locker-m.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 03f9fcbba..19bfb437f 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -1433,6 +1433,9 @@ node|z18-[amenity=public_bookcase], node|z17-[amenity=public_bath], {icon-image: public_bath-m.svg;font-size: 11;} +node|z17-[amenity=luggage_locker], +{icon-image: luggage_locker-m.svg;font-size: 11;} + /* 6. SHOP */ node|z16-[amenity=marketplace], diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index ba922e010..873f5e691 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -1186,6 +1186,7 @@ shop # icon z18- (also has captio === 470 amenity-bbq # icon z18- (also has caption(optional) z18-) +amenity-luggage_locker # icon z17- (also has caption(optional) z19-) amenity-public_bookcase # icon z18- (also has caption(optional) z18-) cemetery-grave # icon z17- (also has caption(optional) z17-) leisure-firepit # icon z18- (also has caption(optional) z18-) @@ -2120,6 +2121,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # === -9530 # amenity-bbq # caption(optional) z18- (also has icon z18-) +# amenity-luggage_locker # caption(optional) z19- (also has icon z17-) # amenity-public_bookcase # caption(optional) z18- (also has icon z18-) # cemetery-grave # caption(optional) z17- (also has icon z17-) # leisure-firepit # caption(optional) z18- (also has icon z18-) diff --git a/data/styles/default/light/symbols/luggage_locker-m.svg b/data/styles/default/light/symbols/luggage_locker-m.svg new file mode 100644 index 000000000..3391e3b32 --- /dev/null +++ b/data/styles/default/light/symbols/luggage_locker-m.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index e4d28b82c..3d81a6343 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1187,6 +1187,7 @@ shop # icon z18- (also has captio === 470 amenity-bbq # icon z16- (also has caption(optional) z17-) +amenity-luggage_locker # icon z17- (also has caption(optional) z19-) amenity-public_bookcase # icon z18- (also has caption(optional) z18-) cemetery-grave # icon z17- (also has caption(optional) z17-) leisure-firepit # icon z16- (also has caption(optional) z17-) @@ -2124,6 +2125,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # === -9530 # amenity-bbq # caption(optional) z17- (also has icon z16-) +# amenity-luggage_locker # caption(optional) z19- (also has icon z17-) # amenity-public_bookcase # caption(optional) z18- (also has icon z18-) # cemetery-grave # caption(optional) z17- (also has icon z17-) # leisure-firepit # caption(optional) z17- (also has icon z16-) diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index 816d9e04a..3724684fa 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -88,6 +88,7 @@ "type.amenity.kindergarten" = "Kindergarten"; "type.amenity.library" = "Library"; "type.amenity.loading_dock" = "Loading Dock"; +"type.amenity.luggage_locker" = "Luggage Locker"; "type.amenity.marketplace" = "Marketplace"; "type.amenity.motorcycle_parking" = "Motorcycle Parking"; "type.amenity.nightclub" = "Nightclub";