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 1c0baaf5f..ef5286305 100644 --- a/android/sdk/src/main/res/values-de/types_strings.xml +++ b/android/sdk/src/main/res/values-de/types_strings.xml @@ -1161,6 +1161,7 @@ Bäckerei Badezimmerausstattung Schönheitssalon + Nagelstudio Getränkemarkt Fahrradladen Wettbüro diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml index a2c9dfd05..78a993014 100644 --- a/android/sdk/src/main/res/values/types_strings.xml +++ b/android/sdk/src/main/res/values/types_strings.xml @@ -1228,6 +1228,7 @@ Bakery Bathroom Furnishings Beauty Shop + Nail Salon Beverages Bicycle Shop Bookmaker diff --git a/data/categories-strings/de.json/localize.json b/data/categories-strings/de.json/localize.json index 127beb9b6..ec2da5779 100644 --- a/data/categories-strings/de.json/localize.json +++ b/data/categories-strings/de.json/localize.json @@ -47,7 +47,8 @@ "shop-jewelry|@category_shopping|@shop": "4Juwelier|Juweliergeschäft|Schmuck", "shop-optician|@shop": "4Optiker|5Brillengeschäft|5Augenoptiker", "shop-gift|@category_shopping|@shop": "5Geschenkeladen|Geschenke|Geschenkartikelladen|5Andenkenladen|Andenken|Präsente|4Mitbringsel|4Souvenirladen", -"shop-beauty": "5Schönheitssalon|Schönheitsshop|Kosmetiker|Friseur|Frisör|Haarschnitt|Kosmetikstudio|Friseursalon|Kosmetiksalon|Nagelstudio|Färbung", +"shop-beauty": "5Schönheitssalon|Schönheitsshop|Kosmetiker|Kosmetikstudio|Kosmetiksalon", +"shop-beauty-nails": "5Nagelstudio|Nagelsalon|Fingernägel|Fußnägel|Nägel", "shop-greengrocer|@category_food|@shop": "5Gemüseladen|Gemüsehändler", "shop-sports|@category_shopping|@shop": "4Sportgeschäft|Sportartikel|Fitnessgeschäft", "shop-supermarket|@category_food|@shop": "3Supermarkt", diff --git a/data/categories-strings/en.json/localize.json b/data/categories-strings/en.json/localize.json index b6a6601c4..9db45c128 100644 --- a/data/categories-strings/en.json/localize.json +++ b/data/categories-strings/en.json/localize.json @@ -50,7 +50,8 @@ "shop-jewelry|@category_shopping|@shop": "4Jewelry|U+1F48D", "shop-optician|@shop": "4Optician|glasses|sunglasses|U+1F453", "shop-gift|@category_shopping|@shop": "Gift|U+1F381|souvenir|souvenirs|3gifts|presents|4Souvenir shop|gift shop|giftshop", -"shop-beauty": "4Beauty Shop|beautician|U+1F484|beauty salon|beauty parlor|nail salon|coloring", +"shop-beauty": "4Beauty Shop|beautician|U+1F484|beauty salon|beauty parlor|coloring", +"shop-beauty-nails": "4Nail salon|nail technician|nail tech|finger nails|toe nails|nails", "shop-greengrocer|@category_food|@shop": "4Greengrocer|U+1F345|U+1F346|U+1F33D|U+1F360|U+1F348|U+1F347|U+1F349|U+1F34A|U+1F34C|U+1F34D|U+1F34E|U+1F34F|U+1F350|U+1F351|U+1F353", "shop-sports|@category_shopping|@shop": "4Sports Goods|U+1F3BF|U+1F3A3|U+1F3C2|U+1F6B4|U+26BD|U+1F3C0|U+1F3C8|U+26BE|U+1F3BE|U+1F3C9|U+26F3", "shop-supermarket|@category_food|@shop": "3Supermarket", diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 3c8c29693..cf61afd3a 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -578,7 +578,7 @@ boundary|administrative|4;[boundary=administrative][admin_level=4];;;;459; # ~100k usages. railway|station;460; sport|handball;461; -deprecated:boundary|administrative|city:04.2024;[boundary=administrative][border_type=city];x;name;int_name;462; +shop|beauty|nails;[shop=beauty][beauty=nails];;name;int_name;462; piste:type|downhill|freeride;[piste:type=downhill][piste:difficulty=freeride],[piste:type=downhill][piste:grooming=backcountry][!piste:difficulty];;name;int_name;463; # _path_grade is a surrogate tag which combines sac_scale and trail_visibility, see osm2type.cpp highway|path|difficult;[highway=path][_path_grade=difficult];;name;int_name;464; diff --git a/data/styles/default/dark/symbols/nails-m.svg b/data/styles/default/dark/symbols/nails-m.svg new file mode 100644 index 000000000..9a2357d66 --- /dev/null +++ b/data/styles/default/dark/symbols/nails-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 1795c20f2..6d928ec76 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -2160,6 +2160,8 @@ node|z17-[shop=pastry], {icon-image: bakery-m.svg;icon-min-distance: 24;} node|z17-[shop=beauty], {icon-image: beauty-m.svg;icon-min-distance: 24;} +node|z17-[shop=beauty][beauty=nails], +{icon-image: nails-m.svg;icon-min-distance: 24;} node|z17-[shop=cosmetics], {icon-image: beauty-m.svg;icon-min-distance: 24;} node|z17-[shop=beverages], diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index a9e5cbbcc..7c4768ba3 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -846,6 +846,7 @@ shop-appliance # icon z18- (also has captio 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-beauty-nails # 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-) @@ -1931,6 +1932,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # 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-beauty-nails # 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/nails-m.svg b/data/styles/default/light/symbols/nails-m.svg new file mode 100644 index 000000000..6d4781cc5 --- /dev/null +++ b/data/styles/default/light/symbols/nails-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 9c7940c66..0df6f546b 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -846,6 +846,7 @@ shop-appliance # icon z18- (also has captio 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-beauty-nails # 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-) @@ -1934,6 +1935,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # 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-beauty-nails # 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/de.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings index 33104210f..59b3493c2 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings @@ -1269,6 +1269,7 @@ "type.shop.bakery" = "Bäckerei"; "type.shop.bathroom_furnishing" = "Badezimmerausstattung"; "type.shop.beauty" = "Schönheitssalon"; +"type.shop.beauty.nails" = "Nagelstudio"; "type.shop.beverages" = "Getränkemarkt"; "type.shop.bicycle" = "Fahrradladen"; "type.shop.bookmaker" = "Wettbüro"; diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings index 9fa8be76a..dbfb7aeb5 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings @@ -1282,6 +1282,7 @@ "type.shop.bakery" = "Bakery"; "type.shop.bathroom_furnishing" = "Bathroom Furnishings"; "type.shop.beauty" = "Beauty Shop"; +"type.shop.beauty.nails" = "Nail Salon"; "type.shop.beverages" = "Beverages"; "type.shop.bicycle" = "Bicycle Shop"; "type.shop.bookmaker" = "Bookmaker"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index d237179fe..35bf832b5 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -1323,6 +1323,7 @@ "type.shop.bakery" = "Bakery"; "type.shop.bathroom_furnishing" = "Bathroom Furnishings"; "type.shop.beauty" = "Beauty Shop"; +"type.shop.beauty.nails" = "Nail Salon"; "type.shop.beverages" = "Beverages"; "type.shop.bicycle" = "Bicycle Shop"; "type.shop.bookmaker" = "Bookmaker";