gisviewer-vue3-arcgis 1.0.101 → 1.0.103

package/es/src/gis-map/gis-map.vue.d.ts

@@ -50,6 +50,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     disconnectCarFlow: () => void;
     handleHoloVehicleTraceData: (vehicleTrace: any) => void;
     clearHoloTrace: () => void;
+    setInterpolate: (enable: boolean) => void;
     handleHoloSignalData: (signalData: any) => Promise<void>;
     clearHoloSignal: () => void;
     toggleTrafficInfo: (params: IToggleTrafficInfoParams) => void;

package/es/src/gis-map/gis-map.vue.mjs

@@ -1,14 +1,14 @@
-import { defineComponent as te, ref as ne, onMounted as ae, getCurrentInstance as re, computed as oe, openBlock as se, createElementBlock as ce, createElementVNode as ie } from "vue";
-import le, { registerStore as me } from "./stores/index.mjs";
+import { defineComponent as ne, ref as ae, onMounted as re, getCurrentInstance as oe, computed as se, openBlock as ce, createElementBlock as ie, createElementVNode as le } from "vue";
+import me, { registerStore as pe } from "./stores/index.mjs";
 import "./style/index.css";
 import g from "./utils/holo-flow/index.mjs";
-import pe from "./utils/map-initializer.mjs";
-import fe from "./utils/open-drive-renderer/index.mjs";
-import ue from "./utils/overlay.mjs";
-import de from "./utils/queue-length.mjs";
+import fe from "./utils/map-initializer.mjs";
+import ue from "./utils/open-drive-renderer/index.mjs";
+import de from "./utils/overlay.mjs";
+import ge from "./utils/queue-length.mjs";
 import v from "./utils/road-config-tool/index.mjs";
