From 3ed1578c0166a33d478dc3967985ec89755e4e2c Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Sat, 29 Jan 2022 19:47:43 +0300
Subject: [PATCH] [classifier] Added vending = excrement_bags, parcel_pickup,
 fuel.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 data/categories.txt                         | 31 ++++++++++++---------
 data/mapcss-mapping.csv                     |  8 +++---
 data/replaced_tags.txt                      |  1 +
 data/strings/types_strings.txt              | 18 ++++++++++++
 generator/generator_tests/osm_type_test.cpp | 15 ++++++++++
 5 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/data/categories.txt b/data/categories.txt
index db5523e63a..8cf730c874 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -7878,19 +7878,6 @@ el:Δικαστικό μέγαρο
 sk:Súd
 fa:دادگاه
 
-amenity-vending_machine
-en:4Vending Machine|Dispenser
-ru:Торговый автомат|Торгомат
-be:Гандлёвы аўтамат
-de:Verkaufsautomat
-fr:Distributeur automatique
-ja:自動販売機
-pl:Automat sprzedający
-pt:Máquina de venda automática
-pt-BR:Máquina de venda automática
-uk:Торговий автомат
-zh-Hans:自动售货机
-
 amenity-vending_machine-cigarettes
 en:4Cigarette Dispenser
 ru:Автомат с сигаретами|Сигаретный автомат|4Сигареты
@@ -8028,6 +8015,24 @@ vi:Máy bán vé phương tiện công cộng tự động
 zh-Hans:公共交通售票机
 zh-Hant:公共交通售票機
 
+amenity-vending_machine-excrement_bags
+en:5Excrement Bags
+be:5Мяшкі дзеля экскрыментаў
+ru:5Пакеты для экскрементов|Какашки
+uk:5Мішки для екскрементів
+
+amenity-vending_machine-parcel_pickup
+en:5Parcel Pickup
+be:5Атрыманне пасылак
+ru:5Получение посылки|Постамат
+uk:5Отримання посилок
+
+amenity-vending_machine-fuel|@fuel
+en:Fuel Dispenser
+be:Паліўны аўтамат
+ru:Топливный автомат
+uk:Паливний автомат
+
 # Skipped if empty name
 building-garage
 en:Garage
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 06620dd99c..df43ed04e5 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1078,14 +1078,14 @@ emergency|phone;1079;
 highway|rest_area;1080;
 highway|traffic_signals;1081;
 leisure|fitness_centre;[leisure=fitness_centre],[leisure=sports_centre][sport=fitness],[amenity=gym];;name;int_name;1082;
-deprecated|deprecated;1083;x
-deprecated|deprecated;1084;x
+amenity|vending_machine|excrement_bags;[amenity=vending_machine][vending=excrement_bags];;name;int_name;1083;
+amenity|vending_machine|parcel_pickup;[amenity=vending_machine][vending=parcel_pickup];;name;int_name;1084;
 leisure|sauna;[leisure=sauna],[amenity=sauna];;name;int_name;1085;
-deprecated|deprecated;1086;x
+amenity|vending_machine|fuel;[amenity=vending_machine][vending=fuel];;name;int_name;1086;
 man_made|chimney;1087;
 man_made|tower;1088;
 man_made|water_well;1089;
-deprecated|deprecated;1090;x
+amenity|vending_machine;[amenity=vending_machine];;name;int_name;1090;
 shop|bookmaker;1091;
 shop|car_repair|tyres;[shop=car_repair][service=tyres];;name;int_name;1092;
 shop|cosmetics;1093;
diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt
index c49ec70016..cfb8cf0007 100644
--- a/data/replaced_tags.txt
+++ b/data/replaced_tags.txt
@@ -71,6 +71,7 @@ place=allotments : place=neighbourhood
 
 crossing=traffic_signals : highway=traffic_signals
 
+vending=parcel_pickup;parcel_mail_in : vending=parcel_pickup
 
 # Replace top tags from here https://taginfo.openstreetmap.org/search?q=recycling on the common ones.
 recycling:electrical_appliances=yes       : recycling:small_appliances=yes
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 41d7c562a3..5638c33e18 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -3416,6 +3416,24 @@
     zh-Hans = 公共交通售票机
     zh-Hant = 公共交通售票機
 
+  [type.amenity.vending_machine.excrement_bags]
+    en = Excrement Bags
+    be = Мяшкі дзеля экскрыментаў
+    ru = Пакеты для экскрементов
+    uk = Мішки для екскрементів
+
+  [type.amenity.vending_machine.parcel_pickup]
+    en = Parcel Pickup
+    be = Атрыманне пасылак
+    ru = Получение посылок
+    uk = Отримання посилок
+
+  [type.amenity.vending_machine.fuel]
+    en = Fuel Dispenser
+    be = Паліўны аўтамат
+    ru = Топливный автомат
+    uk = Паливний автомат
+
   [type.amenity.veterinary]
     en = Veterinary Doctor
     ar = طبيب بيطري
diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index 4c301b47aa..4ce261dcc3 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -1369,6 +1369,21 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Metadata)
   }
 }
 
+UNIT_CLASS_TEST(TestWithClassificator, OsmType_Vending)
+{
+  {
+    Tags const tags = {
+      {"amenity", "vending_machine" },
+      {"vending", "parcel_pickup;parcel_mail_in"},
+    };
+
+    auto const params = GetFeatureBuilderParams(tags);
+
+    TEST_EQUAL(params.m_types.size(), 1, (params));
+    TEST(params.IsTypeExist(GetType({"amenity", "vending_machine", "parcel_pickup" })), (params));
+  }
+}
+
 UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
 {
   Tags const oneTypes = {