diff --git a/android/app/src/main/res/values/types_strings.xml b/android/app/src/main/res/values/types_strings.xml index 70ba8394a..80d59f125 100644 --- a/android/app/src/main/res/values/types_strings.xml +++ b/android/app/src/main/res/values/types_strings.xml @@ -48,6 +48,7 @@ Car Charging Station Nursery Cinema + Studio Bowling Alley Clinic College diff --git a/data/categories.txt b/data/categories.txt index d227e0805..e4caeac6b 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -894,6 +894,8 @@ el:Συνάλλαγμα|ανταλλακτήριο|χρήματα sk:3Zmenáreň|peniaze fa:صرافی +amenity-studio +en:Studio amenity-bar|amenity-pub|@category_eat|@category_nightlife en:2Bar|2pub|beer|drink|U+1F37A|U+1F37B|U+1F376|tavern|bars and pubs|brew pub|cocktail lounge diff --git a/data/editor.config b/data/editor.config index 0be1ebdee..89a554520 100644 --- a/data/editor.config +++ b/data/editor.config @@ -409,6 +409,9 @@ + + + diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index af444de70..1b97dae3d 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -661,7 +661,7 @@ addr:interpolation;[addr:interpolation];;addr:housenumber;name;541; deprecated:amenity|speed_trap:10.2021;542;highway|speed_camera area:highway|track;543; area:highway|primary;544; -deprecated|deprecated;545;x +amenity|studio;545; deprecated|deprecated;546;x deprecated|deprecated;547;x deprecated|deprecated;548;x diff --git a/data/styles/default/dark/symbols/studio-m.svg b/data/styles/default/dark/symbols/studio-m.svg new file mode 100644 index 000000000..374967210 --- /dev/null +++ b/data/styles/default/dark/symbols/studio-m.svg @@ -0,0 +1,8 @@ + + + + + studio-m + + + diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 01af1aca7..2d0c303e5 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -1981,6 +1981,7 @@ node|z16-[shop=gift], area|z16-[shop=gift], node|z16-[shop=music], area|z16-[shop=music], +node|z16-[amenity=studio], node|z16-[shop=video], area|z16-[shop=video], node|z16-[shop=musical_instrument], @@ -2212,6 +2213,8 @@ area|z16[shop=gift] node|z16[shop=music], area|z16[shop=music], {icon-image: music-m.svg;} +node|z16[amenity=studio], +{icon-image: studio-m.svg;} node|z16[shop=video], area|z16[shop=video] {icon-image: media-m.svg;} @@ -2424,6 +2427,8 @@ area|z17-[shop=gift] node|z17-[shop=music], area|z17-[shop=music], {icon-image: music-m.svg;icon-min-distance: 24;} +node|z17-[amenity=studio], +{icon-image: studio-m.svg;icon-min-distance: 24;} node|z17-[shop=video], area|z17-[shop=video] {icon-image: media-m.svg;icon-min-distance: 24;} diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 7b7a9aad3..a4db5d90c 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -997,6 +997,7 @@ man_made-cross # icon z16- (also has captio tourism-artwork # icon z15- (also has caption(optional) z15-) tourism-artwork-architecture # icon z15- (also has caption(optional) z15-) tourism-artwork-painting # icon z15- (also has caption(optional) z15-) +amenity-studio === 1550 amenity-shelter # icon z17- (also has caption(optional) z17-) @@ -1941,6 +1942,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # tourism-artwork # caption(optional) z15- (also has icon z15-) # tourism-artwork-architecture # caption(optional) z15- (also has icon z15-) # tourism-artwork-painting # caption(optional) z15- (also has icon z15-) +# amenity-studio # === -8450 # amenity-shelter # caption(optional) z17- (also has icon z17-) diff --git a/data/styles/default/light/symbols/studio-m.svg b/data/styles/default/light/symbols/studio-m.svg new file mode 100644 index 000000000..c149aa228 --- /dev/null +++ b/data/styles/default/light/symbols/studio-m.svg @@ -0,0 +1,8 @@ + + + + + studio-m + + + diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 424df10a8..6351150d3 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -997,6 +997,7 @@ man_made-cross # icon z14- (also has captio tourism-artwork # icon z15- (also has caption(optional) z15-) tourism-artwork-architecture # icon z15- (also has caption(optional) z15-) tourism-artwork-painting # icon z15- (also has caption(optional) z15-) +amenity-studio === 1550 amenity-shelter # icon z12- (also has caption(optional) z13-) @@ -1944,6 +1945,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # tourism-artwork # caption(optional) z15- (also has icon z15-) # tourism-artwork-architecture # caption(optional) z15- (also has icon z15-) # tourism-artwork-painting # caption(optional) z15- (also has icon z15-) +# amenity-studio # === -8450 # amenity-shelter # caption(optional) z13- (also has icon z12-) diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index bfda0cda0..60f925348 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -2206,6 +2206,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke) {"amenity", "charging_station"}, {"amenity", "childcare"}, {"amenity", "cinema"}, + {"amenity", "studio"}, {"amenity", "clinic"}, {"amenity", "college"}, {"amenity", "community_centre"}, diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index b6f4b4c22..b241ff2e1 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -42,6 +42,7 @@ "type.amenity.car_wash" = "Car Wash"; "type.amenity.casino" = "Casino"; "type.amenity.gambling" = "Gambling"; +"type.amenity.studio" = "Studio"; "type.leisure.adult_gaming_centre" = "Adult Gaming Centre"; "type.leisure.amusement_arcade" = "Arcade"; "type.amenity.charging_station" = "Charging Station";