[mapcss] Fix natural-wood removal: delete hardcoded type from categories, ugc, tests.

data/categories.txt

@@ -4687,7 +4687,7 @@ sw:Ziwa
 fa:دریاچه
 
 # Skipped if empty name
-natural-wood|landuse-forest
+landuse-forest
 en:Forest|U+1F332|U+1F333
 ru:Лес
 ar:غابة

data/ugc_types.csv

@@ -76,7 +76,7 @@ natural-peak,1,1,0,rating
 natural-spring,1,1,0,rating
 natural-volcano,1,1,0,rating
 natural-water,1,1,0,rating
-natural-wood,1,1,0,rating
+landuse-forest,1,1,0,rating
 office,1,1,0,rating
 office-company,1,1,0,rating
 office-government,1,1,0,rating

map/style_tests/classificator_tests.cpp

@@ -234,7 +234,7 @@ void CheckPriority(vector<base::StringIL> const & arrT, vector<size_t> const & a
 // If someone is desagree with this order, please, refer to VNG :)
 // natural-coastline
 // place-island = natural-land
-// natural-wood,scrub,heath,grassland = landuse-grass,farm,farmland,forest
+// natural-scrub,heath,grassland = landuse-grass,farm,farmland,forest
 // natural-water,lake = landuse-basin
 
 UNIT_TEST(Classificator_AreaPriority)
@@ -246,7 +246,7 @@ UNIT_TEST(Classificator_AreaPriority)
     // 1
     {"place", "island"}, {"natural", "land"},
     // 2
-    {"natural", "wood"}, {"natural", "scrub"}, {"natural", "heath"}, {"natural", "grassland"},
+    {"natural", "scrub"}, {"natural", "heath"}, {"natural", "grassland"},
     {"landuse", "grass"}, {"landuse", "farm"}, {"landuse", "farmland"}, {"landuse", "forest"},
     // ?
     //{"leisure", "park"}, {"leisure", "garden"}, - maybe next time (too tricky to do it now)
@@ -254,7 +254,7 @@ UNIT_TEST(Classificator_AreaPriority)
     {"natural", "water"}, {"natural", "lake"}, {"landuse", "basin"}, {"waterway", "riverbank"}
   };
 
-  CheckPriority(types, {1, 2, 8, 4}, drule::area);
+  CheckPriority(types, {1, 2, 7, 4}, drule::area);
 }
 
 UNIT_TEST(Classificator_PoiPriority)

partners_api/promo_catalog_types.cpp

@@ -35,7 +35,6 @@ promo::TypesList kOutdoorTypes = {
   {"natural", "cliff"},
   {"natural", "peak"},
   {"natural", "rock"},
-  {"natural", "wood"},
   {"natural", "bare_rock"},
   {"natural", "glacier"},
   {"boundary", "national_park"}

search/search_integration_tests/smoke_test.cpp

@@ -190,8 +190,7 @@ UNIT_CLASS_TEST(SmokeTest, CategoriesTest)
                                                        {"man_made", "water_well"},
                                                        {"natural", "glacier"},
                                                        {"natural", "pond"},
-                                                       {"natural", "tree"},
-                                                       {"natural", "wood"}};
+                                                       {"natural", "tree"}};
   set<uint32_t> invisibleTypes;
   for (auto const & tags : invisibleAsPointTags)
     invisibleTypes.insert(classif().GetTypeByPath(tags));