gisviewer-vue3-arcgis 1.0.219 → 1.0.221

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

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

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

@@ -84,7 +84,8 @@ export default class SignalControlAreaController1 {
     private resetSelectedSymbol;
     /**
      * 加载支队图层
-     * 现场环境用url创建FeatureLayer有各种问题，改为用url创建Graphic，再将Graphic添加到FeatureLayer
+     * 现场环境用url创建FeatureLayer有各种问题，
+     * 改为图层到处未json，用json创建Graphic，再将Graphic添加到FeatureLayer
      */
     private loadDetachmentLayer;
 }

package/es/src/gis-map/utils/signal-control-area-controller/show-area.mjs

@@ -10,24 +10,24 @@ import * as d from "@turf/helpers";
 import m from "concaveman";
 import F from "../../stores/index.mjs";
 import k from "./district-controller.mjs";
-import { districtDashLineLayerOptions as G, districtSolidLineLayerOptions as S, subDistrictLayerOptions as v, signalMarkerLayerOptions as x, signalPictureLayerOptions as I, signalClusterLayerOptions as M } from "./layer-symbol.mjs";
-class Q {
-  constructor(t) {
-    this.detachmentLayerLoaded = !1, this.districtControllerOid = 0, this.subDistrictControllerOid = 0, this.signalOid = 0, this.popupEnabled = !0, this.districtGraphics = [], this.subDistrictGraphics = [], this.signalGraphics = [], this.view = t, this.hasGpu = localStorage.getItem("gpu") !== "Unknown";
-    const e = F.useAppDataStore;
-    this.mapConfig = JSON.parse(JSON.stringify(e.mapConfig)), this.detachmentLayer = new C(), this.districtControllerDashLayer = new c(
+import { districtDashLineLayerOptions as G, districtSolidLineLayerOptions as v, subDistrictLayerOptions as x, signalMarkerLayerOptions as S, signalPictureLayerOptions as I, signalClusterLayerOptions as M } from "./layer-symbol.mjs";
+class V {
+  constructor(e) {
+    this.detachmentLayerLoaded = !1, this.districtControllerOid = 0, this.subDistrictControllerOid = 0, this.signalOid = 0, this.popupEnabled = !0, this.districtGraphics = [], this.subDistrictGraphics = [], this.signalGraphics = [], this.view = e, this.hasGpu = localStorage.getItem("gpu") !== "Unknown";
+    const t = F.useAppDataStore;
+    this.mapConfig = JSON.parse(JSON.stringify(t.mapConfig)), this.detachmentLayer = new C(), this.districtControllerDashLayer = new c(
       G
-    ), this.districtControllerDashLayer.spatialReference = t.spatialReference, this.districtControllerSolidLayer = new c(
-      S
-    ), this.districtControllerSolidLayer.spatialReference = t.spatialReference, this.districtControllerSolidLayer.popupEnabled = this.popupEnabled, this.subDistrictControllerLayer = new c(
+    ), this.districtControllerDashLayer.spatialReference = e.spatialReference, this.districtControllerSolidLayer = new c(
       v
-    ), this.subDistrictControllerLayer.spatialReference = t.spatialReference, this.subDistrictControllerLayer.popupEnabled = this.popupEnabled, this.signalMarkerLayer = new c(
+    ), this.districtControllerSolidLayer.spatialReference = e.spatialReference, this.districtControllerSolidLayer.popupEnabled = this.popupEnabled, this.subDistrictControllerLayer = new c(
       x
-    ), this.signalMarkerLayer.spatialReference = t.spatialReference, this.signalMarkerLayer.popupEnabled = this.popupEnabled, this.signalPictureLayer = new c(
+    ), this.subDistrictControllerLayer.spatialReference = e.spatialReference, this.subDistrictControllerLayer.popupEnabled = this.popupEnabled, this.signalMarkerLayer = new c(
+      S
+    ), this.signalMarkerLayer.spatialReference = e.spatialReference, this.signalMarkerLayer.popupEnabled = this.popupEnabled, this.signalPictureLayer = new c(
       I
-    ), this.signalPictureLayer.spatialReference = t.spatialReference, this.signalPictureLayer.popupEnabled = this.popupEnabled, this.signalClusterLayer = new c(
+    ), this.signalPictureLayer.spatialReference = e.spatialReference, this.signalPictureLayer.popupEnabled = this.popupEnabled, this.signalClusterLayer = new c(
       M
-    ), this.signalClusterLayer.spatialReference = t.spatialReference, this.signalClusterLayer.popupEnabled = this.popupEnabled, this.view.map.addMany([
+    ), this.signalClusterLayer.spatialReference = e.spatialReference, this.signalClusterLayer.popupEnabled = this.popupEnabled, this.view.map.addMany([
       this.detachmentLayer,
       this.districtControllerSolidLayer,
       this.districtControllerDashLayer,
@@ -42,14 +42,14 @@ class Q {
    * @param params
    * @returns
    */
-  async showSignalControlArea(t) {
+  async showSignalControlArea(e) {
     this.detachmentLayerLoaded || await this.loadDetachmentLayer(), await this.clearSignalControlArea(), this.districtControllerDashLayer.visible = !1, this.districtControllerSolidLayer.visible = !1, this.subDistrictControllerLayer.visible = !1, this.signalMarkerLayer.visible = !1, this.signalPictureLayer.visible = !1, this.signalClusterLayer.visible = !0;
-    for (const e of t.areaList) {
+    for (const t of e.areaList) {
       const s = new k(
-        e,
-        t.style || ""
+        t,
+        e.style || ""
       );
-      this.generateGraphic(s, !0, t.style);
+      this.generateGraphic(s, !0, e.style);
     }
     return await this.districtControllerDashLayer.applyEdits({
       addFeatures: this.districtGraphics
@@ -71,19 +71,19 @@ class Q {
    */
   async clearSignalControlArea() {
     this.districtGraphics = [], this.subDistrictGraphics = [], this.signalGraphics = [], this.districtControllerOid = 0, this.subDistrictControllerOid = 0, this.signalOid = 0;
-    let t = await this.districtControllerDashLayer.queryFeatures();
+    let e = await this.districtControllerDashLayer.queryFeatures();
     return await this.districtControllerDashLayer.applyEdits({
-      deleteFeatures: t.features
-    }), this.districtControllerDashLayer.definitionExpression = "1=1", t = await this.districtControllerSolidLayer.queryFeatures(), await this.districtControllerSolidLayer.applyEdits({
-      deleteFeatures: t.features
-    }), this.districtControllerSolidLayer.definitionExpression = "1=1", t = await this.subDistrictControllerLayer.queryFeatures(), await this.subDistrictControllerLayer.applyEdits({
-      deleteFeatures: t.features
-    }), this.subDistrictControllerLayer.definitionExpression = "1=1", t = await this.signalMarkerLayer.queryFeatures(), await this.signalMarkerLayer.applyEdits({
-      deleteFeatures: t.features
-    }), this.signalMarkerLayer.definitionExpression = "1=1", t = await this.signalPictureLayer.queryFeatures(), await this.signalPictureLayer.applyEdits({
-      deleteFeatures: t.features
-    }), this.signalPictureLayer.definitionExpression = "1=1", t = await this.signalClusterLayer.queryFeatures(), await this.signalClusterLayer.applyEdits({
-      deleteFeatures: t.features
+      deleteFeatures: e.features
+    }), this.districtControllerDashLayer.definitionExpression = "1=1", e = await this.districtControllerSolidLayer.queryFeatures(), await this.districtControllerSolidLayer.applyEdits({
+      deleteFeatures: e.features
+    }), this.districtControllerSolidLayer.definitionExpression = "1=1", e = await this.subDistrictControllerLayer.queryFeatures(), await this.subDistrictControllerLayer.applyEdits({
+      deleteFeatures: e.features
+    }), this.subDistrictControllerLayer.definitionExpression = "1=1", e = await this.signalMarkerLayer.queryFeatures(), await this.signalMarkerLayer.applyEdits({
+      deleteFeatures: e.features
+    }), this.signalMarkerLayer.definitionExpression = "1=1", e = await this.signalPictureLayer.queryFeatures(), await this.signalPictureLayer.applyEdits({
+      deleteFeatures: e.features
+    }), this.signalPictureLayer.definitionExpression = "1=1", e = await this.signalClusterLayer.queryFeatures(), await this.signalClusterLayer.applyEdits({
+      deleteFeatures: e.features
     }), this.signalClusterLayer.definitionExpression = "1=1", { status: 0, message: "ok" };
   }
   /**
@@ -91,22 +91,22 @@ class Q {
    * @param layerName
    * @param visible
    */
-  setLayerVisibility(t) {
-    switch (t.visible === !1 && this.view.closePopup(), t.id) {
+  setLayerVisibility(e) {
+    switch (e.visible === !1 && this.view.closePopup(), e.id) {
       case "district":
-        this.districtControllerDashLayer.visible = t.visible, this.districtControllerSolidLayer.visible = t.visible;
+        this.districtControllerDashLayer.visible = e.visible, this.districtControllerSolidLayer.visible = e.visible;
         break;
       case "subDistrict":
-        this.subDistrictControllerLayer.visible = t.visible;
+        this.subDistrictControllerLayer.visible = e.visible;
         break;
       case "signal":
-        this.signalMarkerLayer.visible = t.visible, this.signalPictureLayer.visible = t.visible;
+        this.signalMarkerLayer.visible = e.visible, this.signalPictureLayer.visible = e.visible;
         break;
       case "signalCluster":
-        this.signalClusterLayer.visible = t.visible;
+        this.signalClusterLayer.visible = e.visible;
         break;
       case "shanghai_district":
-        this.detachmentLayer.visible = t.visible;
+        this.detachmentLayer.visible = e.visible;
         break;
     }
     return { status: 0, message: "ok" };
@@ -116,11 +116,11 @@ class Q {
    * @param params
    * @returns
    */
-  async locateSignalControlArea(t) {
-    switch (t.type) {
+  async locateSignalControlArea(e) {
+    switch (e.type) {
       case "district": {
         const i = this.districtControllerDashLayer.createQuery();
-        i.where = `id = '${t.id}'`, i.returnGeometry = !0, i.outFields = ["*"];
+        i.where = `id = '${e.id}'`, i.returnGeometry = !0, i.outFields = ["*"];
         const r = await this.districtControllerDashLayer.queryFeatures(
           i
         );
@@ -129,20 +129,20 @@ class Q {
         }), { status: 0, message: "ok" }) : { status: 1, message: "未找到区控" };
       }
       case "subDistrict":
-        const e = this.subDistrictControllerLayer.createQuery();
-        e.where = `id = '${t.id}'`, e.returnGeometry = !0, e.outFields = ["*"];
+        const t = this.subDistrictControllerLayer.createQuery();
+        t.where = `id = '${e.id}'`, t.returnGeometry = !0, t.outFields = ["*"];
         const s = await this.subDistrictControllerLayer.queryFeatures(
-          e
+          t
         );
         return s.features.length > 0 ? (await this.view.goTo(s.features, {
           duration: this.hasGpu ? 1e3 : 0
         }), { status: 0, message: "ok" }) : { status: 1, message: "未找到子区" };
       case "signal": {
         const i = this.signalMarkerLayer.createQuery();
-        i.where = `id = '${t.id}'`, i.returnGeometry = !0, i.outFields = ["*"];
+        i.where = `id = '${e.id}'`, i.returnGeometry = !0, i.outFields = ["*"];
         const r = await this.signalMarkerLayer.queryFeatures(i);
         return r.features.length > 0 ? (await this.view.goTo(
-          { target: r.features[0], scale: t.scale || 1e3 },
+          { target: r.features[0], scale: e.scale || 1e3 },
           {
             duration: this.hasGpu ? 1e3 : 0
           }
@@ -157,23 +157,23 @@ class Q {
    * @param params
    * @returns
    */
-  async highlightSignalControlArea(t) {
-    var e;
-    switch ((e = this.view.popup) != null && e.visible && this.view.popup.close(), t.type) {
+  async highlightSignalControlArea(e) {
+    var t;
+    switch ((t = this.view.popup) != null && t.visible && this.view.popup.close(), e.type) {
       case "district": {
         const s = this.districtControllerDashLayer.definitionExpression;
-        this.districtControllerDashLayer.definitionExpression = `id = '${t.id}'`;
+        this.districtControllerDashLayer.definitionExpression = `id = '${e.id}'`;
         const i = await this.districtControllerDashLayer.queryFeatures();
-        return i.features.length > 0 ? (this.districtControllerSolidLayer.definitionExpression = `id = '${t.id}'`, this.subDistrictControllerLayer.definitionExpression = `parentId = '${t.id}'`, this.signalMarkerLayer.definitionExpression = `districtId = '${t.id}'`, this.signalPictureLayer.definitionExpression = `districtId = '${t.id}'`, this.signalClusterLayer.definitionExpression = `districtId = '${t.id}'`, await this.view.goTo(i.features, {
+        return i.features.length > 0 ? (this.districtControllerSolidLayer.definitionExpression = `id = '${e.id}'`, this.subDistrictControllerLayer.definitionExpression = `parentId = '${e.id}'`, this.signalMarkerLayer.definitionExpression = `districtId = '${e.id}'`, this.signalPictureLayer.definitionExpression = `districtId = '${e.id}'`, this.signalClusterLayer.definitionExpression = `districtId = '${e.id}'`, await this.view.goTo(i.features, {
           duration: this.hasGpu ? 1e3 : 0
         }), { status: 0, message: "ok" }) : (this.districtControllerDashLayer.definitionExpression = s, { status: 1, message: "未找到区控" });
       }
       case "subDistrict": {
         const s = this.subDistrictControllerLayer.definitionExpression;
-        this.subDistrictControllerLayer.definitionExpression = `id = '${t.id}'`;
+        this.subDistrictControllerLayer.definitionExpression = `id = '${e.id}'`;
         const i = await this.subDistrictControllerLayer.queryFeatures();
         if (i.features.length > 0) {
-          this.signalMarkerLayer.definitionExpression = `subDistrictId = '${t.id}'`, this.signalPictureLayer.definitionExpression = `subDistrictId = '${t.id}'`, this.signalClusterLayer.definitionExpression = `subDistrictId = '${t.id}'`;
+          this.signalMarkerLayer.definitionExpression = `subDistrictId = '${e.id}'`, this.signalPictureLayer.definitionExpression = `subDistrictId = '${e.id}'`, this.signalClusterLayer.definitionExpression = `subDistrictId = '${e.id}'`;
           const o = i.features[0].attributes.parentId;
           return this.districtControllerDashLayer.definitionExpression = `id = '${o}'`, this.districtControllerSolidLayer.definitionExpression = `id = '${o}'`, await this.view.goTo(i.features, {
             duration: this.hasGpu ? 1e3 : 0
@@ -183,13 +183,13 @@ class Q {
       }
       case "signal": {
         const s = this.signalMarkerLayer.definitionExpression;
-        this.signalMarkerLayer.definitionExpression = `id = '${t.id}'`;
+        this.signalMarkerLayer.definitionExpression = `id = '${e.id}'`;
         const i = await this.signalMarkerLayer.queryFeatures();
         if (i.features.length > 0) {
-          this.signalPictureLayer.definitionExpression = `id = '${t.id}'`, this.signalClusterLayer.definitionExpression = `id = '${t.id}'`;
+          this.signalPictureLayer.definitionExpression = `id = '${e.id}'`, this.signalClusterLayer.definitionExpression = `id = '${e.id}'`;
           const r = i.features[0], { districtId: o, subDistrictId: h } = r.attributes;
           return this.districtControllerDashLayer.definitionExpression = `id = '${o}'`, this.districtControllerSolidLayer.definitionExpression = `id = '${o}'`, this.subDistrictControllerLayer.definitionExpression = `id = '${h}'`, await this.view.goTo(
-            { target: i.features, scale: t.scale || 1e3 },
+            { target: i.features, scale: e.scale || 1e3 },
             {
               duration: this.hasGpu ? 1e3 : 0
             }
@@ -207,8 +207,8 @@ class Q {
    */
   async resetHighlight() {
     this.districtControllerDashLayer.definitionExpression = "1=1", this.districtControllerSolidLayer.definitionExpression = "1=1", this.subDistrictControllerLayer.definitionExpression = "1=1", this.signalMarkerLayer.definitionExpression = "1=1", this.signalClusterLayer.definitionExpression = "1=1", this.signalPictureLayer.definitionExpression = "1=1";
-    const t = await this.districtControllerDashLayer.queryFeatures();
-    return this.view.goTo(t.features, {
+    const e = await this.districtControllerDashLayer.queryFeatures();
+    return this.view.goTo(e.features, {
       duration: this.hasGpu ? 1e3 : 0
     }), { status: 0, message: "ok" };
   }
@@ -218,21 +218,21 @@ class Q {
    * @param isDistrict 是否是区控
    * @returns
    */
-  generateGraphic(t, e, s) {
-    const i = t.getAllSignalCoordinates();
+  generateGraphic(e, t, s) {
+    const i = e.getAllSignalCoordinates();
     let r = null;
     if (i.length >= 2)
       if (i.length === 2)
         r = d.lineString(i);
       else {
-        if (e) {
-          const a = d.featureCollection(
-            i.map((n) => d.point(n))
+        if (t) {
+          const n = d.featureCollection(
+            i.map((a) => d.point(a))
           );
-          r = D(a);
+          r = D(n);
         } else {
-          const a = m(i, 0.5);
-          a.length >= 4 && (r = d.polygon([a]));
+          const n = m(i, 0.5);
+          n.length >= 4 && (r = d.polygon([n]));
         }
         r || (r = d.lineString(i));
       }
@@ -243,7 +243,7 @@ class Q {
     const o = E(
       r.geometry,
       // 区控面积更大，需要更大的缓冲半径
-      e ? 200 : 30,
+      t ? 200 : 30,
       {
         units: "meters"
       }
@@ -253,48 +253,48 @@ class Q {
         paths: o.geometry.coordinates
       },
       attributes: {
-        ObjectID: e ? this.districtControllerOid++ : this.subDistrictControllerOid++,
-        id: t.id,
-        name: t.name,
-        subDistrictCount: t.subDistrictCount,
-        signalCount: t.signalCount,
-        parentId: t.parentId,
-        parentName: t.parentName,
+        ObjectID: t ? this.districtControllerOid++ : this.subDistrictControllerOid++,
+        id: e.id,
+        name: e.name,
+        subDistrictCount: e.subDistrictCount,
+        signalCount: e.signalCount,
+        parentId: e.parentId,
+        parentName: e.parentName,
         selected: s,
-        type: e ? "district" : "subDistrict"
+        type: t ? "district" : "subDistrict"
       }
     });
-    e ? this.districtGraphics.push(h) : this.subDistrictGraphics.push(h);
-    for (const a of t.subDistricts)
-      this.generateGraphic(a, !1, s);
-    t.signals.forEach((a) => {
-      const n = new y({
+    t ? this.districtGraphics.push(h) : this.subDistrictGraphics.push(h);
+    for (const n of e.subDistricts)
+      this.generateGraphic(n, !1, s);
+    e.signals.forEach((n) => {
+      const a = new y({
         geometry: {
           type: "point",
-          x: a.longitude,
-          y: a.latitude
+          x: n.longitude,
+          y: n.latitude
         },
         attributes: {
           ObjectID: this.signalOid++,
-          id: a.id,
-          name: a.name,
-          signalId: a.signalId,
-          nodeId: a.nodeId,
-          isKey: a.isKey,
-          districtId: e ? t.id : t.parentId,
-          districtName: e ? t.name : t.parentName,
-          subDistrictId: e ? "" : t.id,
-          subDistrictName: e ? "" : t.name,
+          id: n.id,
+          name: n.name,
+          signalId: n.signalId,
+          nodeId: n.nodeId,
+          isKey: n.isKey,
+          districtId: t ? e.id : e.parentId,
+          districtName: t ? e.name : e.parentName,
+          subDistrictId: t ? "" : e.id,
+          subDistrictName: t ? "" : e.name,
           type: "signal",
           selected: !0
         }
       });
-      this.signalGraphics.push(n);
+      this.signalGraphics.push(a);
     });
   }
-  async viewHitTest(t) {
-    var a;
-    const s = (a = (await this.view.hitTest(t, {
+  async viewHitTest(e) {
+    var n;
+    const s = (n = (await this.view.hitTest(e, {
       include: [
         this.districtControllerSolidLayer,
         this.subDistrictControllerLayer,
@@ -302,8 +302,8 @@ class Q {
         this.signalPictureLayer,
         this.signalClusterLayer
       ]
-    })).results) == null ? void 0 : a.filter(
-      (n) => n.type === "graphic"
+    })).results) == null ? void 0 : n.filter(
+      (a) => a.type === "graphic"
     );
     if (s.length === 0)
       return;
@@ -313,34 +313,34 @@ class Q {
     const o = i.getAttribute("type"), h = i.getAttribute("id");
     switch (o) {
       case "district": {
-        let n = await this.districtControllerSolidLayer.queryFeatures();
-        n.features.forEach((l) => {
+        let a = await this.districtControllerSolidLayer.queryFeatures();
+        a.features.forEach((l) => {
           l.attributes.selected = l.attributes.id === h;
         }), await this.districtControllerSolidLayer.applyEdits({
-          updateFeatures: n.features
-        }), n = await this.districtControllerDashLayer.queryFeatures(), n.features.forEach((l) => {
+          updateFeatures: a.features
+        }), a = await this.districtControllerDashLayer.queryFeatures(), a.features.forEach((l) => {
           l.attributes.selected = l.attributes.id === h;
         }), await this.districtControllerDashLayer.applyEdits({
-          updateFeatures: n.features
+          updateFeatures: a.features
         });
         break;
       }
       case "subDistrict": {
-        let n = await this.subDistrictControllerLayer.queryFeatures();
-        n.features.forEach((u) => {
+        let a = await this.subDistrictControllerLayer.queryFeatures();
+        a.features.forEach((u) => {
           u.attributes.selected = u.attributes.id === h;
         }), await this.subDistrictControllerLayer.applyEdits({
-          updateFeatures: n.features
-        }), n = await this.signalMarkerLayer.queryFeatures(), n.features.forEach((u) => {
+          updateFeatures: a.features
+        }), a = await this.signalMarkerLayer.queryFeatures(), a.features.forEach((u) => {
           u.attributes.selected = u.attributes.subDistrictId === h;
         });
         let l = await this.signalMarkerLayer.applyEdits({
-          updateFeatures: n.features
+          updateFeatures: a.features
         });
-        console.log(l), n = await this.signalPictureLayer.queryFeatures(), n.features.forEach((u) => {
+        console.log(l), a = await this.signalPictureLayer.queryFeatures(), a.features.forEach((u) => {
           u.attributes.selected = u.attributes.subDistrictId === h;
         }), l = await this.signalPictureLayer.applyEdits({
-          updateFeatures: n.features
+          updateFeatures: a.features
         }), console.log(l);
         break;
       }
@@ -358,35 +358,35 @@ class Q {
   /**
    * 重置所有graphic的置灰状态
    */
-  async resetSelectedSymbol(t) {
-    switch (t) {
+  async resetSelectedSymbol(e) {
+    switch (e) {
       case "district": {
-        let e = await this.districtControllerSolidLayer.queryFeatures();
-        e.features.forEach((s) => {
+        let t = await this.districtControllerSolidLayer.queryFeatures();
+        t.features.forEach((s) => {
           s.attributes.selected = !0;
         }), await this.districtControllerSolidLayer.applyEdits({
-          updateFeatures: e.features
-        }), e = await this.districtControllerDashLayer.queryFeatures(), e.features.forEach((s) => {
+          updateFeatures: t.features
+        }), t = await this.districtControllerDashLayer.queryFeatures(), t.features.forEach((s) => {
           s.attributes.selected = !0;
         }), await this.districtControllerDashLayer.applyEdits({
-          updateFeatures: e.features
+          updateFeatures: t.features
         });
         break;
       }
       case "subDistrict": {
-        let e = await this.subDistrictControllerLayer.queryFeatures();
-        e.features.forEach((s) => {
+        let t = await this.subDistrictControllerLayer.queryFeatures();
+        t.features.forEach((s) => {
           s.attributes.selected = !0;
         }), await this.subDistrictControllerLayer.applyEdits({
-          updateFeatures: e.features
-        }), e = await this.signalMarkerLayer.queryFeatures(), console.log("marker count", e.features.length), e.features.forEach((s) => {
+          updateFeatures: t.features
+        }), t = await this.signalMarkerLayer.queryFeatures(), t.features.forEach((s) => {
           s.attributes.selected = !0;
         }), await this.signalMarkerLayer.applyEdits({
-          updateFeatures: e.features
-        }), e = await this.signalPictureLayer.queryFeatures(), console.log("picture count", e.features.length), e.features.forEach((s) => {
+          updateFeatures: t.features
+        }), t = await this.signalPictureLayer.queryFeatures(), t.features.forEach((s) => {
           s.attributes.selected = !0;
         }), await this.signalPictureLayer.applyEdits({
-          updateFeatures: e.features
+          updateFeatures: t.features
         });
         break;
       }
@@ -394,40 +394,38 @@ class Q {
   }
   /**
    * 加载支队图层
-   * 现场环境用url创建FeatureLayer有各种问题，改为用url创建Graphic，再将Graphic添加到FeatureLayer
+   * 现场环境用url创建FeatureLayer有各种问题，
+   * 改为图层到处未json，用json创建Graphic，再将Graphic添加到FeatureLayer
    */
   async loadDetachmentLayer() {
-    const t = this.mapConfig.baseLayers;
-    if (!t)
+    const e = this.mapConfig.baseLayers;
+    if (!e)
       return;
-    const e = t.find(
-      (a) => a.options.id === "shanghai_district"
+    const t = e.find(
+      (n) => n.options.id === "shanghai_district"
     );
-    if (!e)
+    if (!t)
       return;
     const i = await (await fetch(
       "/GisViewerAssets/ShangHai/Layers/district.json"
-    )).json(), r = [], { renderer: o, labelingInfo: h } = e.options;
-    i.features.forEach((a) => {
-      const n = a.attributes.ZD_NAME;
-      if (n !== "高架支队") {
+    )).json(), r = [], { renderer: o, labelingInfo: h } = t.options;
+    i.features.forEach((n) => {
+      const a = n.attributes.ZD_NAME;
+      if (a !== "高架支队") {
         let l = new b({
-          rings: a.geometry.rings
+          rings: n.geometry.rings
         });
         l = w(l);
         const u = new y({
           geometry: l,
-          attributes: {
-            ...a.attributes,
-            ObjectID: a.attributes.OBJECTID || a.attributes.ESRI_OID
-          }
+          attributes: n.attributes
         });
         if (o) {
           if (o.type === "simple")
             u.symbol = o.symbol;
           else if (o.type === "unique-value") {
-            const p = u.getAttribute("ObjectID"), g = o.uniqueValueInfos.find(
-              (f) => String(f.value) === String(p)
+            const p = u.getAttribute("OBJECTID"), g = o.uniqueValueInfos.find(
+              (f) => f.value == p
             );
             u.symbol = g ? g.symbol : o.defaultSymbol;
           }
@@ -440,10 +438,10 @@ class Q {
               width: 2
             }
           };
-        if (r.push(u), h && n !== "边防港航支队" && n !== "机场支队") {
+        if (r.push(u), h && a !== "边防港航支队" && a !== "机场支队") {
           const p = new y({
             geometry: l.centroid,
-            symbol: { ...h.symbol, text: n }
+            symbol: { ...h.symbol, text: a }
           });
           r.push(p);
         }
@@ -452,5 +450,5 @@ class Q {
   }
 }
 export {
-  Q as default
+  V as default
 };

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 L=require("@arcgis/core/core/reactiveUtils"),d=require("@arcgis/core/geometry"),M=require("@arcgis/core/geometry/support/webMercatorUtils.js"),S=require("@arcgis/core/layers/GraphicsLayer"),b=require("./signal-holo-flow.js");function g(f){const o=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(f){for(const n in f)if(n!=="default"){const l=Object.getOwnPropertyDescriptor(f,n);Object.defineProperty(o,n,l.get?l:{enumerable:!0,get:()=>f[n]})}}return o.default=f,Object.freeze(o)}const v=g(L),u=g(M);class x extends b.default{constructor(o,n){super(o),this.stopLineLayer=new S,this.watchHandle=null,this.stopLineMap=new Map,this.countdownPanelProps=n,this.view.map.add(this.stopLineLayer)}async initializeLayer(){var p,c;console.time("初始化停止线图层");let o=(c=(p=this.mapConfig.holoFlow)==null?void 0:p.signal)==null?void 0:c.stopLineLayer;if(!o)return;o=this.mapConfig.assetsRoot+"/"+o,(await(await fetch(o)).json()).features.forEach(t=>{const{roadId:i,nodeId:e,angle:a}=t.properties;let{destinationPoint:s}=t.properties;const{coordinates:r}=t.geometry;if(!s){const w=r[0],P=r[r.length-1],m=(w[0]+P[0])/2,y=(w[1]+P[1])/2;s=[m,y]}const h=this.stopLineMap.get(e);h?h.set(i,{coord:r,panelPoint:s,angle:a}):this.stopLineMap.set(e,new Map([[i,{coord:r,panelPoint:s,angle:a}]]))}),console.timeEnd("初始化停止线图层")}getPanelScale(){const o=this.view.scale;let n=1;return o<1e3?n=1:o<2e3?n=.8:o<4e3?n=.4:n=0,n}async handleSignalData(o){this.watchHandle||(this.watchHandle=v.watch(()=>this.view.extent,()=>{const t=this.getPanelScale();for(const i of this.countdownPanelProps){t!==this.currentPanelScale&&(i.scale=t);const{mapPoint:e}=i;let a=new d.Point({x:e[0],y:e[1]});this.view.spatialReference.isWebMercator&&(a=u.geographicToWebMercator(a));const s=this.view.toScreen(a);if(i.position.left=s.x,i.position.top=s.y,this.view.type==="3d"){const r=this.getPanelRotation(i.stopLine);i.rotation=r}}this.currentPanelScale=t}));const n=o.crossId,l=this.stopLineMap.get(n);if(!l)return;const p=o.phaseCountDownList,c=new Map;for(const t of p){let i="";for(let r of t.roadIdList)if(r.startsWith("-")&&(r=r.slice(1)),l.has(r)){i=r;break}if(!i)continue;let e=c.get(i);if(e||(e={},c.set(i,e)),!t.direction){console.log(`没有找到对应的方向${n}--${JSON.stringify(t)}`);continue}const a=t.direction.toLowerCase(),s=t.color===1?"red":t.color===2?"yellow":"green";a==="u"?(e.uNumber=t.leftTime,e.uColor=s):a==="l"?(e.lNumber=t.leftTime,e.lColor=s):a==="s"?(e.sNumber=t.leftTime,e.sColor=s):a==="r"&&(e.rNumber=t.leftTime,e.rColor=s)}c.forEach((t,i)=>{const e=l.get(i);if(!e)return;const a=this.countdownPanelProps.find(s=>s.crossId===n&&s.roadId===i);if(a)a.lampStatus=t;else{let s=new d.Point({x:e.panelPoint[0],y:e.panelPoint[1]});this.view.spatialReference.isWebMercator&&(s=u.geographicToWebMercator(s));const r=this.view.toScreen(s),h=this.getPanelRotation(e.coord);this.countdownPanelProps.push({displayMode:"complex",crossId:n,roadId:i,mapPoint:e.panelPoint,stopLine:e.coord,position:{left:r.x,top:r.y},rotation:h,scale:this.getPanelScale(),lampStatus:t})}})}clearSignal(){var o;this.stopLineLayer.removeAll(),this.countdownPanelProps.length=0,(o=this.watchHandle)==null||o.remove(),this.watchHandle=null}getPanelRotation(o){const n=o[0];let l=new d.Point({x:n[0],y:n[1]});this.view.spatialReference.isWebMercator&&(l=u.geographicToWebMercator(l));const p=this.view.toScreen(l),c=o[o.length-1];let t=new d.Point({x:c[0],y:c[1]});this.view.spatialReference.isWebMercator&&(t=u.geographicToWebMercator(t));const i=this.view.toScreen(t),e=i.x-p.x,a=i.y-p.y;return Math.atan2(a,e)*(180/Math.PI)}}exports.default=x;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const y=require("@arcgis/core/core/reactiveUtils"),u=require("@arcgis/core/geometry"),L=require("@arcgis/core/geometry/support/webMercatorUtils.js"),M=require("@arcgis/core/layers/GraphicsLayer"),S=require("./signal-holo-flow.js");function P(f){const o=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(f){for(const n in f)if(n!=="default"){const l=Object.getOwnPropertyDescriptor(f,n);Object.defineProperty(o,n,l.get?l:{enumerable:!0,get:()=>f[n]})}}return o.default=f,Object.freeze(o)}const b=P(y),d=P(L);class v extends S.default{constructor(o,n){super(o),this.stopLineLayer=new M,this.watchHandle=null,this.stopLineMap=new Map,this.countdownPanelProps=n,this.view.map.add(this.stopLineLayer)}async initializeLayer(){var p,c;console.time("初始化停止线图层");let o=(c=(p=this.mapConfig.holoFlow)==null?void 0:p.signal)==null?void 0:c.stopLineLayer;if(!o)return;o=this.mapConfig.assetsRoot+"/"+o;const l=await(await fetch(o)).json();for(const t of l.features){const{roadId:i,nodeId:e}=t.properties;let{destinationPoint:s}=t.properties;const{coordinates:a}=t.geometry;if(s){if(typeof s=="string")try{s=JSON.parse(s)}catch(h){console.error("解析面板基准点失败",h);continue}}else{const h=a[0],w=a[a.length-1],g=(h[0]+w[0])/2,m=(h[1]+w[1])/2;s=[g,m]}const r=this.stopLineMap.get(e);r?r.set(i,{coord:a,panelPoint:s}):this.stopLineMap.set(e,new Map([[i,{coord:a,panelPoint:s}]]))}console.timeEnd("初始化停止线图层")}getPanelScale(){const o=this.view.scale;let n=1;return o<1e3?n=1:o<2e3?n=.8:o<4e3?n=.4:n=0,n}async handleSignalData(o){this.watchHandle||(this.watchHandle=b.watch(()=>this.view.extent,()=>{const t=this.getPanelScale();for(const i of this.countdownPanelProps){t!==this.currentPanelScale&&(i.scale=t);const{mapPoint:e}=i;let s=new u.Point({x:e[0],y:e[1]});this.view.spatialReference.isWebMercator&&(s=d.geographicToWebMercator(s));const a=this.view.toScreen(s);if(i.position.left=a.x,i.position.top=a.y,this.view.type==="3d"){const r=this.getPanelRotation(i.stopLine);i.rotation=r}}this.currentPanelScale=t}));const n=o.crossId,l=this.stopLineMap.get(n);if(!l)return;const p=o.phaseCountDownList,c=new Map;for(const t of p){let i="";for(let r of t.roadIdList)if(r.startsWith("-")&&(r=r.slice(1)),l.has(r)){i=r;break}if(!i)continue;let e=c.get(i);if(e||(e={},c.set(i,e)),!t.direction){console.log(`没有找到对应的方向${n}--${JSON.stringify(t)}`);continue}const s=t.direction.toLowerCase(),a=t.color===1?"red":t.color===2?"yellow":"green";s==="u"?(e.uNumber=t.leftTime,e.uColor=a):s==="l"?(e.lNumber=t.leftTime,e.lColor=a):s==="s"?(e.sNumber=t.leftTime,e.sColor=a):s==="r"&&(e.rNumber=t.leftTime,e.rColor=a)}c.forEach((t,i)=>{const e=l.get(i);if(!e)return;const s=this.countdownPanelProps.find(a=>a.crossId===n&&a.roadId===i);if(s)s.lampStatus=t;else{let a=new u.Point({x:e.panelPoint[0],y:e.panelPoint[1]});this.view.spatialReference.isWebMercator&&(a=d.geographicToWebMercator(a));const r=this.view.toScreen(a),h=this.getPanelRotation(e.coord);this.countdownPanelProps.push({displayMode:"complex",crossId:n,roadId:i,mapPoint:e.panelPoint,stopLine:e.coord,position:{left:r.x,top:r.y},rotation:h,scale:this.getPanelScale(),lampStatus:t})}})}clearSignal(){var o;this.stopLineLayer.removeAll(),this.countdownPanelProps.length=0,(o=this.watchHandle)==null||o.remove(),this.watchHandle=null}getPanelRotation(o){const n=o[0];let l=new u.Point({x:n[0],y:n[1]});this.view.spatialReference.isWebMercator&&(l=d.geographicToWebMercator(l));const p=this.view.toScreen(l),c=o[o.length-1];let t=new u.Point({x:c[0],y:c[1]});this.view.spatialReference.isWebMercator&&(t=d.geographicToWebMercator(t));const i=this.view.toScreen(t),e=i.x-p.x,s=i.y-p.y;return Math.atan2(s,e)*(180/Math.PI)}}exports.default=v;

package/lib/src/gis-map/utils/signal-control-area-controller/show-area.d.ts

@@ -84,7 +84,8 @@ export default class SignalControlAreaController1 {
     private resetSelectedSymbol;
     /**
      * 加载支队图层
-     * 现场环境用url创建FeatureLayer有各种问题，改为用url创建Graphic，再将Graphic添加到FeatureLayer
+     * 现场环境用url创建FeatureLayer有各种问题，
+     * 改为图层到处未json，用json创建Graphic，再将Graphic添加到FeatureLayer
      */
     private loadDetachmentLayer;
 }

package/lib/src/gis-map/utils/signal-control-area-controller/show-area.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const C=require("@arcgis/core/core/reactiveUtils"),E=require("@arcgis/core/geometry"),D=require("@arcgis/core/geometry/support/webMercatorUtils"),g=require("@arcgis/core/Graphic"),d=require("@arcgis/core/layers/FeatureLayer"),m=require("@arcgis/core/layers/GraphicsLayer"),k=require("@turf/buffer"),F=require("@turf/convex"),S=require("@turf/helpers"),v=require("concaveman"),G=require("../../stores/index.js"),q=require("./district-controller.js"),y=require("./layer-symbol.js");function L(h){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(h){for(const t in h)if(t!=="default"){const s=Object.getOwnPropertyDescriptor(h,t);Object.defineProperty(e,t,s.get?s:{enumerable:!0,get:()=>h[t]})}}return e.default=h,Object.freeze(e)}const x=L(C),p=L(S);class I{constructor(e){this.detachmentLayerLoaded=!1,this.districtControllerOid=0,this.subDistrictControllerOid=0,this.signalOid=0,this.popupEnabled=!0,this.districtGraphics=[],this.subDistrictGraphics=[],this.signalGraphics=[],this.view=e,this.hasGpu=localStorage.getItem("gpu")!=="Unknown";const t=G.default.useAppDataStore;this.mapConfig=JSON.parse(JSON.stringify(t.mapConfig)),this.detachmentLayer=new m,this.districtControllerDashLayer=new d(y.districtDashLineLayerOptions),this.districtControllerDashLayer.spatialReference=e.spatialReference,this.districtControllerSolidLayer=new d(y.districtSolidLineLayerOptions),this.districtControllerSolidLayer.spatialReference=e.spatialReference,this.districtControllerSolidLayer.popupEnabled=this.popupEnabled,this.subDistrictControllerLayer=new d(y.subDistrictLayerOptions),this.subDistrictControllerLayer.spatialReference=e.spatialReference,this.subDistrictControllerLayer.popupEnabled=this.popupEnabled,this.signalMarkerLayer=new d(y.signalMarkerLayerOptions),this.signalMarkerLayer.spatialReference=e.spatialReference,this.signalMarkerLayer.popupEnabled=this.popupEnabled,this.signalPictureLayer=new d(y.signalPictureLayerOptions),this.signalPictureLayer.spatialReference=e.spatialReference,this.signalPictureLayer.popupEnabled=this.popupEnabled,this.signalClusterLayer=new d(y.signalClusterLayerOptions),this.signalClusterLayer.spatialReference=e.spatialReference,this.signalClusterLayer.popupEnabled=this.popupEnabled,this.view.map.addMany([this.detachmentLayer,this.districtControllerSolidLayer,this.districtControllerDashLayer,this.signalMarkerLayer,this.signalPictureLayer,this.signalClusterLayer,this.subDistrictControllerLayer]),this.clickHandler=this.view.on("click",this.viewHitTest.bind(this))}async showSignalControlArea(e){this.detachmentLayerLoaded||await this.loadDetachmentLayer(),await this.clearSignalControlArea(),this.districtControllerDashLayer.visible=!1,this.districtControllerSolidLayer.visible=!1,this.subDistrictControllerLayer.visible=!1,this.signalMarkerLayer.visible=!1,this.signalPictureLayer.visible=!1,this.signalClusterLayer.visible=!0;for(const t of e.areaList){const s=new q.default(t,e.style||"");this.generateGraphic(s,!0,e.style)}return await this.districtControllerDashLayer.applyEdits({addFeatures:this.districtGraphics}),await this.districtControllerSolidLayer.applyEdits({addFeatures:this.districtGraphics}),this.view.goTo(this.districtGraphics),this.districtGraphics=[],await this.subDistrictControllerLayer.applyEdits({addFeatures:this.subDistrictGraphics}),this.subDistrictGraphics=[],await this.signalMarkerLayer.applyEdits({addFeatures:this.signalGraphics}),await this.signalPictureLayer.applyEdits({addFeatures:this.signalGraphics}),await this.signalClusterLayer.applyEdits({addFeatures:this.signalGraphics}),this.signalGraphics=[],{status:0,message:"ok"}}async clearSignalControlArea(){this.districtGraphics=[],this.subDistrictGraphics=[],this.signalGraphics=[],this.districtControllerOid=0,this.subDistrictControllerOid=0,this.signalOid=0;let e=await this.districtControllerDashLayer.queryFeatures();return await this.districtControllerDashLayer.applyEdits({deleteFeatures:e.features}),this.districtControllerDashLayer.definitionExpression="1=1",e=await this.districtControllerSolidLayer.queryFeatures(),await this.districtControllerSolidLayer.applyEdits({deleteFeatures:e.features}),this.districtControllerSolidLayer.definitionExpression="1=1",e=await this.subDistrictControllerLayer.queryFeatures(),await this.subDistrictControllerLayer.applyEdits({deleteFeatures:e.features}),this.subDistrictControllerLayer.definitionExpression="1=1",e=await this.signalMarkerLayer.queryFeatures(),await this.signalMarkerLayer.applyEdits({deleteFeatures:e.features}),this.signalMarkerLayer.definitionExpression="1=1",e=await this.signalPictureLayer.queryFeatures(),await this.signalPictureLayer.applyEdits({deleteFeatures:e.features}),this.signalPictureLayer.definitionExpression="1=1",e=await this.signalClusterLayer.queryFeatures(),await this.signalClusterLayer.applyEdits({deleteFeatures:e.features}),this.signalClusterLayer.definitionExpression="1=1",{status:0,message:"ok"}}setLayerVisibility(e){switch(e.visible===!1&&this.view.closePopup(),e.id){case"district":this.districtControllerDashLayer.visible=e.visible,this.districtControllerSolidLayer.visible=e.visible;break;case"subDistrict":this.subDistrictControllerLayer.visible=e.visible;break;case"signal":this.signalMarkerLayer.visible=e.visible,this.signalPictureLayer.visible=e.visible;break;case"signalCluster":this.signalClusterLayer.visible=e.visible;break;case"shanghai_district":this.detachmentLayer.visible=e.visible;break}return{status:0,message:"ok"}}async locateSignalControlArea(e){switch(e.type){case"district":{const i=this.districtControllerDashLayer.createQuery();i.where=`id = '${e.id}'`,i.returnGeometry=!0,i.outFields=["*"];const r=await this.districtControllerDashLayer.queryFeatures(i);return r.features.length>0?(await this.view.goTo(r.features,{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}):{status:1,message:"未找到区控"}}case"subDistrict":const t=this.subDistrictControllerLayer.createQuery();t.where=`id = '${e.id}'`,t.returnGeometry=!0,t.outFields=["*"];const s=await this.subDistrictControllerLayer.queryFeatures(t);return s.features.length>0?(await this.view.goTo(s.features,{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}):{status:1,message:"未找到子区"};case"signal":{const i=this.signalMarkerLayer.createQuery();i.where=`id = '${e.id}'`,i.returnGeometry=!0,i.outFields=["*"];const r=await this.signalMarkerLayer.queryFeatures(i);return r.features.length>0?(await this.view.goTo({target:r.features[0],scale:e.scale||1e3},{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}):{status:1,message:"未找到信号机"}}default:return{status:1,message:"未知类型"}}}async highlightSignalControlArea(e){var t;switch((t=this.view.popup)!=null&&t.visible&&this.view.popup.close(),e.type){case"district":{const s=this.districtControllerDashLayer.definitionExpression;this.districtControllerDashLayer.definitionExpression=`id = '${e.id}'`;const i=await this.districtControllerDashLayer.queryFeatures();return i.features.length>0?(this.districtControllerSolidLayer.definitionExpression=`id = '${e.id}'`,this.subDistrictControllerLayer.definitionExpression=`parentId = '${e.id}'`,this.signalMarkerLayer.definitionExpression=`districtId = '${e.id}'`,this.signalPictureLayer.definitionExpression=`districtId = '${e.id}'`,this.signalClusterLayer.definitionExpression=`districtId = '${e.id}'`,await this.view.goTo(i.features,{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}):(this.districtControllerDashLayer.definitionExpression=s,{status:1,message:"未找到区控"})}case"subDistrict":{const s=this.subDistrictControllerLayer.definitionExpression;this.subDistrictControllerLayer.definitionExpression=`id = '${e.id}'`;const i=await this.subDistrictControllerLayer.queryFeatures();if(i.features.length>0){this.signalMarkerLayer.definitionExpression=`subDistrictId = '${e.id}'`,this.signalPictureLayer.definitionExpression=`subDistrictId = '${e.id}'`,this.signalClusterLayer.definitionExpression=`subDistrictId = '${e.id}'`;const l=i.features[0].attributes.parentId;return this.districtControllerDashLayer.definitionExpression=`id = '${l}'`,this.districtControllerSolidLayer.definitionExpression=`id = '${l}'`,await this.view.goTo(i.features,{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}}else return this.subDistrictControllerLayer.definitionExpression=s,{status:1,message:"未找到子区"}}case"signal":{const s=this.signalMarkerLayer.definitionExpression;this.signalMarkerLayer.definitionExpression=`id = '${e.id}'`;const i=await this.signalMarkerLayer.queryFeatures();if(i.features.length>0){this.signalPictureLayer.definitionExpression=`id = '${e.id}'`,this.signalClusterLayer.definitionExpression=`id = '${e.id}'`;const r=i.features[0],{districtId:l,subDistrictId:c}=r.attributes;return this.districtControllerDashLayer.definitionExpression=`id = '${l}'`,this.districtControllerSolidLayer.definitionExpression=`id = '${l}'`,this.subDistrictControllerLayer.definitionExpression=`id = '${c}'`,await this.view.goTo({target:i.features,scale:e.scale||1e3},{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}}else return this.signalMarkerLayer.definitionExpression=s,{status:1,message:"未找到信号机"}}default:return{status:1,message:"未知类型"}}}async resetHighlight(){this.districtControllerDashLayer.definitionExpression="1=1",this.districtControllerSolidLayer.definitionExpression="1=1",this.subDistrictControllerLayer.definitionExpression="1=1",this.signalMarkerLayer.definitionExpression="1=1",this.signalClusterLayer.definitionExpression="1=1",this.signalPictureLayer.definitionExpression="1=1";const e=await this.districtControllerDashLayer.queryFeatures();return this.view.goTo(e.features,{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}}generateGraphic(e,t,s){const i=e.getAllSignalCoordinates();let r=null;if(i.length>=2)if(i.length===2)r=p.lineString(i);else{if(t){const a=p.featureCollection(i.map(n=>p.point(n)));r=F(a)}else{const a=v(i,.5);a.length>=4&&(r=p.polygon([a]))}r||(r=p.lineString(i))}else if(i.length===1)r=p.point(i[0]);else return;const l=k(r.geometry,t?200:30,{units:"meters"}),c=new g({geometry:{type:"polyline",paths:l.geometry.coordinates},attributes:{ObjectID:t?this.districtControllerOid++:this.subDistrictControllerOid++,id:e.id,name:e.name,subDistrictCount:e.subDistrictCount,signalCount:e.signalCount,parentId:e.parentId,parentName:e.parentName,selected:s,type:t?"district":"subDistrict"}});t?this.districtGraphics.push(c):this.subDistrictGraphics.push(c);for(const a of e.subDistricts)this.generateGraphic(a,!1,s);e.signals.forEach(a=>{const n=new g({geometry:{type:"point",x:a.longitude,y:a.latitude},attributes:{ObjectID:this.signalOid++,id:a.id,name:a.name,signalId:a.signalId,nodeId:a.nodeId,isKey:a.isKey,districtId:t?e.id:e.parentId,districtName:t?e.name:e.parentName,subDistrictId:t?"":e.id,subDistrictName:t?"":e.name,type:"signal",selected:!0}});this.signalGraphics.push(n)})}async viewHitTest(e){var a;const s=(a=(await this.view.hitTest(e,{include:[this.districtControllerSolidLayer,this.subDistrictControllerLayer,this.signalMarkerLayer,this.signalPictureLayer,this.signalClusterLayer]})).results)==null?void 0:a.filter(n=>n.type==="graphic");if(s.length===0)return;const i=s[0].graphic;let r=null;i.geometry.type==="point"?r=i.geometry:i.geometry.type==="polyline"?r=i.geometry.extent.center:i.geometry.type==="polygon"&&(r=i.geometry.centroid),r!==null&&await this.view.goTo(r,{duration:1e3});const l=i.getAttribute("type"),c=i.getAttribute("id");switch(l){case"district":{let n=await this.districtControllerSolidLayer.queryFeatures();n.features.forEach(o=>{o.attributes.selected=o.attributes.id===c}),await this.districtControllerSolidLayer.applyEdits({updateFeatures:n.features}),n=await this.districtControllerDashLayer.queryFeatures(),n.features.forEach(o=>{o.attributes.selected=o.attributes.id===c}),await this.districtControllerDashLayer.applyEdits({updateFeatures:n.features});break}case"subDistrict":{let n=await this.subDistrictControllerLayer.queryFeatures();n.features.forEach(u=>{u.attributes.selected=u.attributes.id===c}),await this.subDistrictControllerLayer.applyEdits({updateFeatures:n.features}),n=await this.signalMarkerLayer.queryFeatures(),n.features.forEach(u=>{u.attributes.selected=u.attributes.subDistrictId===c});let o=await this.signalMarkerLayer.applyEdits({updateFeatures:n.features});console.log(o),n=await this.signalPictureLayer.queryFeatures(),n.features.forEach(u=>{u.attributes.selected=u.attributes.subDistrictId===c}),o=await this.signalPictureLayer.applyEdits({updateFeatures:n.features}),console.log(o);break}}x.when(()=>this.view.popup.visible===!1,async()=>{await this.resetSelectedSymbol(l)},{once:!0})}async resetSelectedSymbol(e){switch(e){case"district":{let t=await this.districtControllerSolidLayer.queryFeatures();t.features.forEach(s=>{s.attributes.selected=!0}),await this.districtControllerSolidLayer.applyEdits({updateFeatures:t.features}),t=await this.districtControllerDashLayer.queryFeatures(),t.features.forEach(s=>{s.attributes.selected=!0}),await this.districtControllerDashLayer.applyEdits({updateFeatures:t.features});break}case"subDistrict":{let t=await this.subDistrictControllerLayer.queryFeatures();t.features.forEach(s=>{s.attributes.selected=!0}),await this.subDistrictControllerLayer.applyEdits({updateFeatures:t.features}),t=await this.signalMarkerLayer.queryFeatures(),console.log("marker count",t.features.length),t.features.forEach(s=>{s.attributes.selected=!0}),await this.signalMarkerLayer.applyEdits({updateFeatures:t.features}),t=await this.signalPictureLayer.queryFeatures(),console.log("picture count",t.features.length),t.features.forEach(s=>{s.attributes.selected=!0}),await this.signalPictureLayer.applyEdits({updateFeatures:t.features});break}}}async loadDetachmentLayer(){const e=this.mapConfig.baseLayers;if(!e)return;const t=e.find(a=>a.options.id==="shanghai_district");if(!t)return;const i=await(await fetch("/GisViewerAssets/ShangHai/Layers/district.json")).json(),r=[],{renderer:l,labelingInfo:c}=t.options;i.features.forEach(a=>{const n=a.attributes.ZD_NAME;if(n!=="高架支队"){let o=new E.Polygon({rings:a.geometry.rings});o=D.webMercatorToGeographic(o);const u=new g({geometry:o,attributes:{...a.attributes,ObjectID:a.attributes.OBJECTID||a.attributes.ESRI_OID}});if(l){if(l.type==="simple")u.symbol=l.symbol;else if(l.type==="unique-value"){const f=u.getAttribute("ObjectID"),b=l.uniqueValueInfos.find(w=>String(w.value)===String(f));u.symbol=b?b.symbol:l.defaultSymbol}}else u.symbol={type:"simple-fill",color:[227,237,255,.4],outline:{color:[255,195,153],width:2}};if(r.push(u),c&&n!=="边防港航支队"&&n!=="机场支队"){const f=new g({geometry:o.centroid,symbol:{...c.symbol,text:n}});r.push(f)}}}),this.detachmentLayer.addMany(r),this.detachmentLayerLoaded=!0}}exports.default=I;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const C=require("@arcgis/core/core/reactiveUtils"),E=require("@arcgis/core/geometry"),D=require("@arcgis/core/geometry/support/webMercatorUtils"),g=require("@arcgis/core/Graphic"),d=require("@arcgis/core/layers/FeatureLayer"),m=require("@arcgis/core/layers/GraphicsLayer"),F=require("@turf/buffer"),k=require("@turf/convex"),v=require("@turf/helpers"),S=require("concaveman"),G=require("../../stores/index.js"),q=require("./district-controller.js"),y=require("./layer-symbol.js");function L(h){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(h){for(const t in h)if(t!=="default"){const s=Object.getOwnPropertyDescriptor(h,t);Object.defineProperty(e,t,s.get?s:{enumerable:!0,get:()=>h[t]})}}return e.default=h,Object.freeze(e)}const x=L(C),p=L(v);class M{constructor(e){this.detachmentLayerLoaded=!1,this.districtControllerOid=0,this.subDistrictControllerOid=0,this.signalOid=0,this.popupEnabled=!0,this.districtGraphics=[],this.subDistrictGraphics=[],this.signalGraphics=[],this.view=e,this.hasGpu=localStorage.getItem("gpu")!=="Unknown";const t=G.default.useAppDataStore;this.mapConfig=JSON.parse(JSON.stringify(t.mapConfig)),this.detachmentLayer=new m,this.districtControllerDashLayer=new d(y.districtDashLineLayerOptions),this.districtControllerDashLayer.spatialReference=e.spatialReference,this.districtControllerSolidLayer=new d(y.districtSolidLineLayerOptions),this.districtControllerSolidLayer.spatialReference=e.spatialReference,this.districtControllerSolidLayer.popupEnabled=this.popupEnabled,this.subDistrictControllerLayer=new d(y.subDistrictLayerOptions),this.subDistrictControllerLayer.spatialReference=e.spatialReference,this.subDistrictControllerLayer.popupEnabled=this.popupEnabled,this.signalMarkerLayer=new d(y.signalMarkerLayerOptions),this.signalMarkerLayer.spatialReference=e.spatialReference,this.signalMarkerLayer.popupEnabled=this.popupEnabled,this.signalPictureLayer=new d(y.signalPictureLayerOptions),this.signalPictureLayer.spatialReference=e.spatialReference,this.signalPictureLayer.popupEnabled=this.popupEnabled,this.signalClusterLayer=new d(y.signalClusterLayerOptions),this.signalClusterLayer.spatialReference=e.spatialReference,this.signalClusterLayer.popupEnabled=this.popupEnabled,this.view.map.addMany([this.detachmentLayer,this.districtControllerSolidLayer,this.districtControllerDashLayer,this.signalMarkerLayer,this.signalPictureLayer,this.signalClusterLayer,this.subDistrictControllerLayer]),this.clickHandler=this.view.on("click",this.viewHitTest.bind(this))}async showSignalControlArea(e){this.detachmentLayerLoaded||await this.loadDetachmentLayer(),await this.clearSignalControlArea(),this.districtControllerDashLayer.visible=!1,this.districtControllerSolidLayer.visible=!1,this.subDistrictControllerLayer.visible=!1,this.signalMarkerLayer.visible=!1,this.signalPictureLayer.visible=!1,this.signalClusterLayer.visible=!0;for(const t of e.areaList){const s=new q.default(t,e.style||"");this.generateGraphic(s,!0,e.style)}return await this.districtControllerDashLayer.applyEdits({addFeatures:this.districtGraphics}),await this.districtControllerSolidLayer.applyEdits({addFeatures:this.districtGraphics}),this.view.goTo(this.districtGraphics),this.districtGraphics=[],await this.subDistrictControllerLayer.applyEdits({addFeatures:this.subDistrictGraphics}),this.subDistrictGraphics=[],await this.signalMarkerLayer.applyEdits({addFeatures:this.signalGraphics}),await this.signalPictureLayer.applyEdits({addFeatures:this.signalGraphics}),await this.signalClusterLayer.applyEdits({addFeatures:this.signalGraphics}),this.signalGraphics=[],{status:0,message:"ok"}}async clearSignalControlArea(){this.districtGraphics=[],this.subDistrictGraphics=[],this.signalGraphics=[],this.districtControllerOid=0,this.subDistrictControllerOid=0,this.signalOid=0;let e=await this.districtControllerDashLayer.queryFeatures();return await this.districtControllerDashLayer.applyEdits({deleteFeatures:e.features}),this.districtControllerDashLayer.definitionExpression="1=1",e=await this.districtControllerSolidLayer.queryFeatures(),await this.districtControllerSolidLayer.applyEdits({deleteFeatures:e.features}),this.districtControllerSolidLayer.definitionExpression="1=1",e=await this.subDistrictControllerLayer.queryFeatures(),await this.subDistrictControllerLayer.applyEdits({deleteFeatures:e.features}),this.subDistrictControllerLayer.definitionExpression="1=1",e=await this.signalMarkerLayer.queryFeatures(),await this.signalMarkerLayer.applyEdits({deleteFeatures:e.features}),this.signalMarkerLayer.definitionExpression="1=1",e=await this.signalPictureLayer.queryFeatures(),await this.signalPictureLayer.applyEdits({deleteFeatures:e.features}),this.signalPictureLayer.definitionExpression="1=1",e=await this.signalClusterLayer.queryFeatures(),await this.signalClusterLayer.applyEdits({deleteFeatures:e.features}),this.signalClusterLayer.definitionExpression="1=1",{status:0,message:"ok"}}setLayerVisibility(e){switch(e.visible===!1&&this.view.closePopup(),e.id){case"district":this.districtControllerDashLayer.visible=e.visible,this.districtControllerSolidLayer.visible=e.visible;break;case"subDistrict":this.subDistrictControllerLayer.visible=e.visible;break;case"signal":this.signalMarkerLayer.visible=e.visible,this.signalPictureLayer.visible=e.visible;break;case"signalCluster":this.signalClusterLayer.visible=e.visible;break;case"shanghai_district":this.detachmentLayer.visible=e.visible;break}return{status:0,message:"ok"}}async locateSignalControlArea(e){switch(e.type){case"district":{const i=this.districtControllerDashLayer.createQuery();i.where=`id = '${e.id}'`,i.returnGeometry=!0,i.outFields=["*"];const r=await this.districtControllerDashLayer.queryFeatures(i);return r.features.length>0?(await this.view.goTo(r.features,{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}):{status:1,message:"未找到区控"}}case"subDistrict":const t=this.subDistrictControllerLayer.createQuery();t.where=`id = '${e.id}'`,t.returnGeometry=!0,t.outFields=["*"];const s=await this.subDistrictControllerLayer.queryFeatures(t);return s.features.length>0?(await this.view.goTo(s.features,{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}):{status:1,message:"未找到子区"};case"signal":{const i=this.signalMarkerLayer.createQuery();i.where=`id = '${e.id}'`,i.returnGeometry=!0,i.outFields=["*"];const r=await this.signalMarkerLayer.queryFeatures(i);return r.features.length>0?(await this.view.goTo({target:r.features[0],scale:e.scale||1e3},{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}):{status:1,message:"未找到信号机"}}default:return{status:1,message:"未知类型"}}}async highlightSignalControlArea(e){var t;switch((t=this.view.popup)!=null&&t.visible&&this.view.popup.close(),e.type){case"district":{const s=this.districtControllerDashLayer.definitionExpression;this.districtControllerDashLayer.definitionExpression=`id = '${e.id}'`;const i=await this.districtControllerDashLayer.queryFeatures();return i.features.length>0?(this.districtControllerSolidLayer.definitionExpression=`id = '${e.id}'`,this.subDistrictControllerLayer.definitionExpression=`parentId = '${e.id}'`,this.signalMarkerLayer.definitionExpression=`districtId = '${e.id}'`,this.signalPictureLayer.definitionExpression=`districtId = '${e.id}'`,this.signalClusterLayer.definitionExpression=`districtId = '${e.id}'`,await this.view.goTo(i.features,{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}):(this.districtControllerDashLayer.definitionExpression=s,{status:1,message:"未找到区控"})}case"subDistrict":{const s=this.subDistrictControllerLayer.definitionExpression;this.subDistrictControllerLayer.definitionExpression=`id = '${e.id}'`;const i=await this.subDistrictControllerLayer.queryFeatures();if(i.features.length>0){this.signalMarkerLayer.definitionExpression=`subDistrictId = '${e.id}'`,this.signalPictureLayer.definitionExpression=`subDistrictId = '${e.id}'`,this.signalClusterLayer.definitionExpression=`subDistrictId = '${e.id}'`;const l=i.features[0].attributes.parentId;return this.districtControllerDashLayer.definitionExpression=`id = '${l}'`,this.districtControllerSolidLayer.definitionExpression=`id = '${l}'`,await this.view.goTo(i.features,{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}}else return this.subDistrictControllerLayer.definitionExpression=s,{status:1,message:"未找到子区"}}case"signal":{const s=this.signalMarkerLayer.definitionExpression;this.signalMarkerLayer.definitionExpression=`id = '${e.id}'`;const i=await this.signalMarkerLayer.queryFeatures();if(i.features.length>0){this.signalPictureLayer.definitionExpression=`id = '${e.id}'`,this.signalClusterLayer.definitionExpression=`id = '${e.id}'`;const r=i.features[0],{districtId:l,subDistrictId:c}=r.attributes;return this.districtControllerDashLayer.definitionExpression=`id = '${l}'`,this.districtControllerSolidLayer.definitionExpression=`id = '${l}'`,this.subDistrictControllerLayer.definitionExpression=`id = '${c}'`,await this.view.goTo({target:i.features,scale:e.scale||1e3},{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}}else return this.signalMarkerLayer.definitionExpression=s,{status:1,message:"未找到信号机"}}default:return{status:1,message:"未知类型"}}}async resetHighlight(){this.districtControllerDashLayer.definitionExpression="1=1",this.districtControllerSolidLayer.definitionExpression="1=1",this.subDistrictControllerLayer.definitionExpression="1=1",this.signalMarkerLayer.definitionExpression="1=1",this.signalClusterLayer.definitionExpression="1=1",this.signalPictureLayer.definitionExpression="1=1";const e=await this.districtControllerDashLayer.queryFeatures();return this.view.goTo(e.features,{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}}generateGraphic(e,t,s){const i=e.getAllSignalCoordinates();let r=null;if(i.length>=2)if(i.length===2)r=p.lineString(i);else{if(t){const n=p.featureCollection(i.map(a=>p.point(a)));r=k(n)}else{const n=S(i,.5);n.length>=4&&(r=p.polygon([n]))}r||(r=p.lineString(i))}else if(i.length===1)r=p.point(i[0]);else return;const l=F(r.geometry,t?200:30,{units:"meters"}),c=new g({geometry:{type:"polyline",paths:l.geometry.coordinates},attributes:{ObjectID:t?this.districtControllerOid++:this.subDistrictControllerOid++,id:e.id,name:e.name,subDistrictCount:e.subDistrictCount,signalCount:e.signalCount,parentId:e.parentId,parentName:e.parentName,selected:s,type:t?"district":"subDistrict"}});t?this.districtGraphics.push(c):this.subDistrictGraphics.push(c);for(const n of e.subDistricts)this.generateGraphic(n,!1,s);e.signals.forEach(n=>{const a=new g({geometry:{type:"point",x:n.longitude,y:n.latitude},attributes:{ObjectID:this.signalOid++,id:n.id,name:n.name,signalId:n.signalId,nodeId:n.nodeId,isKey:n.isKey,districtId:t?e.id:e.parentId,districtName:t?e.name:e.parentName,subDistrictId:t?"":e.id,subDistrictName:t?"":e.name,type:"signal",selected:!0}});this.signalGraphics.push(a)})}async viewHitTest(e){var n;const s=(n=(await this.view.hitTest(e,{include:[this.districtControllerSolidLayer,this.subDistrictControllerLayer,this.signalMarkerLayer,this.signalPictureLayer,this.signalClusterLayer]})).results)==null?void 0:n.filter(a=>a.type==="graphic");if(s.length===0)return;const i=s[0].graphic;let r=null;i.geometry.type==="point"?r=i.geometry:i.geometry.type==="polyline"?r=i.geometry.extent.center:i.geometry.type==="polygon"&&(r=i.geometry.centroid),r!==null&&await this.view.goTo(r,{duration:1e3});const l=i.getAttribute("type"),c=i.getAttribute("id");switch(l){case"district":{let a=await this.districtControllerSolidLayer.queryFeatures();a.features.forEach(o=>{o.attributes.selected=o.attributes.id===c}),await this.districtControllerSolidLayer.applyEdits({updateFeatures:a.features}),a=await this.districtControllerDashLayer.queryFeatures(),a.features.forEach(o=>{o.attributes.selected=o.attributes.id===c}),await this.districtControllerDashLayer.applyEdits({updateFeatures:a.features});break}case"subDistrict":{let a=await this.subDistrictControllerLayer.queryFeatures();a.features.forEach(u=>{u.attributes.selected=u.attributes.id===c}),await this.subDistrictControllerLayer.applyEdits({updateFeatures:a.features}),a=await this.signalMarkerLayer.queryFeatures(),a.features.forEach(u=>{u.attributes.selected=u.attributes.subDistrictId===c});let o=await this.signalMarkerLayer.applyEdits({updateFeatures:a.features});console.log(o),a=await this.signalPictureLayer.queryFeatures(),a.features.forEach(u=>{u.attributes.selected=u.attributes.subDistrictId===c}),o=await this.signalPictureLayer.applyEdits({updateFeatures:a.features}),console.log(o);break}}x.when(()=>this.view.popup.visible===!1,async()=>{await this.resetSelectedSymbol(l)},{once:!0})}async resetSelectedSymbol(e){switch(e){case"district":{let t=await this.districtControllerSolidLayer.queryFeatures();t.features.forEach(s=>{s.attributes.selected=!0}),await this.districtControllerSolidLayer.applyEdits({updateFeatures:t.features}),t=await this.districtControllerDashLayer.queryFeatures(),t.features.forEach(s=>{s.attributes.selected=!0}),await this.districtControllerDashLayer.applyEdits({updateFeatures:t.features});break}case"subDistrict":{let t=await this.subDistrictControllerLayer.queryFeatures();t.features.forEach(s=>{s.attributes.selected=!0}),await this.subDistrictControllerLayer.applyEdits({updateFeatures:t.features}),t=await this.signalMarkerLayer.queryFeatures(),t.features.forEach(s=>{s.attributes.selected=!0}),await this.signalMarkerLayer.applyEdits({updateFeatures:t.features}),t=await this.signalPictureLayer.queryFeatures(),t.features.forEach(s=>{s.attributes.selected=!0}),await this.signalPictureLayer.applyEdits({updateFeatures:t.features});break}}}async loadDetachmentLayer(){const e=this.mapConfig.baseLayers;if(!e)return;const t=e.find(n=>n.options.id==="shanghai_district");if(!t)return;const i=await(await fetch("/GisViewerAssets/ShangHai/Layers/district.json")).json(),r=[],{renderer:l,labelingInfo:c}=t.options;i.features.forEach(n=>{const a=n.attributes.ZD_NAME;if(a!=="高架支队"){let o=new E.Polygon({rings:n.geometry.rings});o=D.webMercatorToGeographic(o);const u=new g({geometry:o,attributes:n.attributes});if(l){if(l.type==="simple")u.symbol=l.symbol;else if(l.type==="unique-value"){const f=u.getAttribute("OBJECTID"),b=l.uniqueValueInfos.find(w=>w.value==f);u.symbol=b?b.symbol:l.defaultSymbol}}else u.symbol={type:"simple-fill",color:[227,237,255,.4],outline:{color:[255,195,153],width:2}};if(r.push(u),c&&a!=="边防港航支队"&&a!=="机场支队"){const f=new g({geometry:o.centroid,symbol:{...c.symbol,text:a}});r.push(f)}}}),this.detachmentLayer.addMany(r),this.detachmentLayerLoaded=!0}}exports.default=M;

package/package.json

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