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

src/graphic/Constant.js

@@ -34,8 +34,8 @@ const Constant = {
   maxRoadSideWidth: 800,
   oneWay: "oneWay", //one表示单向，two表示双向
   twoWay: "twoWay", //one表示单向，two表示双向
-  defaultSingleLaneWidth: 35, //单个车道的宽度
-  defaultMidDivideWidth: 2, //隔离带的宽度
+  defaultSingleLaneWidth: 3.5, //单个车道的宽度
+  defaultMidDivideWidth: 0.2, //隔离带的宽度
   angleLocationMode: "AngleLocationMode", //直角定位
   allLocationMode: "AllLocationMode", //综合定位
   normalLocationMode: "NormalLocationMode", //垂线定位

src/graphic/Controls/UIControl.js

@@ -363,7 +363,6 @@ export default class UIControl {
         break;
       case VectorType.Line:
         let line = dataService.getLine(vectorId);
-
         dataService.deleteLine(vectorId);
         if (vectorId == Settings.baseLineId) {
           this.layer.initLocation();
@@ -447,7 +446,7 @@ export default class UIControl {
         dataService.deleteCircle(vectorId);
         break;
       case VectorType.Text:
-        dataService.deleteText(vectorId);
+        textService.deleteText(vectorId);
         break;
       case VectorType.Magnifier:
         dataService.deleteMagnifier(vectorId);
@@ -688,33 +687,27 @@ export default class UIControl {
   // 设置默认设置
   setDefaultSetting(setting) {
     console.log("获得设置", setting);
-
     uiService.setRoadMidDivideWidth(
-      // (setting.roadQuarantineWidth / coordinate.res) * coordinate.ratio
       setting.roadQuarantineWidth / coordinate.res
     );
     uiService.setCurveRoadMidDivideWidth(
-      // (setting.roadQuarantineWidth / coordinate.res) * coordinate.ratio
       setting.roadQuarantineWidth / coordinate.res
     );
-    uiService.setSingleLaneWidth(
-      // (setting.singleRoadWidth / coordinate.res) * coordinate.ratio
-      setting.singleRoadWidth / coordinate.res
-    );
-    // uiService.setLineWidth(setting.lineWidth / 1000 / coordinate.res);
+    Constant.defaultMidDivideWidth = setting.roadQuarantineWidth;
+    uiService.setSingleLaneWidth(setting.singleRoadWidth / coordinate.res);
+    Constant.defaultSingleLaneWidth = setting.singleRoadWidth;
     uiService.setLineWidth(setting.lineWidth);
     this.layer.renderer.autoRedraw();
   }
 
   // 获取默认设置
   getDefaultSetting() {
-    const singleLaneWidth = uiService.getSingleLaneWidth();
-    const roadMidDivideWidth = uiService.getRoadMidDivideWidth();
+    const singleLaneWidth = Constant.defaultSingleLaneWidth;
+    const roadMidDivideWidth = Constant.defaultMidDivideWidth;
     const lineWidth = uiService.getLineWidth();
     return {
-      singleRoadWidth: singleLaneWidth * coordinate.res,
-      roadQuarantineWidth: roadMidDivideWidth * coordinate.res,
-      // lineWidth: lineWidth * coordinate.res * 1000,
+      singleRoadWidth: singleLaneWidth,
+      roadQuarantineWidth: roadMidDivideWidth,
       lineWidth: lineWidth,
     };
   }

src/graphic/Load.js

@@ -390,14 +390,6 @@ export default class Load {
           }
         } catch (e) {}
         if (data3d.meterPerPixel) {
-          uiService.setSingleLaneWidth(
-            (Constant.defaultSingleLaneWidth * coordinate.res) /
-              data3d.meterPerPixel
-          );
-          uiService.setRoadMidDivideWidth(
-            (Constant.defaultMidDivideWidth * coordinate.res) /
-              data3d.meterPerPixel
-          );
           coordinate.setRes(data3d.meterPerPixel);
         }
         const width = bgImg.imageData.width;
@@ -435,7 +427,7 @@ export default class Load {
               this.getXY(width, height, data3d.measures[i].pos[1]),
               VectorCategory.Line.MeasureLine
             );
-            if (data3d.measures[i].dis) {
+            if (line && data3d.measures[i].dis) {
               line.value = data3d.measures[i].dis;
             }
           }
@@ -467,6 +459,16 @@ export default class Load {
         }
       }
     }
+    uiService.setRoadMidDivideWidth(
+      Constant.defaultMidDivideWidth / coordinate.res
+    );
+    uiService.setCurveRoadMidDivideWidth(
+      Constant.defaultMidDivideWidth / coordinate.res
+    );
+    uiService.setSingleLaneWidth(
+      Constant.defaultSingleLaneWidth / coordinate.res
+    );
+
     if (Settings.baseLineId) {
       this.layer.updateForLocation();
     }

src/graphic/Service/TextService.js

@@ -22,6 +22,14 @@ export default class TextService {
     newText.setFontSize(text.fontSize);
     return newText.vectorId;
   }
+
+  deleteText(vectorId) {
+    let text = dataService.getText(vectorId);
+    if (text.linkedPointId) {
+      dataService.deletePoint(text.linkedPointId);
+    }
+    dataService.deleteText(vectorId);
+  }
 }
 
 const textService = new TextService();

src/graphic/Service/UIService.js

@@ -237,14 +237,17 @@ export default class UIService {
     return Settings.selectRoadStructure;
   }
 
+  //Constant.defaultMidDivideWidth是真实宽度，现在赋值的时候要转换成像素
   setRoadMidDivideWidth(value) {
     Settings.roadMidDivideWidth = value;
   }
 
+  //Constant.defaultMidDivideWidth是真实宽度，现在赋值的时候要转换成像素
   setCurveRoadMidDivideWidth(value) {
     Settings.curveRoadMidDivideWidth = value;
   }
 
+  //Constant.defaultSingleLaneWidth是真实宽度，现在赋值的时候要转换成像素
   setSingleLaneWidth(value) {
     Settings.singleLaneWidth = value;
   }

src/sdk/laser/core/enter.js

@@ -604,7 +604,7 @@ var enter = ({
 
             // 开启放大镜
             openMagnifier() {
-                console.error('开启放大镜')
+                //console.error('开启放大镜')
                 viewer.magnifier.dispatchEvent({
                     type: "setEnable",
                     value: true