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 e2853c324..aa9eadcfd 100644 --- a/android/sdk/src/main/res/values-de/types_strings.xml +++ b/android/sdk/src/main/res/values-de/types_strings.xml @@ -610,6 +610,7 @@ Grünfläche Weinberg Freizeit + Musikpavillon Öffentliche Grünfläche Hundeauslauffläche Fitnessstudio diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml index ab96f787e..ada7eaeab 100644 --- a/android/sdk/src/main/res/values/types_strings.xml +++ b/android/sdk/src/main/res/values/types_strings.xml @@ -643,6 +643,7 @@ Vineyard Plant Nursery Leisure + Bandstand Public Land Dog Park Escape Room diff --git a/data/categories-strings/de.json/localize.json b/data/categories-strings/de.json/localize.json index 1e4f0d8cc..14a9138b9 100644 --- a/data/categories-strings/de.json/localize.json +++ b/data/categories-strings/de.json/localize.json @@ -456,6 +456,7 @@ "shop-watches|@category_shopping|@shop": "Uhrengeschäft|Uhren", "shop-wholesale|@shop": "5Großhandelsgeschäft", "leisure-track": "Laufbahn", +"leisure-bandstand": "6Musikpavillon|8Konzertpavillon|Konzertmuschel|Musikmuschel|Kurpavillon|Kurmuschel", "power-plant": "Kraftwerk", "shop-auction|@category_secondhand": "Auktion", "shop-collector|@category_shopping|@category_secondhand": "Sammlerartikel|Sammlerstücke", diff --git a/data/categories-strings/en.json/localize.json b/data/categories-strings/en.json/localize.json index bf4cbf566..ea4976aa7 100644 --- a/data/categories-strings/en.json/localize.json +++ b/data/categories-strings/en.json/localize.json @@ -481,6 +481,7 @@ "shop-watches|@category_shopping|@shop": "Watches", "shop-wholesale|@shop": "Wholesale", "leisure-track": "Track", +"leisure-bandstand": "5Bandstand", "power-plant": "Power Plant", "shop-auction|@category_secondhand": "4Auction|Auctioneer|Auction House", "shop-collector|@category_shopping|@category_secondhand": "Collectables|Collector", diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 52da8b6b0..8bf702368 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1000,7 +1000,7 @@ deprecated|deprecated;872;x area:highway|pedestrian;873; area:highway|unclassified;874; highway|pedestrian|square;[highway=pedestrian][place=square];;;;875; -deprecated|deprecated;876;x +leisure|bandstand;876; area:highway|cycleway;877; entrance|exit;878; area:highway|motorway;879; diff --git a/data/styles/default/dark/symbols/bandstand-m.svg b/data/styles/default/dark/symbols/bandstand-m.svg new file mode 100644 index 000000000..56bb10dc7 --- /dev/null +++ b/data/styles/default/dark/symbols/bandstand-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index ab117fb01..88739b459 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -655,6 +655,7 @@ node|z16-[tourism=camp_site], node|z16-[tourism=picnic_site], node|z18-[leisure=picnic_table], node|z17-[amenity=shelter], +node|z17-[leisure=bandstand], node|z16-[amenity=shelter][shelter_type=basic_hut], node|z16-[amenity=shelter][shelter_type=lean_to], node|z16-[tourism=caravan_site], @@ -707,6 +708,8 @@ node|z17-[leisure=outdoor_seating], node|z18-[leisure=outdoor_seating], {icon-image: outdoor_seating-m.svg;} +node|z17-[leisure=bandstand], +{icon-image: bandstand-m.svg;} node|z17-[amenity=shelter], node|z16-[amenity=shelter][shelter_type=lean_to], {icon-image: shelter-m.svg;} diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index e19c6013e..f022eddde 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -1059,6 +1059,7 @@ tourism-artwork-painting # icon z15- (also has captio amenity-shelter # icon z17- (also has caption(optional) z17-) amenity-shelter-public_transport # icon z17- (also has caption(optional) z17-) emergency-lifeguard # icon z17- (also has caption(optional) z18-) +leisure-bandstand # icon z17- (also has caption(optional) z17-) leisure-fitness_station # icon z17- (also has caption(optional) z17-, area z15-) leisure-playground # icon z17- (also has caption(optional) z17-, area z15-) natural-cliff # pathtext z16- (also has line z14-) @@ -2066,6 +2067,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-shelter # caption(optional) z17- (also has icon z17-) # amenity-shelter-public_transport # caption(optional) z17- (also has icon z17-) # emergency-lifeguard # caption(optional) z18- (also has icon z17-) +# leisure-bandstand # caption(optional) z17- (also has icon z17-) # leisure-fitness_station # caption(optional) z17- (also has icon z17-, area z15-) # leisure-playground # caption(optional) z17- (also has icon z17-, area z15-) # === -8500 diff --git a/data/styles/default/light/symbols/bandstand-m.svg b/data/styles/default/light/symbols/bandstand-m.svg new file mode 100644 index 000000000..2afcfc63e --- /dev/null +++ b/data/styles/default/light/symbols/bandstand-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 5900c4172..d4141cf5c 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1059,6 +1059,7 @@ tourism-artwork-painting # icon z15- (also has captio amenity-shelter # icon z12- (also has caption(optional) z13-) amenity-shelter-public_transport # icon z14- (also has caption(optional) z14-) emergency-lifeguard # icon z14- (also has caption(optional) z18-) +leisure-bandstand # icon z17- (also has caption(optional) z17-) leisure-fitness_station # icon z17- (also has caption(optional) z17-, area z15-) leisure-playground # icon z17- (also has caption(optional) z17-, area z15-) natural-cliff # pathtext z14- (also has line z12-) @@ -2069,6 +2070,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-shelter # caption(optional) z13- (also has icon z12-) # amenity-shelter-public_transport # caption(optional) z14- (also has icon z14-) # emergency-lifeguard # caption(optional) z18- (also has icon z14-) +# leisure-bandstand # caption(optional) z17- (also has icon z17-) # leisure-fitness_station # caption(optional) z17- (also has icon z17-, area z15-) # leisure-playground # caption(optional) z17- (also has icon z17-, area z15-) # === -8500 diff --git a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings index 8f72c4703..ecd060249 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings @@ -692,6 +692,7 @@ "type.landuse.village_green" = "Grünfläche"; "type.landuse.vineyard" = "Weinberg"; "type.leisure" = "Freizeit"; +"type.leisure.bandstand" = "Musikpavillon"; "type.leisure.common" = "Öffentliche Grünfläche"; "type.leisure.dog_park" = "Hundeauslauffläche"; "type.leisure.fitness_centre" = "Fitnessstudio"; diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings index 95132821e..63a7cb95b 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings @@ -693,6 +693,7 @@ "type.landuse.village_green" = "Land"; "type.landuse.vineyard" = "Vineyard"; "type.leisure" = "Leisure"; +"type.leisure.bandstand" = "Bandstand"; "type.leisure.common" = "Common Land"; "type.leisure.dog_park" = "Dog Park"; "type.leisure.fitness_centre" = "Fitness Centre"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index 76854351d..38f51ccd0 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -722,6 +722,7 @@ "type.landuse.vineyard" = "Vineyard"; "type.landuse.plant_nursery" = "Plant Nursery"; "type.leisure" = "Leisure"; +"type.leisure.bandstand" = "Bandstand"; "type.leisure.common" = "Public Land"; "type.leisure.dog_park" = "Dog Park"; "type.leisure.escape_game" = "Escape Room";