gisviewer-vue3-arcgis 1.0.171 → 1.0.173

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

@@ -1,5 +1,5 @@
-import SignalHoloFlow from './signal-holo-flow';
 import { ISignalCountdownProps } from '../../../types';
+import SignalHoloFlow from './signal-holo-flow';
 export default class LSRSignalHoloFlow extends SignalHoloFlow {
     private stopLineLayer;
     private watchHandle;

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

@@ -1,29 +1,30 @@
-import * as d from "@arcgis/core/core/reactiveUtils";
-import { Point as h } from "@arcgis/core/geometry";
-import w from "@arcgis/core/layers/GraphicsLayer";
-import P from "./signal-holo-flow.mjs";
-class L extends P {
-  constructor(n, s) {
-    super(n), this.stopLineLayer = new w(), this.watchHandle = null, this.stopLineMap = /* @__PURE__ */ new Map(), this.countdownPanelProps = s, this.view.map.add(this.stopLineLayer);
+import * as w from "@arcgis/core/core/reactiveUtils";
+import { Point as f } from "@arcgis/core/geometry";
+import * as d from "@arcgis/core/geometry/support/webMercatorUtils.js";
+import P from "@arcgis/core/layers/GraphicsLayer";
+import g from "./signal-holo-flow.mjs";
+class S extends g {
+  constructor(n, a) {
+    super(n), this.stopLineLayer = new P(), this.watchHandle = null, this.stopLineMap = /* @__PURE__ */ new Map(), this.countdownPanelProps = a, this.view.map.add(this.stopLineLayer);
   }
   async initializeLayer() {
-    var c, r;
+    var p, l;
     console.time("初始化停止线图层");
-    let n = (r = (c = this.mapConfig.holoFlow) == null ? void 0 : c.signal) == null ? void 0 : r.stopLineLayer;
+    let n = (l = (p = this.mapConfig.holoFlow) == null ? void 0 : p.signal) == null ? void 0 : l.stopLineLayer;
     if (!n)
       return;
     n = this.mapConfig.assetsRoot + "/" + n, (await (await fetch(n)).json()).features.forEach((t) => {
-      const { roadId: o, nodeId: e, angle: i, destinationPoint: a } = t.properties, { coordinates: l } = t.geometry, f = this.stopLineMap.get(e);
-      f ? f.set(o, {
-        coord: l,
-        panelPoint: a,
-        angle: i
+      const { roadId: o, nodeId: e, angle: s, destinationPoint: i } = t.properties, { coordinates: r } = t.geometry, h = this.stopLineMap.get(e);
+      h ? h.set(o, {
+        coord: r,
+        panelPoint: i,
+        angle: s
       }) : this.stopLineMap.set(
         e,
         /* @__PURE__ */ new Map([
           [
             o,
-            { coord: l, panelPoint: a, angle: i }
+            { coord: r, panelPoint: i, angle: s }
           ]
         ])
       );
@@ -31,77 +32,84 @@ class L extends P {
   }
   getPanelScale() {
     const n = this.view.scale;
-    let s = 1;
-    return n < 1e3 ? s = 1 : n < 2e3 ? s = 0.8 : s = 0.4, s;
+    let a = 1;
+    return n < 1e3 ? a = 1 : n < 2e3 ? a = 0.8 : a = 0.4, a;
   }
   async handleSignalData(n) {
-    this.watchHandle || (this.watchHandle = d.watch(
+    this.watchHandle || (this.watchHandle = w.watch(
       () => this.view.extent,
       () => {
+        console.log("extent changed");
         const t = this.getPanelScale();
         for (const o of this.countdownPanelProps) {
           t !== this.currentPanelScale && (o.scale = t);
-          const { mapPoint: e } = o, i = this.view.toScreen({
-            type: "point",
+          const { mapPoint: e } = o;
+          let s = new f({
             x: e[0],
             y: e[1]
           });
-          o.position.left = i.x, o.position.top = i.y;
+          this.view.spatialReference.isWebMercator && (s = d.geographicToWebMercator(
+            s
+          ));
+          const i = this.view.toScreen(s);
+          if (o.position.left = i.x, o.position.top = i.y, this.view.type === "3d") {
+            const r = this.getPanelRotation(o.stopLine);
+            o.rotation = r;
+          }
         }
         this.currentPanelScale = t;
       }
     ));
-    const s = n.crossId, p = this.stopLineMap.get(s);
-    if (!p) {
-      console.log(`没有找到路口${s}`);
+    const a = n.crossId, c = this.stopLineMap.get(a);
+    if (!c)
       return;
-    }
-    const c = n.phaseCountDownList, r = /* @__PURE__ */ new Map();
-    for (const t of c) {
+    const p = n.phaseCountDownList, l = /* @__PURE__ */ new Map();
+    for (const t of p) {
       let o = "";
-      for (let l of t.roadIdList)
-        if (l.startsWith("-") && (l = l.slice(1)), p.has(l)) {
-          o = l;
+      for (let r of t.roadIdList)
+        if (r.startsWith("-") && (r = r.slice(1)), c.has(r)) {
+          o = r;
           break;
         }
-      if (!o) {
-        console.log(`没有找到对应的进口道${s}--${o}`);
+      if (!o)
         continue;
-      }
-      let e = r.get(o);
-      if (e || (e = {}, r.set(o, e)), !t.direction) {
-        console.log(`没有找到对应的方向${s}--${JSON.stringify(t)}`);
+      let e = l.get(o);
+      if (e || (e = {}, l.set(o, e)), !t.direction) {
+        console.log(`没有找到对应的方向${a}--${JSON.stringify(t)}`);
         continue;
       }
-      const i = t.direction.toLowerCase(), a = t.color === 1 ? "red" : t.color === 2 ? "yellow" : "green";
-      i === "u" ? (e.uNumber = t.leftTime, e.uColor = a) : i === "l" ? (e.lNumber = t.leftTime, e.lColor = a) : i === "s" ? (e.sNumber = t.leftTime, e.sColor = a) : i === "r" && (e.rNumber = t.leftTime, e.rColor = a);
+      const s = t.direction.toLowerCase(), i = t.color === 1 ? "red" : t.color === 2 ? "yellow" : "green";
+      s === "u" ? (e.uNumber = t.leftTime, e.uColor = i) : s === "l" ? (e.lNumber = t.leftTime, e.lColor = i) : s === "s" ? (e.sNumber = t.leftTime, e.sColor = i) : s === "r" && (e.rNumber = t.leftTime, e.rColor = i);
     }
-    r.forEach((t, o) => {
-      const e = p.get(o);
+    l.forEach((t, o) => {
+      const e = c.get(o);
       if (!e)
         return;
-      const i = this.countdownPanelProps.find(
-        (a) => a.crossId === s && a.roadId === o
+      const s = this.countdownPanelProps.find(
+        (i) => i.crossId === a && i.roadId === o
       );
-      if (i)
-        i.lampStatus = t;
+      if (s)
+        s.lampStatus = t;
       else {
-        const a = e.panelPoint, l = this.view.toScreen({
-          type: "point",
-          x: a[0],
-          y: a[1]
-        }), f = this.getPanelRotation(e.coord);
-        this.countdownPanelProps.push({
+        let i = new f({
+          x: e.panelPoint[0],
+          y: e.panelPoint[1]
+        });
+        this.view.spatialReference.isWebMercator && (i = d.geographicToWebMercator(
+          i
+        ));
+        const r = this.view.toScreen(i), h = this.getPanelRotation(e.coord);
+        console.log(i.toJSON(), r), this.countdownPanelProps.push({
           displayMode: "complex",
-          crossId: s,
+          crossId: a,
           roadId: o,
-          mapPoint: a,
+          mapPoint: e.panelPoint,
           // 定位点地理坐标
           stopLine: e.coord,
           // 关联的停止线坐标
-          position: { left: l.x, top: l.y },
+          position: { left: r.x, top: r.y },
           // 定位点屏幕坐标
-          rotation: f,
+          rotation: h,
           // 面板旋转角度
           scale: this.getPanelScale(),
           lampStatus: t
@@ -112,7 +120,7 @@ class L extends P {
   }
   clearSignal() {
     var n;
-    this.stopLineLayer.removeAll(), this.countdownPanelProps = [], (n = this.watchHandle) == null || n.remove(), this.watchHandle = null;
+    this.stopLineLayer.removeAll(), this.countdownPanelProps.length = 0, (n = this.watchHandle) == null || n.remove(), this.watchHandle = null;
   }
   /**
    * 从停止线坐标计算面板旋转角度
@@ -120,18 +128,26 @@ class L extends P {
    * @returns
    */
   getPanelRotation(n) {
-    const s = n[0], p = new h({
-      x: s[0],
-      y: s[1],
-      spatialReference: this.view.spatialReference
-    }), c = this.view.toScreen(p), r = n[n.length - 1], t = new h({
-      x: r[0],
-      y: r[1],
-      spatialReference: this.view.spatialReference
-    }), o = this.view.toScreen(t), e = o.x - c.x, i = o.y - c.y;
-    return Math.atan2(i, e) * (180 / Math.PI);
+    const a = n[0];
+    let c = new f({
+      x: a[0],
+      y: a[1]
+    });
+    this.view.spatialReference.isWebMercator && (c = d.geographicToWebMercator(
+      c
+    ));
+    const p = this.view.toScreen(c), l = n[n.length - 1];
+    let t = new f({
+      x: l[0],
+      y: l[1]
+    });
+    this.view.spatialReference.isWebMercator && (t = d.geographicToWebMercator(
+      t
+    ));
+    const o = this.view.toScreen(t), e = o.x - p.x, s = o.y - p.y;
+    return Math.atan2(s, e) * (180 / Math.PI);
   }
 }
 export {
-  L as default
+  S as default
 };

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

@@ -186,7 +186,7 @@ class v {
   drawCountdownText(e, t) {
     const a = e.getContext("2d");
     a.clearRect(0, 0, e.width, e.height), a.font = "24px Digital", a.textBaseline = "middle", a.textAlign = "center", a.fillStyle = t.stageRemainingTime <= t.stageAllRedTime ? "red" : t.stageRemainingTime <= t.stageAllRedTime + t.stageYellowTime ? "yellow" : "lime", a.fillText(
-      `${t.stageID} ${t.stageRemainingTime.toFixed(0)}`,
+      `${t.stageRemainingTime.toFixed(0)}`,
       e.width / 2,
       e.height / 2
     );

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

@@ -22,6 +22,7 @@ export default class TraceRendererExternal implements ITraceRendererInterface {
     private truckModel;
     private busModel;
     private bicycleModel;
+    private passengerModel;
     private bluePlateBG;
     private yellowPlateBG;
     private whitePlateBG;