【SDK】【service】【修改路径】

killer1992 · killer1992 · commit 6a38286896a1 · 2022-07-07T09:03:03.000+08:00
diff --git a/src/service/3DPlot/Draw/DrawPlotObjectFactory3D.js b/src/service/3DPlot/Draw/DrawPlotObjectFactory3D.js
@@ -6,7 +6,7 @@
  * @LastEditors: zk
  * @LastEditTime: 2022-06-28 09:52:39
  */
-import SimpleFactory from "../../../service/PlotUtilBase/SimpleFactory";
+import SimpleFactory from "../../PlotUtilBase/SimpleFactory";
 import DrawPoint from "./DrawPoint";
 import DrawPolyline from "./DrawPolyline";
 
diff --git a/src/service/3DPlot/Draw/DrawPoint.js b/src/service/3DPlot/Draw/DrawPoint.js
@@ -1,4 +1,4 @@
-import DrawObject from "../../../service/PlotBase/Draw/DrawObject";
+import DrawObject from "../../PlotBase/Draw/DrawObject";
 import {PrimitiveFactory} from "../Primitive/PrimitiveFactory";
 import {CesiumUtil} from "../Utils/CesiumUtil";
 import {addExtendLayersPlot} from "../Utils/PlotUtil";
diff --git a/src/service/3DPlot/Draw/DrawPolyline.js b/src/service/3DPlot/Draw/DrawPolyline.js
@@ -1,8 +1,8 @@
-import DrawObject from "../../../service/PlotBase/Draw/DrawObject";
+import DrawObject from "../../PlotBase/Draw/DrawObject";
 import PrimitiveFactory from "../Primitive/index";
 import {CesiumUtil} from "../Utils/CesiumUtil";
