modify map proto

modules/map/hdmap/adapter/xml_parser/common_define.h

@@ -62,6 +62,8 @@ using PbStopSignType = apollo::hdmap::StopSign_StopType;
 using PbBoundaryEdgeType = apollo::hdmap::BoundaryEdge_Type;
 using PbRoadType = apollo::hdmap::Road_Type;
 using PbSignInfoType = apollo::hdmap::SignInfo::Type;
+using PbPassageType = apollo::hdmap::Passage_Type;
+using PbPassageGroup = apollo::hdmap::PassageGroup;
 
 struct StopLineInternal {
   std::string id;

modules/map/hdmap/adapter/xml_parser/objects_xml_parser.cc

@@ -353,11 +353,11 @@ Status ObjectsXmlParser::ToPassageType(const std::string& type,
 
   std::string upper_str = UtilXmlParser::ToUpper(type);
   if (upper_str == "ENTRANCE") {
-    *passage_type = apollo::hdmap::Passage_PassageType_ENTRANCE;
+    *passage_type = apollo::hdmap::Passage_Type_ENTRANCE;
   } else if (upper_str == "EXIT") {
-    *passage_type = apollo::hdmap::Passage_PassageType_EXIT;
+    *passage_type = apollo::hdmap::Passage_Type_EXIT;
   } else {
-    *passage_type = apollo::hdmap::Passage_PassageType_UNKNOWN;
+    *passage_type = apollo::hdmap::Passage_Type_UNKNOWN;
   }
 
   return Status::OK();

modules/map/proto/map_pnc_junction.proto

@@ -12,12 +12,12 @@ message Passage {
   repeated Id stop_sign_id = 4;
   repeated Id lane_id = 5;
 
-  enum PassageType {
+  enum Type {
     UNKNOWN = 0;
     ENTRANCE = 1;
     EXIT = 2;
   };
-  optional PassageType type = 6;
+  optional Type type = 6;
 
 };
 
@@ -35,5 +35,4 @@ message PNCJunction {
   repeated Id overlap_id = 3;
 
   repeated PassageGroup passage_group = 4;
-
 }