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

src/graphic/Controls/UIControl.js

@@ -149,11 +149,16 @@ export default class UIControl {
         key = "setWeight";
       }
 
-      if (focusItem.type == VectorType.Line) {
+      if (focusItem.type == VectorType.Line ) {
         let Line = dataService.getLine(focusItem.vectorId);
         // Line.setStyle(selectUI);
         Line[key](selectUI);
-      } else {
+      } else if( focusItem.type == VectorType.CurveLine){
+        let Line = dataService.getCurveLine(focusItem.vectorId);
+        // Line.setStyle(selectUI);
+        Line[key](selectUI);
+        
+      }else {
         let roadEdge = dataService.getRoadEdge(focusItem.vectorId);
         if (roadEdge) {
           // roadEdge.setStyle(selectUI);

src/graphic/Geometry/Magnifier.js

@@ -111,7 +111,11 @@ export default class Magnifier extends Geometry {
   //     };
   //   }
   // }
-  setPopPosition(positionRaw) {
+  setPopPosition(positionRaw,loadPosition) {
+    if(loadPosition){
+      this.popPosition = loadPosition
+      return
+    }
     const position = coordinate.getScreenXY(this.position);
     const center = coordinate.getScreenXY(coordinate.center);
     let line = mathUtil.createLine1(position, center);
@@ -145,6 +149,7 @@ export default class Magnifier extends Geometry {
     this.photoUrl = src;
   }
 
+
   setImageData() {
     return new Promise(async (resolve, reject) => {
       if (this.photoUrl) {

src/graphic/Load.js

@@ -57,6 +57,7 @@ export default class Load {
         }
       }
       if (dataLocal.magnifiers) {
+
         for (let key in dataLocal.magnifiers) {
           let magnifier = magnifierService.create(
             dataLocal.magnifiers[key].position,
@@ -64,6 +65,9 @@ export default class Load {
           );
           magnifier.setSrc(dataLocal.magnifiers[key].photoUrl);
           magnifier.setDisplay(dataLocal.magnifiers[key].display);
+     
+          magnifier.setPopPosition(null,dataLocal.magnifiers[key].popPosition)
+      
           try {
             if (dataLocal.magnifiers[key].photoUrl) {
               await magnifier.setImageData();