From 3968b644b89c4213a29b217b08389826dfa960a5 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Tue, 25 Jan 2022 19:32:18 +0300 Subject: [PATCH] [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;}