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

src/graphic/Controls/MovePoint.js

@@ -71,7 +71,8 @@ export default class MovePoint {
           let startPoint = dataService.getPoint(line.startId);
           let endPoint = dataService.getPoint(line.endId);
           if (
-            mathUtil.getDistance(startPoint, endPoint) == 0 
+            mathUtil.getDistance(startPoint, endPoint) == 0 && 
+            startPoint.category != VectorCategory.Point.BasePoint //点重叠不应删除基准点
           ) {
             pointService.deletePoint(pointId);
           }

src/graphic/Layer.js

@@ -1097,6 +1097,7 @@ export default class Layer {
           addRoad.buildRoad();
           elementService.hideAll();
         }
+        this.uiControl.confirmEntry(); //不能连续创建道路
         break;
       case LayerEvents.AddingLine:
         needAutoRedraw = true;
@@ -1156,6 +1157,7 @@ export default class Layer {
           addRoad.buildCurveRoad();
           elementService.hideAll();
         }
+        this.uiControl.confirmEntry(); //不能连续创建道路
         break;
       case LayerEvents.MoveRoad:
         needAutoRedraw = true;
@@ -1355,13 +1357,13 @@ export default class Layer {
       }
     } else if (eventType == "mouseUp") {
       if (eventName == LayerEvents.AddingRoad) {
-        this.uiControl.showConfirm();
+        // this.uiControl.showConfirm();
         stateService.setEventName(LayerEvents.AddRoad);
       } else if (eventName == LayerEvents.AddingLine) {
         this.uiControl.showConfirm();
         stateService.setEventName(LayerEvents.AddLine);
       } else if (eventName == LayerEvents.AddingCurveRoad) {
-        this.uiControl.showConfirm();
+        // this.uiControl.showConfirm();
         stateService.setEventName(LayerEvents.AddCurveRoad);
       } else if (eventName == LayerEvents.AddLine) {
         stateService.setEventName(LayerEvents.AddingLine);