Merge branch 'master' of http://192.168.0.115:3000/bill/traffic-laser

src/graphic/Controls/MoveLine.js

@@ -176,6 +176,11 @@ export default class MoveLine {
             endPoint.y += dy;
             locationModeControl.setAngle();
           }
+        } else {
+          startPoint.x += dx;
+          startPoint.y += dy;
+          endPoint.x += dx;
+          endPoint.y += dy;
         }
       } else {
         startPoint.x += dx;

src/graphic/Controls/MoveMagnifier.js

@@ -10,8 +10,6 @@ export default class MoveMagnifier {
 
     if (index == 0) {
       magnifier.setPosition(position);
-      magnifier.setPhotoUrl(null)
-      magnifier.setPhotoImg(null)
     } else {
       const popPosition = coordinate.getScreenXY(position);
       magnifier.popPosition = {

src/graphic/Controls/MovePoint.js

@@ -33,6 +33,9 @@ export default class MovePoint {
               point.y = position.y;
               locationModeControl.setAngle();
             }
+          } else {
+            point.x = position.x;
+            point.y = position.y;
           }
         } else {
           point.x = position.x;

src/graphic/ListenLayer.js

@@ -1024,6 +1024,8 @@ export default class ListenLayer {
             magnifierId: magnifierId,
             type: VectorType.Magnifier,
             distance: distance,
+            x: popPosition.x,
+            y: popPosition.y,
             index: 1,
           };
           break;

src/graphic/Service/CurveRoadService.js

@@ -1133,15 +1133,24 @@ export default class CurveRoadService extends RoadService {
     lineService.createCurveLineByPoints(rightCurveEdge.points);
 
     if (curveRoad.way == Constant.oneWay) {
-      for (let i = 0; i < curveRoad.singleLanesCurves.length; ++i) {
-        lineService.createCurveLineByPoints(curveRoad.singleLanes[i]);
+      for (let i = 0; i < curveRoad.singleLanes.length; ++i) {
+        let curveLine = lineService.createCurveLineByPoints(
+          curveRoad.singleLanes[i]
+        );
+        curveLine.setStyle(VectorStyle.SingleDashedLine);
       }
     } else if (curveRoad.way == Constant.twoWay) {
-      for (let i = 0; i < curveRoad.leftLanesCurves.length; ++i) {
-        lineService.createCurveLineByPoints(curveRoad.leftLanes[i]);
+      for (let i = 0; i < curveRoad.leftLanes.length; ++i) {
+        let leftCurveLine = lineService.createCurveLineByPoints(
+          curveRoad.leftLanes[i]
+        );
+        leftCurveLine.setStyle(VectorStyle.SingleDashedLine);
       }
-      for (let i = 0; i < curveRoad.rightLanesCurves.length; ++i) {
-        lineService.createCurveLineByPoints(curveRoad.rightLanes[i]);
+      for (let i = 0; i < curveRoad.rightLanes.length; ++i) {
+        let rightCurveLine = lineService.createCurveLineByPoints(
+          curveRoad.rightLanes[i]
+        );
+        rightCurveLine.setStyle(VectorStyle.SingleDashedLine);
       }
       // let leftMidDivide = lineService.createCurveLineByPoints(
       //   curveRoad.midDivide.leftMidDivide