提交传递的信息修改

EventsRos.cpp

@@ -364,9 +364,11 @@ void EventsRos::SendRosEvents(TrkObjsPtr& outs)
         msg.is_turn = iter.is_turn == 0 ? false : true;
         msg.acc_x = iter.acc_x;
         msg.acc_y = iter.acc_y;
-        msg.nodeId = iter.nodeId;
+        msg.nodeIdId = iter.nodeIdId;
+        msg.nodeIdRegion = iter.nodeIdRegion;
         msg.linkName = iter.linkName;
-        msg.upstreamNodeId = iter.upstreamNodeId;
+        msg.upstreamNodeIdId = iter.upstreamNodeIdId;
+        msg.upstreamNodeIdRegion = iter.upstreamNodeIdRegion;
         msg.sectionId = iter.sectionId;
         msg.laneId = iter._laneId;
         for(auto _its : iter.points)

events/JfxEvents.cpp

@@ -310,9 +310,11 @@ int JfxEvents::CalculateMap(ObjInfoAll& objAll, TrkObj& sendObj)
         sendObj.footLon = ptOutFoot.dLon;//垂足lon
         sendObj.footLat = ptOutFoot.dLat;//垂足lat
 #ifdef _USING_NEW_JFXMAP_ 
-        sendObj.nodeId = roadInfo.lNodeId;
+        sendObj.nodeIdId = roadInfo.lNodeIdId;
+        sendObj.nodeIdRegion = roadInfo.lNodeIdRegion;
         sendObj.linkName = roadInfo.strCrossName;
-        sendObj.upstreamNodeId = roadInfo.lUpstreamNodeId;
+        sendObj.upstreamNodeIdId = roadInfo.lUpstreamNodeIdId;
+        sendObj.upstreamNodeIdRegion = roadInfo.lUpstreamNodeIdRegion;
         sendObj.sectionId = roadInfo.nSectionId;
         sendObj._laneId = roadInfo.nLaneId;
 #endif        

msg/EventInfo.h

@@ -92,9 +92,11 @@ typedef struct _TrkObj {
     double footLat = 0.0f;//垂足lat
     double acc_x = 0.0f;//x轴加速度
     double acc_y = 0.0f;//y轴加速度
-    uint32_t nodeId = 0;    // 所在交叉路口id
+    uint32_t nodeIdId = 0;    // 所在交叉路口id
+    uint32_t nodeIdRegion = 0;    // 所在交叉路口id
     std::string linkName;    // 所在路段，路段名称
-    uint32_t upstreamNodeId = 0; //所在路段的上游节点id
+    uint32_t upstreamNodeIdId = 0; //所在路段的上游节点id
+    uint32_t upstreamNodeIdRegion = 0; //所在路段的上游节点id
     uint32_t sectionId = 0;   // 所在的分段路段
     uint32_t _laneId = 0;      // 所在的车道    
     std::vector<Point64> points;//8个顶点的经纬高
@@ -141,9 +143,11 @@ AJSON(TrkObj,
     footLat,
     acc_x,
     acc_y,
-    nodeId,
+    nodeIdId,
+    nodeIdRegion,
     linkName,
-    upstreamNodeId,
+    upstreamNodeIdId,
+    upstreamNodeIdRegion,
     sectionId,
     _laneId,
     points,