From 8aed02475aac695e12eaea777eca8e451c388301 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Mon, 1 Sep 2025 18:57:07 -0300 Subject: [PATCH] [classifier] Added shop=lighting. Signed-off-by: Viktor Govako Co-authored-by: Konstantin Pastbin --- .../sdk/src/main/res/values-ru/types_strings.xml | 1 + android/sdk/src/main/res/values/types_strings.xml | 1 + data/categories-strings/en.json/localize.json | 1 + data/categories-strings/ru.json/localize.json | 1 + data/editor.config | 14 ++++++++++---- data/mapcss-mapping.csv | 1 + data/styles/default/include/Icons.mapcss | 6 +++++- .../default/include/priorities_4_overlays.prio.txt | 2 ++ .../include/priorities_4_overlays.prio.txt | 2 ++ .../en.lproj/LocalizableTypes.strings | 1 + .../ru.lproj/LocalizableTypes.strings | 1 + 11 files changed, 26 insertions(+), 5 deletions(-) diff --git a/android/sdk/src/main/res/values-ru/types_strings.xml b/android/sdk/src/main/res/values-ru/types_strings.xml index 0bac87c2f..83b40f04f 100644 --- a/android/sdk/src/main/res/values-ru/types_strings.xml +++ b/android/sdk/src/main/res/values-ru/types_strings.xml @@ -1229,6 +1229,7 @@ Торговые поставки Часы Оптовый магазин + Осветительные приборы Спорт Американский футбол Стрельба из лука diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml index 94067a03e..32071d119 100644 --- a/android/sdk/src/main/res/values/types_strings.xml +++ b/android/sdk/src/main/res/values/types_strings.xml @@ -1251,6 +1251,7 @@ Trade Supplies Watch Store Wholesale Store + Lighting Shop Sport American Football Archery diff --git a/data/categories-strings/en.json/localize.json b/data/categories-strings/en.json/localize.json index 5e845ba2b..25160b13e 100644 --- a/data/categories-strings/en.json/localize.json +++ b/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", diff --git a/data/categories-strings/ru.json/localize.json b/data/categories-strings/ru.json/localize.json index 5b96c2ece..2aba3918e 100644 --- a/data/categories-strings/ru.json/localize.json +++ b/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": "Пищевые добавки", diff --git a/data/editor.config b/data/editor.config index f4be95219..ce667ff45 100644 --- a/data/editor.config +++ b/data/editor.config @@ -778,7 +778,7 @@ - + @@ -911,6 +911,9 @@ + + + @@ -927,6 +930,12 @@ + + + + + + @@ -973,9 +982,6 @@ - - - diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 726b69297..1adf25076 100644 --- a/data/mapcss-mapping.csv +++ b/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; diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 559173efc..c80cbe4eb 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/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], diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index c6d41f143..372bc4bb8 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/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-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index dbc986ed5..6a98530ea 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/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-) diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index f8497b520..a3e1d5f3c 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/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"; diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings index ba365152d..5fbf85f83 100644 --- a/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings +++ b/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" = "Стрельба из лука";