diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml index 4c18f8fd7..7f5093399 100644 --- a/android/sdk/src/main/res/values/types_strings.xml +++ b/android/sdk/src/main/res/values/types_strings.xml @@ -1236,6 +1236,7 @@ Kitchen Store Laundry Mall + Day Spa Massage Salon Mobile Phone Store Money Lender diff --git a/data/categories-strings/en.json/localize.json b/data/categories-strings/en.json/localize.json index 75f382445..4a4dd2e5b 100644 --- a/data/categories-strings/en.json/localize.json +++ b/data/categories-strings/en.json/localize.json @@ -438,6 +438,7 @@ "office-insurance": "4Insurance Office", "office-ngo": "4Non-Governmental Organization|NGO", "shop-erotic|@shop": "4Erotic|4Adult|3Sex", +"shop-beauty-day_spa": "4Day Spa|spa|wellness", "shop-massage": "Massage salon|Massage Parlour|4massage|spa|massage center|massage therapy|massage services|spa treatment|spa services", "shop-motorcycle|@shop": "4Motorcycle", "shop-motorcycle_repair": "4Motorcycle Repair", diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 0fd34cb08..4d4e583e4 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -987,7 +987,7 @@ highway|busway|tunnel;[highway=busway][tunnel?];;name;int_name;860; natural|salt_pond;861;landuse|salt_pond amenity|conference_centre;862; amenity|exhibition_centre;863; -deprecated:railway|siding|tunnel:06.2023;864;x +shop|beauty|day_spa;[shop=beauty][beauty=spa];;name;int_name;864; amenity|boat_rental;865; area:highway|footway;866; junction|circular;867; diff --git a/data/styles/default/dark/symbols/day-spa-m.svg b/data/styles/default/dark/symbols/day-spa-m.svg new file mode 100644 index 000000000..1211a7f98 --- /dev/null +++ b/data/styles/default/dark/symbols/day-spa-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 47ebcdb55..312ef4cee 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -2107,6 +2107,8 @@ node|z17-[shop=variety_store], {icon-image: shop-m.svg;} node|z17-[shop=massage], {icon-image: massage_salon-m.svg;icon-min-distance: 24;} +node|z17-[shop=beauty][beauty=spa], +{icon-image: day-spa-m.svg;icon-min-distance: 24;} node|z17-[shop=money_lender], {icon-image: bank-m.svg;icon-min-distance: 24;} node|z17-[shop=pawnbroker], diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 4c807e776..00890c9f2 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -844,6 +844,7 @@ shop-antiques # icon z16- (also has captio shop-appliance # icon z18- (also has caption(optional) z18-) shop-baby_goods # icon z18- (also has caption(optional) z18-) shop-beauty # icon z16- (also has caption(optional) z16-) +shop-beauty-day_spa # icon z16- (also has caption(optional) z16-) shop-beverages # icon z16- (also has caption(optional) z16-) shop-boutique # icon z18- (also has caption(optional) z18-) shop-car_repair # icon z16- (also has caption(optional) z16-) @@ -1890,6 +1891,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # shop-appliance # caption(optional) z18- (also has icon z18-) # shop-baby_goods # caption(optional) z18- (also has icon z18-) # shop-beauty # caption(optional) z16- (also has icon z16-) +# shop-beauty-day_spa # caption(optional) z16- (also has icon z16-) # shop-beverages # caption(optional) z16- (also has icon z16-) # shop-boutique # caption(optional) z18- (also has icon z18-) # shop-car_repair # caption(optional) z16- (also has icon z16-) diff --git a/data/styles/default/light/symbols/day-spa-m.svg b/data/styles/default/light/symbols/day-spa-m.svg new file mode 100644 index 000000000..68a0b3bb1 --- /dev/null +++ b/data/styles/default/light/symbols/day-spa-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 0b2d2cdc4..0d58654ea 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -844,6 +844,7 @@ shop-antiques # icon z16- (also has captio shop-appliance # icon z18- (also has caption(optional) z18-) shop-baby_goods # icon z18- (also has caption(optional) z18-) shop-beauty # icon z16- (also has caption(optional) z16-) +shop-beauty-day_spa # icon z16- (also has caption(optional) z16-) shop-beverages # icon z16- (also has caption(optional) z16-) shop-boutique # icon z18- (also has caption(optional) z18-) shop-car_repair # icon z16- (also has caption(optional) z16-) @@ -1893,6 +1894,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # shop-appliance # caption(optional) z18- (also has icon z18-) # shop-baby_goods # caption(optional) z18- (also has icon z18-) # shop-beauty # caption(optional) z16- (also has icon z16-) +# shop-beauty-day_spa # caption(optional) z16- (also has icon z16-) # shop-beverages # caption(optional) z16- (also has icon z16-) # shop-boutique # caption(optional) z18- (also has icon z18-) # shop-car_repair # caption(optional) z16- (also has icon z16-) diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings index 5617e7aed..6ba271edd 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings @@ -1291,6 +1291,7 @@ "type.shop.kitchen" = "Kitchen Shop"; "type.shop.laundry" = "Launderette"; "type.shop.mall" = "Shopping Centre"; +"type.shop.beauty.day_spa" = "Day Spa"; "type.shop.massage" = "Massage Salon"; "type.shop.mobile_phone" = "Mobile Phone Shop"; "type.shop.money_lender" = "Money Lender"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index 30504651b..f117934c7 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -1331,6 +1331,7 @@ "type.shop.kitchen" = "Kitchen Store"; "type.shop.laundry" = "Laundry"; "type.shop.mall" = "Mall"; +"type.shop.beauty.day_spa" = "Day Spa"; "type.shop.massage" = "Massage Salon"; "type.shop.mobile_phone" = "Mobile Phone Store"; "type.shop.money_lender" = "Money Lender";