提交四维地图接口更新

events/JfxEvents.cpp

@@ -214,10 +214,18 @@ int JfxEvents::CalculateMap(ObjInfoAll& objAll, TrkObj& sendObj)
     std::vector<long> vctlOutNxtRoadId;
 
     //ROS_INFO("begin call jfxmap");
-    bool result = m_OfflineMap->GetMapData(ptInLoc, dCarAngle, lOutRaodId, vctlOutPreRoadId, vctlOutNxtRoadId,
+#ifdef _USING_THIRD_MAP_
+	int land_road_id = 0;
+	bool result = m_OfflineMap->GetMapData(ptInLoc, dCarAngle, lOutRaodId, vctlOutPreRoadId, vctlOutNxtRoadId,
+        nLaneCnt, nOutLaneNum, nOutLaneType,
+        nOutLeftEdgeCrossType, nOutRightEdgeCrossType,
+        nOutSpeedLimit, dOutLaneAngle, ptOutFoot,land_road_id);
+#else
+   bool result = m_OfflineMap->GetMapData(ptInLoc, dCarAngle, lOutRaodId, vctlOutPreRoadId, vctlOutNxtRoadId,
         nLaneCnt, nOutLaneNum, nOutLaneType,
         nOutLeftEdgeCrossType, nOutRightEdgeCrossType,
         nOutSpeedLimit, dOutLaneAngle, ptOutFoot);
+#endif
     ObjInfoAll& obj = objAll;
     if (result)
     {
@@ -265,9 +273,9 @@ int JfxEvents::CalculateMap(ObjInfoAll& objAll, TrkObj& sendObj)
         obj.objMapCount++;
 
 #ifdef _USING_THIRD_MAP_
-        int ids = 0;
-        m_OfflineMap->GetMapIDS(ptInLoc,dOutLaneAngle, ids);
-        sendObj.laneId = ids;
+        //int ids = 0;
+        //m_OfflineMap->GetMapIDS(ptInLoc,dOutLaneAngle, ids);
+        sendObj.laneId = land_road_id;
 		SDK_LOG(SDK_INFO,"m_OfflineMap->GetMapIDS = %d,lon = %.8f,lat = %.8f",sendObj.laneId,ptInLoc.dLon,ptInLoc.dLat);
 #endif
         //赋值给发送的数据，之前没有后面加入的