gisviewer-vue3-arcgis 1.0.238 → 1.0.240

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

@@ -1,7 +1,7 @@
 import { IResult, ISignalCountdownProps } from '../../../types';
 import SignalHoloFlow from './signal-holo-flow';
 export default class LSRSignalHoloFlow extends SignalHoloFlow {
-    private stopLineLayer;
+    private waitingAreaLayer;
     private watchHandle;
     private countdownPanelProps;
     private currentPanelScale;
@@ -9,6 +9,7 @@ export default class LSRSignalHoloFlow extends SignalHoloFlow {
     private trajectoryDelayTime;
     /** 按照路口id->进口道路段id->停止线坐标保存的停止线 */
     private stopLineMap;
+    private waitingAreaMap;
     /** 信号机id->进口道id->灯组id */
     private lampGroupMap;
     constructor(view: __esri.MapView | __esri.SceneView, countdownPanelInfos: ISignalCountdownProps[]);
@@ -35,6 +36,8 @@ export default class LSRSignalHoloFlow extends SignalHoloFlow {
      */
     private updatePanelPosition;
     private doHoloSignalData;
+    private updateWaitingArea;
+    private getColor;
     private updateLampGroupPanelStatus;
     /**
      * 处理全息流信号灯数据

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

@@ -1,62 +1,70 @@
 import * as w from "@arcgis/core/core/reactiveUtils";
-import { Point as d } from "@arcgis/core/geometry";
-import * as u from "@arcgis/core/geometry/support/webMercatorUtils.js";
-import g from "@arcgis/core/layers/GraphicsLayer";
-import P from "./signal-holo-flow.mjs";
-class M extends P {
-  constructor(e, s) {
-    var l, i;
-    super(e), this.stopLineLayer = new g(), this.watchHandle = null, this.trajectoryDelayTime = 2, this.stopLineMap = /* @__PURE__ */ new Map(), this.lampGroupMap = /* @__PURE__ */ new Map(), this.countdownPanelProps = s, this.view.map.add(this.stopLineLayer), this.trajectoryDelayTime = (i = (l = this.mapConfig.holoFlow) == null ? void 0 : l.signal) == null ? void 0 : i.delay, this.trajectoryDelayTime === void 0 && (this.trajectoryDelayTime = 2);
+import { Point as u } from "@arcgis/core/geometry";
+import * as g from "@arcgis/core/geometry/support/webMercatorUtils.js";
+import L from "@arcgis/core/Graphic";
+import b from "@arcgis/core/layers/GraphicsLayer";
+import M from "./signal-holo-flow.mjs";
+class v extends M {
+  constructor(e, t) {
+    var n, a;
+    super(e), this.waitingAreaLayer = new b(), this.watchHandle = null, this.trajectoryDelayTime = 2, this.stopLineMap = /* @__PURE__ */ new Map(), this.waitingAreaMap = /* @__PURE__ */ new Map(), this.lampGroupMap = /* @__PURE__ */ new Map(), this.countdownPanelProps = t, this.view.map.add(this.waitingAreaLayer), this.trajectoryDelayTime = (a = (n = this.mapConfig.holoFlow) == null ? void 0 : n.signal) == null ? void 0 : a.delay, this.trajectoryDelayTime === void 0 && (this.trajectoryDelayTime = 2);
   }
   /**
    * 读取停止线图层，将灯组面板沿着停止线放置
    * @returns
    */
   async initializeLayer() {
-    var i, t;
+    var a, o, s, i, r;
     if (this.stopLineMap.size > 0)
       return;
     console.time("初始化停止线图层");
-    let e = (t = (i = this.mapConfig.holoFlow) == null ? void 0 : i.signal) == null ? void 0 : t.stopLineLayer;
+    let e = (o = (a = this.mapConfig.holoFlow) == null ? void 0 : a.signal) == null ? void 0 : o.stopLineLayer;
     if (!e)
       return;
     e = this.mapConfig.assetsRoot + "/" + e;
-    const l = await (await fetch(e)).json();
-    for (const n of l.features) {
-      const { roadId: a } = n.properties;
-      let { destinationPoint: o } = n.properties;
-      const { coordinates: r } = n.geometry;
-      if (o) {
-        if (typeof o == "string")
+    let t = await fetch(e), n = await t.json();
+    for (const l of n.features) {
+      const { roadId: c, nodeId: d } = l.properties;
+      let { destinationPoint: p } = l.properties;
+      const { coordinates: h } = l.geometry;
+      if (p) {
+        if (typeof p == "string")
           try {
-            o = JSON.parse(o);
-          } catch (c) {
-            console.error("解析面板基准点失败", c);
+            p = JSON.parse(p);
+          } catch (f) {
+            console.error("解析面板基准点失败", f);
             continue;
           }
       } else {
-        const c = r[0], h = r[r.length - 1], p = (c[0] + h[0]) / 2, f = (c[1] + h[1]) / 2;
-        o = [p, f];
+        const f = h[0], m = h[h.length - 1], y = (f[0] + m[0]) / 2, P = (f[1] + m[1]) / 2;
+        p = [y, P];
       }
-      this.stopLineMap.set(a, {
-        coord: r,
-        panelPoint: o
+      this.stopLineMap.set(`${d}_${c}`, {
+        coord: h,
+        panelPoint: p
       });
     }
-    console.timeEnd("初始化停止线图层");
+    if (console.timeEnd("初始化停止线图层"), console.time("初始化待行区图层"), e = (i = (s = this.mapConfig.holoFlow) == null ? void 0 : s.signal) == null ? void 0 : i.waitingAreaLayer, !!e) {
+      e = this.mapConfig.assetsRoot + "/" + e, t = await fetch(e), n = await t.json();
+      for (const l of n.features) {
+        const { roadId: c, direction: d, nodeId: p } = l.properties, { coordinates: h } = l.geometry, f = `${p}_${c}`;
+        this.waitingAreaMap.has(f) || this.waitingAreaMap.set(f, []), (r = this.waitingAreaMap.get(f)) == null || r.push({ coord: h, direction: d });
+      }
+      console.timeEnd("初始化待行区图层");
+    }
   }
   /**
    * 初始化灯组与进口道的关联关系
    */
   initializeLampGroup(e) {
-    const { sigId: s, lampGroupList: l } = e, i = [];
-    l.forEach((t) => {
-      const { lampGroupNo: n, lampGroupType: a, crossFlowList: o, pedList: r } = t;
-      if (o.length > 0)
-        for (const c of o) {
-          if (a === 81)
+    const { sigId: t, lampGroupList: n } = e, a = [];
+    n.forEach((o) => {
+      const { lampGroupNo: s, lampGroupType: i, crossFlowList: r, pedList: l } = o;
+      if (r.length > 0)
+        for (const c of r) {
+          if (i === 81)
             continue;
-          const h = c.upSectionId;
+          const d = c.upSectionId;
           let p = "s";
           switch (c.turn) {
             case 1:
@@ -72,14 +80,14 @@ class M extends P {
               p = "u";
               break;
           }
-          i.push({
-            lampGroupId: n,
-            roadId: h,
+          a.push({
+            lampGroupId: s,
+            roadId: d,
             dir: p
           });
         }
-      r.length > 0;
-    }), this.lampGroupMap.set(s, i);
+      l.length > 0;
+    }), this.lampGroupMap.set(t, a);
   }
   /**
    * 处理统一信控平台信号灯数据
@@ -90,151 +98,190 @@ class M extends P {
       () => this.view.extent,
       () => this.updatePanelPosition()
     ));
-    const { sigId: s, runningStatus: l } = e.data.basicInfo, i = this.lampGroupMap.get(s);
-    if (!i)
+    const { sigId: t, runningStatus: n } = e.data.basicInfo, a = this.lampGroupMap.get(t);
+    if (!a)
       return { status: -1, message: "灯组未初始化" };
-    const t = /* @__PURE__ */ new Map();
-    let n = !1;
-    switch (String(l)) {
+    const o = /* @__PURE__ */ new Map();
+    let s = !1;
+    switch (String(n)) {
       case "4": {
-        n = !0, i.forEach((a) => {
-          const { roadId: o, dir: r } = a;
-          t.set(o, {
-            ...t.get(o) || {},
-            [`${r}Number`]: "",
-            [`${r}Color`]: "yellow"
+        s = !0, a.forEach((i) => {
+          const { roadId: r, dir: l } = i;
+          o.set(r, {
+            ...o.get(r) || {},
+            [`${l}Number`]: "",
+            [`${l}Color`]: "yellow"
           });
         });
         break;
       }
       case "5": {
-        i.forEach((a) => {
-          const { roadId: o, dir: r } = a;
-          t.set(o, {
-            ...t.get(o) || {},
-            [`${r}Number`]: "",
-            [`${r}Color`]: "red"
+        a.forEach((i) => {
+          const { roadId: r, dir: l } = i;
+          o.set(r, {
+            ...o.get(r) || {},
+            [`${l}Number`]: "",
+            [`${l}Color`]: "red"
           });
         });
         break;
       }
       case "6":
       case "9": {
-        i.forEach((a) => {
-          const { roadId: o, dir: r } = a;
-          t.set(o, {
-            ...t.get(o) || {},
-            [`${r}Number`]: "",
-            [`${r}Color`]: "off"
+        a.forEach((i) => {
+          const { roadId: r, dir: l } = i;
+          o.set(r, {
+            ...o.get(r) || {},
+            [`${l}Number`]: "",
+            [`${l}Color`]: "off"
           });
         });
         break;
       }
       default: {
-        const { curSigColorInfo: a } = e.data;
-        a.forEach((o) => {
-          const r = String(o.lamgroupId), { color: c, leftTime: h } = o, p = i.find(
-            (f) => f.lampGroupId === r
+        const { curSigColorInfo: i } = e.data;
+        i.forEach((r) => {
+          const l = String(r.lamgroupId), { color: c, leftTime: d } = r, p = a.find(
+            (h) => h.lampGroupId === l
           );
           if (p) {
-            const { roadId: f, dir: m } = p;
-            t.set(f, {
-              ...t.get(f) || {},
-              [`${m}Number`]: h,
-              [`${m}Color`]: c === 1 ? "red" : c === 2 ? "yellow" : "green"
+            const { roadId: h, dir: f } = p;
+            o.set(h, {
+              ...o.get(h) || {},
+              [`${f}Number`]: d,
+              [`${f}Color`]: c === 1 ? "red" : c === 2 ? "yellow" : "green"
             });
           }
         });
       }
     }
-    return this.updateLampGroupPanelStatus(s, t, n), { status: 0, message: "ok" };
+    return this.updateLampGroupPanelStatus(t, o, s), { status: 0, message: "ok" };
   }
   /**
    * 根据地图比例尺计算灯组面板缩放比例
    */
   getPanelScale() {
     const e = this.view.scale;
-    let s = 1;
-    return e < 500 ? s = 1.2 : e < 1e3 ? s = 1 : e < 2e3 ? s = 0.8 : e < 4e3 ? s = 0.4 : s = 0, s;
+    let t = 1;
+    return e < 500 ? t = 1.2 : e < 1e3 ? t = 1 : e < 2e3 ? t = 0.8 : e < 4e3 ? t = 0.4 : t = 0, t;
   }
   /**
    * 地图移动时更新灯组面板位置
    */
   updatePanelPosition() {
     const e = this.getPanelScale();
-    for (const s of this.countdownPanelProps) {
-      e !== this.currentPanelScale && (s.scale = e);
-      const { mapPoint: l } = s;
-      let i = new d({
-        x: l[0],
-        y: l[1]
+    for (const t of this.countdownPanelProps) {
+      e !== this.currentPanelScale && (t.scale = e);
+      const { mapPoint: n } = t;
+      let a = new u({
+        x: n[0],
+        y: n[1]
       });
-      this.view.spatialReference.isWebMercator && (i = u.geographicToWebMercator(
-        i
+      this.view.spatialReference.isWebMercator && (a = g.geographicToWebMercator(
+        a
       ));
-      const t = this.view.toScreen(i);
-      if (s.position.left = t.x, s.position.top = t.y, this.view.type === "3d") {
-        const n = this.getPanelRotation(s.stopLine);
-        s.rotation = n;
+      const o = this.view.toScreen(a);
+      if (t.position.left = o.x, t.position.top = o.y, this.view.type === "3d") {
+        const s = this.getPanelRotation(t.stopLine);
+        t.rotation = s;
       }
     }
     this.currentPanelScale = e;
   }
   doHoloSignalData(e) {
-    const s = e.crossId, l = e.phaseCountDownList, i = /* @__PURE__ */ new Map();
-    for (const t of l) {
-      let n = "";
-      for (let c of t.roadIdList)
-        if (c.startsWith("-") && (c = c.slice(1)), this.stopLineMap.has(c)) {
-          n = c;
+    const t = e.crossId, n = e.phaseCountDownList, a = /* @__PURE__ */ new Map();
+    for (const o of n) {
+      let s = "";
+      for (let c of o.roadIdList)
+        if (c.startsWith("-") && (c = c.slice(1)), this.stopLineMap.has(`${t}_${c}`)) {
+          s = `${t}_${c}`;
           break;
         }
-      if (!n) {
-        console.log(`没有找到对应的进口道${s}--${n}`);
+      if (!s) {
+        console.log(`没有找到对应的进口道${t}--${s}`);
         continue;
       }
-      let a = i.get(n);
-      if (a || (a = {}, i.set(n, a)), !t.direction)
+      let i = a.get(s);
+      if (i || (i = {}, a.set(s, i)), !o.direction)
         continue;
-      const o = t.direction.toLowerCase(), r = t.color === 1 ? "red" : t.color === 2 ? "yellow" : "green";
-      o === "u" ? (a.uNumber = t.leftTime, a.uColor = r) : o === "l" ? (a.lNumber = t.leftTime, a.lColor = r) : o === "s" ? (a.sNumber = t.leftTime, a.sColor = r) : o === "r" && (a.rNumber = t.leftTime, a.rColor = r);
+      const r = o.direction.toLowerCase(), l = o.color === 1 ? "red" : o.color === 2 ? "yellow" : "green";
+      r === "u" ? (i.uNumber = o.leftTime, i.uColor = l) : r === "l" ? (i.lNumber = o.leftTime, i.lColor = l) : r === "s" ? (i.sNumber = o.leftTime, i.sColor = l) : r === "r" && (i.rNumber = o.leftTime, i.rColor = l);
     }
-    this.updateLampGroupPanelStatus(s, i);
+    this.updateLampGroupPanelStatus(t, a), this.updateWaitingArea(t, a);
+  }
+  updateWaitingArea(e, t) {
+    t.forEach((n, a) => {
+      var o;
+      if (n.lColor) {
+        let s = this.waitingAreaLayer.graphics.find(
+          (i) => i.attributes.roadId === a && i.attributes.direction === "l"
+        );
+        if (s)
+          s.attributes.color !== n.lColor && (s.attributes.color = n.lColor, s.symbol = {
+            type: "simple-fill",
+            color: this.getColor(n.lColor),
+            outline: {
+              color: this.getColor(n.lColor)
+            }
+          });
+        else {
+          const i = (o = this.waitingAreaMap.get(a)) == null ? void 0 : o.find((r) => r.direction === "l");
+          i && (s = new L({
+            geometry: { type: "polygon", rings: i.coord },
+            attributes: {
+              roadId: a,
+              direction: "l",
+              color: n.lColor
+            },
+            symbol: {
+              type: "simple-fill",
+              color: this.getColor(n.lColor),
+              outline: {
+                color: this.getColor(n.lColor)
+              }
+            }
+          }), this.waitingAreaLayer.add(s));
+        }
+      }
+    });
+  }
+  getColor(e) {
+    return e === "green" ? [0, 255, 0, 0.8] : e === "yellow" ? [255, 192, 2, 0.8] : [255, 0, 0, 0.8];
   }
-  updateLampGroupPanelStatus(e, s, l = !1) {
-    s.forEach((i, t) => {
-      const n = this.stopLineMap.get(t);
-      if (!n)
+  updateLampGroupPanelStatus(e, t, n = !1) {
+    t.forEach((a, o) => {
+      const s = this.stopLineMap.get(o);
+      if (!s)
         return;
-      const a = this.countdownPanelProps.find(
-        (o) => o.roadId === t
+      const i = this.countdownPanelProps.find(
+        (r) => r.roadId === o
       );
-      if (a)
-        a.lampStatus = i, a.flash = l;
+      if (i)
+        i.lampStatus = a, i.flash = n;
       else {
-        let o = new d({
-          x: n.panelPoint[0],
-          y: n.panelPoint[1]
+        let r = new u({
+          x: s.panelPoint[0],
+          y: s.panelPoint[1]
         });
-        this.view.spatialReference.isWebMercator && (o = u.geographicToWebMercator(
-          o
+        this.view.spatialReference.isWebMercator && (r = g.geographicToWebMercator(
+          r
         ));
-        const r = this.view.toScreen(o), c = this.getPanelRotation(n.coord);
+        const l = this.view.toScreen(r), c = this.getPanelRotation(s.coord);
         this.countdownPanelProps.push({
           displayMode: "complex",
-          flash: l,
+          flash: n,
           crossId: e,
-          roadId: t,
-          mapPoint: n.panelPoint,
+          roadId: o,
+          mapPoint: s.panelPoint,
           // 定位点地理坐标
-          stopLine: n.coord,
+          stopLine: s.coord,
           // 关联的停止线坐标
-          position: { left: r.x, top: r.y },
+          position: { left: l.x, top: l.y },
           // 定位点屏幕坐标
           rotation: c,
           // 面板旋转角度
           scale: this.getPanelScale(),
-          lampStatus: i
+          lampStatus: a
           // 灯组状态
         });
       }
@@ -256,7 +303,7 @@ class M extends P {
   }
   clearSignal() {
     var e;
-    this.stopLineLayer.removeAll(), this.countdownPanelProps.length = 0, (e = this.watchHandle) == null || e.remove(), this.watchHandle = null;
+    this.waitingAreaLayer.removeAll(), this.countdownPanelProps.length = 0, (e = this.watchHandle) == null || e.remove(), this.watchHandle = null;
   }
   /**
    * 从停止线坐标计算面板旋转角度
@@ -264,26 +311,26 @@ class M extends P {
    * @returns
    */
   getPanelRotation(e) {
-    const s = e[0];
-    let l = new d({
-      x: s[0],
-      y: s[1]
-    });
-    this.view.spatialReference.isWebMercator && (l = u.geographicToWebMercator(
-      l
-    ));
-    const i = this.view.toScreen(l), t = e[e.length - 1];
-    let n = new d({
+    const t = e[0];
+    let n = new u({
       x: t[0],
       y: t[1]
     });
-    this.view.spatialReference.isWebMercator && (n = u.geographicToWebMercator(
+    this.view.spatialReference.isWebMercator && (n = g.geographicToWebMercator(
       n
     ));
-    const a = this.view.toScreen(n), o = a.x - i.x, r = a.y - i.y;
-    return Math.atan2(r, o) * (180 / Math.PI);
+    const a = this.view.toScreen(n), o = e[e.length - 1];
+    let s = new u({
+      x: o[0],
+      y: o[1]
+    });
+    this.view.spatialReference.isWebMercator && (s = g.geographicToWebMercator(
+      s
+    ));
+    const i = this.view.toScreen(s), r = i.x - a.x, l = i.y - a.y;
+    return Math.atan2(l, r) * (180 / Math.PI);
   }
 }
 export {
-  M as default
+  v as default
 };

package/es/src/gis-map/utils/map-initializer.mjs

@@ -1,24 +1,25 @@
-import C from "@arcgis/core/Basemap";
-import d from "@arcgis/core/config";
-import * as k from "@arcgis/core/core/reactiveUtils";
-import { Multipoint as L, Polygon as W, Polyline as z, Point as T } from "@arcgis/core/geometry";
-import * as w from "@arcgis/core/geometry/support/webMercatorUtils";
+import k from "@arcgis/core/Basemap";
+import u from "@arcgis/core/config";
+import * as T from "@arcgis/core/core/reactiveUtils";
+import { Multipoint as P, Polygon as W, Polyline as z, Point as C } from "@arcgis/core/geometry";
+import * as g from "@arcgis/core/geometry/support/webMercatorUtils";
 import x from "@arcgis/core/layers/FeatureLayer";
 import I from "@arcgis/core/layers/GeoJSONLayer";
-import R from "@arcgis/core/layers/IntegratedMesh3DTilesLayer";
+import R from "@arcgis/core/layers/GroupLayer";
+import G from "@arcgis/core/layers/IntegratedMesh3DTilesLayer";
 import H from "@arcgis/core/layers/MapImageLayer";
-import G from "@arcgis/core/layers/TileLayer";
+import B from "@arcgis/core/layers/TileLayer";
 import O from "@arcgis/core/layers/WebTileLayer";
 import S from "@arcgis/core/Map";
-import B from "@arcgis/core/views/MapView";
-import N from "@arcgis/core/views/SceneView";
-import E from "@turf/destination";
-import * as A from "@turf/helpers";
-import J from "./custom-layer/custom-wmts-layer.mjs";
-function P(h, e) {
-  return h && (h.startsWith("http://") || h.startsWith("https://") ? h : e + h);
+import N from "@arcgis/core/views/MapView";
+import E from "@arcgis/core/views/SceneView";
+import A from "@turf/destination";
+import * as J from "@turf/helpers";
+import K from "./custom-layer/custom-wmts-layer.mjs";
+function L(l, e) {
+  return l && (l.startsWith("http://") || l.startsWith("https://") ? l : e + l);
 }
-class te {
+class oe {
   constructor() {
     this.mapConfig = {}, this.watchHandleMap = /* @__PURE__ */ new Map(), this.handleIndex = 0, this.zoomWatchHandle = null;
   }
@@ -28,19 +29,19 @@ class te {
    * @returns view
    */
   async initialize(e) {
-    var p, u, b, y;
+    var f, b, v, y;
     this.mapConfig = e.mapConfig;
-    const { container: i, markerClickCallback: o, mapClickCallback: r } = e;
-    d.assetsPath = `${this.mapConfig.assetsRoot}/ArcgisAssets`, d.fontsUrl = `${this.mapConfig.assetsRoot}/fonts`, d.apiKey = "AAPKf5a3e1044d7a4faeb3b1ec7060f5c68equIrP2KbRyL-t_b40Kk4GTWUQ1BFCyttvyQPQnWpFmBd7kp9gkrVihjfmcKBwxjW";
-    const s = new S();
-    if (((p = this.mapConfig) == null ? void 0 : p.mapOptions.mode.toLowerCase()) === "2d" ? (this.view = new B({
-      map: s,
+    const { container: i, markerClickCallback: o, mapClickCallback: a } = e;
+    u.assetsPath = `${this.mapConfig.assetsRoot}/ArcgisAssets`, u.fontsUrl = `${this.mapConfig.assetsRoot}/fonts`, u.apiKey = "AAPKf5a3e1044d7a4faeb3b1ec7060f5c68equIrP2KbRyL-t_b40Kk4GTWUQ1BFCyttvyQPQnWpFmBd7kp9gkrVihjfmcKBwxjW";
+    const r = new S();
+    if (((f = this.mapConfig) == null ? void 0 : f.mapOptions.mode.toLowerCase()) === "2d" ? (this.view = new N({
+      map: r,
       container: i,
       ...this.mapConfig.mapOptions
     }), this.view.on("drag", (t) => {
       t.button === 2 && t.stopPropagation();
-    })) : this.view = new N({
-      map: s,
+    })) : this.view = new E({
+      map: r,
       container: i,
       environment: {
         atmosphereEnabled: !0,
@@ -48,7 +49,7 @@ class te {
           type: "virtual"
         }
       },
-      ...(u = this.mapConfig) == null ? void 0 : u.mapOptions
+      ...(b = this.mapConfig) == null ? void 0 : b.mapOptions
     }), this.view.popup.visibleElements = {
       closeButton: !0,
       collapseButton: !1,
@@ -58,109 +59,118 @@ class te {
       buttonEnabled: !1,
       breakpoint: !1
     }, this.view.on("click", async (t) => {
-      var v, M;
-      if (r) {
-        let a = t.mapPoint;
-        a.spatialReference.isWebMercator && (a = w.webMercatorToGeographic(
-          a
-        )), r(
-          [a.x, a.y],
+      var h, M;
+      if (a) {
+        let s = t.mapPoint;
+        s.spatialReference.isWebMercator && (s = g.webMercatorToGeographic(
+          s
+        )), a(
+          [s.x, s.y],
           [t.screenPoint.x, t.screenPoint.y],
           t
         );
       }
       if (this.view.type === "3d") {
-        const a = this.view.camera;
+        const s = this.view.camera;
         if (this.view.spatialReference.isWebMercator) {
-          const m = w.webMercatorToGeographic(
-            a.position
-          ), f = {
-            heading: a.heading,
-            tilt: a.tilt,
+          const m = g.webMercatorToGeographic(
+            s.position
+          ), w = {
+            heading: s.heading,
+            tilt: s.tilt,
             position: m.toJSON()
           };
-          console.log(f), (v = navigator.clipboard) == null || v.writeText(JSON.stringify(f));
+          console.log(w), (h = navigator.clipboard) == null || h.writeText(JSON.stringify(w));
         } else
-          console.log(a.toJSON());
+          console.log(s.toJSON());
         console.log(this.view.zoom, this.view.scale);
       } else {
-        let a = this.view.center;
-        this.view.spatialReference.isWebMercator && (a = w.webMercatorToGeographic(
-          a
+        let s = this.view.center;
+        this.view.spatialReference.isWebMercator && (s = g.webMercatorToGeographic(
+          s
         )), console.log({
-          center: a.toJSON(),
+          center: s.toJSON(),
           zoom: this.view.zoom,
           scale: this.view.scale
         });
       }
       const n = (M = (await this.view.hitTest(t)).results) == null ? void 0 : M.filter(
-        (a) => a.type === "graphic"
+        (s) => s.type === "graphic"
       );
-      n.length > 0 && n.forEach((a) => {
-        var f;
-        const m = a.graphic;
-        (f = m.attributes) != null && f.type && o && o(
+      n.length > 0 && n.forEach((s) => {
+        var w;
+        const m = s.graphic;
+        (w = m.attributes) != null && w.type && o && o(
           m.attributes.type,
           m.attributes.id,
           m.attributes,
           t
         );
       });
-    }), (b = this.mapConfig) != null && b.baseLayers ? this.mapConfig.baseLayers.forEach((t) => {
-      const c = P(t.url, this.mapConfig.assetsRoot);
+    }), (v = this.mapConfig) != null && v.baseLayers ? this.mapConfig.baseLayers.forEach((t) => {
+      const c = L(t.url, this.mapConfig.assetsRoot);
+      let n = null;
       switch (t.type.toLowerCase()) {
         case "webTile".toLowerCase(): {
-          const n = new O({
+          n = new O({
             urlTemplate: c,
             ...t.options
           });
-          s.add(n);
           break;
         }
         case "tile": {
-          const n = new G({
+          n = new B({
             url: c,
             ...t.options
           });
-          s.add(n);
           break;
         }
         case "customWMTS".toLowerCase(): {
-          const n = new J({
+          n = new K({
             urlTemplate: c,
             ...t.options
           });
-          s.add(n);
           break;
         }
         case "mapImage".toLowerCase(): {
-          const n = new H({
+          n = new H({
             url: c,
             ...t.options
           });
-          s.add(n);
           break;
         }
         case "arcgis": {
-          const n = new C(t.options);
-          s.basemap = n;
+          const h = new k(t.options);
+          r.basemap = h;
           break;
         }
         case "feature": {
-          const n = new x({ url: c, ...t.options });
-          s.add(n);
+          n = new x({ url: c, ...t.options });
           break;
         }
         case "3dtiles": {
-          const n = new R({
+          n = new G({
             url: c,
             ...t.options
           });
-          s.add(n);
           break;
         }
+        default:
+          console.warn(`不支持的图层类型: ${t.type}`);
+          break;
       }
-    }) : s.basemap = new C({
+      if (n)
+        if (t.group) {
+          let h = r.findLayerById(t.group);
+          console.log(h), h && h.type === "group" ? h.add(n) : (h = new R({
+            id: t.group,
+            title: t.groupTitle,
+            visibilityMode: "inherited",
+            layers: [n]
+          }), r.add(h));
+        } else
+          r.add(n);
+    }) : r.basemap = new k({
       style: {
         id: "arcgis/light-gray",
         language: "zh-CN"
@@ -170,37 +180,37 @@ class te {
         (c) => (
           // 图层文件为GeoJson格式, renderer和symbol使用autocast配置
           new I({
-            url: P(c.url, this.mapConfig.assetsRoot),
+            url: L(c.url, this.mapConfig.assetsRoot),
             ...c.options,
             title: c.options.id
           })
         )
       );
-      s.addMany(t);
+      r.addMany(t);
     }
     this.view.ui.remove("attribution"), await this.view.when();
-    const g = this.mapConfig.camera;
-    let l;
+    const d = this.mapConfig.camera;
+    let p;
     if (this.view.type === "2d") {
       let t = this.view.center;
-      this.view.spatialReference.isWebMercator && (t = w.webMercatorToGeographic(
+      this.view.spatialReference.isWebMercator && (t = g.webMercatorToGeographic(
         t
-      )), l = { center: [t.x, t.y], zoom: this.view.zoom };
+      )), p = { center: [t.x, t.y], zoom: this.view.zoom };
     } else {
       let t = this.view.camera.position;
-      this.view.spatialReference.isWebMercator && (t = w.webMercatorToGeographic(
+      this.view.spatialReference.isWebMercator && (t = g.webMercatorToGeographic(
         t
-      )), l = {
+      )), p = {
         position: t,
         heading: this.view.camera.heading,
         tilt: this.view.camera.tilt
       };
     }
-    return g ? g.home = l : this.mapConfig.camera = { home: l }, this.view;
+    return d ? d.home = p : this.mapConfig.camera = { home: p }, this.view;
   }
   setLayerVisibility(e) {
-    const { id: i, visible: o } = e, r = this.view.map.findLayerById(i);
-    return r ? (r.visible = o, { status: 0, message: "ok" }) : { status: -1, message: "未找到图层" };
+    const { id: i, visible: o } = e, a = this.view.map.findLayerById(i);
+    return a ? (a.visible = o, { status: 0, message: "ok" }) : { status: -1, message: "未找到图层" };
   }
   /**
    * 设置地图中心点
@@ -214,7 +224,7 @@ class te {
     if (e.center || e.target) {
       switch ((i = e.target) == null ? void 0 : i.type.toLowerCase()) {
         case "point":
-          e.target = new T(e.target);
+          e.target = new C(e.target);
           break;
         case "polyline":
           e.target = new z(e.target);
@@ -223,7 +233,7 @@ class te {
           e.target = new W(e.target);
           break;
         case "multipoint":
-          e.target = new L(e.target);
+          e.target = new P(e.target);
           break;
       }
       await this.view.goTo(e, { duration: (e.duration || 0) * 1e3 });
@@ -251,9 +261,9 @@ class te {
         { duration: (e.duration || 2) * 1e3 }
       );
     else {
-      const r = Math.tan(i * Math.PI / 180) * e.height, s = E(
-        A.point(e.center),
-        r,
+      const a = Math.tan(i * Math.PI / 180) * e.height, r = A(
+        J.point(e.center),
+        a,
         o + 180,
         {
           units: "meters"
@@ -262,8 +272,8 @@ class te {
       await this.view.goTo(
         {
           position: {
-            x: s.geometry.coordinates[0],
-            y: s.geometry.coordinates[1],
+            x: r.geometry.coordinates[0],
+            y: r.geometry.coordinates[1],
             z: e.height
           },
           heading: o,
@@ -276,33 +286,33 @@ class te {
   async setMapCamera(e) {
     if (!this.view)
       return { status: -1, message: "未初始化" };
-    const { name: i, duration: o = 0 } = e, { camera: r } = this.mapConfig;
-    if (!r)
+    const { name: i, duration: o = 0 } = e, { camera: a } = this.mapConfig;
+    if (!a)
       return { status: -1, message: "未配置camera" };
-    const s = r[i];
-    return s ? (await this.view.goTo(s, { duration: o * 1e3 }), { status: 0, message: "成功" }) : { status: -1, message: "未配置camera" };
+    const r = a[i];
+    return r ? (await this.view.goTo(r, { duration: o * 1e3 }), { status: 0, message: "成功" }) : { status: -1, message: "未配置camera" };
   }
   /**
    * 经纬度转像素坐标，在地图移动时回调
    * */
   requestCoordinateTransform(e, i) {
     let o = 0;
-    const s = 1e3 / 30, g = k.watch(
+    const r = 1e3 / 30, d = T.watch(
       () => this.view.center,
       () => {
-        const l = this.transformPoints(e), p = Date.now();
-        p - o > s && (i(l), o = p);
+        const p = this.transformPoints(e), f = Date.now();
+        f - o > r && (i(p), o = f);
       }
     );
-    return this.handleIndex++, this.watchHandleMap.set(this.handleIndex, g), { handle: this.handleIndex, points: this.transformPoints(e) };
+    return this.handleIndex++, this.watchHandleMap.set(this.handleIndex, d), { handle: this.handleIndex, points: this.transformPoints(e) };
   }
   transformPoints(e) {
     return e.map((i) => {
-      const o = new T({
+      const o = new C({
         x: i[0],
         y: i[1]
-      }), r = this.view.toScreen(o);
-      return [r.x, r.y];
+      }), a = this.view.toScreen(o);
+      return [a.x, a.y];
     });
   }
   /**
@@ -317,14 +327,14 @@ class te {
    * */
   setMapZoomRange(e) {
     const { min: i, max: o } = e;
-    !i && !o || (this.zoomWatchHandle && this.zoomWatchHandle.remove(), this.zoomWatchHandle = k.watch(
+    !i && !o || (this.zoomWatchHandle && this.zoomWatchHandle.remove(), this.zoomWatchHandle = T.watch(
       () => this.view.zoom,
-      (r) => {
-        i && r <= i && (this.view.zoom = i), o && r >= o && (this.view.zoom = o);
+      (a) => {
+        i && a <= i && (this.view.zoom = i), o && a >= o && (this.view.zoom = o);
       }
     ));
   }
 }
 export {
-  te as default
+  oe as default
 };

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

@@ -1,7 +1,7 @@
 import { IResult, ISignalCountdownProps } from '../../../types';
 import SignalHoloFlow from './signal-holo-flow';
 export default class LSRSignalHoloFlow extends SignalHoloFlow {
-    private stopLineLayer;
+    private waitingAreaLayer;
     private watchHandle;
     private countdownPanelProps;
     private currentPanelScale;
@@ -9,6 +9,7 @@ export default class LSRSignalHoloFlow extends SignalHoloFlow {
     private trajectoryDelayTime;
     /** 按照路口id->进口道路段id->停止线坐标保存的停止线 */
     private stopLineMap;
+    private waitingAreaMap;
     /** 信号机id->进口道id->灯组id */
     private lampGroupMap;
     constructor(view: __esri.MapView | __esri.SceneView, countdownPanelInfos: ISignalCountdownProps[]);
@@ -35,6 +36,8 @@ export default class LSRSignalHoloFlow extends SignalHoloFlow {
      */
     private updatePanelPosition;
     private doHoloSignalData;
+    private updateWaitingArea;
+    private getColor;
     private updateLampGroupPanelStatus;
     /**
      * 处理全息流信号灯数据

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

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const y=require("@arcgis/core/core/reactiveUtils"),d=require("@arcgis/core/geometry"),S=require("@arcgis/core/geometry/support/webMercatorUtils.js"),b=require("@arcgis/core/layers/GraphicsLayer"),L=require("./signal-holo-flow.js");function P(u){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(u){for(const t in u)if(t!=="default"){const l=Object.getOwnPropertyDescriptor(u,t);Object.defineProperty(e,t,l.get?l:{enumerable:!0,get:()=>u[t]})}}return e.default=u,Object.freeze(e)}const w=P(y),m=P(S);class M extends L.default{constructor(e,t){var l,i;super(e),this.stopLineLayer=new b,this.watchHandle=null,this.trajectoryDelayTime=2,this.stopLineMap=new Map,this.lampGroupMap=new Map,this.countdownPanelProps=t,this.view.map.add(this.stopLineLayer),this.trajectoryDelayTime=(i=(l=this.mapConfig.holoFlow)==null?void 0:l.signal)==null?void 0:i.delay,this.trajectoryDelayTime===void 0&&(this.trajectoryDelayTime=2)}async initializeLayer(){var i,o;if(this.stopLineMap.size>0)return;console.time("初始化停止线图层");let e=(o=(i=this.mapConfig.holoFlow)==null?void 0:i.signal)==null?void 0:o.stopLineLayer;if(!e)return;e=this.mapConfig.assetsRoot+"/"+e;const l=await(await fetch(e)).json();for(const n of l.features){const{roadId:s}=n.properties;let{destinationPoint:a}=n.properties;const{coordinates:r}=n.geometry;if(a){if(typeof a=="string")try{a=JSON.parse(a)}catch(c){console.error("解析面板基准点失败",c);continue}}else{const c=r[0],h=r[r.length-1],p=(c[0]+h[0])/2,f=(c[1]+h[1])/2;a=[p,f]}this.stopLineMap.set(s,{coord:r,panelPoint:a})}console.timeEnd("初始化停止线图层")}initializeLampGroup(e){const{sigId:t,lampGroupList:l}=e,i=[];l.forEach(o=>{const{lampGroupNo:n,lampGroupType:s,crossFlowList:a,pedList:r}=o;if(a.length>0)for(const c of a){if(s===81)continue;const h=c.upSectionId;let p="s";switch(c.turn){case 1:p="s";break;case 2:p="l";break;case 4:p="r";break;case 8:p="u";break}i.push({lampGroupId:n,roadId:h,dir:p})}r.length>0}),this.lampGroupMap.set(t,i)}handleUniSignalData(e){this.watchHandle||(this.watchHandle=w.watch(()=>this.view.extent,()=>this.updatePanelPosition()));const{sigId:t,runningStatus:l}=e.data.basicInfo,i=this.lampGroupMap.get(t);if(!i)return{status:-1,message:"灯组未初始化"};const o=new Map;let n=!1;switch(String(l)){case"4":{n=!0,i.forEach(s=>{const{roadId:a,dir:r}=s;o.set(a,{...o.get(a)||{},[`${r}Number`]:"",[`${r}Color`]:"yellow"})});break}case"5":{i.forEach(s=>{const{roadId:a,dir:r}=s;o.set(a,{...o.get(a)||{},[`${r}Number`]:"",[`${r}Color`]:"red"})});break}case"6":case"9":{i.forEach(s=>{const{roadId:a,dir:r}=s;o.set(a,{...o.get(a)||{},[`${r}Number`]:"",[`${r}Color`]:"off"})});break}default:{const{curSigColorInfo:s}=e.data;s.forEach(a=>{const r=String(a.lamgroupId),{color:c,leftTime:h}=a,p=i.find(f=>f.lampGroupId===r);if(p){const{roadId:f,dir:g}=p;o.set(f,{...o.get(f)||{},[`${g}Number`]:h,[`${g}Color`]:c===1?"red":c===2?"yellow":"green"})}})}}return this.updateLampGroupPanelStatus(t,o,n),{status:0,message:"ok"}}getPanelScale(){const e=this.view.scale;let t=1;return e<500?t=1.2:e<1e3?t=1:e<2e3?t=.8:e<4e3?t=.4:t=0,t}updatePanelPosition(){const e=this.getPanelScale();for(const t of this.countdownPanelProps){e!==this.currentPanelScale&&(t.scale=e);const{mapPoint:l}=t;let i=new d.Point({x:l[0],y:l[1]});this.view.spatialReference.isWebMercator&&(i=m.geographicToWebMercator(i));const o=this.view.toScreen(i);if(t.position.left=o.x,t.position.top=o.y,this.view.type==="3d"){const n=this.getPanelRotation(t.stopLine);t.rotation=n}}this.currentPanelScale=e}doHoloSignalData(e){const t=e.crossId,l=e.phaseCountDownList,i=new Map;for(const o of l){let n="";for(let c of o.roadIdList)if(c.startsWith("-")&&(c=c.slice(1)),this.stopLineMap.has(c)){n=c;break}if(!n){console.log(`没有找到对应的进口道${t}--${n}`);continue}let s=i.get(n);if(s||(s={},i.set(n,s)),!o.direction)continue;const a=o.direction.toLowerCase(),r=o.color===1?"red":o.color===2?"yellow":"green";a==="u"?(s.uNumber=o.leftTime,s.uColor=r):a==="l"?(s.lNumber=o.leftTime,s.lColor=r):a==="s"?(s.sNumber=o.leftTime,s.sColor=r):a==="r"&&(s.rNumber=o.leftTime,s.rColor=r)}this.updateLampGroupPanelStatus(t,i)}updateLampGroupPanelStatus(e,t,l=!1){t.forEach((i,o)=>{const n=this.stopLineMap.get(o);if(!n)return;const s=this.countdownPanelProps.find(a=>a.roadId===o);if(s)s.lampStatus=i,s.flash=l;else{let a=new d.Point({x:n.panelPoint[0],y:n.panelPoint[1]});this.view.spatialReference.isWebMercator&&(a=m.geographicToWebMercator(a));const r=this.view.toScreen(a),c=this.getPanelRotation(n.coord);this.countdownPanelProps.push({displayMode:"complex",flash:l,crossId:e,roadId:o,mapPoint:n.panelPoint,stopLine:n.coord,position:{left:r.x,top:r.y},rotation:c,scale:this.getPanelScale(),lampStatus:i})}})}async handleHoloSignalData(e){this.watchHandle||(this.watchHandle=w.watch(()=>this.view.extent,()=>this.updatePanelPosition())),this.trajectoryDelayTime===0?this.doHoloSignalData(e):setTimeout(()=>this.doHoloSignalData(e),this.trajectoryDelayTime*1e3)}clearSignal(){var e;this.stopLineLayer.removeAll(),this.countdownPanelProps.length=0,(e=this.watchHandle)==null||e.remove(),this.watchHandle=null}getPanelRotation(e){const t=e[0];let l=new d.Point({x:t[0],y:t[1]});this.view.spatialReference.isWebMercator&&(l=m.geographicToWebMercator(l));const i=this.view.toScreen(l),o=e[e.length-1];let n=new d.Point({x:o[0],y:o[1]});this.view.spatialReference.isWebMercator&&(n=m.geographicToWebMercator(n));const s=this.view.toScreen(n),a=s.x-i.x,r=s.y-i.y;return Math.atan2(r,a)*(180/Math.PI)}}exports.default=M;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const M=require("@arcgis/core/core/reactiveUtils"),g=require("@arcgis/core/geometry"),S=require("@arcgis/core/geometry/support/webMercatorUtils.js"),C=require("@arcgis/core/Graphic"),I=require("@arcgis/core/layers/GraphicsLayer"),v=require("./signal-holo-flow.js");function P(d){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(d){for(const t in d)if(t!=="default"){const a=Object.getOwnPropertyDescriptor(d,t);Object.defineProperty(e,t,a.get?a:{enumerable:!0,get:()=>d[t]})}}return e.default=d,Object.freeze(e)}const y=P(M),w=P(S);class G extends v.default{constructor(e,t){var a,s;super(e),this.waitingAreaLayer=new I,this.watchHandle=null,this.trajectoryDelayTime=2,this.stopLineMap=new Map,this.waitingAreaMap=new Map,this.lampGroupMap=new Map,this.countdownPanelProps=t,this.view.map.add(this.waitingAreaLayer),this.trajectoryDelayTime=(s=(a=this.mapConfig.holoFlow)==null?void 0:a.signal)==null?void 0:s.delay,this.trajectoryDelayTime===void 0&&(this.trajectoryDelayTime=2)}async initializeLayer(){var s,o,n,i,r;if(this.stopLineMap.size>0)return;console.time("初始化停止线图层");let e=(o=(s=this.mapConfig.holoFlow)==null?void 0:s.signal)==null?void 0:o.stopLineLayer;if(!e)return;e=this.mapConfig.assetsRoot+"/"+e;let t=await fetch(e),a=await t.json();for(const l of a.features){const{roadId:c,nodeId:u}=l.properties;let{destinationPoint:p}=l.properties;const{coordinates:h}=l.geometry;if(p){if(typeof p=="string")try{p=JSON.parse(p)}catch(f){console.error("解析面板基准点失败",f);continue}}else{const f=h[0],m=h[h.length-1],b=(f[0]+m[0])/2,L=(f[1]+m[1])/2;p=[b,L]}this.stopLineMap.set(`${u}_${c}`,{coord:h,panelPoint:p})}if(console.timeEnd("初始化停止线图层"),console.time("初始化待行区图层"),e=(i=(n=this.mapConfig.holoFlow)==null?void 0:n.signal)==null?void 0:i.waitingAreaLayer,!!e){e=this.mapConfig.assetsRoot+"/"+e,t=await fetch(e),a=await t.json();for(const l of a.features){const{roadId:c,direction:u,nodeId:p}=l.properties,{coordinates:h}=l.geometry,f=`${p}_${c}`;this.waitingAreaMap.has(f)||this.waitingAreaMap.set(f,[]),(r=this.waitingAreaMap.get(f))==null||r.push({coord:h,direction:u})}console.timeEnd("初始化待行区图层")}}initializeLampGroup(e){const{sigId:t,lampGroupList:a}=e,s=[];a.forEach(o=>{const{lampGroupNo:n,lampGroupType:i,crossFlowList:r,pedList:l}=o;if(r.length>0)for(const c of r){if(i===81)continue;const u=c.upSectionId;let p="s";switch(c.turn){case 1:p="s";break;case 2:p="l";break;case 4:p="r";break;case 8:p="u";break}s.push({lampGroupId:n,roadId:u,dir:p})}l.length>0}),this.lampGroupMap.set(t,s)}handleUniSignalData(e){this.watchHandle||(this.watchHandle=y.watch(()=>this.view.extent,()=>this.updatePanelPosition()));const{sigId:t,runningStatus:a}=e.data.basicInfo,s=this.lampGroupMap.get(t);if(!s)return{status:-1,message:"灯组未初始化"};const o=new Map;let n=!1;switch(String(a)){case"4":{n=!0,s.forEach(i=>{const{roadId:r,dir:l}=i;o.set(r,{...o.get(r)||{},[`${l}Number`]:"",[`${l}Color`]:"yellow"})});break}case"5":{s.forEach(i=>{const{roadId:r,dir:l}=i;o.set(r,{...o.get(r)||{},[`${l}Number`]:"",[`${l}Color`]:"red"})});break}case"6":case"9":{s.forEach(i=>{const{roadId:r,dir:l}=i;o.set(r,{...o.get(r)||{},[`${l}Number`]:"",[`${l}Color`]:"off"})});break}default:{const{curSigColorInfo:i}=e.data;i.forEach(r=>{const l=String(r.lamgroupId),{color:c,leftTime:u}=r,p=s.find(h=>h.lampGroupId===l);if(p){const{roadId:h,dir:f}=p;o.set(h,{...o.get(h)||{},[`${f}Number`]:u,[`${f}Color`]:c===1?"red":c===2?"yellow":"green"})}})}}return this.updateLampGroupPanelStatus(t,o,n),{status:0,message:"ok"}}getPanelScale(){const e=this.view.scale;let t=1;return e<500?t=1.2:e<1e3?t=1:e<2e3?t=.8:e<4e3?t=.4:t=0,t}updatePanelPosition(){const e=this.getPanelScale();for(const t of this.countdownPanelProps){e!==this.currentPanelScale&&(t.scale=e);const{mapPoint:a}=t;let s=new g.Point({x:a[0],y:a[1]});this.view.spatialReference.isWebMercator&&(s=w.geographicToWebMercator(s));const o=this.view.toScreen(s);if(t.position.left=o.x,t.position.top=o.y,this.view.type==="3d"){const n=this.getPanelRotation(t.stopLine);t.rotation=n}}this.currentPanelScale=e}doHoloSignalData(e){const t=e.crossId,a=e.phaseCountDownList,s=new Map;for(const o of a){let n="";for(let c of o.roadIdList)if(c.startsWith("-")&&(c=c.slice(1)),this.stopLineMap.has(`${t}_${c}`)){n=`${t}_${c}`;break}if(!n){console.log(`没有找到对应的进口道${t}--${n}`);continue}let i=s.get(n);if(i||(i={},s.set(n,i)),!o.direction)continue;const r=o.direction.toLowerCase(),l=o.color===1?"red":o.color===2?"yellow":"green";r==="u"?(i.uNumber=o.leftTime,i.uColor=l):r==="l"?(i.lNumber=o.leftTime,i.lColor=l):r==="s"?(i.sNumber=o.leftTime,i.sColor=l):r==="r"&&(i.rNumber=o.leftTime,i.rColor=l)}this.updateLampGroupPanelStatus(t,s),this.updateWaitingArea(t,s)}updateWaitingArea(e,t){t.forEach((a,s)=>{var o;if(a.lColor){let n=this.waitingAreaLayer.graphics.find(i=>i.attributes.roadId===s&&i.attributes.direction==="l");if(n)n.attributes.color!==a.lColor&&(n.attributes.color=a.lColor,n.symbol={type:"simple-fill",color:this.getColor(a.lColor),outline:{color:this.getColor(a.lColor)}});else{const i=(o=this.waitingAreaMap.get(s))==null?void 0:o.find(r=>r.direction==="l");i&&(n=new C({geometry:{type:"polygon",rings:i.coord},attributes:{roadId:s,direction:"l",color:a.lColor},symbol:{type:"simple-fill",color:this.getColor(a.lColor),outline:{color:this.getColor(a.lColor)}}}),this.waitingAreaLayer.add(n))}}})}getColor(e){return e==="green"?[0,255,0,.8]:e==="yellow"?[255,192,2,.8]:[255,0,0,.8]}updateLampGroupPanelStatus(e,t,a=!1){t.forEach((s,o)=>{const n=this.stopLineMap.get(o);if(!n)return;const i=this.countdownPanelProps.find(r=>r.roadId===o);if(i)i.lampStatus=s,i.flash=a;else{let r=new g.Point({x:n.panelPoint[0],y:n.panelPoint[1]});this.view.spatialReference.isWebMercator&&(r=w.geographicToWebMercator(r));const l=this.view.toScreen(r),c=this.getPanelRotation(n.coord);this.countdownPanelProps.push({displayMode:"complex",flash:a,crossId:e,roadId:o,mapPoint:n.panelPoint,stopLine:n.coord,position:{left:l.x,top:l.y},rotation:c,scale:this.getPanelScale(),lampStatus:s})}})}async handleHoloSignalData(e){this.watchHandle||(this.watchHandle=y.watch(()=>this.view.extent,()=>this.updatePanelPosition())),this.trajectoryDelayTime===0?this.doHoloSignalData(e):setTimeout(()=>this.doHoloSignalData(e),this.trajectoryDelayTime*1e3)}clearSignal(){var e;this.waitingAreaLayer.removeAll(),this.countdownPanelProps.length=0,(e=this.watchHandle)==null||e.remove(),this.watchHandle=null}getPanelRotation(e){const t=e[0];let a=new g.Point({x:t[0],y:t[1]});this.view.spatialReference.isWebMercator&&(a=w.geographicToWebMercator(a));const s=this.view.toScreen(a),o=e[e.length-1];let n=new g.Point({x:o[0],y:o[1]});this.view.spatialReference.isWebMercator&&(n=w.geographicToWebMercator(n));const i=this.view.toScreen(n),r=i.x-s.x,l=i.y-s.y;return Math.atan2(l,r)*(180/Math.PI)}}exports.default=G;

package/lib/src/gis-map/utils/map-initializer.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const P=require("@arcgis/core/Basemap"),g=require("@arcgis/core/config"),q=require("@arcgis/core/core/reactiveUtils"),f=require("@arcgis/core/geometry"),z=require("@arcgis/core/geometry/support/webMercatorUtils"),W=require("@arcgis/core/layers/FeatureLayer"),O=require("@arcgis/core/layers/GeoJSONLayer"),x=require("@arcgis/core/layers/IntegratedMesh3DTilesLayer"),I=require("@arcgis/core/layers/MapImageLayer"),S=require("@arcgis/core/layers/TileLayer"),R=require("@arcgis/core/layers/WebTileLayer"),H=require("@arcgis/core/Map"),_=require("@arcgis/core/views/MapView"),G=require("@arcgis/core/views/SceneView"),j=require("@turf/destination"),B=require("@turf/helpers"),N=require("./custom-layer/custom-wmts-layer.js");function b(c){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(c){for(const t in c)if(t!=="default"){const s=Object.getOwnPropertyDescriptor(c,t);Object.defineProperty(e,t,s.get?s:{enumerable:!0,get:()=>c[t]})}}return e.default=c,Object.freeze(e)}const T=b(q),m=b(z),U=b(B);function L(c,e){return c&&(c.startsWith("http://")||c.startsWith("https://")?c:e+c)}class E{constructor(){this.mapConfig={},this.watchHandleMap=new Map,this.handleIndex=0,this.zoomWatchHandle=null}async initialize(e){var u,y,v,M;this.mapConfig=e.mapConfig;const{container:t,markerClickCallback:s,mapClickCallback:n}=e;g.assetsPath=`${this.mapConfig.assetsRoot}/ArcgisAssets`,g.fontsUrl=`${this.mapConfig.assetsRoot}/fonts`,g.apiKey="AAPKf5a3e1044d7a4faeb3b1ec7060f5c68equIrP2KbRyL-t_b40Kk4GTWUQ1BFCyttvyQPQnWpFmBd7kp9gkrVihjfmcKBwxjW";const a=new H;if(((u=this.mapConfig)==null?void 0:u.mapOptions.mode.toLowerCase())==="2d"?(this.view=new _({map:a,container:t,...this.mapConfig.mapOptions}),this.view.on("drag",i=>{i.button===2&&i.stopPropagation()})):this.view=new G({map:a,container:t,environment:{atmosphereEnabled:!0,lighting:{type:"virtual"}},...(y=this.mapConfig)==null?void 0:y.mapOptions}),this.view.popup.visibleElements={closeButton:!0,collapseButton:!1,actionBar:!1,featureNavigation:!0},this.view.popup.dockOptions={buttonEnabled:!1,breakpoint:!1},this.view.on("click",async i=>{var k,C;if(n){let o=i.mapPoint;o.spatialReference.isWebMercator&&(o=m.webMercatorToGeographic(o)),n([o.x,o.y],[i.screenPoint.x,i.screenPoint.y],i)}if(this.view.type==="3d"){const o=this.view.camera;if(this.view.spatialReference.isWebMercator){const p=m.webMercatorToGeographic(o.position),w={heading:o.heading,tilt:o.tilt,position:p.toJSON()};console.log(w),(k=navigator.clipboard)==null||k.writeText(JSON.stringify(w))}else console.log(o.toJSON());console.log(this.view.zoom,this.view.scale)}else{let o=this.view.center;this.view.spatialReference.isWebMercator&&(o=m.webMercatorToGeographic(o)),console.log({center:o.toJSON(),zoom:this.view.zoom,scale:this.view.scale})}const r=(C=(await this.view.hitTest(i)).results)==null?void 0:C.filter(o=>o.type==="graphic");r.length>0&&r.forEach(o=>{var w;const p=o.graphic;(w=p.attributes)!=null&&w.type&&s&&s(p.attributes.type,p.attributes.id,p.attributes,i)})}),(v=this.mapConfig)!=null&&v.baseLayers?this.mapConfig.baseLayers.forEach(i=>{const l=L(i.url,this.mapConfig.assetsRoot);switch(i.type.toLowerCase()){case"webTile".toLowerCase():{const r=new R({urlTemplate:l,...i.options});a.add(r);break}case"tile":{const r=new S({url:l,...i.options});a.add(r);break}case"customWMTS".toLowerCase():{const r=new N.default({urlTemplate:l,...i.options});a.add(r);break}case"mapImage".toLowerCase():{const r=new I({url:l,...i.options});a.add(r);break}case"arcgis":{const r=new P(i.options);a.basemap=r;break}case"feature":{const r=new W({url:l,...i.options});a.add(r);break}case"3dtiles":{const r=new x({url:l,...i.options});a.add(r);break}}}):a.basemap=new P({style:{id:"arcgis/light-gray",language:"zh-CN"}}),(M=this.mapConfig)!=null&&M.hdLayers){const i=this.mapConfig.hdLayers.map(l=>new O({url:L(l.url,this.mapConfig.assetsRoot),...l.options,title:l.options.id}));a.addMany(i)}this.view.ui.remove("attribution"),await this.view.when();const d=this.mapConfig.camera;let h;if(this.view.type==="2d"){let i=this.view.center;this.view.spatialReference.isWebMercator&&(i=m.webMercatorToGeographic(i)),h={center:[i.x,i.y],zoom:this.view.zoom}}else{let i=this.view.camera.position;this.view.spatialReference.isWebMercator&&(i=m.webMercatorToGeographic(i)),h={position:i,heading:this.view.camera.heading,tilt:this.view.camera.tilt}}return d?d.home=h:this.mapConfig.camera={home:h},this.view}setLayerVisibility(e){const{id:t,visible:s}=e,n=this.view.map.findLayerById(t);return n?(n.visible=s,{status:0,message:"ok"}):{status:-1,message:"未找到图层"}}async setMapCenter(e){var t;if(!this.view)return{status:-1,message:"未初始化"};if(e.center||e.target){switch((t=e.target)==null?void 0:t.type.toLowerCase()){case"point":e.target=new f.Point(e.target);break;case"polyline":e.target=new f.Polyline(e.target);break;case"polygon":e.target=new f.Polygon(e.target);break;case"multipoint":e.target=new f.Multipoint(e.target);break}await this.view.goTo(e,{duration:(e.duration||0)*1e3})}return{status:0,message:"成功"}}async lookAt(e){if(this.view.type==="2d")return;const t=e.tilt||0,s=e.heading||0;if(t===0)await this.view.goTo({position:{x:e.center[0],y:e.center[1],z:e.height},heading:s,tilt:0},{duration:(e.duration||2)*1e3});else{const n=Math.tan(t*Math.PI/180)*e.height,a=j(U.point(e.center),n,s+180,{units:"meters"});await this.view.goTo({position:{x:a.geometry.coordinates[0],y:a.geometry.coordinates[1],z:e.height},heading:s,tilt:t},{duration:(e.duration||2)*1e3})}}async setMapCamera(e){if(!this.view)return{status:-1,message:"未初始化"};const{name:t,duration:s=0}=e,{camera:n}=this.mapConfig;if(!n)return{status:-1,message:"未配置camera"};const a=n[t];return a?(await this.view.goTo(a,{duration:s*1e3}),{status:0,message:"成功"}):{status:-1,message:"未配置camera"}}requestCoordinateTransform(e,t){let s=0;const a=1e3/30,d=T.watch(()=>this.view.center,()=>{const h=this.transformPoints(e),u=Date.now();u-s>a&&(t(h),s=u)});return this.handleIndex++,this.watchHandleMap.set(this.handleIndex,d),{handle:this.handleIndex,points:this.transformPoints(e)}}transformPoints(e){return e.map(t=>{const s=new f.Point({x:t[0],y:t[1]}),n=this.view.toScreen(s);return[n.x,n.y]})}cancelCoordinateTransform(e){const t=this.watchHandleMap.get(e);t&&(t.remove(),this.watchHandleMap.delete(e))}setMapZoomRange(e){const{min:t,max:s}=e;!t&&!s||(this.zoomWatchHandle&&this.zoomWatchHandle.remove(),this.zoomWatchHandle=T.watch(()=>this.view.zoom,n=>{t&&n<=t&&(this.view.zoom=t),s&&n>=s&&(this.view.zoom=s)}))}}exports.default=E;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const T=require("@arcgis/core/Basemap"),b=require("@arcgis/core/config"),q=require("@arcgis/core/core/reactiveUtils"),m=require("@arcgis/core/geometry"),z=require("@arcgis/core/geometry/support/webMercatorUtils"),W=require("@arcgis/core/layers/FeatureLayer"),O=require("@arcgis/core/layers/GeoJSONLayer"),I=require("@arcgis/core/layers/GroupLayer"),x=require("@arcgis/core/layers/IntegratedMesh3DTilesLayer"),S=require("@arcgis/core/layers/MapImageLayer"),R=require("@arcgis/core/layers/TileLayer"),G=require("@arcgis/core/layers/WebTileLayer"),H=require("@arcgis/core/Map"),_=require("@arcgis/core/views/MapView"),B=require("@arcgis/core/views/SceneView"),j=require("@turf/destination"),N=require("@turf/helpers"),U=require("./custom-layer/custom-wmts-layer.js");function v(r){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(r){for(const i in r)if(i!=="default"){const s=Object.getOwnPropertyDescriptor(r,i);Object.defineProperty(e,i,s.get?s:{enumerable:!0,get:()=>r[i]})}}return e.default=r,Object.freeze(e)}const L=v(q),g=v(z),E=v(N);function C(r,e){return r&&(r.startsWith("http://")||r.startsWith("https://")?r:e+r)}class A{constructor(){this.mapConfig={},this.watchHandleMap=new Map,this.handleIndex=0,this.zoomWatchHandle=null}async initialize(e){var w,y,M,k;this.mapConfig=e.mapConfig;const{container:i,markerClickCallback:s,mapClickCallback:a}=e;b.assetsPath=`${this.mapConfig.assetsRoot}/ArcgisAssets`,b.fontsUrl=`${this.mapConfig.assetsRoot}/fonts`,b.apiKey="AAPKf5a3e1044d7a4faeb3b1ec7060f5c68equIrP2KbRyL-t_b40Kk4GTWUQ1BFCyttvyQPQnWpFmBd7kp9gkrVihjfmcKBwxjW";const n=new H;if(((w=this.mapConfig)==null?void 0:w.mapOptions.mode.toLowerCase())==="2d"?(this.view=new _({map:n,container:i,...this.mapConfig.mapOptions}),this.view.on("drag",t=>{t.button===2&&t.stopPropagation()})):this.view=new B({map:n,container:i,environment:{atmosphereEnabled:!0,lighting:{type:"virtual"}},...(y=this.mapConfig)==null?void 0:y.mapOptions}),this.view.popup.visibleElements={closeButton:!0,collapseButton:!1,actionBar:!1,featureNavigation:!0},this.view.popup.dockOptions={buttonEnabled:!1,breakpoint:!1},this.view.on("click",async t=>{var h,P;if(a){let o=t.mapPoint;o.spatialReference.isWebMercator&&(o=g.webMercatorToGeographic(o)),a([o.x,o.y],[t.screenPoint.x,t.screenPoint.y],t)}if(this.view.type==="3d"){const o=this.view.camera;if(this.view.spatialReference.isWebMercator){const p=g.webMercatorToGeographic(o.position),f={heading:o.heading,tilt:o.tilt,position:p.toJSON()};console.log(f),(h=navigator.clipboard)==null||h.writeText(JSON.stringify(f))}else console.log(o.toJSON());console.log(this.view.zoom,this.view.scale)}else{let o=this.view.center;this.view.spatialReference.isWebMercator&&(o=g.webMercatorToGeographic(o)),console.log({center:o.toJSON(),zoom:this.view.zoom,scale:this.view.scale})}const c=(P=(await this.view.hitTest(t)).results)==null?void 0:P.filter(o=>o.type==="graphic");c.length>0&&c.forEach(o=>{var f;const p=o.graphic;(f=p.attributes)!=null&&f.type&&s&&s(p.attributes.type,p.attributes.id,p.attributes,t)})}),(M=this.mapConfig)!=null&&M.baseLayers?this.mapConfig.baseLayers.forEach(t=>{const l=C(t.url,this.mapConfig.assetsRoot);let c=null;switch(t.type.toLowerCase()){case"webTile".toLowerCase():{c=new G({urlTemplate:l,...t.options});break}case"tile":{c=new R({url:l,...t.options});break}case"customWMTS".toLowerCase():{c=new U.default({urlTemplate:l,...t.options});break}case"mapImage".toLowerCase():{c=new S({url:l,...t.options});break}case"arcgis":{const h=new T(t.options);n.basemap=h;break}case"feature":{c=new W({url:l,...t.options});break}case"3dtiles":{c=new x({url:l,...t.options});break}default:console.warn(`不支持的图层类型: ${t.type}`);break}if(c)if(t.group){let h=n.findLayerById(t.group);console.log(h),h&&h.type==="group"?h.add(c):(h=new I({id:t.group,title:t.groupTitle,visibilityMode:"inherited",layers:[c]}),n.add(h))}else n.add(c)}):n.basemap=new T({style:{id:"arcgis/light-gray",language:"zh-CN"}}),(k=this.mapConfig)!=null&&k.hdLayers){const t=this.mapConfig.hdLayers.map(l=>new O({url:C(l.url,this.mapConfig.assetsRoot),...l.options,title:l.options.id}));n.addMany(t)}this.view.ui.remove("attribution"),await this.view.when();const d=this.mapConfig.camera;let u;if(this.view.type==="2d"){let t=this.view.center;this.view.spatialReference.isWebMercator&&(t=g.webMercatorToGeographic(t)),u={center:[t.x,t.y],zoom:this.view.zoom}}else{let t=this.view.camera.position;this.view.spatialReference.isWebMercator&&(t=g.webMercatorToGeographic(t)),u={position:t,heading:this.view.camera.heading,tilt:this.view.camera.tilt}}return d?d.home=u:this.mapConfig.camera={home:u},this.view}setLayerVisibility(e){const{id:i,visible:s}=e,a=this.view.map.findLayerById(i);return a?(a.visible=s,{status:0,message:"ok"}):{status:-1,message:"未找到图层"}}async setMapCenter(e){var i;if(!this.view)return{status:-1,message:"未初始化"};if(e.center||e.target){switch((i=e.target)==null?void 0:i.type.toLowerCase()){case"point":e.target=new m.Point(e.target);break;case"polyline":e.target=new m.Polyline(e.target);break;case"polygon":e.target=new m.Polygon(e.target);break;case"multipoint":e.target=new m.Multipoint(e.target);break}await this.view.goTo(e,{duration:(e.duration||0)*1e3})}return{status:0,message:"成功"}}async lookAt(e){if(this.view.type==="2d")return;const i=e.tilt||0,s=e.heading||0;if(i===0)await this.view.goTo({position:{x:e.center[0],y:e.center[1],z:e.height},heading:s,tilt:0},{duration:(e.duration||2)*1e3});else{const a=Math.tan(i*Math.PI/180)*e.height,n=j(E.point(e.center),a,s+180,{units:"meters"});await this.view.goTo({position:{x:n.geometry.coordinates[0],y:n.geometry.coordinates[1],z:e.height},heading:s,tilt:i},{duration:(e.duration||2)*1e3})}}async setMapCamera(e){if(!this.view)return{status:-1,message:"未初始化"};const{name:i,duration:s=0}=e,{camera:a}=this.mapConfig;if(!a)return{status:-1,message:"未配置camera"};const n=a[i];return n?(await this.view.goTo(n,{duration:s*1e3}),{status:0,message:"成功"}):{status:-1,message:"未配置camera"}}requestCoordinateTransform(e,i){let s=0;const n=1e3/30,d=L.watch(()=>this.view.center,()=>{const u=this.transformPoints(e),w=Date.now();w-s>n&&(i(u),s=w)});return this.handleIndex++,this.watchHandleMap.set(this.handleIndex,d),{handle:this.handleIndex,points:this.transformPoints(e)}}transformPoints(e){return e.map(i=>{const s=new m.Point({x:i[0],y:i[1]}),a=this.view.toScreen(s);return[a.x,a.y]})}cancelCoordinateTransform(e){const i=this.watchHandleMap.get(e);i&&(i.remove(),this.watchHandleMap.delete(e))}setMapZoomRange(e){const{min:i,max:s}=e;!i&&!s||(this.zoomWatchHandle&&this.zoomWatchHandle.remove(),this.zoomWatchHandle=L.watch(()=>this.view.zoom,a=>{i&&a<=i&&(this.view.zoom=i),s&&a>=s&&(this.view.zoom=s)}))}}exports.default=A;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gisviewer-vue3-arcgis",
-  "version": "1.0.238",
+  "version": "1.0.240",
   "main": "lib/index.js",
   "module": "es/index.mjs",
   "files": [