gisviewer-vue3-arcgis 1.0.113 → 1.0.115

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

@@ -1,17 +1,16 @@
-import * as w from "@arcgis/core/core/promiseUtils.js";
+import * as P from "@arcgis/core/core/promiseUtils.js";
 import * as b from "@arcgis/core/core/reactiveUtils.js";
 import v from "@arcgis/core/geometry/SpatialReference";
 import * as u from "@arcgis/core/views/3d/externalRenderers";
 import * as l from "three";
 import { GLTFLoader as y } from "three/examples/jsm/loaders/GLTFLoader";
-import { EVehiclePlateState as d } from "../../../types/index.mjs";
-import G from "../../stores/index.mjs";
-import C from "./vehicle-pool.mjs";
-class N {
+import { EVehiclePlateState as m } from "../../../types/index.mjs";
+import T from "../../stores/index.mjs";
+class I {
   constructor(i) {
     this.cameraHeightThreshold = 1e3, this.roughness = 0.2, this.metalness = 0.8, this.defaultMaterial = new l.MeshPhongMaterial({
       color: 16777215
-    }), this.vehiclePool = new C(), this.materialMap = /* @__PURE__ */ new Map([
+    }), this.materialMap = /* @__PURE__ */ new Map([
       [1, this.createCarMaterial(16777215)],
       [2, this.createCarMaterial(7833753)],
       [3, this.createCarMaterial(16766720)],
@@ -23,17 +22,37 @@ class N {
       [9, this.createCarMaterial(2105376)],
       [10, this.createCarMaterial(9662683)],
       [99, this.createCarMaterial(6908265)]
-    ]), this.isInitialized = !1, this.showGroundVehicle = !0, this.showElevatedVehicle = !0, this.isPaused = !1, this.currentSpriteContent = d.None, this.historyPositionMap = /* @__PURE__ */ new Map(), this.vehicleObjectMap = /* @__PURE__ */ new Map(), this.needInterpolate = !0, this.updateModel = !1;
-    const e = G.useAppDataStore;
-    this.assetsRoot = JSON.parse(
-      JSON.stringify(e.mapConfig)
+    ]), this.isInitialized = !1, this.showGroundVehicle = !0, this.showElevatedVehicle = !0, this.isPaused = !1, this.currentSpriteContent = m.None, this.historyPositionMap = /* @__PURE__ */ new Map(), this.vehicleObjectMap = /* @__PURE__ */ new Map(), this.needInterpolate = !0, this.updateModel = !1, this.appDataStore = T.useAppDataStore, this.logTable = [
+      [
+        "ptcId",
+        "plateno",
+        "timestamp",
+        "localTimestamp",
+        "speed",
+        "longitude",
+        "latitude",
+        "ptcType",
+        "vehicleType",
+        "vehicleColor",
+        "plateColor",
+        "heading",
+        "fixAngle",
+        "roadLayer",
+        "step",
+        "receiveTimestamp",
+        "queueLength",
+        "status"
+      ]
+    ], this.assetsRoot = JSON.parse(
+      JSON.stringify(this.appDataStore.mapConfig)
     ).assetsRoot, this.view = i, b.watch(
       () => this.view.camera.position.z,
-      (t, o) => {
-        (o <= this.cameraHeightThreshold && t > this.cameraHeightThreshold || o > this.cameraHeightThreshold && t <= this.cameraHeightThreshold) && (this.updateModel = !0);
+      (e, t) => {
+        (t <= this.cameraHeightThreshold && e > this.cameraHeightThreshold || t > this.cameraHeightThreshold && e <= this.cameraHeightThreshold) && (this.updateModel = !0);
       }
     );
   }
+  // private readonly vehiclePool = new VehiclePool();
   createCarMaterial(i) {
     return new l.MeshPhongMaterial({
       color: i
@@ -42,9 +61,12 @@ class N {
       // metalness: this.metalness
     });
   }
+  getLog() {
+    return this.logTable;
+  }
   async init() {
     const i = new y();
-    await w.eachAlways([
+    await P.eachAlways([
       new Promise((e) => {
         i.load(`${this.assetsRoot}/3DModels/car.glb`, (t) => {
           this.carModel = t.scene, this.carModel.rotation.x = l.MathUtils.degToRad(90), e();
@@ -121,8 +143,8 @@ class N {
     const e = this.renderer.setRenderTarget.bind(
       this.renderer
     );
-    this.renderer.setRenderTarget = (o) => {
-      e(o), o == null && i.bindRenderTarget();
+    this.renderer.setRenderTarget = (s) => {
+      e(s), s == null && i.bindRenderTarget();
     }, this.scene = new l.Scene();
     const { camera: t } = i;
     this.camera = new l.PerspectiveCamera(
@@ -133,19 +155,19 @@ class N {
     ), this.ambient = new l.AmbientLight(16777215, 2), this.scene.add(this.ambient), this.sun = new l.DirectionalLight(16777215, 2), this.scene.add(this.sun), i.resetWebGLState();
   }
   async render(i) {
-    var o;
+    var s;
     const e = i.camera;
     if (this.camera.position.set(e.eye[0], e.eye[1], e.eye[2]), this.camera.up.set(e.up[0], e.up[1], e.up[2]), this.camera.lookAt(
       new l.Vector3(e.center[0], e.center[1], e.center[2])
     ), this.camera.projectionMatrix.fromArray(e.projectionMatrix), !this.isPaused && this.needInterpolate)
-      for (const s of this.vehicleObjectMap.keys()) {
-        const n = (o = this.vehicleObjectMap.get(s)) == null ? void 0 : o.model;
+      for (const a of this.vehicleObjectMap.keys()) {
+        const n = (s = this.vehicleObjectMap.get(a)) == null ? void 0 : s.model;
         if (!n)
           continue;
-        const a = this.computeVehiclePosition(s);
-        if (a) {
-          const h = this.toRenderCoordinates(a);
-          n.position.set(h[0], h[1], h[2]), n.rotation.y = l.MathUtils.degToRad(-a[3]);
+        const o = this.computeVehiclePosition(a);
+        if (o) {
+          const d = this.toRenderCoordinates(o);
+          n.position.set(d[0], d[1], d[2]), n.rotation.y = l.MathUtils.degToRad(-o[3]);
         }
       }
     const t = i.sunLight;
@@ -163,27 +185,49 @@ class N {
    * 新增车辆
    * */
   async addVehicles(i) {
-    if (!(this.isPaused || !this.isInitialized))
-      for (const e of i) {
-        const { vehicleId: t, localTimestamp: o } = e, s = Number(e.x), n = Number(e.y), a = Number(e.heading);
-        this.historyPositionMap.set(t, [
-          { pos: [s, n, 0], heading: a, time: o }
-        ]);
-        const h = this.getVehicleModel(e);
-        h.name = t, h.visible = !1;
-        try {
-          const r = await this.createPlateSprite(e);
-          r && (h.add(r), r.position.set(0, 5, -4));
-        } catch (r) {
-          console.log("createPlateSprite error:", r);
-        }
-        this.scene.add(h), this.vehicleObjectMap.set(t, {
-          model: h,
-          data: e,
-          waitForDelete: !1,
-          isMoving: !1
-        });
+    if (this.isPaused || !this.isInitialized)
+      return;
+    const e = Date.now();
+    for (const t of i) {
+      this.appDataStore.saveTrackLog && this.logTable.push([
+        t.ptcId,
+        t.plateNo,
+        t.timestamp,
+        t.localTimestamp,
+        t.speed,
+        t.x,
+        t.y,
+        t.ptcType,
+        t.vehicleType,
+        t.vehicleColor,
+        t.plateColor,
+        t.heading,
+        t.fixAngle,
+        t.roadLayer,
+        t.step,
+        e,
+        0,
+        0
+      ]);
+      const { vehicleId: s, localTimestamp: a } = t, n = Number(t.x), o = Number(t.y), d = Number(t.heading);
+      this.historyPositionMap.set(s, [
+        { pos: [n, o, 0], heading: d, time: a }
+      ]);
+      const h = this.getVehicleModel(t);
+      h.name = s, h.visible = !1;
+      try {
+        const r = await this.createPlateSprite(t);
+        r && (h.add(r), r.position.set(0, 5, -4));
+      } catch (r) {
+        console.log("createPlateSprite error:", r);
       }
+      this.scene.add(h), this.vehicleObjectMap.set(s, {
+        model: h,
+        data: t,
+        waitForDelete: !1,
+        isMoving: !1
+      });
+    }
   }
   /**
    * 更新车辆
@@ -191,39 +235,58 @@ class N {
   async updateVehicles(i) {
     if (this.isPaused || !this.isInitialized)
       return;
-    const e = [];
-    for (const t of i) {
-      const { vehicleId: o, timestamp: s } = t, n = Number(t.x), a = Number(t.y);
-      let h = Number(t.heading);
-      const r = this.vehicleObjectMap.get(o), m = this.historyPositionMap.get(
-        o
+    const e = [], t = Date.now();
+    for (const s of i) {
+      const { vehicleId: a, timestamp: n } = s, o = Number(s.x), d = Number(s.y);
+      let h = Number(s.heading);
+      const r = this.vehicleObjectMap.get(a), p = this.historyPositionMap.get(
+        a
       );
-      if (!r || !m)
-        e.push(t);
+      if (!r || !p)
+        e.push(s);
       else {
-        if (this.updateModel || r.data.vehicleColor !== t.vehicleColor || r.data.vehicleType !== t.vehicleType) {
-          this.vehiclePool.recycleInstance(r.model), r.model = this.getVehicleModel(t), r.model.visible = !0;
-          const c = await this.createPlateSprite(t);
+        if (this.appDataStore.saveTrackLog && this.logTable.push([
+          s.ptcId,
+          s.plateNo,
+          s.timestamp,
+          s.localTimestamp,
+          s.speed,
+          s.x,
+          s.y,
+          s.ptcType,
+          s.vehicleType,
+          s.vehicleColor,
+          s.plateColor,
+          s.heading,
+          s.fixAngle,
+          s.roadLayer,
+          s.step,
+          t,
+          p.length,
+          1
+        ]), this.updateModel || r.data.vehicleColor !== s.vehicleColor || r.data.vehicleType !== s.vehicleType) {
+          this.scene.remove(r.model), this.disposeModel(r.model), r.model = this.getVehicleModel(s), r.model.visible = !0;
+          const c = await this.createPlateSprite(s);
           c && (r.model.add(c), c.position.set(0, 5, -4)), this.scene.add(r.model);
         }
-        if (r.data.showName !== t.showName || r.data.plateColor !== t.plateColor) {
+        if (r.data.showName !== s.showName || r.data.plateColor !== s.plateColor) {
           const c = r.model.getObjectByName("VehiclePlate");
           c && (r.model.remove(c), this.disposeModel(c));
-          const p = await this.createPlateSprite(t);
-          p && (r.model.add(p), p.position.set(0, 5, -4));
+          const g = await this.createPlateSprite(s);
+          g && (r.model.add(g), g.position.set(0, 5, -4));
         }
-        if (r.data = t, this.needInterpolate) {
-          const c = m[m.length - 1];
-          Math.abs(h - c.heading) >= 180 && (h > c.heading ? c.heading += 360 : h += 360), m.push({
-            pos: [n, a, 0],
+        if (r.data = s, this.needInterpolate) {
+          const c = p[p.length - 1];
+          Math.abs(h - c.heading) >= 180 && (h > c.heading ? c.heading += 360 : h += 360), p.push({
+            pos: [o, d, 0],
             heading: h,
-            time: s
+            time: n
           });
         } else {
-          this.historyPositionMap.set(o, [
-            { pos: [n, a, 0], heading: h, time: s }
+          this.historyPositionMap.set(a, [
+            { pos: [o, d, 0], heading: h, time: n }
           ]);
-          const c = this.toRenderCoordinates([n, a, 0]);
+          const c = this.toRenderCoordinates([o, d, 0]);
           r.model.position.set(c[0], c[1], c[2]), r.model.rotation.y = l.MathUtils.degToRad(-h);
         }
       }
@@ -247,19 +310,45 @@ class N {
    * 删除车辆
    * */
   deleteVehicles(i) {
-    this.isPaused || i.forEach((e) => {
-      const t = this.vehicleObjectMap.get(e);
-      t && (this.needInterpolate ? t.isMoving ? t.waitForDelete = !0 : this.deleteVehicle(t) : this.deleteVehicle(t));
+    if (this.isPaused)
+      return;
+    const e = Date.now();
+    i.forEach((t) => {
+      if (this.appDataStore.saveTrackLog) {
+        const a = this.historyPositionMap.get(t);
+        this.logTable.push([
+          t,
+          "",
+          "",
+          "",
+          "",
+          "",
+          "",
+          "",
+          "",
+          "",
+          "",
+          "",
+          "",
+          "",
+          "",
+          e,
+          a ? a.length : 0,
+          2
+        ]);
+      }
+      const s = this.vehicleObjectMap.get(t);
+      s && (this.needInterpolate ? s.isMoving ? s.waitForDelete = !0 : this.deleteVehicle(s) : this.deleteVehicle(s));
     });
   }
   deleteVehicle(i) {
-    this.vehiclePool.recycleInstance(i.model);
+    this.scene.remove(i.model), this.disposeModel(i.model);
     const e = i.data.vehicleId;
     this.vehicleObjectMap.delete(e), this.historyPositionMap.delete(e);
   }
   async toggleTrafficInfo(i) {
-    i.name === "vehiclePlate" && (i.visible === !0 && this.currentSpriteContent === d.None ? await this.updatePanelContent(d.PlateNumber) : await this.updatePanelContent(
-      i.visible ? this.currentSpriteContent : d.None
+    i.name === "vehiclePlate" && (i.visible === !0 && this.currentSpriteContent === m.None ? await this.updatePanelContent(m.PlateNumber) : await this.updatePanelContent(
+      i.visible ? this.currentSpriteContent : m.None
     ));
   }
   togglePause(i) {
@@ -271,7 +360,7 @@ class N {
   clearVehicles() {
     for (const i of this.vehicleObjectMap.keys()) {
       const e = this.vehicleObjectMap.get(i);
-      e && this.vehiclePool.recycleInstance(e.model);
+      e && (this.scene.remove(e.model), this.disposeModel(e.model));
     }
     this.vehicleObjectMap.clear(), this.historyPositionMap.clear();
   }
@@ -286,10 +375,10 @@ class N {
       for (const e of this.vehicleObjectMap.keys()) {
         const t = this.vehicleObjectMap.get(e);
         if (t) {
-          const o = t.model.getObjectByName("VehiclePlate");
-          if (o && (t.model.remove(o), this.disposeModel(o)), i !== d.None) {
-            const s = await this.createPlateSprite(t.data);
-            s && (t.model.add(s), s.position.set(0, 5, -4));
+          const s = t.model.getObjectByName("VehiclePlate");
+          if (s && (t.model.remove(s), this.disposeModel(s)), i !== m.None) {
+            const a = await this.createPlateSprite(t.data);
+            a && (t.model.add(a), a.position.set(0, 5, -4));
           }
         }
       }
@@ -316,21 +405,24 @@ class N {
     const e = this.historyPositionMap.get(i), t = this.vehicleObjectMap.get(i);
     if (!t || !e || !t.isMoving && e.length <= 2)
       return;
-    const o = Date.now();
-    t.isMoving = !0, t.data.roadLayer === "1" ? t.model.visible = this.showGroundVehicle : t.model.visible = this.showElevatedVehicle, t.segmentStartTime || (t.segmentStartTime = o, t.segmentTotalTime = e[1].time - e[0].time);
-    const s = o - t.segmentStartTime, n = Math.min(
-      s / t.segmentTotalTime,
+    const s = Date.now();
+    t.isMoving = !0, t.data.roadLayer === "1" ? t.model.visible = this.showGroundVehicle : t.model.visible = this.showElevatedVehicle, t.segmentStartTime || (t.segmentStartTime = s, t.segmentTotalTime = e[1].time - e[0].time);
+    const a = s - t.segmentStartTime, n = Math.min(
+      a / t.segmentTotalTime,
       1
     );
     if (n === 1)
       if (e.shift(), e.length === 1) {
         t.waitForDelete === !0 ? this.deleteVehicle(t) : (t.segmentStartTime = void 0, t.segmentTotalTime = void 0, t.model.visible = !1, t.isMoving = !1, console.log("hide vehicle", i));
         return;
-      } else
-        return t.segmentStartTime = Date.now(), t.segmentTotalTime = e[1].time - e[0].time, (e[1].heading >= 270 && e[0].heading <= 90 || e[1].heading <= 90 && e[0].heading >= 270) && (e[1].heading > e[0].heading ? e[0].heading += 360 : e[1].heading += 360), e[0].pos.concat(e[0].heading);
+      } else {
+        const o = a - t.segmentTotalTime;
+        return t.segmentStartTime = Date.now(), t.segmentTotalTime = e[1].time - e[0].time - // 补偿损耗时间
+        (o > 0 ? o : 0), (e[1].heading >= 270 && e[0].heading <= 90 || e[1].heading <= 90 && e[0].heading >= 270) && (e[1].heading > e[0].heading ? e[0].heading += 360 : e[1].heading += 360), e[0].pos.concat(e[0].heading);
+      }
     else if (e.length >= 2) {
-      const a = e[0].pos[0] + (e[1].pos[0] - e[0].pos[0]) * n, h = e[0].pos[1] + (e[1].pos[1] - e[0].pos[1]) * n, r = e[0].heading + (e[1].heading - e[0].heading) * n;
-      return [a, h, 0, r];
+      const o = e[0].pos[0] + (e[1].pos[0] - e[0].pos[0]) * n, d = e[0].pos[1] + (e[1].pos[1] - e[0].pos[1]) * n, h = e[0].heading + (e[1].heading - e[0].heading) * n;
+      return [o, d, 0, h];
     } else
       return;
   }
@@ -369,9 +461,9 @@ class N {
             break;
         }
         const t = this.materialMap.get(i.vehicleColor) || this.defaultMaterial;
-        let o = !1;
-        e.traverse((s) => {
-          !o && s instanceof l.Mesh && (s.material = t, o = !0);
+        let s = !1;
+        e.traverse((a) => {
+          !s && a instanceof l.Mesh && (a.material = t, s = !0);
         });
       }
       return e;
@@ -381,70 +473,70 @@ class N {
    * 创建号牌canvas
    * */
   createCanvas(i, e, t) {
-    const o = document.createElement("canvas"), s = i.width, n = i.height;
-    o.width = s, o.height = n;
-    const a = o.getContext("2d");
-    if (!a) {
+    const s = document.createElement("canvas"), a = i.width, n = i.height;
+    s.width = a, s.height = n;
+    const o = s.getContext("2d");
+    if (!o) {
       console.log("canvas创建失败");
       return;
     }
-    return a.fillStyle = "rgba(0,0,0,0.0)", a.fillRect(0, 0, s, n), a.drawImage(i, 0, 0, s, n), a.beginPath(), a.translate(s / 2, n / 2), a.fillStyle = t, a.font = "bold 32px 宋体", a.textBaseline = "middle", a.textAlign = "center", a.fillText(e, 0, 0), o;
+    return o.fillStyle = "rgba(0,0,0,0.0)", o.fillRect(0, 0, a, n), o.drawImage(i, 0, 0, a, n), o.beginPath(), o.translate(a / 2, n / 2), o.fillStyle = t, o.font = "bold 32px 宋体", o.textBaseline = "middle", o.textAlign = "center", o.fillText(e, 0, 0), s;
   }
   createPlateSprite(i) {
     return new Promise((e, t) => {
-      var r, m;
-      const o = !i.plateNo || i.plateNo === "0" || i.plateNo === "000000";
-      if (this.currentSpriteContent === d.None || this.currentSpriteContent === d.PlateNumber && o) {
+      var h, r;
+      const s = !i.plateNo || i.plateNo === "0" || i.plateNo === "000000";
+      if (this.currentSpriteContent === m.None || this.currentSpriteContent === m.PlateNumber && s) {
         e(void 0);
         return;
       }
-      let s = new Image(), n = "", a = "";
-      if (this.currentSpriteContent === d.PlateNumber || this.currentSpriteContent === d.Mix)
-        if (o)
-          s = this.greyPlateBG, n = i.ptcId, a = "#ffffff";
+      let a = new Image(), n = "", o = "";
+      if (this.currentSpriteContent === m.PlateNumber || this.currentSpriteContent === m.Mix)
+        if (s)
+          a = this.greyPlateBG, n = i.ptcId, o = "#ffffff";
         else
-          switch (n = ((r = i.showName) == null ? void 0 : r.substring(0, 2)) + "•" + ((m = i.showName) == null ? void 0 : m.substring(2)), i.plateColor) {
+          switch (n = ((h = i.showName) == null ? void 0 : h.substring(0, 2)) + "•" + ((r = i.showName) == null ? void 0 : r.substring(2)), i.plateColor) {
             case 1:
-              s = this.bluePlateBG, a = "#ffffff";
+              a = this.bluePlateBG, o = "#ffffff";
               break;
             case 2:
-              s = this.yellowPlateBG, a = "#000000";
+              a = this.yellowPlateBG, o = "#000000";
               break;
             case 3:
-              s = this.whitePlateBG, a = "#000000";
+              a = this.whitePlateBG, o = "#000000";
               break;
             case 4:
-              s = this.blackPlateBG, a = "#ffffff";
+              a = this.blackPlateBG, o = "#ffffff";
               break;
             case 5:
-              s = this.neoYellowPlateBG, a = "#000000";
+              a = this.neoYellowPlateBG, o = "#000000";
               break;
             case 6:
-              s = this.neoGreenPlateBG, a = "#000000";
+              a = this.neoGreenPlateBG, o = "#000000";
               break;
             default:
-              s = this.greyPlateBG, n = i.plateNo, a = "#ffffff";
+              a = this.greyPlateBG, n = i.plateNo, o = "#ffffff";
               break;
           }
       else
-        this.currentSpriteContent === d.Id && (s = this.greyPlateBG, n = i.ptcId, a = "#ffffff");
-      const h = this.createCanvas(s, n, a);
-      if (h) {
-        const c = new l.CanvasTexture(h), p = new l.SpriteMaterial({
-          map: c,
+        this.currentSpriteContent === m.Id && (a = this.greyPlateBG, n = i.ptcId, o = "#ffffff");
+      const d = this.createCanvas(a, n, o);
+      if (d) {
+        const p = new l.CanvasTexture(d), c = new l.SpriteMaterial({
+          map: p,
           transparent: !1
-        }), g = new l.Sprite(p), f = 0.05, M = h.width * f, P = h.height * f;
-        g.scale.set(M, P, 1), g.name = "VehiclePlate", e(g);
+        }), g = new l.Sprite(c), f = 0.05, w = d.width * f, M = d.height * f;
+        g.scale.set(w, M, 1), g.name = "VehiclePlate", e(g);
       } else {
         t("canvas创建失败");
         return;
       }
-      s.onerror = (c) => {
-        console.log(`号牌背景加载失败: ${s.src}`, c), t(c);
+      a.onerror = (p) => {
+        console.log(`号牌背景加载失败: ${a.src}`, p), t(p);
       };
     });
   }
 }
 export {
-  N as default
+  I as default
 };

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

@@ -4,7 +4,10 @@ export default class TraceRendererLayer implements ITraceRendererInterface {
     private readonly vehicleLayer;
     private mapConfig;
     private rafSignal;
+    private appDataStore;
+    private logTable;
     constructor(view: __esri.MapView);
+    getLog(): (string | number)[][];
     init(): Promise<void>;
     private needInterpolate;
     private isPaused;

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

@@ -3,12 +3,39 @@ import p from "@arcgis/core/layers/GraphicsLayer";
 import m from "../../stores/index.mjs";
 class f {
   constructor(i) {
-    this.needInterpolate = !0, this.isPaused = !1, this.showVehiclePlate = !1, this.showGroundVehicle = !0, this.showElevatedVehicle = !0, this.historyPositionMap = /* @__PURE__ */ new Map(), this.vehicleObjectMap = /* @__PURE__ */ new Map(), this.view = i;
-    const e = m.useAppDataStore;
-    this.mapConfig = JSON.parse(JSON.stringify(e.mapConfig)), this.vehicleLayer = new p({
+    this.appDataStore = m.useAppDataStore, this.logTable = [
+      [
+        "uuid",
+        "ptcId",
+        "plateno",
+        "timestamp",
+        "localTimestamp",
+        "timestamp_str",
+        "speed",
+        "laneNo",
+        "objHeight",
+        "objLength",
+        "latitude",
+        "longitude",
+        "ptcType",
+        "vehicleType",
+        "vehicleColor",
+        "plateColor",
+        "sbdm",
+        "heading",
+        "fixAngle",
+        "roadLayer",
+        "status",
+        "step",
+        "receiveTimestamp"
+      ]
+    ], this.needInterpolate = !0, this.isPaused = !1, this.showVehiclePlate = !1, this.showGroundVehicle = !0, this.showElevatedVehicle = !0, this.historyPositionMap = /* @__PURE__ */ new Map(), this.vehicleObjectMap = /* @__PURE__ */ new Map(), this.view = i, this.mapConfig = JSON.parse(JSON.stringify(this.appDataStore.mapConfig)), this.vehicleLayer = new p({
       id: "vehicleLayer"
     }), this.view.map.add(this.vehicleLayer), this.rafSignal = requestAnimationFrame(() => this.render());
   }
+  getLog() {
+    return this.logTable;
+  }
   async init() {
     console.log("init");
   }
@@ -19,27 +46,27 @@ class f {
         return;
       }
       const t = i.map((s) => {
-        const { vehicleId: o, heading: a, localTimestamp: h } = s, r = Number(s.x), n = Number(s.y);
+        const { vehicleId: o, heading: a, localTimestamp: h } = s, r = Number(s.x), l = Number(s.y);
         this.historyPositionMap.set(o, [
-          { pos: [r, n, 0], heading: a, time: h }
+          { pos: [r, l, 0], heading: a, time: h }
         ]);
-        const l = new c({
+        const n = new c({
           geometry: {
             type: "point",
             x: r,
-            y: n
+            y: l
           },
           attributes: {
             ...s
           },
           symbol: this.createCIMSymbol(s)
         });
-        return l.visible = !1, this.vehicleObjectMap.set(o, {
-          graphic: l,
+        return n.visible = !1, this.vehicleObjectMap.set(o, {
+          graphic: n,
           data: s,
           waitForDelete: !1,
           isMoving: !1
-        }), l;
+        }), n;
       });
       this.vehicleLayer.addMany(t), e();
     });
@@ -52,11 +79,11 @@ class f {
       }
       const t = [];
       i.forEach((s) => {
-        const { vehicleId: o, heading: a, localTimestamp: h } = s, r = Number(s.x), n = Number(s.y), l = this.vehicleObjectMap.get(o);
-        l ? (l.data = s, this.historyPositionMap.get(
+        const { vehicleId: o, heading: a, localTimestamp: h } = s, r = Number(s.x), l = Number(s.y), n = this.vehicleObjectMap.get(o);
+        n ? (n.data = s, this.historyPositionMap.get(
           o
         ).push({
-          pos: [r, n, 0],
+          pos: [r, l, 0],
           heading: a,
           time: h
         })) : t.push(s);
@@ -123,12 +150,12 @@ class f {
           y: e[0].pos[1]
         };
     else {
-      const h = e[0].pos[0] + (e[1].pos[0] - e[0].pos[0]) * a, r = e[0].pos[1] + (e[1].pos[1] - e[0].pos[1]) * a, n = e[0].heading + (e[1].heading - e[0].heading) * a;
+      const h = e[0].pos[0] + (e[1].pos[0] - e[0].pos[0]) * a, r = e[0].pos[1] + (e[1].pos[1] - e[0].pos[1]) * a, l = e[0].heading + (e[1].heading - e[0].heading) * a;
       t.graphic.geometry = {
         type: "point",
         x: h,
         y: r
-      }, t.data.heading = n, t.graphic.symbol = this.createCIMSymbol(t.data);
+      }, t.data.heading = l, t.graphic.symbol = this.createCIMSymbol(t.data);
     }
   }
   /**

package/es/src/types/index.d.ts

@@ -37,6 +37,7 @@ export interface IVehicleTrack {
     speed?: number;
     plateNo?: string;
     roadLayer?: string;
+    step?: number;
 }
 export interface IVehicleRecord {
     model: Three.Group | Three.Mesh;
@@ -151,6 +152,7 @@ export interface IToggleTrafficInfoParams {
 }
 export interface ITraceRendererInterface {
     init(): Promise<void>;
+    getLog(): (string | number | undefined)[][];
     addVehicles(objects: IVehicleTrack[]): Promise<void>;
     updateVehicles(objects: IVehicleTrack[]): Promise<void>;
     deleteVehicles(idList: string[]): void;

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

@@ -3,8 +3,6 @@ export default class TraceHoloFlow {
     private readonly traceRenderer;
     constructor(view: __esri.View);
     init(): Promise<void>;
-    private appDataStore;
-    private logTable;
     downloadLog(): void;
     /**
      * 处理全息流轨迹数据

package/lib/src/gis-map/utils/holo-flow/trace-holo-flow.js

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const g=require("@arcgis/core/views/3d/externalRenderers"),m=require("../../stores/index.js"),b=require("./trace-renderer-external.js"),f=require("./trace-renderer-layer.js");function T(l){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(l){for(const r in l)if(r!=="default"){const n=Object.getOwnPropertyDescriptor(l,r);Object.defineProperty(e,r,n.get?n:{enumerable:!0,get:()=>l[r]})}}return e.default=l,Object.freeze(e)}const y=T(g);class v{constructor(e){this.appDataStore=m.default.useAppDataStore,this.logTable=[["uuid","ptcId","plateno","timestamp","localTimestamp","timestamp_str","speed","laneNo","objHeight","objLength","latitude","longitude","ptcType","vehicleType","vehicleColor","plateColor","sbdm","heading","fixAngle","roadLayer","status","step","receiveTimestamp"]],e.type==="3d"?(this.traceRenderer=new b.default(e),y.add(e,this.traceRenderer)):this.traceRenderer=new f.default(e)}async init(){await this.traceRenderer.init()}downloadLog(){const e=this.logTable.map(c=>c.join(",")).join(`
-`).replace(/null/g,""),r=new Blob([e],{type:"text/csv;charset=utf-8;"}),n=URL.createObjectURL(r),a=document.createElement("a");a.setAttribute("href",n),a.setAttribute("download","trace-log.csv"),a.style.visibility="hidden",document.body.appendChild(a),a.click(),document.body.removeChild(a)}async handleVehicleTraceData(e){const{newVehList:r,updateVehList:n,deleteVehList:a,jgsj:c}=e,i=e.crossId||"",s=[],d=[],h=Date.now();if(r&&r.length>0){for(const t of r){t.localTimestamp||(t.localTimestamp=c||Date.now()),this.appDataStore.saveTrackLog&&this.logTable.push([t.uuid,t.ptcId,t.plateno,t.timestamp,t.localTimestamp,t.timestamp_str,t.speed,t.laneNo,t.objHeight,t.objLength,t.latitude,t.longitude,t.ptcType,t.vehicleType,t.vehicleColor,t.plateColor,t.sbdm,t.heading,t.fixAngle,t.roadLayer,t.status,t.step,h]);const o=this.buildVehicleTrackData(t,i);o&&s.push(o)}await this.traceRenderer.addVehicles(s)}if(n&&n.length>0){const t=Date.now();for(const o of n){this.appDataStore.saveTrackLog&&this.logTable.push([o.uuid,o.ptcId,o.plateno,o.timestamp,o.localTimestamp,o.timestamp_str,o.speed,o.laneNo,o.objHeight,o.objLength,o.latitude,o.longitude,o.ptcType,o.vehicleType,o.vehicleColor,o.plateColor,o.sbdm,o.heading,o.fixAngle,o.roadLayer,o.status,o.step,t]);const p=this.buildVehicleTrackData(o,i);p&&d.push(p)}await this.traceRenderer.updateVehicles(d)}if(a&&a.length>0){const t=a.map(o=>i+"-"+(o.ptcId||o.vehno||o.vehNo));this.traceRenderer.deleteVehicles(t)}}toggleTrafficInfo(e){this.traceRenderer.toggleTrafficInfo(e)}clearTrace(){this.traceRenderer.clearVehicles()}togglePause(e){this.traceRenderer.togglePause(e)}updatePanelContent(e){this.traceRenderer.updatePanelContent(e)}toggleGroundVehicle(e){this.traceRenderer.toggleGroundVehicle(e)}toggleElevatedVehicle(e){this.traceRenderer.toggleElevatedVehicle(e)}setInterpolate(e){this.traceRenderer.setInterpolate(e)}buildVehicleTrackData(e,r){const n=e.longitude,a=e.latitude,c=e.ptcId,i=Number(e.ptcType),s=e.heading,d=Number(e.vehicleType),h=Number(e.vehicleColor),t=e.plateNo||e.plateno,o=Number(e.plateColor),p=e.timestamp,u=e.roadLayer?String(e.roadLayer):"1";if(!(i<0||i>8))return{ptcId:c,crossId:r,vehicleId:r+"-"+c,x:n,y:a,ptcType:i,vehicleType:d,heading:i===2?-s:s,vehicleColor:h,showName:t&&t!==""&&t!=="0"&&t!=="000000"?t:"",plateNo:t,plateColor:o,timestamp:p,localTimestamp:Date.now(),roadLayer:u}}}exports.default=v;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const m=require("@arcgis/core/views/3d/externalRenderers"),b=require("./trace-renderer-external.js"),y=require("./trace-renderer-layer.js");function R(i){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(i){for(const r in i)if(r!=="default"){const n=Object.getOwnPropertyDescriptor(i,r);Object.defineProperty(e,r,n.get?n:{enumerable:!0,get:()=>i[r]})}}return e.default=i,Object.freeze(e)}const T=R(m);class v{constructor(e){e.type==="3d"?(this.traceRenderer=new b.default(e),T.add(e,this.traceRenderer)):this.traceRenderer=new y.default(e)}async init(){await this.traceRenderer.init()}downloadLog(){const e=this.traceRenderer.getLog().map(s=>s.join(",")).join(`
+`).replace(/null/g,""),r=new Blob([e],{type:"text/csv;charset=utf-8;"}),n=URL.createObjectURL(r),c=document.createElement("a");c.setAttribute("href",n),c.setAttribute("download","trace-log.csv"),c.style.visibility="hidden",document.body.appendChild(c),c.click(),document.body.removeChild(c)}async handleVehicleTraceData(e){const{newVehList:r,updateVehList:n,deleteVehList:c,jgsj:s}=e,l=e.crossId||"",a=[],d=[];if(r&&r.length>0){for(const o of r){o.localTimestamp||(o.localTimestamp=s||Date.now());const t=this.buildVehicleTrackData(o,l);t&&a.push(t)}await this.traceRenderer.addVehicles(a)}if(n&&n.length>0){for(const o of n){const t=this.buildVehicleTrackData(o,l);t&&d.push(t)}await this.traceRenderer.updateVehicles(d)}if(c&&c.length>0){const o=c.map(t=>l+"-"+(t.ptcId||t.vehno||t.vehNo));this.traceRenderer.deleteVehicles(o)}}toggleTrafficInfo(e){this.traceRenderer.toggleTrafficInfo(e)}clearTrace(){this.traceRenderer.clearVehicles()}togglePause(e){this.traceRenderer.togglePause(e)}updatePanelContent(e){this.traceRenderer.updatePanelContent(e)}toggleGroundVehicle(e){this.traceRenderer.toggleGroundVehicle(e)}toggleElevatedVehicle(e){this.traceRenderer.toggleElevatedVehicle(e)}setInterpolate(e){this.traceRenderer.setInterpolate(e)}buildVehicleTrackData(e,r){const n=e.longitude,c=e.latitude,s=e.ptcId,l=Number(e.ptcType),a=e.heading,d=Number(e.vehicleType),o=Number(e.vehicleColor),t=e.plateNo||e.plateno,h=Number(e.plateColor),u=e.timestamp,p=e.localTimestamp,g=e.roadLayer?String(e.roadLayer):"1",f=e.step;if(!(l<0||l>8))return{ptcId:s,crossId:r,vehicleId:r+"-"+s,x:n,y:c,ptcType:l,vehicleType:d,heading:l===2?-a:a,vehicleColor:o,showName:t&&t!==""&&t!=="0"&&t!=="000000"?t:"",plateNo:t,plateColor:h,timestamp:u,localTimestamp:p,roadLayer:g,step:f}}}exports.default=v;