xushiting 2 سال پیش
والد
کامیت
f78bc0ae7e
3فایلهای تغییر یافته به همراه24 افزوده شده و 4 حذف شده
  1. 9 0
      src/graphic/History/HistoryUtil.js
  2. 12 1
      src/graphic/Load.js
  3. 3 3
      src/graphic/Service/CurveRoadService.js

+ 9 - 0
src/graphic/History/HistoryUtil.js

@@ -520,6 +520,9 @@ export default class HistoryUtil {
       curveRoadInfo.singleCurveRoadWidth = curveRoad2.singleCurveRoadWidth;
       curveRoadInfo.singleCurveRoadDrivewayCount =
         curveRoad2.singleCurveRoadDrivewayCount;
+      curveRoadInfo.singleLanes = JSON.parse(
+        JSON.stringify(curveRoad2.singleLanes)
+      );
       curveRoadInfo.singleLanesCurves = JSON.parse(
         JSON.stringify(curveRoad2.singleLanesCurves)
       );
@@ -537,6 +540,12 @@ export default class HistoryUtil {
       curveRoadInfo.rightLanesCurves = JSON.parse(
         JSON.stringify(curveRoad2.rightLanesCurves)
       );
+      curveRoadInfo.leftLanes = JSON.parse(
+        JSON.stringify(curveRoad2.leftLanes)
+      );
+      curveRoadInfo.rightLanes = JSON.parse(
+        JSON.stringify(curveRoad2.rightLanes)
+      );
     }
     curveRoadInfo.points = [];
     for (let i = 0; i < curveRoad2.points.length; ++i) {

+ 12 - 1
src/graphic/Load.js

@@ -247,10 +247,12 @@ export default class Load {
 
       if (dataLocal.curveRoadPoints) {
         for (let key in dataLocal.curveRoadPoints) {
-          curveRoadPointService.create(
+          let curveRoadPoint = curveRoadPointService.create(
             dataLocal.curveRoadPoints[key],
             dataLocal.curveRoadPoints[key].vectorId
           );
+          curveRoadPoint.setIndex(dataLocal.curveRoadPoints[key].index);
+          curveRoadPoint.setParent(dataLocal.curveRoadPoints[key].parent);
         }
       }
 
@@ -299,6 +301,9 @@ export default class Load {
           curveRoad.singleLanesCurves = JSON.parse(
             JSON.stringify(curveRoadData.singleLanesCurves)
           );
+          curveRoad.singleLanesCurves = JSON.parse(
+            JSON.stringify(curveRoadData.singleLanes)
+          );
           curveRoad.leftWidth = curveRoadData.leftWidth;
           curveRoad.rightWidth = curveRoadData.rightWidth;
           curveRoad.leftDrivewayCount = curveRoadData.leftDrivewayCount;
@@ -312,6 +317,12 @@ export default class Load {
           curveRoad.rightLanesCurves = JSON.parse(
             JSON.stringify(curveRoadData.rightLanesCurves)
           );
+          curveRoad.leftLanes = JSON.parse(
+            JSON.stringify(curveRoadData.leftLanes)
+          );
+          curveRoad.rightLanes = JSON.parse(
+            JSON.stringify(curveRoadData.rightLanes)
+          );
         }
       }
 

+ 3 - 3
src/graphic/Service/CurveRoadService.js

@@ -1132,14 +1132,14 @@ export default class CurveRoadService extends RoadService {
 
     if (curveRoad.way == Constant.oneWay) {
       for (let i = 0; i < curveRoad.singleLanesCurves.length; ++i) {
-        lineService.createCurveLineByPoints(curveRoad.singleLanesCurves[i]);
+        lineService.createCurveLineByPoints(curveRoad.singleLanes[i]);
       }
     } else if (curveRoad.way == Constant.twoWay) {
       for (let i = 0; i < curveRoad.leftLanesCurves.length; ++i) {
-        lineService.createCurveLineByPoints(curveRoad.leftLanesCurves[i]);
+        lineService.createCurveLineByPoints(curveRoad.leftLanes[i]);
       }
       for (let i = 0; i < curveRoad.rightLanesCurves.length; ++i) {
-        lineService.createCurveLineByPoints(curveRoad.rightLanesCurves[i]);
+        lineService.createCurveLineByPoints(curveRoad.rightLanes[i]);
       }
       // let leftMidDivide = lineService.createCurveLineByPoints(
       //   curveRoad.midDivide.leftMidDivide