xushiting 2 年 前
コミット
1820601515

+ 2 - 2
src/graphic/Controls/AddCrossRoad.js

@@ -267,7 +267,7 @@ export default class AddCrossRoad {
   }
 
   buildExitRamp(position) {
-    const roadLen = 600;
+    const roadLen = 800;
     let startPoint = {
       x: position.x,
       y: position.y + (roadLen * 3) / 5,
@@ -284,7 +284,7 @@ export default class AddCrossRoad {
     roadService.create(startPoint.vectorId, crossPoint.vectorId);
     roadService.create(crossPoint.vectorId, endPoint.vectorId);
     let startPoint2 = {
-      x: startPoint.x + roadLen / 4,
+      x: startPoint.x + roadLen / 3,
       y: startPoint.y,
     };
     startPoint2 = roadPointService.create(startPoint2);

+ 1 - 1
src/graphic/History/Change.js

@@ -94,7 +94,7 @@ export default class Change {
       this.currentData.curveRoadEdges.length == 0 &&
       this.currentData.curveRoads.length == 0 &&
       this.currentData.crossPoints.length == 0 &&
-      this.currentData.settings
+      !this.currentData.settings
     ) {
       this.saveCurrentInfo();
       return false;

+ 3 - 2
src/graphic/History/History.js

@@ -224,9 +224,10 @@ export default class History {
         const preCircle = item.circle;
         let newCircle = circleService.create(
           preCircle.center,
-          preCircle.radius,
+          preCircle.radiusX,
           preCircle.id
         );
+
         historyUtil.assignCircleFromCircle(newCircle, preCircle);
       } else if (item.handle == HistoryEvents.ModifyCircle) {
         const preCircle = item.preCircle;
@@ -571,7 +572,7 @@ export default class History {
         const preCircle = item.circle;
         let newCircle = circleService.create(
           preCircle.center,
-          preCircle.radius,
+          preCircle.radiusX,
           preCircle.id
         );
         historyUtil.assignCircleFromCircle(newCircle, preCircle);

+ 2 - 1
src/graphic/History/HistoryUtil.js

@@ -89,7 +89,8 @@ export default class HistoryUtil {
   isDifferentForMagnifiers(magnifier1, magnifier2) {
     if (
       mathUtil.equalPoint(magnifier1.position, magnifier2.position) &&
-      magnifier1.photoUrl == magnifier2.photoUrl
+      magnifier1.photoUrl == magnifier2.photoUrl &&
+      mathUtil.equalPoint(magnifier1.popPosition, magnifier2.popPosition)
     ) {
       return false;
     } else {