Bladeren bron

fix: 添加了路缘的道路上撤销和回退操作后,路缘显示不正确

jinx 1 jaar geleden
bovenliggende
commit
3eba60ddc2
2 gewijzigde bestanden met toevoegingen van 69 en 202 verwijderingen
  1. 62 195
      src/graphic/History/HistoryUtil.js
  2. 7 7
      src/store/sync.ts

+ 62 - 195
src/graphic/History/HistoryUtil.js

@@ -32,7 +32,7 @@ export default class HistoryUtil {
       line1.linkedFixPointId == line2.linkedFixPointId &&
       line1.linkedBasePointId == line2.linkedBasePointId &&
       line1.style == line2.style &&
-      line1.weight == line2.weight && 
+      line1.weight == line2.weight &&
       line1.zebraCrossStyle == line2.zebraCrossStyle
     ) {
       return false;
@@ -42,12 +42,7 @@ export default class HistoryUtil {
   }
 
   isDifferentForCurvePoints(curvePoint1, curvePoint2) {
-    if (
-      curvePoint1.x == curvePoint2.x &&
-      curvePoint1.y == curvePoint2.y &&
-      curvePoint1.parent == curvePoint2.parent &&
-      curvePoint1.index == curvePoint2.index
-    ) {
+    if (curvePoint1.x == curvePoint2.x && curvePoint1.y == curvePoint2.y && curvePoint1.parent == curvePoint2.parent && curvePoint1.index == curvePoint2.index) {
       return false;
     } else {
       return true;
@@ -55,11 +50,7 @@ export default class HistoryUtil {
   }
 
   isDifferentForCurveLines(curveLine1, curveLine2) {
-    if (
-      curveLine1.startId == curveLine2.startId &&
-      curveLine1.endId == curveLine2.endId &&
-      mathUtil.equalJSON(curveLine1.points, curveLine2.points)
-    ) {
+    if (curveLine1.startId == curveLine2.startId && curveLine1.endId == curveLine2.endId && mathUtil.equalJSON(curveLine1.points, curveLine2.points)) {
       return false;
     } else {
       return true;
@@ -67,12 +58,7 @@ export default class HistoryUtil {
   }
 
   isDifferentForCircles(circle1, circle2) {
-    if (
-      mathUtil.equalPoint(circle1.center, circle2.center) &&
-      circle1.radiusX == circle2.radiusX &&
-      circle1.radiusY == circle2.radiusY &&
-      circle1.color == circle2.color
-    ) {
+    if (mathUtil.equalPoint(circle1.center, circle2.center) && circle1.radiusX == circle2.radiusX && circle1.radiusY == circle2.radiusY && circle1.color == circle2.color) {
       return false;
     } else {
       return true;
@@ -95,11 +81,7 @@ export default class HistoryUtil {
   }
 
   isDifferentForMagnifiers(magnifier1, magnifier2) {
-    if (
-      mathUtil.equalPoint(magnifier1.position, magnifier2.position) &&
-      magnifier1.photoUrl == magnifier2.photoUrl &&
-      mathUtil.equalPoint(magnifier1.popPosition, magnifier2.popPosition)
-    ) {
+    if (mathUtil.equalPoint(magnifier1.position, magnifier2.position) && magnifier1.photoUrl == magnifier2.photoUrl && mathUtil.equalPoint(magnifier1.popPosition, magnifier2.popPosition)) {
       return false;
     } else {
       return true;
@@ -107,12 +89,7 @@ export default class HistoryUtil {
   }
 
   isDifferentForSVGs(svg1, svg2) {
-    if (
-      mathUtil.equalPoint(svg1.center, svg2.center) &&
-      svg1.type == svg2.type &&
-      svg1.angle == svg2.angle &&
-      svg1.scale == svg2.scale
-    ) {
+    if (mathUtil.equalPoint(svg1.center, svg2.center) && svg1.type == svg2.type && svg1.angle == svg2.angle && svg1.scale == svg2.scale) {
       return false;
     } else {
       return true;
@@ -120,10 +97,7 @@ export default class HistoryUtil {
   }
 
   isDifferentForRoadPoints(roadPoint1, roadPoint2) {
-    if (
-      mathUtil.equalPoint(roadPoint1, roadPoint2) &&
-      mathUtil.equalJSON(roadPoint1.parent, roadPoint2.parent)
-    ) {
+    if (mathUtil.equalPoint(roadPoint1, roadPoint2) && mathUtil.equalJSON(roadPoint1.parent, roadPoint2.parent)) {
       return false;
     } else {
       return true;
@@ -136,7 +110,7 @@ export default class HistoryUtil {
       mathUtil.equalPoint(roadEdge1.end, roadEdge2.end) &&
       roadEdge1.parent == roadEdge2.parent &&
       roadEdge1.style == roadEdge2.style &&
-      roadEdge1.roadSide == roadEdge2.roadSide 
+      roadEdge1.roadSide == roadEdge2.roadSide
     ) {
       return false;
     } else {
@@ -151,25 +125,12 @@ export default class HistoryUtil {
       road1.leftEdgeId == road2.leftEdgeId &&
       road1.rightEdgeId == road2.rightEdgeId &&
       road1.way == road2.way &&
-      road1.roadWidthTipsPos == road2.roadWidthTipsPos 
+      road1.roadWidthTipsPos == road2.roadWidthTipsPos
     ) {
       if (road1.way == Constant.oneWay) {
-        if (
-          road1.singleRoadWidth == road2.singleRoadWidth &&
-          road1.singleRoadDrivewayCount == road2.singleRoadDrivewayCount &&
-          road1.singleLanes.length == road2.singleLanes.length
-        ) {
+        if (road1.singleRoadWidth == road2.singleRoadWidth && road1.singleRoadDrivewayCount == road2.singleRoadDrivewayCount && road1.singleLanes.length == road2.singleLanes.length) {
           for (let i = 0; i < road1.singleLanes.length; ++i) {
-            if (
-              !mathUtil.equalPoint(
-                road1.singleLanes[i].start,
-                road2.singleLanes[i].start
-              ) ||
-              !mathUtil.equalPoint(
-                road1.singleLanes[i].end,
-                road2.singleLanes[i].end
-              )
-            ) {
+            if (!mathUtil.equalPoint(road1.singleLanes[i].start, road2.singleLanes[i].start) || !mathUtil.equalPoint(road1.singleLanes[i].end, road2.singleLanes[i].end)) {
               return true;
             }
           }
@@ -184,50 +145,20 @@ export default class HistoryUtil {
           road1.leftDrivewayCount == road2.leftDrivewayCount &&
           road1.rightDrivewayCount == road2.rightDrivewayCount &&
           road1.midDivide.midDivideWidth == road2.midDivide.midDivideWidth &&
-          mathUtil.equalPoint(
-            road1.midDivide.leftMidDivide.start,
-            road2.midDivide.leftMidDivide.start
-          ) &&
-          mathUtil.equalPoint(
-            road1.midDivide.leftMidDivide.end,
-            road2.midDivide.leftMidDivide.end
-          ) &&
-          mathUtil.equalPoint(
-            road1.midDivide.rightMidDivide.start,
-            road2.midDivide.rightMidDivide.start
-          ) &&
-          mathUtil.equalPoint(
-            road1.midDivide.rightMidDivide.end,
-            road2.midDivide.rightMidDivide.end
-          ) &&
+          mathUtil.equalPoint(road1.midDivide.leftMidDivide.start, road2.midDivide.leftMidDivide.start) &&
+          mathUtil.equalPoint(road1.midDivide.leftMidDivide.end, road2.midDivide.leftMidDivide.end) &&
+          mathUtil.equalPoint(road1.midDivide.rightMidDivide.start, road2.midDivide.rightMidDivide.start) &&
+          mathUtil.equalPoint(road1.midDivide.rightMidDivide.end, road2.midDivide.rightMidDivide.end) &&
           road1.leftLanes.length == road2.leftLanes.length &&
           road1.rightLanes.length == road2.rightLanes.length
         ) {
           for (let i = 0; i < road1.leftLanes.length; ++i) {
-            if (
-              !mathUtil.equalPoint(
-                road1.leftLanes[i].start,
-                road2.leftLanes[i].start
-              ) ||
-              !mathUtil.equalPoint(
-                road1.leftLanes[i].end,
-                road2.leftLanes[i].end
-              )
-            ) {
+            if (!mathUtil.equalPoint(road1.leftLanes[i].start, road2.leftLanes[i].start) || !mathUtil.equalPoint(road1.leftLanes[i].end, road2.leftLanes[i].end)) {
               return true;
             }
           }
           for (let i = 0; i < road1.rightLanes.length; ++i) {
-            if (
-              !mathUtil.equalPoint(
-                road1.rightLanes[i].start,
-                road2.rightLanes[i].start
-              ) ||
-              !mathUtil.equalPoint(
-                road1.rightLanes[i].end,
-                road2.rightLanes[i].end
-              )
-            ) {
+            if (!mathUtil.equalPoint(road1.rightLanes[i].start, road2.rightLanes[i].start) || !mathUtil.equalPoint(road1.rightLanes[i].end, road2.rightLanes[i].end)) {
               return true;
             }
           }
@@ -244,11 +175,7 @@ export default class HistoryUtil {
   }
 
   isDifferentForCurveRoadPoints(curveRoadPoint1, curveRoadPoint2) {
-    if (
-      mathUtil.equalPoint(curveRoadPoint1, curveRoadPoint2) &&
-      mathUtil.equalJSON(curveRoadPoint1.parent, curveRoadPoint2.parent) &&
-      curveRoadPoint1.index == curveRoadPoint2.index
-    ) {
+    if (mathUtil.equalPoint(curveRoadPoint1, curveRoadPoint2) && mathUtil.equalJSON(curveRoadPoint1.parent, curveRoadPoint2.parent) && curveRoadPoint1.index == curveRoadPoint2.index) {
       return false;
     } else {
       return true;
@@ -262,9 +189,9 @@ export default class HistoryUtil {
       mathUtil.equalPoints(curveRoadEdge1.points, curveRoadEdge2.points) &&
       curveRoadEdge1.parent == curveRoadEdge2.parent &&
       curveRoadEdge1.style == curveRoadEdge2.style &&
-      curveRoadEdge1.weight == curveRoadEdge2.weight 
+      curveRoadEdge1.weight == curveRoadEdge2.weight
       // &&
-      // curveRoadEdge1.roadSide == curveRoadEdge2.roadSide 
+      // curveRoadEdge1.roadSide == curveRoadEdge2.roadSide
     ) {
       return false;
     } else {
@@ -282,11 +209,7 @@ export default class HistoryUtil {
       curveRoad1.way == curveRoad2.way
     ) {
       if (curveRoad1.way == Constant.oneWay) {
-        if (
-          curveRoad1.singleRoadWidth == curveRoad2.singleRoadWidth &&
-          curveRoad1.singleRoadDrivewayCount ==
-            curveRoad2.singleRoadDrivewayCount
-        ) {
+        if (curveRoad1.singleRoadWidth == curveRoad2.singleRoadWidth && curveRoad1.singleRoadDrivewayCount == curveRoad2.singleRoadDrivewayCount) {
           return false;
         } else {
           return true;
@@ -297,8 +220,7 @@ export default class HistoryUtil {
           curveRoad1.rightWidth == curveRoad2.rightWidth &&
           curveRoad1.leftDrivewayCount == curveRoad2.leftDrivewayCount &&
           curveRoad1.rightDrivewayCount == curveRoad2.rightDrivewayCount &&
-          curveRoad1.midDivide.midDivideWidth ==
-            curveRoad2.midDivide.midDivideWidth
+          curveRoad1.midDivide.midDivideWidth == curveRoad2.midDivide.midDivideWidth
         ) {
           return false;
         } else {
@@ -367,7 +289,7 @@ export default class HistoryUtil {
     lineInfo.value = line2.value;
     lineInfo.style = line2.style;
     lineInfo.weight = line2.weight;
-    lineInfo.zebraCrossStyle = line2.zebraCrossStyle
+    lineInfo.zebraCrossStyle = line2.zebraCrossStyle;
     this.setLineInfo(lineInfo);
   }
 
@@ -418,9 +340,7 @@ export default class HistoryUtil {
     magnifierInfo.vectorId = magnifier1.vectorId;
     magnifierInfo.photoUrl = magnifier2.photoUrl;
     magnifierInfo.position = JSON.parse(JSON.stringify(magnifier2.position));
-    magnifierInfo.popPosition = JSON.parse(
-      JSON.stringify(magnifier2.popPosition)
-    );
+    magnifierInfo.popPosition = JSON.parse(JSON.stringify(magnifier2.popPosition));
     this.setMagnifierInfo(magnifierInfo);
   }
 
@@ -489,9 +409,7 @@ export default class HistoryUtil {
       x: curveRoadPoint2.position.x,
       y: curveRoadPoint2.position.y,
     };
-    curveRoadPointInfo.parent = JSON.parse(
-      JSON.stringify(curveRoadPoint2.parent)
-    );
+    curveRoadPointInfo.parent = JSON.parse(JSON.stringify(curveRoadPoint2.parent));
 
     curveRoadPointInfo.index = curveRoadPoint2.index;
     this.setCurveRoadPointInfo(curveRoadPointInfo);
@@ -508,16 +426,12 @@ export default class HistoryUtil {
       x: curveRoadEdge2.end.x,
       y: curveRoadEdge2.end.y,
     };
-    curveRoadEdgeInfo.points = JSON.parse(
-      JSON.stringify(curveRoadEdge2.points)
-    );
-    curveRoadEdgeInfo.curves = JSON.parse(
-      JSON.stringify(curveRoadEdge2.curves)
-    );
+    curveRoadEdgeInfo.points = JSON.parse(JSON.stringify(curveRoadEdge2.points));
+    curveRoadEdgeInfo.curves = JSON.parse(JSON.stringify(curveRoadEdge2.curves));
     curveRoadEdgeInfo.parent = curveRoadEdge2.parent;
     curveRoadEdgeInfo.style = curveRoadEdge2.style;
     curveRoadEdgeInfo.weight = curveRoadEdge2.weight;
-    // curveRoadEdgeInfo.roadSide == curveRoadEdge2.roadSide 
+    // curveRoadEdgeInfo.roadSide == curveRoadEdge2.roadSide
     this.setCurveRoadEdgeInfo(curveRoadEdgeInfo);
   }
 
@@ -533,34 +447,19 @@ export default class HistoryUtil {
     curveRoadInfo.way = curveRoad2.way;
     if (curveRoad2.way == Constant.oneWay) {
       curveRoadInfo.singleCurveRoadWidth = curveRoad2.singleCurveRoadWidth;
-      curveRoadInfo.singleCurveRoadDrivewayCount =
-        curveRoad2.singleCurveRoadDrivewayCount;
-      curveRoadInfo.singleLanes = JSON.parse(
-        JSON.stringify(curveRoad2.singleLanes)
-      );
-      curveRoadInfo.singleLanesCurves = JSON.parse(
-        JSON.stringify(curveRoad2.singleLanesCurves)
-      );
+      curveRoadInfo.singleCurveRoadDrivewayCount = curveRoad2.singleCurveRoadDrivewayCount;
+      curveRoadInfo.singleLanes = JSON.parse(JSON.stringify(curveRoad2.singleLanes));
+      curveRoadInfo.singleLanesCurves = JSON.parse(JSON.stringify(curveRoad2.singleLanesCurves));
     } else if (curveRoad2.way == Constant.twoWay) {
       curveRoadInfo.leftWidth = curveRoad2.leftWidth;
       curveRoadInfo.rightWidth = curveRoad2.rightWidth;
       curveRoadInfo.leftDrivewayCount = curveRoad2.leftDrivewayCount;
       curveRoadInfo.rightDrivewayCount = curveRoad2.rightDrivewayCount;
-      curveRoadInfo.midDivide = JSON.parse(
-        JSON.stringify(curveRoad2.midDivide)
-      );
-      curveRoadInfo.leftLanesCurves = JSON.parse(
-        JSON.stringify(curveRoad2.leftLanesCurves)
-      );
-      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.midDivide = JSON.parse(JSON.stringify(curveRoad2.midDivide));
+      curveRoadInfo.leftLanesCurves = JSON.parse(JSON.stringify(curveRoad2.leftLanesCurves));
+      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) {
@@ -578,12 +477,8 @@ export default class HistoryUtil {
       x: crossPoint2.position.x,
       y: crossPoint2.position.y,
     };
-    crossPointInfo.edgeInfo1 = JSON.parse(
-      JSON.stringify(crossPoint2.edgeInfo1)
-    );
-    crossPointInfo.edgeInfo2 = JSON.parse(
-      JSON.stringify(crossPoint2.edgeInfo2)
-    );
+    crossPointInfo.edgeInfo1 = JSON.parse(JSON.stringify(crossPoint2.edgeInfo1));
+    crossPointInfo.edgeInfo2 = JSON.parse(JSON.stringify(crossPoint2.edgeInfo2));
     crossPoint1.edgeInfo1 = JSON.parse(JSON.stringify(crossPoint2.edgeInfo1));
     crossPoint1.edgeInfo2 = JSON.parse(JSON.stringify(crossPoint2.edgeInfo2));
     dataService.addCrossPoint(crossPoint1);
@@ -630,7 +525,7 @@ export default class HistoryUtil {
     data.type = line.geoType;
     data.style = line.style;
     data.weight = line.weight;
-    data.zebraCrossStyle = line.zebraCrossStyle
+    data.zebraCrossStyle = line.zebraCrossStyle;
     return data;
   }
 
@@ -787,7 +682,7 @@ export default class HistoryUtil {
     data.curves = JSON.parse(JSON.stringify(curveRoadEdge.curves));
     data.style = curveRoadEdge.style;
     data.weight = curveRoadEdge.weight;
-    // data.roadSide == curveRoadEdge.roadSide 
+    // data.roadSide == curveRoadEdge.roadSide
     return data;
   }
 
@@ -806,9 +701,7 @@ export default class HistoryUtil {
     if (curveRoad.way == Constant.oneWay) {
       data.singleCurveRoadWidth = curveRoad.singleRoadWidth;
       data.singleCurveRoadDrivewayCount = curveRoad.singleRoadDrivewayCount;
-      data.singleLanesCurves = JSON.parse(
-        JSON.stringify(curveRoad.singleLanesCurves)
-      );
+      data.singleLanesCurves = JSON.parse(JSON.stringify(curveRoad.singleLanesCurves));
       data.singleLanes = JSON.parse(JSON.stringify(curveRoad.singleLanes));
     } else if (curveRoad.way == Constant.twoWay) {
       data.leftWidth = curveRoad.leftWidth;
@@ -816,12 +709,8 @@ export default class HistoryUtil {
       data.leftDrivewayCount = curveRoad.leftDrivewayCount;
       data.rightDrivewayCount = curveRoad.rightDrivewayCount;
       data.midDivide = JSON.parse(JSON.stringify(curveRoad.midDivide));
-      data.leftLanesCurves = JSON.parse(
-        JSON.stringify(curveRoad.leftLanesCurves)
-      );
-      data.rightLanesCurves = JSON.parse(
-        JSON.stringify(curveRoad.rightLanesCurves)
-      );
+      data.leftLanesCurves = JSON.parse(JSON.stringify(curveRoad.leftLanesCurves));
+      data.rightLanesCurves = JSON.parse(JSON.stringify(curveRoad.rightLanesCurves));
       data.leftLanes = JSON.parse(JSON.stringify(curveRoad.leftLanes));
       data.rightLanes = JSON.parse(JSON.stringify(curveRoad.rightLanes));
     }
@@ -877,7 +766,7 @@ export default class HistoryUtil {
     line.value = lineInfo.value;
     line.style = lineInfo.style;
     line.weight = lineInfo.weight;
-    line.zebraCrossStyle = lineInfo.zebraCrossStyle
+    line.zebraCrossStyle = lineInfo.zebraCrossStyle;
     return line;
   }
 
@@ -895,9 +784,7 @@ export default class HistoryUtil {
     curveLine.endId = curveLineInfo.endId;
     curveLine.points = [];
     for (let i = 0; i < curveLineInfo.points.length; ++i) {
-      curveLine.points[i] = dataService.getCurvePoint(
-        curveLineInfo.points[i].vectorId
-      );
+      curveLine.points[i] = dataService.getCurvePoint(curveLineInfo.points[i].vectorId);
     }
     curveLine.curves = JSON.parse(JSON.stringify(curveLineInfo.curves));
     return curveLine;
@@ -929,9 +816,7 @@ export default class HistoryUtil {
     let magnifier = dataService.getMagnifier(magnifierInfo.vectorId);
     magnifier.vectorId = magnifierInfo.vectorId;
     magnifier.position = JSON.parse(JSON.stringify(magnifierInfo.position));
-    magnifier.popPosition = JSON.parse(
-      JSON.stringify(magnifierInfo.popPosition)
-    );
+    magnifier.popPosition = JSON.parse(JSON.stringify(magnifierInfo.popPosition));
     magnifier.photoUrl = magnifierInfo.photoUrl;
   }
 
@@ -960,6 +845,9 @@ export default class HistoryUtil {
     roadEdge.type = roadEdgeInfo.type;
     roadEdge.style = roadEdgeInfo.style;
     roadEdge.roadSide = roadEdgeInfo.roadSide;
+    if (roadEdge.roadSide) {
+      roadEdge.setRoadSideWidth(roadEdge.roadSide.width);
+    }
   }
 
   setRoadInfo(roadInfo) {
@@ -987,26 +875,19 @@ export default class HistoryUtil {
   }
 
   setCurveRoadPointInfo(curveRoadPointInfo) {
-    let curveRoadPoint = dataService.getCurveRoadPoint(
-      curveRoadPointInfo.vectorId
-    );
+    let curveRoadPoint = dataService.getCurveRoadPoint(curveRoadPointInfo.vectorId);
     curveRoadPoint.vectorId = curveRoadPointInfo.vectorId;
     mathUtil.clonePoint(curveRoadPoint, curveRoadPointInfo.position);
-    curveRoadPoint.parent = JSON.parse(
-      JSON.stringify(curveRoadPointInfo.parent)
-    );
+    curveRoadPoint.parent = JSON.parse(JSON.stringify(curveRoadPointInfo.parent));
     curveRoadPoint.index = curveRoadPointInfo.index;
   }
 
   setCurveRoadEdgeInfo(curveRoadEdgeInfo) {
-    console.error(1)
-    let curveRoadEdge = dataService.getCurveRoadEdge(
-      curveRoadEdgeInfo.vectorId
-    );
+    let curveRoadEdge = dataService.getCurveRoadEdge(curveRoadEdgeInfo.vectorId);
     curveRoadEdge.vectorId = curveRoadEdgeInfo.vectorId;
     mathUtil.clonePoint(curveRoadEdge.start, curveRoadEdgeInfo.start);
     mathUtil.clonePoint(curveRoadEdge.end, curveRoadEdgeInfo.end);
-    curveRoadEdge.points = []
+    curveRoadEdge.points = [];
     for (let i = 0; i < curveRoadEdgeInfo.points.length; ++i) {
       curveRoadEdge.points[i] = {};
       mathUtil.clonePoint(curveRoadEdge.points[i], curveRoadEdgeInfo.points[i]);
@@ -1016,7 +897,7 @@ export default class HistoryUtil {
     curveRoadEdge.type = curveRoadEdgeInfo.type;
     curveRoadEdge.style = curveRoadEdgeInfo.style;
     curveRoadEdge.weight = curveRoadEdgeInfo.weight;
-    // curveRoadEdge.roadSide == curveRoadEdgeInfo.roadSide 
+    // curveRoadEdge.roadSide == curveRoadEdgeInfo.roadSide
   }
 
   setCurveRoadInfo(curveRoadInfo) {
@@ -1026,42 +907,28 @@ export default class HistoryUtil {
     curveRoad.endId = curveRoadInfo.endId;
     curveRoad.leftEdgeId = curveRoadInfo.leftEdgeId;
     curveRoad.rightEdgeId = curveRoadInfo.rightEdgeId;
-    curveRoad.points=[]
+    curveRoad.points = [];
     for (let i = 0; i < curveRoadInfo.points.length; ++i) {
-      curveRoad.points[i] = dataService.getCurveRoadPoint(
-        curveRoadInfo.points[i].vectorId
-      );
-    
+      curveRoad.points[i] = dataService.getCurveRoadPoint(curveRoadInfo.points[i].vectorId);
     }
     // curveRoad.points = JSON.parse(JSON.stringify(curveRoadInfo.points));
     curveRoad.curves = JSON.parse(JSON.stringify(curveRoadInfo.curves));
 
     if (curveRoad.way == Constant.oneWay) {
       curveRoad.singleCurveRoadWidth = curveRoadInfo.singleCurveRoadWidth;
-      curveRoad.singleCurveRoadDrivewayCount =
-        curveRoadInfo.singleCurveRoadDrivewayCount;
-      curveRoad.singleLanesCurves = JSON.parse(
-        JSON.stringify(curveRoadInfo.singleLanesCurves)
-      );
-      curveRoad.singleLanes = JSON.parse(
-        JSON.stringify(curveRoadInfo.singleLanes)
-      );
+      curveRoad.singleCurveRoadDrivewayCount = curveRoadInfo.singleCurveRoadDrivewayCount;
+      curveRoad.singleLanesCurves = JSON.parse(JSON.stringify(curveRoadInfo.singleLanesCurves));
+      curveRoad.singleLanes = JSON.parse(JSON.stringify(curveRoadInfo.singleLanes));
     } else if (curveRoad.way == Constant.twoWay) {
       curveRoad.leftWidth = curveRoadInfo.leftWidth;
       curveRoad.rightWidth = curveRoadInfo.rightWidth;
       curveRoad.leftDrivewayCount = curveRoadInfo.leftDrivewayCount;
       curveRoad.rightDrivewayCount = curveRoadInfo.rightDrivewayCount;
       curveRoad.midDivide = JSON.parse(JSON.stringify(curveRoadInfo.midDivide));
-      curveRoad.leftLanesCurves = JSON.parse(
-        JSON.stringify(curveRoadInfo.leftLanesCurves)
-      );
-      curveRoad.rightLanesCurves = JSON.parse(
-        JSON.stringify(curveRoadInfo.rightLanesCurves)
-      );
+      curveRoad.leftLanesCurves = JSON.parse(JSON.stringify(curveRoadInfo.leftLanesCurves));
+      curveRoad.rightLanesCurves = JSON.parse(JSON.stringify(curveRoadInfo.rightLanesCurves));
       curveRoad.leftLanes = JSON.parse(JSON.stringify(curveRoadInfo.leftLanes));
-      curveRoad.rightLanes = JSON.parse(
-        JSON.stringify(curveRoadInfo.rightLanes)
-      );
+      curveRoad.rightLanes = JSON.parse(JSON.stringify(curveRoadInfo.rightLanes));
     }
   }
 

+ 7 - 7
src/store/sync.ts

@@ -22,13 +22,13 @@ const global = window as any;
 const getFilesIng = [];
 const getFilesSuccess = [];
 setInterval(() => {
-  console.log(
-    "请求资源数:" + getFilesIng.length,
-    "响应结果数:" + getFilesSuccess.length
-  );
-  console.log(
-    "未返回资源:" + getFilesIng.filter((url) => !getFilesSuccess.includes(url))
-  );
+  // console.log(
+  //   "请求资源数:" + getFilesIng.length,
+  //   "响应结果数:" + getFilesSuccess.length
+  // );
+  // console.log(
+  //   "未返回资源:" + getFilesIng.filter((url) => !getFilesSuccess.includes(url))
+  // );
 }, 1000);
 const normalImage = async (url: string) => {
   const getUrl = await api.getFile(url);