-import ge from "./utils/traffic-flow.mjs";
-const ye = { class: "gis-viewer" }, Le = /* @__PURE__ */ te({
+import ye from "./utils/traffic-flow.mjs";
+const Ce = { class: "gis-viewer" }, De = /* @__PURE__ */ ne({
   __name: "gis-map",
   props: {
     config: {},
@@ -16,25 +16,25 @@ const ye = { class: "gis-viewer" }, Le = /* @__PURE__ */ te({
   },
   emits: ["mapLoaded", "markerClick", "mapClick"],
   setup(w, { expose: O, emit: T }) {
-    const m = ne(null);
+    const m = ae(null);
     let o, s, a, r, t, n, i, l;
-    me(), ae(async () => {
+    pe(), re(async () => {
       if (!m.value)
         return;
-      const e = re(), { $gisviewerAssetsRoot: c } = e.appContext.config.globalProperties, C = await (await fetch(y.config)).json();
+      const e = oe(), { $gisviewerAssetsRoot: c } = e.appContext.config.globalProperties, C = await (await fetch(y.config)).json();
       C.assetsRoot = y.assetsRoot || c;
-      const F = le.useAppDataStore;
-      F.mapConfig = C, s = new pe(), o = await s.initialize({
+      const ee = me.useAppDataStore;
+      ee.mapConfig = C, s = new fe(), o = await s.initialize({
         container: m.value,
-        markerClickCallback: (f, u, d, ee) => {
-          p("markerClick", f, u, d, ee);
+        markerClickCallback: (f, u, d, te) => {
+          p("markerClick", f, u, d, te);
         },
         mapClickCallback: (f, u, d) => {
           p("mapClick", f, u, d);
         }
       }), t = new g(o), p("mapLoaded");
     });
-    const k = oe(() => o), h = async (e) => await s.setMapCenter(e), I = async (e) => await s.setMapCamera(e), b = async (e) => await s.lookAt(e), A = (e) => s.setLayerVisibility(e), L = (e, c) => s.requestCoordinateTransform(e, c), D = (e) => {
+    const k = se(() => o), I = async (e) => await s.setMapCenter(e), b = async (e) => await s.setMapCamera(e), h = async (e) => await s.lookAt(e), A = (e) => s.setLayerVisibility(e), L = (e, c) => s.requestCoordinateTransform(e, c), D = (e) => {
       s.cancelCoordinateTransform(e);
     }, S = (e) => {
       s.setMapZoomRange(e);
@@ -42,48 +42,50 @@ const ye = { class: "gis-viewer" }, Le = /* @__PURE__ */ te({
       a == null || a.clearLaneNumber();
     }, R = async (e) => (a || (a = new v(o)), await a.initializeSearch(e)), V = async () => a == null ? void 0 : a.calCrossIndicatorArea(), x = async () => {
     }, B = async (e, c) => {
-      r || (r = new ge(o)), r.connectTrafficFlow(e, c);
+      r || (r = new ye(o)), r.connectTrafficFlow(e, c);
     }, H = () => {
       r == null || r.disconnectTrafficFlow();
     }, z = (e) => {
       t || (t = new g(o)), t.handleVehicleTraceData(e);
     }, N = () => {
       t == null || t.clearHoloTrace();
-    }, Q = async (e) => {
+    }, Q = (e) => {
+      t == null || t.setInterpolate(e);
+    }, j = async (e) => {
       t || (t = new g(o)), await t.handleSignalData(e);
-    }, j = () => {
+    }, E = () => {
       t == null || t.clearHoloSignal();
-    }, E = (e) => {
-      r == null || r.toggleTrafficInfo(e), t == null || t.toggleTrafficInfo(e);
     }, P = (e) => {
-      t == null || t.toggleTrafficObject(e), r == null || r.toggleTrafficObject(e);
+      r == null || r.toggleTrafficInfo(e), t == null || t.toggleTrafficInfo(e);
     }, Z = (e) => {
+      t == null || t.toggleTrafficObject(e), r == null || r.toggleTrafficObject(e);
+    }, q = (e) => {
       t == null || t.updatePanelContent(e);
-    }, q = async (e) => (n || (n = new ue(o)), n.addOverlays(e)), $ = (e) => n == null ? void 0 : n.removeOverlaysByType(e), G = (e) => n == null ? void 0 : n.removeOverlaysById(e), J = () => n == null ? void 0 : n.removeAllOverlays(), K = () => {
+    }, $ = async (e) => (n || (n = new de(o)), n.addOverlays(e)), G = (e) => n == null ? void 0 : n.removeOverlaysByType(e), J = (e) => n == null ? void 0 : n.removeOverlaysById(e), K = () => n == null ? void 0 : n.removeAllOverlays(), U = () => {
       n == null || n.showAllOverlays();
-    }, U = (e) => {
-      i || (i = new de(o)), i.updateQueueLength(e);
-    }, W = () => {
+    }, W = (e) => {
+      i || (i = new ge(o)), i.updateQueueLength(e);
+    }, X = () => {
       i == null || i.removeQueueLength();
-    }, X = async (e, c) => {
-      l || (l = new fe(o)), await l.showOpenDrive(e, c);
-    }, Y = async () => {
+    }, Y = async (e, c) => {
+      l || (l = new ue(o)), await l.showOpenDrive(e, c);
+    }, F = async () => {
       await (l == null ? void 0 : l.hideOpenDrive());
     }, y = w, p = T;
     return O({
       mapViewer: k,
       setLayerVisibility: A,
-      setMapCenter: h,
-      lookAt: b,
-      setMapCamera: I,
+      setMapCenter: I,
+      lookAt: h,
+      setMapCamera: b,
       setMapZoomRange: S,
       requestCoordinateTransform: L,
       cancelCoordinateTransform: D,
-      addOverlays: q,
-      showAllOverlays: K,
-      removeOverlaysByType: $,
-      removeOverlaysById: G,
-      removeAllOverlays: J,
+      addOverlays: $,
+      showAllOverlays: U,
+      removeOverlaysByType: G,
+      removeOverlaysById: J,
+      removeAllOverlays: K,
       showLaneNumber: _,
       clearLaneNumber: M,
       initializeAreaTool: R,
@@ -93,17 +95,18 @@ const ye = { class: "gis-viewer" }, Le = /* @__PURE__ */ te({
       disconnectCarFlow: H,
       handleHoloVehicleTraceData: z,
       clearHoloTrace: N,
-      handleHoloSignalData: Q,
-      clearHoloSignal: j,
-      toggleTrafficInfo: E,
-      toggleTrafficObject: P,
-      toggleVehicleInfo: Z,
-      updateQueueLength: U,
-      removeQueueLength: W,
-      showOpenDrive: X,
-      hideOpenDrive: Y
-    }), (e, c) => (se(), ce("div", ye, [
-      ie("div", {
+      handleHoloSignalData: j,
+      clearHoloSignal: E,
+      setInterpolate: Q,
+      toggleTrafficInfo: P,
+      toggleTrafficObject: Z,
+      toggleVehicleInfo: q,
+      updateQueueLength: W,
+      removeQueueLength: X,
+      showOpenDrive: Y,
+      hideOpenDrive: F
+    }), (e, c) => (ce(), ie("div", Ce, [
+      le("div", {
         class: "gis-viewer-main",
         ref_key: "mapContainer",
         ref: m
@@ -112,5 +115,5 @@ const ye = { class: "gis-viewer" }, Le = /* @__PURE__ */ te({
   }
 });
 export {
-  Le as default
+  De as default
 };

package/es/src/gis-map/index.d.ts

@@ -40,6 +40,7 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
     disconnectCarFlow: () => void;
     handleHoloVehicleTraceData: (vehicleTrace: any) => void;
     clearHoloTrace: () => void;
+    setInterpolate: (enable: boolean) => void;
     handleHoloSignalData: (signalData: any) => Promise<void>;
     clearHoloSignal: () => void;
     toggleTrafficInfo: (params: import("../types").IToggleTrafficInfoParams) => void;

package/es/src/gis-map/utils/holo-flow/index.d.ts

@@ -15,4 +15,5 @@ export default class Index {
     updatePanelContent(contentType: string): void;
     handleSignalData(data: any): Promise<void>;
     clearHoloSignal(): void;
+    setInterpolate(enable: boolean): void;
 }

package/es/src/gis-map/utils/holo-flow/index.mjs

@@ -59,6 +59,10 @@ class h {
     var e;
     (e = this.signalHoloFlow) == null || e.clearSignal();
   }
+  setInterpolate(e) {
+    var o;
+    (o = this.traceHoloFlow) == null || o.setInterpolate(e);
+  }
 }
 export {
   h as default

package/es/src/gis-map/utils/holo-flow/signal-holo-flow.mjs

@@ -216,7 +216,7 @@ class f {
   createCountdownCanvas() {
     return new Promise((e, a) => {
       const i = new Image();
-      i.src = `${this.mapConfig.assetsRoot}/Images/timeboard/CountdownBG.png`, console.log(i.src), i.onload = () => {
+      i.src = `${this.mapConfig.assetsRoot}/Images/timeboard/CountdownBG.png`, i.onload = () => {
         const n = document.createElement("canvas");
         n.width = this.canvasWidth, n.height = this.canvasHeight, n.style.position = "absolute", n.style.transform = "translate(-50%, -50%)", n.getContext(
           "2d"

package/es/src/gis-map/utils/holo-flow/trace-holo-flow.d.ts

@@ -21,5 +21,6 @@ export default class TraceHoloFlow {
     updatePanelContent(contentType: EVehiclePlateState): void;
     toggleGroundVehicle(visible: boolean): void;
     toggleElevatedVehicle(visible: boolean): void;
+    setInterpolate(enable: boolean): void;
     private buildVehicleTrackData;
 }

package/es/src/gis-map/utils/holo-flow/trace-holo-flow.mjs

@@ -1,12 +1,12 @@
 import * as f from "@arcgis/core/views/3d/externalRenderers";
-import u from "../../stores/index.mjs";
-import g from "./trace-external-renderer.mjs";
-import T from "./trace-layer-renderer.mjs";
-class N {
+import g from "../../stores/index.mjs";
+import u from "./trace-renderer-external.mjs";
+import T from "./trace-renderer-layer.mjs";
+class b {
   constructor(e) {
     this.lastDataTime = 0, this.view = e;
-    const i = u.useAppDataStore;
-    this.mapConfig = JSON.parse(JSON.stringify(i.mapConfig)), e.type === "3d" ? (this.traceRenderer = new g(e), f.add(
+    const c = g.useAppDataStore;
+    this.mapConfig = JSON.parse(JSON.stringify(c.mapConfig)), e.type === "3d" ? (this.traceRenderer = new u(e), f.add(
       e,
       this.traceRenderer
     )) : this.traceRenderer = new T(e);
@@ -15,31 +15,27 @@ class N {
    * 处理全息流轨迹数据
    * */
   handleVehicleTraceData(e) {
-    const i = new Date().getTime();
-    if (i - this.lastDataTime < 100)
-      return;
-    this.lastDataTime = i;
-    const { newVehList: s, updateVehList: n, deleteVehList: o, jgsj: l } = e, a = e.crossId || "", h = [], r = [];
+    const c = new Date().getTime(), { newVehList: s, updateVehList: l, deleteVehList: o, jgsj: i } = e, n = e.crossId || "", a = [], h = [];
     if (s && s.length > 0) {
-      for (const c of s) {
-        c.localTimestamp || (c.localTimestamp = l || i);
-        const t = this.buildVehicleTrackData(c, a);
-        t && h.push(t);
+      for (const t of s) {
+        t.localTimestamp || (t.localTimestamp = i || c);
+        const r = this.buildVehicleTrackData(t, n);
+        r && a.push(r);
       }
-      this.traceRenderer.addVehicles(h);
+      this.traceRenderer.addVehicles(a);
     }
-    if (n && n.length > 0) {
-      for (const c of n) {
-        const t = this.buildVehicleTrackData(c, a);
-        t && r.push(t);
+    if (l && l.length > 0) {
+      for (const t of l) {
+        const r = this.buildVehicleTrackData(t, n);
+        r && h.push(r);
       }
-      this.traceRenderer.updateVehicles(r);
+      this.traceRenderer.updateVehicles(h);
     }
     if (o && o.length > 0) {
-      const c = o.map(
-        (t) => a + "-" + (t.ptcId || t.vehno || t.vehNo)
+      const t = o.map(
+        (r) => n + "-" + (r.ptcId || r.vehno || r.vehNo)
       );
-      this.traceRenderer.deleteVehicles(c);
+      this.traceRenderer.deleteVehicles(t);
     }
   }
   /**
@@ -64,27 +60,31 @@ class N {
   toggleElevatedVehicle(e) {
     this.traceRenderer.toggleElevatedVehicle(e);
   }
-  buildVehicleTrackData(e, i) {
-    const p = e.longitude, s = e.latitude, n = e.ptcId, o = Number(e.ptcType), l = e.heading, a = Number(e.vehicleType), h = Number(e.vehicleColor), r = e.plateNo || e.plateno, c = Number(e.plateColor), t = e.timestamp, d = e.localTimestamp, m = String(e.roadLayer) || "1";
-    if (!(o < 0 || o > 8))
+  setInterpolate(e) {
+    this.traceRenderer.setInterpolate(e);
+  }
+  buildVehicleTrackData(e, c) {
+    const s = e.longitude, l = e.latitude, o = e.ptcId, i = Number(e.ptcType), n = e.heading, a = Number(e.vehicleType), h = Number(e.vehicleColor), t = e.plateNo || e.plateno, r = Number(e.plateColor), p = e.timestamp, d = e.localTimestamp, m = String(e.roadLayer) || "1";
+    if (!(i < 0 || i > 8))
       return {
-        ptcId: n,
-        crossId: i,
-        x: p,
-        y: s,
-        ptcType: o,
+        ptcId: o,
+        crossId: c,
+        vehicleId: c + "-" + o,
+        x: s,
+        y: l,
+        ptcType: i,
         vehicleType: a,
-        heading: o === 2 ? -l : l,
+        heading: i === 2 ? -n : n,
         vehicleColor: h,
-        showName: r && r !== "" && r !== "0" && r !== "000000" ? r : "",
-        plateNo: r,
-        plateColor: c,
-        timestamp: t,
+        showName: t && t !== "" && t !== "0" && t !== "000000" ? t : "",
+        plateNo: t,
+        plateColor: r,
+        timestamp: p,
         localTimestamp: d,
         roadLayer: m
       };
   }
 }
 export {
-  N as default
+  b as default
 };

package/es/src/gis-map/utils/holo-flow/{trace-external-renderer.d.ts → trace-renderer-external.d.ts}

@@ -1,5 +1,5 @@
 import { EVehiclePlateState, IToggleTrafficInfoParams, ITraceRendererInterface, IVehicleTrack } from '../../../types';
-export default class TraceExternalRenderer implements ITraceRendererInterface {
+export default class TraceRendererExternal implements ITraceRendererInterface {
     private renderer;
     private scene;
     private camera;
@@ -24,22 +24,30 @@ export default class TraceExternalRenderer implements ITraceRendererInterface {
     private currentSpriteContent;
     private historyPositionMap;
     private vehicleObjectMap;
+    private needInterpolate;
+    private mesh;
+    private sprite;
     constructor(view: __esri.SceneView);
+    setInterpolate(needInterpolate: boolean): void;
+    private context;
     setup(context: any): Promise<void>;
+    private geometryTest;
     render(context: any): Promise<void>;
     /**
      * 新增车辆
      * */
-    addVehicles(objects: IVehicleTrack[]): void;
+    addVehicles(objects: IVehicleTrack[]): Promise<void>;
     /**
      * 更新车辆
      * */
-    updateVehicles(objects: IVehicleTrack[]): void;
+    updateVehicles(objects: IVehicleTrack[]): Promise<void>;
+    private toRenderCoordinates;
     /**
      * 删除车辆
      * */
     deleteVehicles(idList: string[]): void;
-    toggleTrafficInfo(params: IToggleTrafficInfoParams): void;
+    private deleteVehicle;
+    toggleTrafficInfo(params: IToggleTrafficInfoParams): Promise<void>;
     /**
      * 清除全部车辆
      * */
@@ -49,7 +57,7 @@ export default class TraceExternalRenderer implements ITraceRendererInterface {
      * @param contentType
      * @returns
      */
-    updatePanelContent(contentType: EVehiclePlateState): void;
+    updatePanelContent(contentType: EVehiclePlateState): Promise<void>;
     toggleGroundVehicle(visible: boolean): void;
     toggleElevatedVehicle(visible: boolean): void;
     /**