gisviewer-vue3-arcgis 1.0.167 → 1.0.168

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

@@ -1,4 +1,4 @@
-import { defineComponent as C, computed as o, openBlock as l, createElementBlock as n, normalizeStyle as a, createElementVNode as t, toDisplayString as i, createCommentVNode as u } from "vue";
+import { defineComponent as C, computed as o, openBlock as l, createElementBlock as a, normalizeStyle as n, createElementVNode as s, toDisplayString as i, createCommentVNode as u } from "vue";
 const b = {
   key: 0,
   class: "signal-countdown-container"
@@ -19,32 +19,33 @@ const b = {
     roadId: {},
     mapPoint: {},
     stopLine: {},
+    scale: {},
     position: {},
     rotation: {},
     lampStatus: {}
   },
   setup(c) {
-    const s = c, m = o(() => ({
-      top: `${s.position.top}px`,
-      left: `${s.position.left}px`,
+    const t = c, m = o(() => ({
+      top: `${t.position.top}px`,
+      left: `${t.position.left}px`,
       "transform-origin": "bottom center",
-      transform: `translateX(-50%) translateY(-100%) rotate(${s.rotation}deg)`
+      transform: `translateX(-50%) translateY(-100%) rotate(${t.rotation}deg) scale(${t.scale})`
     })), p = o(
-      () => `/GisViewerAssets/Images/SignalLamp/u-${s.lampStatus.uColor}.png`
+      () => `/GisViewerAssets/Images/SignalLamp/u-${t.lampStatus.uColor}.png`
     ), d = o(() => ({
-      color: r(s.lampStatus.uColor)
+      color: r(t.lampStatus.uColor)
     })), g = o(
-      () => `/GisViewerAssets/Images/SignalLamp/l-${s.lampStatus.lColor}.png`
+      () => `/GisViewerAssets/Images/SignalLamp/l-${t.lampStatus.lColor}.png`
     ), S = o(() => ({
-      color: r(s.lampStatus.lColor)
+      color: r(t.lampStatus.lColor)
     })), h = o(
-      () => `/GisViewerAssets/Images/SignalLamp/s-${s.lampStatus.sColor}.png`
+      () => `/GisViewerAssets/Images/SignalLamp/s-${t.lampStatus.sColor}.png`
     ), v = o(() => ({
-      color: r(s.lampStatus.sColor)
+      color: r(t.lampStatus.sColor)
     })), w = o(
-      () => `/GisViewerAssets/Images/SignalLamp/r-${s.lampStatus.rColor}.png`
+      () => `/GisViewerAssets/Images/SignalLamp/r-${t.lampStatus.rColor}.png`
     ), y = o(() => ({
-      color: r(s.lampStatus.rColor)
+      color: r(t.lampStatus.rColor)
     })), r = (e) => {
       switch (e) {
         case "red":
@@ -57,56 +58,56 @@ const b = {
           return "white";
       }
     };
-    return (e, L) => (l(), n("div", {
+    return (e, L) => (l(), a("div", {
       class: "signal-countdown-panel",
-      style: a(m.value)
+      style: n(m.value)
     }, [
-      e.lampStatus.uColor ? (l(), n("div", b, [
-        t("div", {
+      e.lampStatus.uColor ? (l(), a("div", b, [
+        s("div", {
           class: "signal-countdown-number",
-          style: a(d.value)
+          style: n(d.value)
         }, i(e.lampStatus.uNumber), 5),
-        t("div", null, [
-          t("img", {
+        s("div", null, [
+          s("img", {
             src: p.value,
             width: "20px",
             height: "20px"
           }, null, 8, _)
         ])
       ])) : u("", !0),
-      e.lampStatus.lColor ? (l(), n("div", I, [
-        t("div", {
+      e.lampStatus.lColor ? (l(), a("div", I, [
+        s("div", {
           class: "signal-countdown-number",
-          style: a(S.value)
+          style: n(S.value)
         }, i(e.lampStatus.lNumber), 5),
-        t("div", null, [
-          t("img", {
+        s("div", null, [
+          s("img", {
             src: g.value,
             width: "20px",
             height: "20px"
           }, null, 8, N)
         ])
       ])) : u("", !0),
-      e.lampStatus.sColor ? (l(), n("div", f, [
-        t("div", {
+      e.lampStatus.sColor ? (l(), a("div", f, [
+        s("div", {
           class: "signal-countdown-number",
-          style: a(v.value)
+          style: n(v.value)
         }, i(e.lampStatus.sNumber), 5),
-        t("div", null, [
-          t("img", {
+        s("div", null, [
+          s("img", {
             src: h.value,
             width: "20px",
             height: "20px"
           }, null, 8, $)
         ])
       ])) : u("", !0),
-      e.lampStatus.rColor !== void 0 ? (l(), n("div", k, [
-        t("div", {
+      e.lampStatus.rColor !== void 0 ? (l(), a("div", k, [
+        s("div", {
           class: "signal-countdown-number",
-          style: a(y.value)
+          style: n(y.value)
         }, i(e.lampStatus.rNumber), 5),
-        t("div", null, [
-          t("img", {
+        s("div", null, [
+          s("img", {
             src: w.value,
             width: "20px",
             height: "20px"

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

@@ -6,6 +6,8 @@ export default class LSRSignalHoloFlow extends SignalHoloFlow {
     constructor(view: __esri.MapView | __esri.SceneView);
     private stopLineMap;
     initializeLayer(): Promise<void>;
+    private currentPanelScale;
+    private getPanelScale;
     handleSignalData(data: any): Promise<void>;
     clearSignal(): void;
     /**

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

@@ -1,117 +1,133 @@
-import * as u from "@arcgis/core/core/reactiveUtils";
-import { Point as d } from "@arcgis/core/geometry";
+import * as d from "@arcgis/core/core/reactiveUtils";
+import { Point as m } from "@arcgis/core/geometry";
 import P from "@arcgis/core/layers/GraphicsLayer";
-import y from "@turf/bearing";
-import L from "@turf/destination";
-import * as w from "@turf/helpers";
-import S from "../../stores/index.mjs";
-import R from "../common-utils.mjs";
-import v from "./signal-holo-flow.mjs";
-class b extends v {
-  constructor(t) {
-    super(t), this.stopLineLayer = new P(), this.store = S.useAppDataStore, this.watchHandle = null, this.stopLineMap = /* @__PURE__ */ new Map(), this.view.map.add(this.stopLineLayer);
+import w from "@turf/bearing";
+import u from "@turf/destination";
+import * as h from "@turf/helpers";
+import g from "../../stores/index.mjs";
+import y from "../common-utils.mjs";
+import L from "./signal-holo-flow.mjs";
+class b extends L {
+  constructor(e) {
+    super(e), this.stopLineLayer = new P(), this.store = g.useAppDataStore, this.watchHandle = null, this.stopLineMap = /* @__PURE__ */ new Map(), this.view.map.add(this.stopLineLayer);
   }
   async initializeLayer() {
-    var p, h;
+    var c, r;
     console.time("初始化停止线图层");
-    let t = (h = (p = this.mapConfig.holoFlow) == null ? void 0 : p.signal) == null ? void 0 : h.stopLineLayer;
-    if (!t)
+    let e = (r = (c = this.mapConfig.holoFlow) == null ? void 0 : c.signal) == null ? void 0 : r.stopLineLayer;
+    if (!e)
       return;
-    t = this.mapConfig.assetsRoot + "/" + t, (await (await fetch(t)).json()).features.forEach((a) => {
-      const { roadId: o, nodeId: n } = a.properties, { coordinates: r } = a.geometry, e = this.stopLineMap.get(n);
-      e ? e.set(o, r) : this.stopLineMap.set(n, /* @__PURE__ */ new Map([[o, r]]));
+    e = this.mapConfig.assetsRoot + "/" + e, (await (await fetch(e)).json()).features.forEach((t) => {
+      const { roadId: n, nodeId: o, angle: s, destinationPoint: a } = t.properties, { coordinates: l } = t.geometry, f = this.stopLineMap.get(o);
+      f ? f.set(n, {
+        coord: l,
+        panelPoint: a,
+        angle: s
+      }) : this.stopLineMap.set(
+        o,
+        /* @__PURE__ */ new Map([
+          [
+            n,
+            { coord: l, panelPoint: a, angle: s }
+          ]
+        ])
+      );
     }), console.timeEnd("初始化停止线图层");
   }
-  async handleSignalData(t) {
-    this.watchHandle || (this.watchHandle = u.watch(
+  getPanelScale() {
+    const e = this.view.scale;
+    let i = 1;
+    return e < 1e3 ? i = 1 : e < 2e3 ? i = 0.8 : i = 0.4, i;
+  }
+  async handleSignalData(e) {
+    this.watchHandle || (this.watchHandle = d.watch(
       () => this.view.extent,
       () => {
-        for (const o of this.store.countdownPanels) {
-          const { mapPoint: n } = o, r = this.view.toScreen({
+        const t = this.getPanelScale();
+        for (const n of this.store.countdownPanels) {
+          t !== this.currentPanelScale && (n.scale = t);
+          const { mapPoint: o } = n, s = this.view.toScreen({
             type: "point",
-            x: n[0],
-            y: n[1]
+            x: o[0],
+            y: o[1]
           });
-          o.position.left = r.x, o.position.top = r.y;
+          n.position.left = s.x, n.position.top = s.y;
         }
+        this.currentPanelScale = t;
       }
     ));
-    const s = t.crossId, i = t.rtStage, p = t.nonCurStageRemainingTime, h = t.allStageFlows;
-    console.log(s, i, p, h);
-    const a = /* @__PURE__ */ new Map();
-    h.forEach((o) => {
-      const { stageId: n, stageFlows: r } = o;
-      let e = "green", m = i.stageRemainingTime;
-      if (n === i.stageId)
-        m <= i.stageAllRedTime ? e = "red" : i.stageYellowTime !== 0 && m <= i.stageYellowTime + i.stageAllRedTime && (e = "yellow");
-      else {
-        e = "red";
-        const l = p.find(
-          (g) => g.stageId === n
-        );
-        m = l ? l.stageNextRunRemainingTime : 0;
+    const i = e.crossId, p = this.stopLineMap.get(i);
+    if (!p) {
+      console.log(`没有找到路口${i}`);
+      return;
+    }
+    const c = e.phaseCountDownList, r = /* @__PURE__ */ new Map();
+    for (const t of c) {
+      let n = "";
+      for (let l of t.roadIdList)
+        if (l.startsWith("-") && (l = l.slice(1)), p.has(l)) {
+          n = l;
+          break;
+        }
+      if (!n) {
+        console.log(`没有找到对应的进口道${i}--${n}`);
+        continue;
       }
-      r.forEach((l) => {
-        let { fromRoadId: g } = l;
-        g.startsWith("-") && (g = g.slice(1));
-        const f = l.direction.toLowerCase();
-        let c = a.get(g);
-        c || (c = {}, a.set(g, c)), f === "u" ? (c.uNumber = m, c.uColor = e) : f === "l" ? (c.lNumber = m, c.lColor = e) : f === "s" ? (c.sNumber = m, c.sColor = e) : f === "r" && (c.rNumber = m, c.rColor = e === "yellow" ? "red" : e);
-      });
-    }), a.forEach((o, n) => {
-      console.log(n, o);
-      const r = this.stopLineMap.get(s);
-      if (!r) {
-        console.error(`路口${s}没有找到对应的停止线`);
-        return;
+      let o = r.get(n);
+      if (o || (o = {}, r.set(n, o)), !t.direction) {
+        console.log(`没有找到对应的方向${i}--${JSON.stringify(t)}`);
+        continue;
       }
-      const e = r.get(n);
-      if (!e) {
-        console.error(`路口${s}的进口道${n}没有找到对应的停止线`);
+      const s = t.direction.toLowerCase(), a = t.color === 1 ? "red" : t.color === 2 ? "yellow" : "green";
+      s === "u" ? (o.uNumber = t.leftTime, o.uColor = a) : s === "l" ? (o.lNumber = t.leftTime, o.lColor = a) : s === "s" ? (o.sNumber = t.leftTime, o.sColor = a) : s === "r" && (o.rNumber = t.leftTime, o.rColor = a);
+    }
+    r.forEach((t, n) => {
+      const o = p.get(n);
+      if (!o)
         return;
-      }
-      const m = this.store.countdownPanels.find(
-        (l) => l.crossId === s && l.roadId === n
+      const s = this.store.countdownPanels.find(
+        (a) => a.crossId === i && a.roadId === n
       );
-      if (m)
-        m.lampStatus = o;
+      if (s)
+        s.lampStatus = t;
       else {
-        const l = this.getPanelPoint(e), g = this.view.toScreen({
+        const a = o.panelPoint, l = this.view.toScreen({
           type: "point",
-          x: l[0],
-          y: l[1]
-        }), f = this.getPanelRotation(e);
+          x: a[0],
+          y: a[1]
+        }), f = this.getPanelRotation(o.coord);
         this.store.countdownPanels.push({
-          displayMode: "complete",
-          crossId: s,
+          displayMode: "complex",
+          crossId: i,
           roadId: n,
-          mapPoint: l,
+          mapPoint: a,
           // 定位点地理坐标
-          stopLine: e,
+          stopLine: o.coord,
           // 关联的停止线坐标
-          position: { left: g.x, top: g.y },
+          position: { left: l.x, top: l.y },
           // 定位点屏幕坐标
           rotation: f,
           // 面板旋转角度
-          lampStatus: o
+          scale: this.getPanelScale(),
+          lampStatus: t
           // 灯组状态
         });
       }
     });
   }
   clearSignal() {
-    var t;
-    this.stopLineLayer.removeAll(), this.store.countdownPanels = [], (t = this.watchHandle) == null || t.remove(), this.watchHandle = null;
+    var e;
+    this.stopLineLayer.removeAll(), this.store.countdownPanels = [], (e = this.watchHandle) == null || e.remove(), this.watchHandle = null;
   }
   /**
    * 从停止线坐标计算面板位置
    * @param coordinates
    * @returns
    */
-  getPanelPoint(t) {
-    const s = R.getCenterPointInLine(t), i = t[0], p = t[t.length - 1];
-    let a = y(w.point(i), w.point(p)) - 90;
-    return a < -180 && (a += 360), L(w.point(s), 1, a, {
+  getPanelPoint(e) {
+    const i = y.getCenterPointInLine(e), p = e[0], c = e[e.length - 1];
+    let t = w(h.point(p), h.point(c)) - 90;
+    return t < -180 && (t += 360), u(h.point(i), 1, t, {
       units: "meters"
     }).geometry.coordinates;
   }
@@ -120,17 +136,17 @@ class b extends v {
    * @param coordinates
    * @returns
    */
-  getPanelRotation(t) {
-    const s = t[0], i = new d({
-      x: s[0],
-      y: s[1],
+  getPanelRotation(e) {
+    const i = e[0], p = new m({
+      x: i[0],
+      y: i[1],
       spatialReference: this.view.spatialReference
-    }), p = this.view.toScreen(i), h = t[t.length - 1], a = new d({
-      x: h[0],
-      y: h[1],
+    }), c = this.view.toScreen(p), r = e[e.length - 1], t = new m({
+      x: r[0],
+      y: r[1],
       spatialReference: this.view.spatialReference
-    }), o = this.view.toScreen(a), n = o.x - p.x, r = o.y - p.y;
-    return Math.atan2(r, n) * (180 / Math.PI);
+    }), n = this.view.toScreen(t), o = n.x - c.x, s = n.y - c.y;
+    return Math.atan2(s, o) * (180 / Math.PI);
   }
 }
 export {

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

@@ -1,12 +1,13 @@
 import * as d from "@arcgis/core/core/reactiveUtils";
 import { Point as c } from "@arcgis/core/geometry";
 import p from "@arcgis/core/layers/FeatureLayer";
-import u from "../../stores/index.mjs";
-class f {
+import { toRaw as u } from "vue";
+import g from "../../stores/index.mjs";
+class v {
   constructor(e) {
     this.currentPhaseMap = /* @__PURE__ */ new Map(), this.countdownCanvasMap = /* @__PURE__ */ new Map(), this.lastDataTime = 0, this.isDeletingCanvas = !1, this.canvasWidth = 80, this.canvasHeight = 40, this.view = (e.type === "2d", e);
-    const t = u.useAppDataStore;
-    this.mapConfig = JSON.parse(JSON.stringify(t.mapConfig));
+    const t = g.useAppDataStore;
+    this.mapConfig = u(t.mapConfig);
   }
   /**
    * 初始化相位线图层
@@ -247,5 +248,5 @@ class f {
   }
 }
 export {
-  f as default
+  v as default
 };

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

@@ -16,7 +16,7 @@ export default class TraceRendererExternal implements ITraceRendererInterface {
     /** 车身颜色材质 */
     private materialMap;
     private readonly view;
-    private readonly assetsRoot;
+    private assetsRoot;
     private carModel;
     private vanModel;
     private truckModel;
@@ -39,6 +39,7 @@ export default class TraceRendererExternal implements ITraceRendererInterface {
     private needInterpolate;
     private updateModel;
     private appDataStore;
+    private mapConfig;
     /** 轨迹日志 */
     private logTable;
     constructor(view: __esri.SceneView);

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

@@ -4,9 +4,10 @@ import v from "@arcgis/core/geometry/SpatialReference";
 import * as u from "@arcgis/core/views/3d/externalRenderers";
 import * as a from "three";
 import { GLTFLoader as y } from "three/examples/jsm/loaders/GLTFLoader";
+import { toRaw as T } from "vue";
 import { EVehiclePlateState as m } from "../../../types/index.mjs";
-import T from "../../stores/index.mjs";
-class R {
+import C from "../../stores/index.mjs";
+class V {
   constructor(s) {
     this.cameraHeightThreshold = 1e3, this.roughness = 0.2, this.metalness = 0.8, this.defaultMaterial = new a.MeshPhongMaterial({
       color: 16777215
@@ -22,7 +23,7 @@ class R {
       [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 = m.None, this.historyPositionMap = /* @__PURE__ */ new Map(), this.vehicleObjectMap = /* @__PURE__ */ new Map(), this.needInterpolate = !0, this.updateModel = !1, this.appDataStore = T.useAppDataStore, this.logTable = [
+    ]), 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 = C.useAppDataStore, this.logTable = [
       [
         "ptcId",
         "plateno",
@@ -43,12 +44,12 @@ class R {
         "queueLength",
         "status"
       ]
-    ], this.assetsRoot = JSON.parse(
-      JSON.stringify(this.appDataStore.mapConfig)
-    ).assetsRoot, this.view = s, P.watch(
+    ], this.view = s;
+    const e = T(this.appDataStore.mapConfig);
+    this.assetsRoot = e.assetsRoot, P.watch(
       () => this.view.camera.position.z,
-      (e, t) => {
-        (t <= this.cameraHeightThreshold && e > this.cameraHeightThreshold || t > this.cameraHeightThreshold && e <= this.cameraHeightThreshold) && (this.updateModel = !0);
+      (t, i) => {
+        (i <= this.cameraHeightThreshold && t > this.cameraHeightThreshold || i > this.cameraHeightThreshold && t <= this.cameraHeightThreshold) && (this.updateModel = !0);
       }
     );
   }
@@ -544,5 +545,5 @@ class R {
   }
 }
 export {
-  R as default
+  V as default
 };

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

@@ -1,9 +1,10 @@
 import c from "@arcgis/core/Graphic";
 import p from "@arcgis/core/layers/GraphicsLayer";
-import m from "../../stores/index.mjs";
-class f {
+import { toRaw as m } from "vue";
+import g from "../../stores/index.mjs";
+class M {
   constructor(i) {
-    this.appDataStore = m.useAppDataStore, this.logTable = [
+    this.appDataStore = g.useAppDataStore, this.logTable = [
       [
         "uuid",
         "ptcId",
@@ -29,7 +30,7 @@ class f {
         "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({
+    ], 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 = m(this.appDataStore.mapConfig), this.vehicleLayer = new p({
       id: "vehicleLayer"
     }), this.view.map.add(this.vehicleLayer), this.rafSignal = requestAnimationFrame(() => this.render());
   }
@@ -350,5 +351,5 @@ class f {
   }
 }
 export {
-  f as default
+  M as default
 };

package/es/src/gis-map/utils/signal-control-area-controller/index.d.ts

@@ -13,11 +13,12 @@ export default class SignalControlAreaController {
     locateSignalControlArea(params: {
         id: string;
     }): Promise<IResult>;
-    private showPopup;
     highlightSignalControlArea(params: {
         id: string;
     }): Promise<IResult>;
     resetHighlight(): IResult;
+    showSubSignalControlArea(params: any): IResult;
+    editSubSignalArea(): IResult;
     /**
      * 在区控\子区\路口图层中查找对应的graphic
      * @param id
@@ -31,6 +32,7 @@ export default class SignalControlAreaController {
      * @returns
      */
     private drawArea;
+    private getCrossGraphicInSubDistrict;
     /**
      * 生成路口点符号。在不同比例尺下，使用不同的符号
      * @param attributes