[types] Adding nail salon

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>

android/sdk/src/main/res/values-de/types_strings.xml

@@ -1161,6 +1161,7 @@
     <string name="type.shop.bakery">Bäckerei</string>
     <string name="type.shop.bathroom_furnishing">Badezimmerausstattung</string>
     <string name="type.shop.beauty">Schönheitssalon</string>
+    <string name="type.shop.beauty.nails">Nagelstudio</string>
     <string name="type.shop.beverages">Getränkemarkt</string>
     <string name="type.shop.bicycle">Fahrradladen</string>
     <string name="type.shop.bookmaker">Wettbüro</string>

android/sdk/src/main/res/values/types_strings.xml

@@ -1228,6 +1228,7 @@
     <string name="type.shop.bakery">Bakery</string>
     <string name="type.shop.bathroom_furnishing">Bathroom Furnishings</string>
     <string name="type.shop.beauty">Beauty Shop</string>
+    <string name="type.shop.beauty.nails">Nail Salon</string>
     <string name="type.shop.beverages">Beverages</string>
     <string name="type.shop.bicycle">Bicycle Shop</string>
     <string name="type.shop.bookmaker">Bookmaker</string>

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",

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",

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;

data/styles/default/dark/symbols/nails-m.svg

@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#6b425c" r="8.25"/><path d="m11.3068855 7.79744628c.2660818.39143376.434642.85491199.4713535 1.35761533l.2671914 3.65874019c.0482703.6609814-.4484303 1.2359436-1.1094118 1.284214l-.0436715.00239-3.74096459.0007971c-.6627417 0-1.2-.5372583-1.2-1.2l.00318713-.0874011.26719134-3.65874019c.03402228-.46587839.18128389-.89806797.41366076-1.27042362l.05861214-.08773368-.07742212 1.60884098-.00280641.11671571c0 1.2272994.91033155 2.2222222 2.03328243 2.2222222l.76013224-.0007669.05337767-.0023003c1.12140091-.0644603 1.98266351-1.1102652 1.92368381-2.33587071zm-2.30643887-3.89864928c.27723165 0 .65337303.43058372.98287113 1.26364976.26967134.68180667.47230104 1.58891008.48902314 1.93639653l.1128653 2.34535583c.0385946.80200078-.5036245 1.46040098-1.17051828 1.49873528l-.0419112.0017492h-.72649609c-.66366659 0-1.23247528-.6216648-1.23247528-1.4222226l.11566443-2.44268114c.01652017-.34329115.21891042-1.24559252.48806605-1.92351364.32920022-.82915515.70475843-1.25746922.9829108-1.25746922z" fill="#000" fill-rule="evenodd"/></g></svg>

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],

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-)

data/styles/default/light/symbols/nails-m.svg

@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#be75a3" r="8.25"/><path d="m11.3068855 7.79744628c.2660818.39143376.434642.85491199.4713535 1.35761533l.2671914 3.65874019c.0482703.6609814-.4484303 1.2359436-1.1094118 1.284214l-.0436715.00239-3.74096459.0007971c-.6627417 0-1.2-.5372583-1.2-1.2l.00318713-.0874011.26719134-3.65874019c.03402228-.46587839.18128389-.89806797.41366076-1.27042362l.05861214-.08773368-.07742212 1.60884098-.00280641.11671571c0 1.2272994.91033155 2.2222222 2.03328243 2.2222222l.76013224-.0007669.05337767-.0023003c1.12140091-.0644603 1.98266351-1.1102652 1.92368381-2.33587071zm-2.30643887-3.89864928c.27723165 0 .65337303.43058372.98287113 1.26364976.26967134.68180667.47230104 1.58891008.48902314 1.93639653l.1128653 2.34535583c.0385946.80200078-.5036245 1.46040098-1.17051828 1.49873528l-.0419112.0017492h-.72649609c-.66366659 0-1.23247528-.6216648-1.23247528-1.4222226l.11566443-2.44268114c.01652017-.34329115.21891042-1.24559252.48806605-1.92351364.32920022-.82915515.70475843-1.25746922.9829108-1.25746922z" fill="#fff" fill-rule="evenodd"/></g></svg>

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-)

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";

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";

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";