xushiting 2 년 전
부모
커밋
afc99b026b
3개의 변경된 파일8개의 추가작업 그리고 4개의 파일을 삭제
  1. 4 2
      src/graphic/Controls/AddMagnifier.js
  2. 2 2
      src/graphic/ListenLayer.js
  3. 2 0
      src/graphic/Service/DataService.js

+ 4 - 2
src/graphic/Controls/AddMagnifier.js

@@ -1,5 +1,6 @@
 import { mathUtil } from "../Util/MathUtil";
 import { mathUtil } from "../Util/MathUtil";
 import { magnifierService } from "../Service/MagnifierService";
 import { magnifierService } from "../Service/MagnifierService";
+import { listenLayer } from "../ListenLayer";
 
 
 export default class AddMagnifier {
 export default class AddMagnifier {
   constructor() {
   constructor() {
@@ -9,10 +10,11 @@ export default class AddMagnifier {
   buildMagnifier(position) {
   buildMagnifier(position) {
     this.newMagnifier = magnifierService.create(position);
     this.newMagnifier = magnifierService.create(position);
     listenLayer.clear();
     listenLayer.clear();
-    this.clear();
   }
   }
 
 
-  clear() {}
+  clear() {
+    this.newMagnifier = null;
+  }
 }
 }
 
 
 const addMagnifier = new AddMagnifier();
 const addMagnifier = new AddMagnifier();

+ 2 - 2
src/graphic/ListenLayer.js

@@ -839,8 +839,8 @@ export default class ListenLayer {
     } else if (info && info.magnifierInfo.magnifierId) {
     } else if (info && info.magnifierInfo.magnifierId) {
       this.modifyPoint = {};
       this.modifyPoint = {};
       this.modifyPoint.magnifierId = info.magnifierInfo.magnifierId;
       this.modifyPoint.magnifierId = info.magnifierInfo.magnifierId;
-      this.modifyPoint.x = info.magnifierInfo.position.x;
-      this.modifyPoint.y = info.magnifierInfo.position.y;
+      this.modifyPoint.x = info.magnifierInfo.x;
+      this.modifyPoint.y = info.magnifierInfo.y;
     } else if (
     } else if (
       info &&
       info &&
       (info.roadEdgeInfo.edgeId || info.curveRoadEdgeInfo.curveEdgeId)
       (info.roadEdgeInfo.edgeId || info.curveRoadEdgeInfo.curveEdgeId)

+ 2 - 0
src/graphic/Service/DataService.js

@@ -55,6 +55,7 @@ export class DataService {
     this.vectorData.basePointIds = [];
     this.vectorData.basePointIds = [];
     this.vectorData.texts = {};
     this.vectorData.texts = {};
     this.vectorData.SVGs = {};
     this.vectorData.SVGs = {};
+    this.vectorData.magnifiers = {};
   }
   }
 
 
   //网格
   //网格
@@ -525,6 +526,7 @@ export class DataService {
     this.vectorData.basePointIds = [];
     this.vectorData.basePointIds = [];
     this.vectorData.texts = {};
     this.vectorData.texts = {};
     this.vectorData.SVGs = {};
     this.vectorData.SVGs = {};
+    this.vectorData.magnifiers = {};
   }
   }
 }
 }