revert, merge bush to vege label

Author: yhr

LibCarla/source/carla/image/CityScapesPalette.h

@@ -50,7 +50,6 @@ namespace detail {
         {230u, 150u, 140u},   // rail track    =  27u
         {180u, 165u, 180u},   // guard rail    =  28u
         {180u, 130u,  70u},   // rock          =  29u
-        {90u,    0u,  90u},   // bush          =  30u
       };
 
 } // namespace detail

LibCarla/source/carla/rpc/ObjectLabel.h

@@ -46,7 +46,6 @@ namespace rpc {
     RailTrack    =   27u,
     GuardRail    =   28u,
     Rock         =   29u,
-    Bush         =   30u,
 
     Any          =  0xFF
   };

PythonAPI/carla/src/World.cpp

@@ -229,7 +229,6 @@ void export_world() {
     .value("Rider", cr::CityObjectLabel::Rider)
     .value("Train", cr::CityObjectLabel::Train)
     .value("Rock", cr::CityObjectLabel::Rock)
-    .value("Bush", cr::CityObjectLabel::Bush)
     .value("Any", cr::CityObjectLabel::Any)
   ;
 

Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/Tagger.cpp

@@ -56,7 +56,7 @@ crp::CityObjectLabel ATagger::GetLabelByFolderName(const FString &String) {
   else if (String == "Train")        return crp::CityObjectLabel::Train;
   else if (String == "Rock")         return crp::CityObjectLabel::Rock;
   else if (String == "Stone")        return crp::CityObjectLabel::Rock;
-  else if (String == "Bush")         return crp::CityObjectLabel::Bush;
+  else if (String == "Bush")         return crp::CityObjectLabel::Vegetation;
   else                               return crp::CityObjectLabel::None;
 }
 
@@ -229,7 +229,6 @@ crp::CityObjectLabel ATagger::GetTagFromString(FString Tag)
   if(Tag.Contains("Rider")) return crp::CityObjectLabel::Rider;
   if(Tag.Contains("Train")) return crp::CityObjectLabel::Train;
   if(Tag.Contains("Rock")) return crp::CityObjectLabel::Rock;
-  if(Tag.Contains("Bush")) return crp::CityObjectLabel::Bush;
   return crp::CityObjectLabel::None;
 }
 
@@ -268,7 +267,6 @@ FString ATagger::GetTagAsString(const crp::CityObjectLabel Label)
     CARLA_GET_LABEL_STR(Train)
     CARLA_GET_LABEL_STR(Rider)
     CARLA_GET_LABEL_STR(Rock)
-    CARLA_GET_LABEL_STR(Bush)
 
 #undef CARLA_GET_LABEL_STR
   }