[classifier] Added shop=lighting.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
Co-authored-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>

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

@@ -1229,6 +1229,7 @@
     <string name="type.shop.trade">Торговые поставки</string>
     <string name="type.shop.watches">Часы</string>
     <string name="type.shop.wholesale">Оптовый магазин</string>
+    <string name="type.shop.lighting">Осветительные приборы</string>
     <string name="type.sport">Спорт</string>
     <string name="type.sport.american_football">Американский футбол</string>
     <string name="type.sport.archery">Стрельба из лука</string>

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

@@ -1251,6 +1251,7 @@
     <string name="type.shop.trade">Trade Supplies</string>
     <string name="type.shop.watches">Watch Store</string>
     <string name="type.shop.wholesale">Wholesale Store</string>
+    <string name="type.shop.lighting">Lighting Shop</string>
     <string name="type.sport">Sport</string>
     <string name="type.sport.american_football">American Football</string>
     <string name="type.sport.archery">Archery</string>

data/categories-strings/en.json/localize.json

@@ -465,6 +465,7 @@
 "shop-electrical|@shop": "Electrical Supplies|Electrical|U+1F50B|U+1F50C|U+1F4A1|U+1F526",
 "shop-fishing|@shop": "Fishing",
 "shop-interior_decoration|@shop": "Interior Decorations",
+"shop-lighting|@shop": "4Lighting|Lighting fixtures|4Lamps",
 "shop-lottery|@gambling": "Lottery Tickets",
 "shop-medical_supply|@shop": "Medical Supplies",
 "shop-nutrition_supplements|@shop": "Nutrition Supplements",

data/categories-strings/ru.json/localize.json

@@ -450,6 +450,7 @@
 "shop-electrical|@shop": "4Электроника|Электротовары",
 "shop-fishing|@shop": "Рыболовный",
 "shop-interior_decoration|@shop": "Украшения для интерьера",
+"shop-lighting|@shop": "4Осветительные приборы|5освещение|4световые приборы|4лампы",
 "shop-lottery|@gambling": "Лотерея|Лотерейные билеты",
 "shop-medical_supply|@shop": "Медикаменты",
 "shop-nutrition_supplements|@shop": "Пищевые добавки",

data/editor.config

@@ -778,7 +778,7 @@
       <type id="shop-bakery" group="shop">
         <include group="poi_internet" />
       </type>
-      <type id="shop-pastry" group="shop">
+      <type id="shop-bathroom_furnishing" group="shop">
         <include group="poi_internet" />
       </type>
       <type id="shop-beauty">
@@ -911,6 +911,9 @@
         <include group="poi_internet" />
         <include field="self_service" />
       </type>
+      <type id="shop-lighting" group="shop">
+        <include group="poi_internet" />
+      </type>
       <!-- Not addable as mapping as a node is uncommon -->
       <type id="shop-mall" group="big_shop" can_add="no">
         <include group="poi_internet" />
@@ -927,6 +930,12 @@
       <type id="shop-outdoor" group="shop">
         <include group="poi_internet" />
       </type>
+      <type id="shop-pasta" group="shop">
+        <include group="poi_internet" />
+      </type>
+      <type id="shop-pastry" group="shop">
+        <include group="poi_internet" />
+      </type>
       <type id="shop-perfumery" group="shop">
         <include group="poi_internet" />
       </type>
@@ -973,9 +982,6 @@
       <type id="shop-auction" group="shop" can_add="no">
         <include group="poi_internet" />
       </type>
-      <type id="shop-bathroom_furnishing" group="shop">
-        <include group="poi_internet" />
-      </type>
       <type id="shop-bed" group="shop">
         <include group="poi_internet" />
       </type>

data/mapcss-mapping.csv

@@ -1757,3 +1757,4 @@ leisure|escape_game;1628;
 amenity|luggage_locker;1629;
 building|guardhouse;[building=guardhouse],[amenity=security_booth],[amenity=checkpoint];;;;1630;
 office|security;1631;
+shop|lighting;1632;

data/styles/default/include/Icons.mapcss

@@ -1542,12 +1542,12 @@ node|z16-[shop=houseware],
 node|z16-[shop=jewelry],
 node|z16-[shop=kiosk],
 node|z16-[shop=laundry],
+node|z16-[shop=lighting],
 node|z16-[shop=dry_cleaning],
 node|z16-[shop=mobile_phone],
 node|z16-[shop=optician],
 node|z16-[shop=outdoor],
 node|z16-[shop=rental],
-node|z16-[shop=rental][rental=bike],
 node|z16-[shop=seafood],
 node|z16-[shop=shoes],
 node|z16-[shop=sports],