-import GeomUtil from "../../../service/PlotUtilBase/Geometry/GeomUtil";
-import Point from "../../../service/PlotUtilBase/Geometry/Point";
+import GeomUtil from "../../PlotUtilBase/Geometry/GeomUtil";
+import Point from "../../PlotUtilBase/Geometry/Point";
 import {addExtendLayersPlot} from "../Utils/PlotUtil";
 
 function look(viewer, center, offset) {
diff --git a/src/service/3DPlot/PlotLayer3D.js b/src/service/3DPlot/PlotLayer3D.js
@@ -1,15 +1,15 @@
 import {defined} from "../PlotUtilBase/Check";
-import SymbolManager from "../../service/PlotBase/SymbolManager/SymbolManager";
+import SymbolManager from "../PlotBase/SymbolManager/SymbolManager";
 import {DrawPlotObjectFactory3D} from "./Draw";
 import {CesiumUtil} from "./Utils/CesiumUtil";
-import Observable from "../../service/PlotUtilBase/Observable";
+import Observable from "../PlotUtilBase/Observable";
 import EditTool from "./EditTool/EditTool";
 import {PrimitiveFactory} from "./Primitive/PrimitiveFactory";
 import * as turf from "@turf/turf";
 import Point from "../PlotUtilBase/Geometry/Point";
 import GeomUtil from "../PlotUtilBase/Geometry/GeomUtil";
 import {addExtendLayersPlot, removeExtendLayersPlot} from "./Utils/PlotUtil";
-import { Zondy } from "../common/Base";
+import { Zondy } from "../common";
 
 /**
  * @class module:3DPlot.PlotLayer3D
@@ -197,7 +197,7 @@ class PlotLayer3D extends Observable {
      */
     removeAll() {
         let plotLayer = this._getPlotLayer();
-        plotLayer.removeAll();
+        plotLayer && plotLayer.removeAll();
     }
 
     /**
diff --git a/src/service/3DPlot/Primitive/BasePlotPrimitive.js b/src/service/3DPlot/Primitive/BasePlotPrimitive.js
@@ -48,6 +48,7 @@ class BasePlotPrimitive {
      * @private
      */
     _elemPropsUpdateHandler(event) {
+        console.log("event.type",event.type)
         if (event.type === 'positions') {
             let { _positionBillboards, _shapeBillboards } = this;
             const positions = event.value;
diff --git a/src/service/3DPlot/Primitive/ElementInstance/IrregularElementInstance.js b/src/service/3DPlot/Primitive/ElementInstance/IrregularElementInstance.js
@@ -1,6 +1,6 @@
 import { defined } from "../../../PlotUtilBase/Check";
 import RegularLineElementInstance from "./RegularLineElementInstance";
-import GeomUtil from "../../../../service/PlotUtilBase/Geometry/GeomUtil";
+import GeomUtil from "../../../PlotUtilBase/Geometry/GeomUtil";
 
 /**
  * @class module:3DPlot.IrregularElementInstance
diff --git a/src/service/3DPlot/Primitive/ElementInstance/RegularLine1ElementInstance.js b/src/service/3DPlot/Primitive/ElementInstance/RegularLine1ElementInstance.js
@@ -1,5 +1,5 @@
 import { CesiumGeomUtil, CesiumUtil } from "../../Utils/CesiumUtil";
-import MainElement from "../../../../service/PlotBase/SvgLoader/element/extend/MainElement";
+import MainElement from "../../../PlotBase/SvgLoader/element/extend/MainElement";
 import RegularLineElementInstance from "./RegularLineElementInstance";
 
 /**
diff --git a/src/service/3DPlot/Primitive/ElementInstance/RegularLineElementInstance.js b/src/service/3DPlot/Primitive/ElementInstance/RegularLineElementInstance.js
@@ -1,6 +1,6 @@
 import SvgElementInstance from "./SvgElementInstance";
 import { CesiumGeomUtil, CesiumUtil } from "../../Utils/CesiumUtil";
-import MainElement from "../../../../service/PlotBase/SvgLoader/element/extend/MainElement";
+import MainElement from "../../../PlotBase/SvgLoader/element/extend/MainElement";
 import { defined } from "../../../PlotUtilBase/Check";
 
 /**
diff --git a/src/service/3DPlot/Primitive/ElementInstance/RegularSurfaceElementInstance.js b/src/service/3DPlot/Primitive/ElementInstance/RegularSurfaceElementInstance.js
@@ -1,4 +1,4 @@
-import Bounds from "../../../../service/PlotUtilBase/Geometry/Bound";
+import Bounds from "../../../PlotUtilBase/Geometry/Bound";
 import {CesiumUtil} from "../../Utils/CesiumUtil";
 import SvgElementInstance from "./SvgElementInstance";
 
diff --git a/src/service/3DPlot/Primitive/ElementInstance/SimpleLineElementInstance.js b/src/service/3DPlot/Primitive/ElementInstance/SimpleLineElementInstance.js
@@ -1,5 +1,5 @@
 import { CesiumGeomUtil, CesiumUtil } from '../../Utils/CesiumUtil';
-import MainElement from '../../../../service/PlotBase/SvgLoader/element/extend/MainElement';
+import MainElement from '../../../PlotBase/SvgLoader/element/extend/MainElement';
 import RegularLineElementInstance from './RegularLineElementInstance';
 
 /**
diff --git a/src/service/3DPlot/Primitive/ElementInstance/SvgElementInstance.js b/src/service/3DPlot/Primitive/ElementInstance/SvgElementInstance.js
@@ -1,9 +1,9 @@
 import {Vector2} from "../../../PlotUtilBase/Math/Vector2";
 import {Vector3} from "../../../PlotUtilBase/Math/Vector3";
-import PolylineCurve3 from "../../../../service/PlotUtilBase/Curves/PolylineCurve3";
+import PolylineCurve3 from "../../../PlotUtilBase/Curves/PolylineCurve3";
 import {CesiumGeomUtil} from "../../Utils/CesiumUtil";
 import {defined} from "../../../PlotUtilBase/Check";
-import GeomUtil from "../../../../service/PlotUtilBase/Geometry/GeomUtil";
+import GeomUtil from "../../../PlotUtilBase/Geometry/GeomUtil";
 import {ExtrudeGeometryUtil} from "../../Utils/ExtrudeGeometryUtil";
 import {Shape} from "../../../PlotUtilBase/Path2D/Shape";
 import {setOffsetHeight} from "./Util";
diff --git a/src/service/3DPlot/Primitive/IrregularPrimitive/BaseIrregularPrimitive.js b/src/service/3DPlot/Primitive/IrregularPrimitive/BaseIrregularPrimitive.js
@@ -1,4 +1,4 @@
-import Point from '../../../../service/PlotUtilBase/Geometry/Point';
+import Point from '../../../PlotUtilBase/Geometry/Point';
 import { Vector2 } from '../../../PlotUtilBase/Math/Vector2';
 import BasePlotPrimitive from '../BasePlotPrimitive';
 import IrregularElementInstance from '../ElementInstance/IrregularElementInstance';
diff --git a/src/service/3DPlot/Primitive/PrimitiveFactory.js b/src/service/3DPlot/Primitive/PrimitiveFactory.js
@@ -6,6 +6,6 @@
  * @Description: In User Settings Edit
  * @FilePath: \MapGISPlotBase\src\3DPlot\Primitive\PrimitiveFactory.js
  */
-import SimpleFactory from "../../../service/PlotUtilBase/SimpleFactory";
+import SimpleFactory from "../../PlotUtilBase/SimpleFactory";
 
 export const PrimitiveFactory = new SimpleFactory();
diff --git a/src/service/3DPlot/Utils/CesiumUtil.js b/src/service/3DPlot/Utils/CesiumUtil.js
@@ -1,5 +1,5 @@
 import {Vector3} from "../../PlotUtilBase/Math/Vector3";
-import MathUtil from "../../../service/PlotUtilBase/Util/MathUtil";
+import MathUtil from "../../PlotUtilBase/Util/MathUtil";
 import {defined, Check} from "../../PlotUtilBase/Check";
 
 /**
diff --git a/src/service/3DPlot/Utils/ExtrudeGeometryUtil.js b/src/service/3DPlot/Utils/ExtrudeGeometryUtil.js
@@ -1,9 +1,9 @@
 import { ArrayBufferVector3 } from "../../PlotUtilBase/BufferArray";
 import { defined, defaultValue } from "../../PlotUtilBase/Check";
-import LogTool from "../../../service/PlotUtilBase/Log/LogTool";
+import LogTool from "../../PlotUtilBase/Log/LogTool";
 import { Vector3 } from "../../PlotUtilBase/Math/Vector3";
 import { ShapeUtils } from "../../PlotUtilBase/Path2D/ShapeUtils";
-import ArrayUtil from "../../../service/PlotUtilBase/Util/ArrayUtil";
+import ArrayUtil from "../../PlotUtilBase/Util/ArrayUtil";
 
 let _vec3$ = new Vector3();
 let _binormal$ = new Vector3();
diff --git a/src/service/PlotBase/Animation/TimeLine/TimeLine.js b/src/service/PlotBase/Animation/TimeLine/TimeLine.js
@@ -5,7 +5,7 @@
  * @LastEditors: zk
  * @LastEditTime: 2022-07-06 12:05:37
  */
-import { Zondy } from '../../../common/Base';
+import { Zondy } from '../../../common';
 import { AnimationReg } from '../AnimationTypes';
 export default class TimeLine {
     constructor(layerGroup, options) {
diff --git a/src/service/PlotBase/Draw/DrawTool.js b/src/service/PlotBase/Draw/DrawTool.js
@@ -3,7 +3,7 @@ import { PlotLayer3D } from '../../3DPlot';
 import { PlotLayer2D } from '../../2DPlot';
 import { DrawPlotObjectFactory2D } from '../../2DPlot/Draw/DrawPlotObjectFactory2D';
 import LogTool from '../../PlotUtilBase/Log/LogTool';
-import {Zondy} from '../../common/Base'
+import {Zondy} from '../../common'
 
 /**
  * @class module:3DPlot.DrawTool

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import DrawObject from "../../../service/PlotBase/Draw/DrawObject";`
	`1`	`+import DrawObject from "../../PlotBase/Draw/DrawObject";`
`2`	`2`	`import {PrimitiveFactory} from "../Primitive/PrimitiveFactory";`
`3`	`3`	`import {CesiumUtil} from "../Utils/CesiumUtil";`
`4`	`4`	`import {addExtendLayersPlot} from "../Utils/PlotUtil";`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import Bounds from "../../../../service/PlotUtilBase/Geometry/Bound";`
	`1`	`+import Bounds from "../../../PlotUtilBase/Geometry/Bound";`
`2`	`2`	`import {CesiumUtil} from "../../Utils/CesiumUtil";`
`3`	`3`	`import SvgElementInstance from "./SvgElementInstance";`
`4`	`4`