@vesium/plot 1.0.1-beta.26 → 1.0.1-beta.28

package/dist/index.mjs

@@ -1,8 +1,8 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-import { Color, Cartesian3, VerticalOrigin, HorizontalOrigin, Rectangle, Entity, CallbackPositionProperty, CallbackProperty, PolygonHierarchy, JulianDate, Event, TimeInterval, createGuid, PrimitiveCollection, CustomDataSource, ScreenSpaceEventType } from "cesium";
-import { toCartographic, toCartesian3, canvasCoordToCartesian, isFunction, assertError, createCesiumAttribute, createCesiumProperty, throttle, arrayDifference, pickHitGraphic } from "@vesium/shared";
+import { Entity, Color, Cartesian3, VerticalOrigin, HorizontalOrigin, Rectangle, CallbackPositionProperty, CallbackProperty, PolygonHierarchy, JulianDate, Event, TimeInterval, createGuid, PrimitiveCollection, CustomDataSource, ScreenSpaceEventType } from "cesium";
+import { toCartographic, toCartesian3, canvasCoordToCartesian, assertError, createCesiumAttribute, createCesiumProperty, throttle, arrayDiff, isFunction, pickHitGraphic } from "@vesium/shared";
 import { assert, notNullish, watchArray, promiseTimeout, onKeyStroke } from "@vueuse/core";
 import { useViewer, usePrimitive, useDataSource, useEntityScope, usePrimitiveScope, useScreenSpaceEventHandler, useCesiumEventListener, useGraphicDrag, useGraphicHover, useGraphicLeftClick } from "@vesium/core";
 import { useViewer as useViewer$1 } from "@vesium/core/useViewer";
@@ -13,25 +13,30 @@ var PlotAction = /* @__PURE__ */ ((PlotAction2) => {
   PlotAction2[PlotAction2["ACTIVE"] = 2] = "ACTIVE";
   return PlotAction2;
 })(PlotAction || {});
