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 aa9eadcfd..f6d78e841 100644 --- a/android/sdk/src/main/res/values-de/types_strings.xml +++ b/android/sdk/src/main/res/values-de/types_strings.xml @@ -79,6 +79,7 @@ Internetcafé Bibliothek Laderampe + Liege Marktplatz Motorrad-Parkplatz Nachtclub diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml index 727ffac66..0b368a635 100644 --- a/android/sdk/src/main/res/values/types_strings.xml +++ b/android/sdk/src/main/res/values/types_strings.xml @@ -90,6 +90,7 @@ Kindergarten Library Loading Dock + Lounger Luggage Locker Marketplace Motorcycle Parking diff --git a/data/copyright.html b/data/copyright.html index 1fefff9d0..8e35b1268 100644 --- a/data/copyright.html +++ b/data/copyright.html @@ -353,6 +353,9 @@
  • OpenStreetMap Carto
    © 2025 OpenStreetMap Carto; CC0 1.0 Universal
    • + +
  • Temaki
    + © 2025 Rapid Editor; CC0 1.0 Universal
    • diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 53d200126..254037401 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -251,7 +251,7 @@ railway|tram;150; # ~430k usages. amenity|toilets;151; natural|water|basin;[natural=water][water=basin];;name;int_name;152; -deprecated:highway|footway|permissive:12.2023;[highway=footway][access=permissive],[highway=footway][foot=permissive];x;name;int_name;153;highway|footway +amenity|lounger;[amenity=lounger][!seasonal];;name;int_name;153; leisure|picnic_table;154; landuse|construction;155; tourism|viewpoint;156; diff --git a/data/styles/default/dark/symbols/lounger-m.svg b/data/styles/default/dark/symbols/lounger-m.svg new file mode 100644 index 000000000..0c5cd8007 --- /dev/null +++ b/data/styles/default/dark/symbols/lounger-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 5f6e97c73..d842e517e 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -1574,6 +1574,8 @@ node|z18-[amenity=bench], {icon-image: bench.svg;} node|z18-[amenity=bench][backrest=not], {icon-image: bench_backless.svg;} +node|z18-[amenity=lounger], +{icon-image: lounger-m.svg;} node|z18-[amenity=waste_basket] {icon-image: waste-basket-s.svg;} node|z18-[amenity=waste_disposal], diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index fc20b69e9..9f0d4b706 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -2325,6 +2325,7 @@ building-address # caption z16- amenity-bench # icon z18- (also has caption(optional) z19-) amenity-bench-backless # 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-assembly_point # icon z18- (also has caption(optional) z18-) emergency-defibrillator # icon z18- (also has caption(optional) z18-) @@ -2340,6 +2341,7 @@ power-substation # icon z17- (also has captio # amenity-bench-backless # caption(optional) z19- (also has icon z18-) amenity-loading_dock # icon z18- (also has caption(optional) z19-) # amenity-loading_dock # caption(optional) z19- (also has icon z18-) +# amenity-lounger # caption(optional) z19- (also has icon z18-) # amenity-parking_space-disabled # caption(optional) z19- (also has icon z18-) # amenity-telephone # caption(optional) z19- (also has icon z17-) # amenity-vending_machine # caption(optional) z18- (also has icon z18-) diff --git a/data/styles/default/light/symbols/lounger-m.svg b/data/styles/default/light/symbols/lounger-m.svg new file mode 100644 index 000000000..c740ac2d0 --- /dev/null +++ b/data/styles/default/light/symbols/lounger-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 9fb5b0667..76fe8f9f1 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -2331,6 +2331,7 @@ building-address # caption z16- amenity-bench # icon z18- (also has caption(optional) z19-) amenity-bench-backless # 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-assembly_point # icon z18- (also has caption(optional) z18-) emergency-defibrillator # icon z18- (also has caption(optional) z18-) @@ -2346,6 +2347,7 @@ power-substation # icon z17- (also has captio # amenity-bench-backless # caption(optional) z19- (also has icon z18-) amenity-loading_dock # icon z18- (also has caption(optional) z19-) # amenity-loading_dock # caption(optional) z19- (also has icon z18-) +# amenity-lounger # caption(optional) z19- (also has icon z18-) # amenity-parking_space-disabled # caption(optional) z19- (also has icon z18-) # amenity-telephone # caption(optional) z19- (also has icon z17-) # amenity-vending_machine # caption(optional) z18- (also has icon z18-) diff --git a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings index ecd060249..c68f66348 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings @@ -83,6 +83,7 @@ "type.amenity.kindergarten" = "Kindergarten"; "type.amenity.library" = "Bibliothek"; "type.amenity.loading_dock" = "Laderampe"; +"type.amenity.lounger" = "Liege"; "type.amenity.marketplace" = "Marktplatz"; "type.amenity.motorcycle_parking" = "Motorrad-Parkplatz"; "type.amenity.nightclub" = "Nachtclub"; diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings index 63a7cb95b..21b372643 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings @@ -83,6 +83,7 @@ "type.amenity.kindergarten" = "Kindergarten"; "type.amenity.library" = "Library"; "type.amenity.loading_dock" = "Loading Bay"; +"type.amenity.lounger" = "Lounger"; "type.amenity.marketplace" = "Marketplace"; "type.amenity.motorcycle_parking" = "Motorcycle Parking"; "type.amenity.nightclub" = "Nightclub"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index a27340dda..ea6933ad7 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -93,6 +93,7 @@ "type.amenity.kindergarten" = "Kindergarten"; "type.amenity.library" = "Library"; "type.amenity.loading_dock" = "Loading Dock"; +"type.amenity.lounger" = "Lounger"; "type.amenity.luggage_locker" = "Luggage Locker"; "type.amenity.marketplace" = "Marketplace"; "type.amenity.motorcycle_parking" = "Motorcycle Parking";