From 3968b644b89c4213a29b217b08389826dfa960a5 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Tue, 25 Jan 2022 19:32:18 +0300 Subject: [PATCH 1/5] [classifier] Add shop=caravan, update dump station icon Needed-for: #1921 Signed-off-by: Konstantin Pastbin --- data/categories.txt | 15 ++++-- data/mapcss-mapping.csv | 2 +- data/replaced_tags.txt | 2 + data/strings/types_strings.txt | 8 ++- data/styles/clear/include/Icons.mapcss | 8 +++ .../style-clear/symbols/caravan-shop-m.svg | 14 ++++++ .../style-clear/symbols/dump-station-m.svg | 50 +++---------------- .../style-night/symbols/caravan-shop-m.svg | 14 ++++++ .../style-night/symbols/dump-station-m.svg | 50 +++---------------- data/styles/vehicle/include/Icons.mapcss | 6 +++ 10 files changed, 79 insertions(+), 90 deletions(-) create mode 100644 data/styles/clear/style-clear/symbols/caravan-shop-m.svg create mode 100644 data/styles/clear/style-night/symbols/caravan-shop-m.svg diff --git a/data/categories.txt b/data/categories.txt index e8b6f84a46..85c3ddbbc2 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -1815,10 +1815,17 @@ sk:Oblečenie sw:Duka la nguo|nguo fa:لباس فروشی|بوتیک +shop-caravan +en:RV dealership|Caravan dealership|Motorhome dealership +be:Продаж аўтадамоў +ru:Продажа автодомов +uk:Продаж автобудинків + shop-car -en:Auto Dealer|U+1F697|U+1F698|U+1F699 -en-GB:Car Dealer|Car showroom|U+1F697|U+1F698|U+1F699 -en-AU:Car Dealer|Car showroom|U+1F697|U+1F698|U+1F699 +en:3Car Dealership|Auto Dealer|U+1F697|U+1F698|U+1F699 +en-GB:3Car Dealership|Car showroom|U+1F697|U+1F698|U+1F699 +en-AU:3Car Dealership|Car showroom|U+1F697|U+1F698|U+1F699 +be:Аўтасалон ru:Автосалон bg:Майстор|автомонтьор|механик|автосалон ar:متجر سيارات|متجر @@ -8196,7 +8203,7 @@ sk:Vinotéka fa:مشروب فروشی shop-car_parts -en:Car Parts|Auto Parts +en:3Car Parts|Auto Parts ru:Автомобильные запчасти|Автозапчасти bg:Автомобил|части|авточасти ar:ﺓﺭﺎﻴﺴﻟﺍ ءﺍﺰﺟﺃ diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 2ae925eedf..06620dd99c 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -718,7 +718,7 @@ historic|ruins;717; historic|monument;718; historic|castle;719; historic|archaeological_site;720; -deprecated|deprecated;721;x +shop|caravan;721; man_made|cutline;722; natural|bay;723; natural|spring;724; diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt index 7df96e7d09..55b559075f 100644 --- a/data/replaced_tags.txt +++ b/data/replaced_tags.txt @@ -22,6 +22,8 @@ drinkable=yes : amenity=drinking_water drinking_water=yes : amenity=drinking_water water_point=yes : amenity=water_point sanitary_dump_station=yes : amenity=sanitary_dump_station +sanitary_dump_station=customers : amenity=sanitary_dump_station +sanitary_dump_station=public : amenity=sanitary_dump_station waterway=sanitary_dump_station : amenity=sanitary_dump_station building=entrance : entrance=yes diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 9c4f651377..9f6e1368e7 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -14864,7 +14864,7 @@ zh-Hant = 肉商 [type.shop.car] - en = Car Shop + en = Car Dealership ar = متجر سيارات cs = Obchod s auty da = Bilforhandler @@ -14991,6 +14991,12 @@ zh-Hans = 轮胎修理 zh-Hant = 輪胎修補 + [type.shop.caravan] + en = RV Dealership + be = Продаж аўтадамоў + ru = Продажа автодомов + uk = Продаж автобудинків + [type.shop.chemist] en = Chemist Shop ar = متجر كيماويات diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index f3e3dc68fa..5f803bbf8d 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -268,6 +268,8 @@ node[shop=supermarket], area[shop=supermarket], node[shop=car_repair][service=tyres], area[shop=car_repair][service=tyres], +node[shop=caravan], +area[shop=caravan], node[highway=services], area[highway=services], node[amenity=clinic], @@ -2126,6 +2128,9 @@ area|z16[shop=butcher] node|z16[shop=car], area|z16[shop=car] {icon-image: car_shop-m.svg;} +node|z16[shop=caravan], +area|z16[shop=caravan] +{icon-image: caravan-shop-m.svg;} node|z16[shop=motorcycle], area|z16[shop=motorcycle] {icon-image: motorcycle_shop-m.svg;} @@ -2289,6 +2294,9 @@ area|z17-[shop=butcher] node|z17-[shop=car], area|z17-[shop=car] {icon-image: car_shop-m.svg;icon-min-distance: 24;text-optional: true;} +node|z17-[shop=caravan], +area|z17-[shop=caravan] +{icon-image: caravan-shop-m.svg;icon-min-distance: 24;text-optional: true;} node|z17-[shop=motorcycle], area|z17-[shop=motorcycle] {icon-image: motorcycle_shop-m.svg;icon-min-distance: 24;text-optional: true;} diff --git a/data/styles/clear/style-clear/symbols/caravan-shop-m.svg b/data/styles/clear/style-clear/symbols/caravan-shop-m.svg new file mode 100644 index 0000000000..c405cd1b28 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/caravan-shop-m.svg @@ -0,0 +1,14 @@ + + + caravan_shop-m + + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/dump-station-m.svg b/data/styles/clear/style-clear/symbols/dump-station-m.svg index a9d44684b3..422149d6c5 100644 --- a/data/styles/clear/style-clear/symbols/dump-station-m.svg +++ b/data/styles/clear/style-clear/symbols/dump-station-m.svg @@ -1,44 +1,10 @@ - - - - - - - - image/svg+xml - - - - - - - - + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/caravan-shop-m.svg b/data/styles/clear/style-night/symbols/caravan-shop-m.svg new file mode 100644 index 0000000000..bbd5cc39e1 --- /dev/null +++ b/data/styles/clear/style-night/symbols/caravan-shop-m.svg @@ -0,0 +1,14 @@ + + + caravan_shop-m + + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/dump-station-m.svg b/data/styles/clear/style-night/symbols/dump-station-m.svg index a9d44684b3..60f6c9be62 100644 --- a/data/styles/clear/style-night/symbols/dump-station-m.svg +++ b/data/styles/clear/style-night/symbols/dump-station-m.svg @@ -1,44 +1,10 @@ - - - - - - - - image/svg+xml - - - - - - - - + + + + + + + + diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index 196a4a1f3a..d8db8e609a 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -893,6 +893,9 @@ area|z18-[shop=car_repair][service=tyres] node|z17[shop=car], area|z17[shop=car] {icon-image: car_shop-m.svg;icon-min-distance: 24;font-size: 13.75;} +node|z17[shop=caravan], +area|z17[shop=caravan] +{icon-image: caravan-shop-m.svg;icon-min-distance: 24;font-size: 13.75;} node|z17[shop=motorcycle], area|z17[shop=motorcycle] {icon-image: motorcycle_shop-m.svg;icon-min-distance: 24;font-size: 13.75;} @@ -906,6 +909,9 @@ area|z17[shop=car_repair] node|z18-[shop=car], area|z18-[shop=car] {icon-image: car_shop-m.svg;font-size: 14.5;} +node|z18-[shop=caravan], +area|z18-[shop=caravan] +{icon-image: caravan-shop-m.svg;font-size: 14.5;} node|z18-[shop=motorcycle], area|z18-[shop=motorcycle] {icon-image: motorcycle_shop-m.svg;font-size: 14.5;} -- 2.45.3 From 0d6010994337ede186e988039576f199ada801c6 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Tue, 25 Jan 2022 19:37:12 +0300 Subject: [PATCH 2/5] [strings] Regenerate Signed-off-by: Konstantin Pastbin --- android/res/values-be/strings.xml | 1 + android/res/values-ru/strings.xml | 1 + android/res/values-tr/strings.xml | 2 +- android/res/values-uk/strings.xml | 1 + android/res/values/strings.xml | 3 ++- data/sound-strings/tr.json/localize.json | 4 ++-- iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings | 4 +++- iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings | 4 +++- iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings | 4 +++- iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings | 4 +++- iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings | 4 +++- iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings | 4 +++- iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings | 4 +++- iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings | 4 +++- iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings | 2 ++ iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings | 2 ++ .../Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings | 2 ++ .../Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings | 2 ++ 42 files changed, 88 insertions(+), 12 deletions(-) diff --git a/android/res/values-be/strings.xml b/android/res/values-be/strings.xml index 7cd48bcf00..c62f7b3ace 100644 --- a/android/res/values-be/strings.xml +++ b/android/res/values-be/strings.xml @@ -716,6 +716,7 @@ Седлавіна Вадаём Чыгуначная платформа + Продаж аўтадамоў Рытуальныя паслугі Рака Рака diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml index 23612c9b34..99ed959915 100644 --- a/android/res/values-ru/strings.xml +++ b/android/res/values-ru/strings.xml @@ -1380,6 +1380,7 @@ Автомобильные запчасти СТО Шиномонтаж + Продажа автодомов Бытовая химия Магазин Магазин одежды diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml index e92fbef74b..87caa5c764 100644 --- a/android/res/values-tr/strings.xml +++ b/android/res/values-tr/strings.xml @@ -458,7 +458,7 @@ Diğer Diğer yorumlar Rezervasyon - Çağrı + Ara Yer İmini Düzenle Yorum… Tüm yerel değişiklikler sıfırlansın mı? diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml index 27558500d8..182cb21ab0 100644 --- a/android/res/values-uk/strings.xml +++ b/android/res/values-uk/strings.xml @@ -1346,6 +1346,7 @@ Автозапчастини СТО Шиномонтаж + Продаж автобудинків Магазин побутової хімії Крамниця Магазин одягу diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index d2852cb0f4..599ed44931 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -1405,10 +1405,11 @@ Bookmaker Bookstore Butcher’s - Car Shop + Car Dealership Car Parts Car Repair Shop Tyre Repair + RV Dealership Chemist Shop Shop Clothes Shop diff --git a/data/sound-strings/tr.json/localize.json b/data/sound-strings/tr.json/localize.json index 1620166adf..4b2649dd05 100644 --- a/data/sound-strings/tr.json/localize.json +++ b/data/sound-strings/tr.json/localize.json @@ -29,8 +29,8 @@ "in_2_kilometers":"İki kilometre sonra", "in_2_5_kilometers":"İki buçuk kilometre sonra", "in_3_kilometers":"Üç kilometre sonra", -"then":"Sonra", -"take_the_1_exit":"İlk çıkıştan çıkın.", +"then":"Ardından", +"take_the_1_exit":"Birinci çıkıştan çıkın.", "take_the_2_exit":"İkinci çıkıştan çıkın.", "take_the_3_exit":"Üçüncü çıkıştan çıkın.", "take_the_4_exit":"Dördüncü çıkıştan çıkın.", diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings index 1665a932a7..b234f1a1ec 100644 --- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "إصلاح إطارات"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "متجر كيماويات"; "type.shop.chocolate" = "متجر"; diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings index 07eb5502f5..affbc4c6ec 100644 --- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings @@ -2630,7 +2630,7 @@ "type.shop.butcher" = "Butcher’s"; -"type.shop.car" = "Car Shop"; +"type.shop.car" = "Car Dealership"; "type.shop.car_parts" = "Car Parts"; @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Tyre Repair"; +"type.shop.caravan" = "Продаж аўтадамоў"; + "type.shop.chemist" = "Chemist Shop"; "type.shop.chocolate" = "Shop"; diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings index b4a83ce8db..d59913cacf 100644 --- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings @@ -2630,7 +2630,7 @@ "type.shop.butcher" = "Butcher’s"; -"type.shop.car" = "Car Shop"; +"type.shop.car" = "Car Dealership"; "type.shop.car_parts" = "Car Parts"; @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Tyre Repair"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Chemist Shop"; "type.shop.chocolate" = "Shop"; diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings index a56b628ff0..c194d374e2 100644 --- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Pneuservis"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Drogerie"; "type.shop.chocolate" = "Obchod"; diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings index 9b11bca52d..20d250b189 100644 --- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Dækreparation"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Materialist"; "type.shop.chocolate" = "Butik"; diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings index 122ba39308..02cae4ac37 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Reifenservice"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Drogerie"; "type.shop.chocolate" = "Schokoladengeschäft"; diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings index b6f51f0f17..4782180b37 100644 --- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Βουλκανιζατέρ"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Χημικά προϊόντα"; "type.shop.chocolate" = "Κατάστημα"; diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings index 489350f7db..110569cc1e 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings @@ -2630,7 +2630,7 @@ "type.shop.butcher" = "Butcher’s"; -"type.shop.car" = "Car Shop"; +"type.shop.car" = "Car Dealership"; "type.shop.car_parts" = "Car Parts"; @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Tyre Repair"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Chemist Shop"; "type.shop.chocolate" = "Shop"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings index 60ae76a9b6..ddc88c2876 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings @@ -2630,7 +2630,7 @@ "type.shop.butcher" = "Butcher’s"; -"type.shop.car" = "Car Shop"; +"type.shop.car" = "Car Dealership"; "type.shop.car_parts" = "Car Parts"; @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Tyre Repair"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Chemist Shop"; "type.shop.chocolate" = "Shop"; diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings index 4f16d6d1ab..a6fb40b46f 100644 --- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings @@ -2630,7 +2630,7 @@ "type.shop.butcher" = "Butcher’s"; -"type.shop.car" = "Car Shop"; +"type.shop.car" = "Car Dealership"; "type.shop.car_parts" = "Car Parts"; @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Tyre Repair"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Chemist Shop"; "type.shop.chocolate" = "Shop"; diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings index 60722905e7..f1050ea142 100644 --- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Reparación de neumáticos"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Droguería"; "type.shop.chocolate" = "Tienda"; diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings index 9d50c4e752..2e042c74c9 100644 --- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "اپاراتی"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "فروشگاه"; "type.shop.chocolate" = "فروشگاه"; diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings index f09b4edad2..29773fe18d 100644 --- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Rengashuolto"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Kosmetiikkamyymälä"; "type.shop.chocolate" = "Kauppa"; diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings index d6cd3ad1b4..d2effb5449 100644 --- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Réparation de pneus"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Droguerie"; "type.shop.chocolate" = "Chocolatier"; diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings index a106e5613a..27f3489828 100644 --- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings @@ -2630,7 +2630,7 @@ "type.shop.butcher" = "Butcher’s"; -"type.shop.car" = "Car Shop"; +"type.shop.car" = "Car Dealership"; "type.shop.car_parts" = "Car Parts"; @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Tyre Repair"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Chemist Shop"; "type.shop.chocolate" = "Shop"; diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings index 5716458767..070b55a3a1 100644 --- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Gumiszerviz"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Drogéria"; "type.shop.chocolate" = "Bolt"; diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings index 06204398bd..f595ca9db9 100644 --- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Tambal ban"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Toko Bahan Kimia"; "type.shop.chocolate" = "Toko"; diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings index 4fe5d18827..3762806c32 100644 --- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Gommista"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Negozio di detersivi"; "type.shop.chocolate" = "Negozio"; diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings index f07dbaf391..9f5100ac1b 100644 --- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "タイヤ修理"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "化学薬品店"; "type.shop.chocolate" = "チョコレート屋"; diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings index 5a0adb324b..702249c527 100644 --- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "타이어수리점"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "화학물질 가게"; "type.shop.chocolate" = "가게"; diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings index b8905de1e8..3db3022968 100644 --- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Dekkreparasjon"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Husholdningsartikler"; "type.shop.chocolate" = "Butikk"; diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings index fa238884b3..30cb898bf1 100644 --- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Bandenreparatie"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Drogisterij"; "type.shop.chocolate" = "Winkel"; diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings index d3c2bbe69c..e12eafb834 100644 --- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Wulkanizacja"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Drogeria"; "type.shop.chocolate" = "Sklep z czekoladą"; diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings index d1937bc4c8..bb366f578b 100644 --- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Borracheiro"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Drogaria"; "type.shop.chocolate" = "Loja de chocolates"; diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings index e5226d513c..81f1b8c812 100644 --- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Recauchutadora"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Parafarmácia"; "type.shop.chocolate" = "Loja de chocolates"; diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings index 26f26038ef..0ebe742a22 100644 --- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Vulcanizare"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Mercerie"; "type.shop.chocolate" = "Magazin"; diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings index ca28b39a07..4e6c654728 100644 --- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Шиномонтаж"; +"type.shop.caravan" = "Продажа автодомов"; + "type.shop.chemist" = "Бытовая химия"; "type.shop.chocolate" = "Магазин"; diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings index 4742a5d890..e8b507c938 100644 --- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Pneuservis"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Drogéria"; "type.shop.chocolate" = "Obchod"; diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings index 880ab8e1d0..f1875ca628 100644 --- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Däckverkstad"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Hushållskemikalier"; "type.shop.chocolate" = "Butik"; diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings index 30ba30d378..d6c59373f9 100644 --- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings @@ -2630,7 +2630,7 @@ "type.shop.butcher" = "Butcher’s"; -"type.shop.car" = "Car Shop"; +"type.shop.car" = "Car Dealership"; "type.shop.car_parts" = "Car Parts"; @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Tyre Repair"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Chemist Shop"; "type.shop.chocolate" = "Shop"; diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings index 783e7fbfc1..fd1d0c61fb 100644 --- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "ร้านปะยาง"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "ร้านเคมีภัณฑ์"; "type.shop.chocolate" = "ร้านค้า"; diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings index e4bbc6a1ec..fa42b95a54 100644 --- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings @@ -757,7 +757,7 @@ "book_button" = "Rezervasyon"; -"placepage_call_button" = "Çağrı"; +"placepage_call_button" = "Ara"; "placepage_edit_bookmark_button" = "Yer İmini Düzenle"; @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Réparation de pneus"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Temizlik Ürünleri Mağazası"; "type.shop.chocolate" = "Mağaza"; diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings index c06d905b1f..9922dde409 100644 --- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Шиномонтаж"; +"type.shop.caravan" = "Продаж автобудинків"; + "type.shop.chemist" = "Магазин побутової хімії"; "type.shop.chocolate" = "Крамниця"; diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings index 7a9444d4a7..fd1e840967 100644 --- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "Vá Lốp"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "Cửa hàng Hóa chất"; "type.shop.chocolate" = "Cửa hàng"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings index fc22563e54..68adec58d2 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "轮胎修理"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "药妆店"; "type.shop.chocolate" = "商店"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings index 03a66f1b29..c8a3642f60 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings @@ -2638,6 +2638,8 @@ "type.shop.car_repair.tyres" = "輪胎修補"; +"type.shop.caravan" = "RV Dealership"; + "type.shop.chemist" = "藥妝店"; "type.shop.chocolate" = "購物"; -- 2.45.3 From 7d02a67af1a49ea54d521e3354839369e8b35d86 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Wed, 26 Jan 2022 22:47:32 +0300 Subject: [PATCH 3/5] [classifier] Add waterway=water_point alias Signed-off-by: Konstantin Pastbin --- data/replaced_tags.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt index 55b559075f..880edcbb9d 100644 --- a/data/replaced_tags.txt +++ b/data/replaced_tags.txt @@ -21,6 +21,7 @@ ruins=yes : historic=ruins drinkable=yes : amenity=drinking_water drinking_water=yes : amenity=drinking_water water_point=yes : amenity=water_point +waterway=water_point : amenity=water_point sanitary_dump_station=yes : amenity=sanitary_dump_station sanitary_dump_station=customers : amenity=sanitary_dump_station sanitary_dump_station=public : amenity=sanitary_dump_station -- 2.45.3 From f2c62fa2c8d777af3e5ee678d63967b0353343dc Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Wed, 26 Jan 2022 22:52:11 +0300 Subject: [PATCH 4/5] [editor] Update editor.config Signed-off-by: Konstantin Pastbin --- data/config.xsd | 2 +- data/editor.config | 59 +++++++++++++++++++++++++++++++++------------- 2 files changed, 43 insertions(+), 18 deletions(-) diff --git a/data/config.xsd b/data/config.xsd index 212264c1c3..4e6d31456a 100644 --- a/data/config.xsd +++ b/data/config.xsd @@ -4,7 +4,7 @@ This XML Schema document defines validation rules for editor.xml and other OMaps configurations XMLs. Run it with: - xmllint --noount --schema config.xsd editor.xml + xmllint --noout --schema config.xsd editor.xml diff --git a/data/editor.config b/data/editor.config index 9e3902ea62..9e1cb3bb1f 100644 --- a/data/editor.config +++ b/data/editor.config @@ -1,8 +1,8 @@ @@ -228,6 +228,7 @@ + @@ -305,15 +306,11 @@ - + - - - - - + @@ -342,8 +339,13 @@ + + + + + @@ -357,6 +359,8 @@ + + @@ -547,6 +551,10 @@ + + + + @@ -695,17 +703,13 @@ - - - - @@ -786,8 +790,14 @@ - - + + + + + + + + @@ -812,9 +822,22 @@ - - - + + + + + + + + + + + + + + + + @@ -951,6 +974,8 @@ + + -- 2.45.3 From 40ca5b913aa11bdc2e9b185fa66e1e640abf2966 Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Thu, 27 Jan 2022 00:05:03 +0100 Subject: [PATCH 5/5] Minor warning fixes Signed-off-by: Alexander Borsuk --- drape_frontend/gui/ruler.cpp | 2 +- drape_frontend/user_mark_shapes.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drape_frontend/gui/ruler.cpp b/drape_frontend/gui/ruler.cpp index bbc13c018c..9c6224e1e6 100644 --- a/drape_frontend/gui/ruler.cpp +++ b/drape_frontend/gui/ruler.cpp @@ -39,7 +39,7 @@ dp::BindingInfo GetBindingInfo() uint8_t offset = 0; offset += dp::FillDecl(0, "a_position", info, offset); offset += dp::FillDecl(1, "a_normal", info, offset); - offset += dp::FillDecl(2, "a_colorTexCoords", info, offset); + /*offset += */dp::FillDecl(2, "a_colorTexCoords", info, offset); return info; } diff --git a/drape_frontend/user_mark_shapes.cpp b/drape_frontend/user_mark_shapes.cpp index 2ff2ff1a31..756d1542d6 100644 --- a/drape_frontend/user_mark_shapes.cpp +++ b/drape_frontend/user_mark_shapes.cpp @@ -110,7 +110,7 @@ struct UserPointVertex : public gpu::BaseVertex offset += dp::FillDecl(1, "a_normalAndAnimateOrZ", info, offset); offset += dp::FillDecl(2, "a_texCoords", info, offset); - offset += dp::FillDecl(3, "a_color", info, offset); + /*offset += */dp::FillDecl(3, "a_color", info, offset); return info; } -- 2.45.3