@@ -1663,6 +1663,7 @@ node|z16[shop=pet],
 node|z16[shop=department_store],
 {icon-image: department_store-m.svg;}
 node|z16[shop=interior_decoration],
+node|z16[shop=lighting],
 {icon-image: interior_decoration-m.svg;}
 node|z16[shop=doityourself],
 {icon-image: doityourself-m.svg;}
@@ -1804,6 +1805,7 @@ node|z17-[shop=pet],
 node|z17-[shop=department_store],
 {icon-image: department_store-m.svg;icon-min-distance: 24;}
 node|z17-[shop=interior_decoration],
+node|z17-[shop=lighting],
 {icon-image: interior_decoration-m.svg;icon-min-distance: 24;}
 node|z17-[shop=doityourself],
 {icon-image: doityourself-m.svg;icon-min-distance: 24;}
@@ -2125,6 +2127,7 @@ node[shop=hardware],
 node[shop=health_food],
 node[shop=houseware],
 node[shop=interior_decoration],
+node[shop=lighting],
 node[shop=jewelry],
 node[shop=kiosk],
 node[shop=kitchen],
@@ -2167,6 +2170,7 @@ node[shop=hearing_aids],
 node[shop=lottery],
 node[shop=tobacco],
 node[shop=wholesale],
+node[shop=electrical],
 {text-color: @shop_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
 
 node[amenity=bar],

data/styles/default/include/priorities_4_overlays.prio.txt

@@ -971,6 +971,7 @@ shop-interior_decoration                            # icon z16- (also has captio
 shop-jewelry                                        # icon z16- (also has caption(optional) z16-)
 shop-kiosk                                          # icon z16- (also has caption(optional) z16-)
 shop-kitchen                                        # icon z16- (also has caption(optional) z16-)
+shop-lighting                                       # icon z16- (also has caption(optional) z16-)
 shop-massage                                        # icon z17- (also has caption(optional) z18-)
 shop-money_lender                                   # icon z17- (also has caption(optional) z17-)
 shop-motorcycle                                     # icon z16- (also has caption(optional) z16-)
@@ -1936,6 +1937,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-jewelry                                      # caption(optional) z16- (also has icon z16-)
 # shop-kiosk                                        # caption(optional) z16- (also has icon z16-)
 # shop-kitchen                                      # caption(optional) z16- (also has icon z16-)
+# shop-lighting                                     # caption(optional) z16- (also has icon z16-)
 # shop-massage                                      # caption(optional) z18- (also has icon z17-)
 # shop-money_lender                                 # caption(optional) z17- (also has icon z17-)
 # shop-motorcycle                                   # caption(optional) z16- (also has icon z16-)

data/styles/outdoors/include/priorities_4_overlays.prio.txt

@@ -971,6 +971,7 @@ shop-interior_decoration                            # icon z16- (also has captio
 shop-jewelry                                        # icon z16- (also has caption(optional) z16-)
 shop-kiosk                                          # icon z16- (also has caption(optional) z16-)
 shop-kitchen                                        # icon z16- (also has caption(optional) z16-)
+shop-lighting                                       # icon z16- (also has caption(optional) z16-)
 shop-massage                                        # icon z17- (also has caption(optional) z18-)
 shop-money_lender                                   # icon z17- (also has caption(optional) z17-)
 shop-motorcycle                                     # icon z16- (also has caption(optional) z16-)
@@ -1939,6 +1940,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-jewelry                                      # caption(optional) z16- (also has icon z16-)
 # shop-kiosk                                        # caption(optional) z16- (also has icon z16-)
 # shop-kitchen                                      # caption(optional) z16- (also has icon z16-)
+# shop-lighting                                     # caption(optional) z16- (also has icon z16-)
 # shop-massage                                      # caption(optional) z18- (also has icon z17-)
 # shop-money_lender                                 # caption(optional) z17- (also has icon z17-)
 # shop-motorcycle                                   # caption(optional) z16- (also has icon z16-)

iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings

@@ -1347,6 +1347,7 @@
 "type.shop.trade" = "Trade Supplies";
 "type.shop.watches" = "Watch Store";
 "type.shop.wholesale" = "Wholesale Store";
+"type.shop.lighting" = "Lighting Shop";
 "type.sport" = "Sport";
 "type.sport.american_football" = "American Football";
 "type.sport.archery" = "Archery";

iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings

@@ -1315,6 +1315,7 @@
 "type.shop.trade" = "Торговые поставки";
 "type.shop.watches" = "Часы";
 "type.shop.wholesale" = "Оптовый магазин";
+"type.shop.lighting" = "Осветительные приборы";
 "type.sport" = "Спорт";
 "type.sport.american_football" = "Американский футбол";
 "type.sport.archery" = "Стрельба из лука";