+class PlotSkeletonEntity extends Entity {
+  constructor(options) {
+    super(options);
+  }
+}
 function control() {
   return {
-    diabled: ({ active }) => !active,
+    disabled: ({ active }) => !active,
     cursor: "pointer",
     dragCursor: "crosshair",
-    onDrag({ viewer, sample, packable, context, index, lockCamera }) {
+    onDrag({ viewer, sampled, packable, context, index, lockCamera }) {
       lockCamera();
       const position = canvasCoordToCartesian(context.endPosition, viewer.scene);
       if (position) {
         const positions = [...packable.positions ?? []];
         positions[index] = position;
-        sample.setSample({
+        sampled.setSample({
           time: packable.time,
           derivative: packable.derivative,
           positions
         });
       }
     },
-    onKeyPressed({ viewer, keyEvent, sample, packable, index }) {
+    onKeyPressed({ viewer, keyEvent, sampled, packable, index }) {
       var _a;
       const height = (_a = toCartographic(viewer.camera.position)) == null ? void 0 : _a.height;
       if (!height || !["ArrowUp", "ArrowRight", "ArrowDown", "ArrowLeft"].includes(keyEvent.key))
@@ -60,7 +65,7 @@ function control() {
       cartographic.latitude += distance * Math.cos(newHeading);
       cartographic.longitude += distance * Math.sin(newHeading);
       positions[index] = toCartesian3(cartographic);
-      sample.setSample({
+      sampled.setSample({
         time: packable.time,
         derivative: packable.derivative,
         positions
@@ -88,7 +93,7 @@ function control() {
 function interval() {
   let dragIndex = -1;
   return {
-    diabled: ({ active, defining }) => !active || defining,
+    disabled: ({ active, defining }) => !active || defining,
     cursor: "pointer",
     dragCursor: "crosshair",
     format(packable) {
@@ -101,7 +106,7 @@ function interval() {
         return Cartesian3.midpoint(position, next, new Cartesian3());
       });
     },
-    onDrag({ viewer, sample, packable, context, index, lockCamera, dragging }) {
+    onDrag({ viewer, sampled, packable, context, index, lockCamera, dragging }) {
       lockCamera();
       const position = canvasCoordToCartesian(context.endPosition, viewer.scene);
       if (!position) {
@@ -117,7 +122,7 @@ function interval() {
       if (!dragging) {
         dragIndex = -1;
       }
-      sample.setSample({
+      sampled.setSample({
         time: packable.time,
         derivative: packable.derivative,
         positions
@@ -148,7 +153,7 @@ function interval() {
 function intervalNonclosed() {
   let dragIndex = -1;
   return {
-    diabled: ({ active, defining }) => !active || defining,
+    disabled: ({ active, defining }) => !active || defining,
     cursor: "pointer",
     dragCursor: "crosshair",
     format(packable) {
@@ -156,11 +161,13 @@ function intervalNonclosed() {
       if (_positions.length < 2) {
         return [];
       }
-      return _positions.slice(0, _positions.length - 1).map((position, i) => {
-        return Cartesian3.midpoint(position, _positions[i + 1], new Cartesian3());
-      });
+      const midpoints = [];
+      for (let i = 0; i < _positions.length - 1; i++) {
+        midpoints.push(Cartesian3.midpoint(_positions[i], _positions[i + 1], new Cartesian3()));
+      }
+      return midpoints;
     },
-    onDrag({ viewer, sample, packable, context, index, lockCamera, dragging }) {
+    onDrag({ viewer, sampled, packable, context, index, lockCamera, dragging }) {
       lockCamera();
       const position = canvasCoordToCartesian(context.endPosition, viewer.scene);
       if (!position) {
@@ -176,7 +183,7 @@ function intervalNonclosed() {
       if (!dragging) {
         dragIndex = -1;
       }
-      sample.setSample({
+      sampled.setSample({
         time: packable.time,
         derivative: packable.derivative,
         positions
@@ -206,7 +213,7 @@ const svg = `data:image/svg+xml;utf8,${encodeURIComponent(
 )}`;
 function moved() {
   return {
-    diabled: ({ active, defining }) => !active || defining,
+    disabled: ({ active, defining }) => !active || defining,
     cursor: "pointer",
     dragCursor: "crosshair",
     format(packable) {
@@ -220,7 +227,7 @@ function moved() {
         return [toCartesian3(center)];
       }
     },
-    onDrag({ viewer, sample, packable, context, lockCamera, dragging }) {
+    onDrag({ viewer, sampled, packable, context, lockCamera, dragging }) {
       dragging && lockCamera();
       const startPosition = canvasCoordToCartesian(context.startPosition, viewer.scene);
       const endPosition = canvasCoordToCartesian(context.endPosition, viewer.scene);
@@ -229,7 +236,7 @@ function moved() {
       }
       const offset = Cartesian3.subtract(endPosition, startPosition, new Cartesian3());
       const positions = [...packable.positions ?? []];
-      sample.setSample({
+      sampled.setSample({
         time: packable.time,
         derivative: packable.derivative,
         positions: positions.map((position) => Cartesian3.add(position, offset, new Cartesian3()))
@@ -399,16 +406,20 @@ const _PlotScheme = class _PlotScheme {
     this.complete = options.complete;
     this.forceComplete = options.forceComplete;
     this.definingCursor = options.definingCursor ?? "crosshair";
-    this.skeletons = ((_a = options.skeletons) == null ? void 0 : _a.map((item) => isFunction(item) ? item() : item)) ?? [];
+    this.skeletons = ((_a = options.skeletons) == null ? void 0 : _a.map((item) => item())) ?? [];
     this.render = options.render;
   }
-  static getRecordTypes() {
+  static getCacheTypes() {
     return [...this._record.keys()];
   }
-  static getRecord(type) {
+  static getCache(type) {
     return _PlotScheme._record.get(type);
   }
-  static setRecord(scheme) {
+  /**
+   * 设置标绘方案
+   * @param scheme
+   */
+  static setCache(scheme) {
     assertError(!scheme.type, "`scheme.type` is required");
     _PlotScheme._record.set(scheme.type, scheme);
   }
@@ -417,7 +428,7 @@ const _PlotScheme = class _PlotScheme {
    */
   static resolve(maybeScheme) {
     if (typeof maybeScheme === "string") {
-      const _scheme = _PlotScheme.getRecord(maybeScheme);
+      const _scheme = _PlotScheme.getCache(maybeScheme);
       assert(!!_scheme, `scheme ${maybeScheme} not found`);
       return _scheme;
     } else if (!(maybeScheme instanceof _PlotScheme)) {
@@ -682,31 +693,45 @@ class Plot {
     createCesiumAttribute(this, "disabled", !!options.disabled);
     createCesiumAttribute(this, "defining", true);
     createCesiumAttribute(this, "scheme", PlotScheme.resolve(options.scheme), { readonly: true });
-    const sample = options.sample instanceof SampledPlotProperty ? options.sample : new SampledPlotProperty(options.sample);
-    createCesiumProperty(this, "sample", sample);
+    const sampled = options.sampled instanceof SampledPlotProperty ? options.sampled : new SampledPlotProperty(options.sampled);
+    createCesiumProperty(this, "sampled", sampled);
     createCesiumAttribute(this, "entities", []);
     createCesiumAttribute(this, "primitives", []);
     createCesiumAttribute(this, "groundPrimitives", []);
     createCesiumAttribute(this, "skeletonEntities", []);
   }
+  /**
+   * An event that is raised when a property is changed.
+   */
   get definitionChanged() {
     return this._definitionChanged;
   }
+  /**
+   * 当前标绘是否处于定义态
+   */
   isDefining() {
     return this.defining;
   }
+  /**
+   * 获取当前标绘的entity数组
+   */
   getEntities() {
     return [...this.entities];
   }
+  /**
+   * 获取当前标绘的primitive数组
+   */
   getPrimitives() {
     return [...this.primitives];
   }
+  /**
+   * 获取当前标绘的贴地primitive数组
+   */
   getGroundPrimitives() {
     return [...this.groundPrimitives];
   }
   /**
-   * 获取该标绘的骨架点entity数组
-   *
+   * 获取当前标绘标绘的骨架点entity数组
    */
   getSkeletonEntities() {
     return [...this.skeletonEntities];
@@ -745,15 +770,15 @@ function useRender(plots, current, getCurrentTime) {
     () => plots.value.map((item) => item.definitionChanged),
     (_scope, key, newValue, oldValue) => {
       if (key === "entities") {
-        const { added, removed } = arrayDifference(newValue, oldValue);
+        const { added, removed } = arrayDiff(newValue, oldValue);
         added.forEach((item) => entityScope.add(item));
         removed.forEach((item) => entityScope.remove(item));
       } else if (key === "primitives") {
-        const { added, removed } = arrayDifference(newValue, oldValue);
+        const { added, removed } = arrayDiff(newValue, oldValue);
         added.forEach((item) => primitiveScope.add(item));
         removed.forEach((item) => primitiveScope.remove(item));
       } else if (key === "groundPrimitives") {
-        const { added, removed } = arrayDifference(newValue, oldValue);
+        const { added, removed } = arrayDiff(newValue, oldValue);
         added.forEach((item) => groundPrimitiveScope.add(item));
         removed.forEach((item) => groundPrimitiveScope.remove(item));
       }
@@ -762,7 +787,7 @@ function useRender(plots, current, getCurrentTime) {
   const update = throttle(async (plot) => {
     var _a, _b;
     const reslut = await ((_b = (_a = plot.scheme).render) == null ? void 0 : _b.call(_a, {
-      packable: plot.sample.getValue(getCurrentTime()),
+      packable: plot.sampled.getValue(getCurrentTime()),
       mouse: plot.defining ? mouseCartesian.value : void 0,
       defining: plot.defining,
       previous: {
@@ -781,7 +806,7 @@ function useRender(plots, current, getCurrentTime) {
   useCesiumEventListener(
     () => plots.value.map((item) => item.definitionChanged),
     (plot, key) => {
-      if (["disabled", "defining", "scheme", "sample", "time"].includes(key)) {
+      if (["disabled", "defining", "scheme", "sampled", "time"].includes(key)) {
         update(plot);
       }
     }
@@ -800,7 +825,7 @@ function useSampled(current, getCurrentTime) {
   const doubleClicking = ref(false);
   const packable = computed(() => {
     var _a;
-    return (_a = current.value) == null ? void 0 : _a.sample.getValue(getCurrentTime());
+    return (_a = current.value) == null ? void 0 : _a.sampled.getValue(getCurrentTime());
   });
   useScreenSpaceEventHandler(
     ScreenSpaceEventType.LEFT_CLICK,
@@ -813,7 +838,7 @@ function useSampled(current, getCurrentTime) {
       if (doubleClicking.value) {
         return;
       }
-      const { scheme, defining, sample } = current.value;
+      const { scheme, defining, sampled } = current.value;
       if (!defining) {
         return;
       }
@@ -823,7 +848,7 @@ function useSampled(current, getCurrentTime) {
       }
       (_a = packable.value).positions ?? (_a.positions = []);
       packable.value.positions.push(position);
-      sample.setSample(packable.value);
+      sampled.setSample(packable.value);
       const completed = (_b = scheme.complete) == null ? void 0 : _b.call(scheme, packable.value);
       completed && (current.value.defining = false);
     }
@@ -857,7 +882,7 @@ function useSampled(current, getCurrentTime) {
       if (!current.value || !packable.value) {
         return;
       }
-      const { defining, sample } = current.value;
+      const { defining, sampled } = current.value;
       if (!defining) {
         return;
       }
@@ -866,7 +891,7 @@ function useSampled(current, getCurrentTime) {
         return;
       }
       packable.value.positions.splice(packable.value.positions.length - 1, 1);
-      sample.setSample(packable.value);
+      sampled.setSample(packable.value);
     }
   );
   const definingCursorCss = ref();
@@ -889,17 +914,12 @@ function useSampled(current, getCurrentTime) {
     var _a;
     return (_a = current.value) == null ? void 0 : _a.definitionChanged;
   }, (plot, key) => {
-    if (key === "defining" || key === "sample") {
+    if (key === "defining" || key === "sampled") {
       setDefiningCursorCss();
     }
   });
   watch(current, () => setDefiningCursorCss());
 }
-class PlotSkeletonEntity extends Entity {
-  constructor(options) {
-    super(options);
-  }
-}
 function useSkeleton(plots, current, getCurrentTime) {
   const viewer = useViewer();
   const dataSource = useDataSource(new CustomDataSource());
@@ -919,14 +939,14 @@ function useSkeleton(plots, current, getCurrentTime) {
     if (destroyed || plot.disabled) {
       plot.skeletonEntities = [];
     } else {
-      const packable = plot.sample.getValue(getCurrentTime());
+      const packable = plot.sampled.getValue(getCurrentTime());
       const defining = plot.defining;
       const active = current.value === plot;
       const skeletons = plot.scheme.skeletons;
       skeletons.forEach((skeleton) => {
         var _a;
-        const diabled = isFunction(skeleton.diabled) ? skeleton.diabled({ active, defining }) : skeleton.diabled;
-        if (diabled) {
+        const disabled = isFunction(skeleton.disabled) ? skeleton.disabled({ active, defining }) : skeleton.disabled;
+        if (disabled) {
           return;
         }
         const positions = ((_a = skeleton.format) == null ? void 0 : _a.call(skeleton, packable)) ?? (packable == null ? void 0 : packable.positions) ?? [];
@@ -987,10 +1007,10 @@ function useSkeleton(plots, current, getCurrentTime) {
         activeEntity.value = entity;
         const skeleton = entity.skeleton;
         const index = entity.index;
-        const packable = plot.sample.getValue(getCurrentTime());
+        const packable = plot.sampled.getValue(getCurrentTime());
         (_a = skeleton.onDrag) == null ? void 0 : _a.call(skeleton, {
           viewer: viewer.value,
-          sample: plot.sample,
+          sampled: plot.sampled,
           packable,
           active: current.value === plot,
           index,
@@ -1010,10 +1030,10 @@ function useSkeleton(plots, current, getCurrentTime) {
       const plot = entity.plot;
       const skeleton = entity.skeleton;
       const index = entity.index;
-      const packable = plot.sample.getValue(getCurrentTime());
+      const packable = plot.sampled.getValue(getCurrentTime());
       (_a = skeleton.onKeyPressed) == null ? void 0 : _a.call(skeleton, {
         viewer: viewer.value,
-        sample: plot.sample,
+        sampled: plot.sampled,
         packable,
         index,
         keyEvent
@@ -1039,10 +1059,10 @@ function useSkeleton(plots, current, getCurrentTime) {
         const plot = entity.plot;
         const skeleton = entity.skeleton;
         const index = entity.index;
-        const packable = plot.sample.getValue(getCurrentTime());
+        const packable = plot.sampled.getValue(getCurrentTime());
         (_a = skeleton.onLeftClick) == null ? void 0 : _a.call(skeleton, {
           viewer: viewer.value,
-          sample: plot.sample,
+          sampled: plot.sampled,
           packable,
           active: current.value === plot,
           defining: plot.defining,
@@ -1059,11 +1079,11 @@ function useSkeleton(plots, current, getCurrentTime) {
     removed.forEach((plot) => update(plot, true));
   });
   useCesiumEventListener(() => plots.value.map((plot) => plot.definitionChanged), (plot, key, newValue, oldValue) => {
-    if (["disabled", "defining", "scheme", "sample", "time"].includes(key)) {
+    if (["disabled", "defining", "scheme", "sampled", "time"].includes(key)) {
       update(plot);
     }
     if (key === "skeletonEntities") {
-      const { added, removed } = arrayDifference(newValue, oldValue);
+      const { added, removed } = arrayDiff(newValue, oldValue);
       added.forEach((item) => entityScope.add(item));
       removed.forEach((item) => entityScope.remove(item));
     }
@@ -1092,11 +1112,11 @@ function usePlot(options) {
   useCesiumEventListener([
     () => {
       var _a;
-      return (_a = current.value) == null ? void 0 : _a.sample.definitionChanged;
+      return (_a = current.value) == null ? void 0 : _a.sampled.definitionChanged;
     }
   ], () => {
     var _a;
-    packable.value = (_a = current.value) == null ? void 0 : _a.sample.getValue(getCurrentTime());
+    packable.value = (_a = current.value) == null ? void 0 : _a.sampled.getValue(getCurrentTime());
   });
   useSampled(current, getCurrentTime);
   useRender(plots, current, getCurrentTime);
@@ -1122,7 +1142,7 @@ function usePlot(options) {
     var _a, _b;
     if (previous) {
       if (previous.defining) {
-        const packable2 = previous.sample.getValue(getCurrentTime());
+        const packable2 = previous.sampled.getValue(getCurrentTime());
         const completed = (_b = (_a = previous.scheme).forceComplete) == null ? void 0 : _b.call(_a, packable2);
         if (completed) {
           previous.defining = false;