gisviewer-vue3-arcgis 1.0.217 → 1.0.219

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

@@ -2,6 +2,9 @@ import { IFindSignalControlAreaParams, ILayerVisibleParams, IResult, IShowSignal
 export default class SignalControlAreaController1 {
     private view;
     private hasGpu;
+    /** 支队图层 */
+    private detachmentLayer;
+    private detachmentLayerLoaded;
     /** 区控虚线图层 */
     private districtControllerDashLayer;
     /** 区控实线图层，区控符号由半透明实线+不透明虚线组成 */
@@ -19,6 +22,7 @@ export default class SignalControlAreaController1 {
     private subDistrictControllerOid;
     private signalOid;
     private popupEnabled;
+    private mapConfig;
     constructor(view: __esri.MapView | __esri.SceneView);
     /** 暂存等待绘制的区控graphic */
     private districtGraphics;
@@ -78,4 +82,9 @@ export default class SignalControlAreaController1 {
      * 重置所有graphic的置灰状态
      */
     private resetSelectedSymbol;
+    /**
+     * 加载支队图层
+     * 现场环境用url创建FeatureLayer有各种问题，改为用url创建Graphic，再将Graphic添加到FeatureLayer
+     */
+    private loadDetachmentLayer;
 }

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

@@ -1,27 +1,34 @@
-import * as p from "@arcgis/core/core/reactiveUtils";
+import * as L from "@arcgis/core/core/reactiveUtils";
+import { Polygon as b } from "@arcgis/core/geometry";
+import { webMercatorToGeographic as w } from "@arcgis/core/geometry/support/webMercatorUtils";
 import y from "@arcgis/core/Graphic";
 import c from "@arcgis/core/layers/FeatureLayer";
-import g from "@turf/buffer";
-import f from "@turf/convex";
+import C from "@arcgis/core/layers/GraphicsLayer";
+import E from "@turf/buffer";
+import D from "@turf/convex";
 import * as d from "@turf/helpers";
-import L from "concaveman";
-import b from "./district-controller.mjs";
-import { districtDashLineLayerOptions as C, districtSolidLineLayerOptions as w, subDistrictLayerOptions as E, signalMarkerLayerOptions as D, signalPictureLayerOptions as F, signalClusterLayerOptions as k } from "./layer-symbol.mjs";
-class P {
+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.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", this.districtControllerDashLayer = new c(
-      C
+    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(
+      G
     ), this.districtControllerDashLayer.spatialReference = t.spatialReference, this.districtControllerSolidLayer = new c(
-      w
+      S
     ), this.districtControllerSolidLayer.spatialReference = t.spatialReference, this.districtControllerSolidLayer.popupEnabled = this.popupEnabled, this.subDistrictControllerLayer = new c(
-      E
+      v
     ), this.subDistrictControllerLayer.spatialReference = t.spatialReference, this.subDistrictControllerLayer.popupEnabled = this.popupEnabled, this.signalMarkerLayer = new c(
-      D
+      x
     ), this.signalMarkerLayer.spatialReference = t.spatialReference, this.signalMarkerLayer.popupEnabled = this.popupEnabled, this.signalPictureLayer = new c(
-      F
+      I
     ), this.signalPictureLayer.spatialReference = t.spatialReference, this.signalPictureLayer.popupEnabled = this.popupEnabled, this.signalClusterLayer = new c(
-      k
+      M
     ), this.signalClusterLayer.spatialReference = t.spatialReference, this.signalClusterLayer.popupEnabled = this.popupEnabled, this.view.map.addMany([
+      this.detachmentLayer,
       this.districtControllerSolidLayer,
       this.districtControllerDashLayer,
       this.signalMarkerLayer,
@@ -36,10 +43,10 @@ class P {
    * @returns
    */
   async showSignalControlArea(t) {
-    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 i of t.areaList) {
-      const s = new b(
-        i,
+    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) {
+      const s = new k(
+        e,
         t.style || ""
       );
       this.generateGraphic(s, !0, t.style);
@@ -98,6 +105,9 @@ class P {
       case "signalCluster":
         this.signalClusterLayer.visible = t.visible;
         break;
+      case "shanghai_district":
+        this.detachmentLayer.visible = t.visible;
+        break;
     }
     return { status: 0, message: "ok" };
   }
@@ -109,28 +119,28 @@ class P {
   async locateSignalControlArea(t) {
     switch (t.type) {
       case "district": {
-        const e = this.districtControllerDashLayer.createQuery();
-        e.where = `id = '${t.id}'`, e.returnGeometry = !0, e.outFields = ["*"];
+        const i = this.districtControllerDashLayer.createQuery();
+        i.where = `id = '${t.id}'`, i.returnGeometry = !0, i.outFields = ["*"];
         const r = await this.districtControllerDashLayer.queryFeatures(
-          e
+          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 i = this.subDistrictControllerLayer.createQuery();
-        i.where = `id = '${t.id}'`, i.returnGeometry = !0, i.outFields = ["*"];
+        const e = this.subDistrictControllerLayer.createQuery();
+        e.where = `id = '${t.id}'`, e.returnGeometry = !0, e.outFields = ["*"];
         const s = await this.subDistrictControllerLayer.queryFeatures(
-          i
+          e
         );
         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 e = this.signalMarkerLayer.createQuery();
-        e.where = `id = '${t.id}'`, e.returnGeometry = !0, e.outFields = ["*"];
-        const r = await this.signalMarkerLayer.queryFeatures(e);
+        const i = this.signalMarkerLayer.createQuery();
+        i.where = `id = '${t.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 },
           {
@@ -148,24 +158,24 @@ class P {
    * @returns
    */
   async highlightSignalControlArea(t) {
-    var i;
-    switch ((i = this.view.popup) != null && i.visible && this.view.popup.close(), t.type) {
+    var e;
+    switch ((e = this.view.popup) != null && e.visible && this.view.popup.close(), t.type) {
       case "district": {
         const s = this.districtControllerDashLayer.definitionExpression;
         this.districtControllerDashLayer.definitionExpression = `id = '${t.id}'`;
-        const e = await this.districtControllerDashLayer.queryFeatures();
-        return e.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(e.features, {
+        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, {
           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}'`;
-        const e = await this.subDistrictControllerLayer.queryFeatures();
-        if (e.features.length > 0) {
+        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}'`;
-          const l = e.features[0].attributes.parentId;
-          return this.districtControllerDashLayer.definitionExpression = `id = '${l}'`, this.districtControllerSolidLayer.definitionExpression = `id = '${l}'`, await this.view.goTo(e.features, {
+          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
           }), { status: 0, message: "ok" };
         } else
@@ -174,12 +184,12 @@ class P {
       case "signal": {
         const s = this.signalMarkerLayer.definitionExpression;
         this.signalMarkerLayer.definitionExpression = `id = '${t.id}'`;
-        const e = await this.signalMarkerLayer.queryFeatures();
-        if (e.features.length > 0) {
+        const i = await this.signalMarkerLayer.queryFeatures();
+        if (i.features.length > 0) {
           this.signalPictureLayer.definitionExpression = `id = '${t.id}'`, this.signalClusterLayer.definitionExpression = `id = '${t.id}'`;
-          const r = e.features[0], { districtId: l, subDistrictId: o } = r.attributes;
-          return this.districtControllerDashLayer.definitionExpression = `id = '${l}'`, this.districtControllerSolidLayer.definitionExpression = `id = '${l}'`, this.subDistrictControllerLayer.definitionExpression = `id = '${o}'`, await this.view.goTo(
-            { target: e.features, scale: t.scale || 1e3 },
+          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 },
             {
               duration: this.hasGpu ? 1e3 : 0
             }
@@ -208,42 +218,42 @@ class P {
    * @param isDistrict 是否是区控
    * @returns
    */
-  generateGraphic(t, i, s) {
-    const e = t.getAllSignalCoordinates();
+  generateGraphic(t, e, s) {
+    const i = t.getAllSignalCoordinates();
     let r = null;
-    if (e.length >= 2)
-      if (e.length === 2)
-        r = d.lineString(e);
+    if (i.length >= 2)
+      if (i.length === 2)
+        r = d.lineString(i);
       else {
-        if (i) {
-          const n = d.featureCollection(
-            e.map((a) => d.point(a))
+        if (e) {
+          const a = d.featureCollection(
+            i.map((n) => d.point(n))
           );
-          r = f(n);
+          r = D(a);
         } else {
-          const n = L(e, 0.5);
-          n.length >= 4 && (r = d.polygon([n]));
+          const a = m(i, 0.5);
+          a.length >= 4 && (r = d.polygon([a]));
         }
-        r || (r = d.lineString(e));
+        r || (r = d.lineString(i));
       }
-    else if (e.length === 1)
-      r = d.point(e[0]);
+    else if (i.length === 1)
+      r = d.point(i[0]);
     else
       return;
-    const l = g(
+    const o = E(
       r.geometry,
       // 区控面积更大，需要更大的缓冲半径
-      i ? 200 : 30,
+      e ? 200 : 30,
       {
         units: "meters"
       }
-    ), o = new y({
+    ), h = new y({
       geometry: {
         type: "polyline",
-        paths: l.geometry.coordinates
+        paths: o.geometry.coordinates
       },
       attributes: {
-        ObjectID: i ? this.districtControllerOid++ : this.subDistrictControllerOid++,
+        ObjectID: e ? this.districtControllerOid++ : this.subDistrictControllerOid++,
         id: t.id,
         name: t.name,
         subDistrictCount: t.subDistrictCount,
@@ -251,40 +261,40 @@ class P {
         parentId: t.parentId,
         parentName: t.parentName,
         selected: s,
-        type: i ? "district" : "subDistrict"
+        type: e ? "district" : "subDistrict"
       }
     });
-    i ? this.districtGraphics.push(o) : this.subDistrictGraphics.push(o);
-    for (const n of t.subDistricts)
-      this.generateGraphic(n, !1, s);
-    t.signals.forEach((n) => {
-      const a = new y({
+    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({
         geometry: {
           type: "point",
-          x: n.longitude,
-          y: n.latitude
+          x: a.longitude,
+          y: a.latitude
         },
         attributes: {
           ObjectID: this.signalOid++,
-          id: n.id,
-          name: n.name,
-          signalId: n.signalId,
-          nodeId: n.nodeId,
-          isKey: n.isKey,
-          districtId: i ? t.id : t.parentId,
-          districtName: i ? t.name : t.parentName,
-          subDistrictId: i ? "" : t.id,
-          subDistrictName: i ? "" : t.name,
+          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,
           type: "signal",
           selected: !0
         }
       });
-      this.signalGraphics.push(a);
+      this.signalGraphics.push(n);
     });
   }
   async viewHitTest(t) {
-    var n;
-    const s = (n = (await this.view.hitTest(t, {
+    var a;
+    const s = (a = (await this.view.hitTest(t, {
       include: [
         this.districtControllerSolidLayer,
         this.subDistrictControllerLayer,
@@ -292,53 +302,53 @@ class P {
         this.signalPictureLayer,
         this.signalClusterLayer
       ]
-    })).results) == null ? void 0 : n.filter(
-      (a) => a.type === "graphic"
+    })).results) == null ? void 0 : a.filter(
+      (n) => n.type === "graphic"
     );
     if (s.length === 0)
       return;
-    const e = s[0].graphic;
+    const i = s[0].graphic;
     let r = null;
-    e.geometry.type === "point" ? r = e.geometry : e.geometry.type === "polyline" ? r = e.geometry.extent.center : e.geometry.type === "polygon" && (r = e.geometry.centroid), r !== null && await this.view.goTo(r, { duration: 1e3 });
-    const l = e.getAttribute("type"), o = e.getAttribute("id");
-    switch (l) {
+    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 o = i.getAttribute("type"), h = i.getAttribute("id");
+    switch (o) {
       case "district": {
-        let a = await this.districtControllerSolidLayer.queryFeatures();
-        a.features.forEach((u) => {
-          u.attributes.selected = u.attributes.id === o;
+        let n = await this.districtControllerSolidLayer.queryFeatures();
+        n.features.forEach((l) => {
+          l.attributes.selected = l.attributes.id === h;
         }), await this.districtControllerSolidLayer.applyEdits({
-          updateFeatures: a.features
-        }), a = await this.districtControllerDashLayer.queryFeatures(), a.features.forEach((u) => {
-          u.attributes.selected = u.attributes.id === o;
+          updateFeatures: n.features
+        }), n = await this.districtControllerDashLayer.queryFeatures(), n.features.forEach((l) => {
+          l.attributes.selected = l.attributes.id === h;
         }), await this.districtControllerDashLayer.applyEdits({
-          updateFeatures: a.features
+          updateFeatures: n.features
         });
         break;
       }
       case "subDistrict": {
-        let a = await this.subDistrictControllerLayer.queryFeatures();
-        a.features.forEach((h) => {
-          h.attributes.selected = h.attributes.id === o;
+        let n = await this.subDistrictControllerLayer.queryFeatures();
+        n.features.forEach((u) => {
+          u.attributes.selected = u.attributes.id === h;
         }), await this.subDistrictControllerLayer.applyEdits({
-          updateFeatures: a.features
-        }), a = await this.signalMarkerLayer.queryFeatures(), a.features.forEach((h) => {
-          h.attributes.selected = h.attributes.subDistrictId === o;
+          updateFeatures: n.features
+        }), n = await this.signalMarkerLayer.queryFeatures(), n.features.forEach((u) => {
+          u.attributes.selected = u.attributes.subDistrictId === h;
         });
-        let u = await this.signalMarkerLayer.applyEdits({
-          updateFeatures: a.features
+        let l = await this.signalMarkerLayer.applyEdits({
+          updateFeatures: n.features
         });
-        console.log(u), a = await this.signalPictureLayer.queryFeatures(), a.features.forEach((h) => {
-          h.attributes.selected = h.attributes.subDistrictId === o;
-        }), u = await this.signalPictureLayer.applyEdits({
-          updateFeatures: a.features
-        }), console.log(u);
+        console.log(l), n = await this.signalPictureLayer.queryFeatures(), n.features.forEach((u) => {
+          u.attributes.selected = u.attributes.subDistrictId === h;
+        }), l = await this.signalPictureLayer.applyEdits({
+          updateFeatures: n.features
+        }), console.log(l);
         break;
       }
     }
-    p.when(
+    L.when(
       () => this.view.popup.visible === !1,
       async () => {
-        await this.resetSelectedSymbol(l);
+        await this.resetSelectedSymbol(o);
       },
       {
         once: !0
@@ -351,38 +361,96 @@ class P {
   async resetSelectedSymbol(t) {
     switch (t) {
       case "district": {
-        let i = await this.districtControllerSolidLayer.queryFeatures();
-        i.features.forEach((s) => {
+        let e = await this.districtControllerSolidLayer.queryFeatures();
+        e.features.forEach((s) => {
           s.attributes.selected = !0;
         }), await this.districtControllerSolidLayer.applyEdits({
-          updateFeatures: i.features
-        }), i = await this.districtControllerDashLayer.queryFeatures(), i.features.forEach((s) => {
+          updateFeatures: e.features
+        }), e = await this.districtControllerDashLayer.queryFeatures(), e.features.forEach((s) => {
           s.attributes.selected = !0;
         }), await this.districtControllerDashLayer.applyEdits({
-          updateFeatures: i.features
+          updateFeatures: e.features
         });
         break;
       }
       case "subDistrict": {
-        let i = await this.subDistrictControllerLayer.queryFeatures();
-        i.features.forEach((s) => {
+        let e = await this.subDistrictControllerLayer.queryFeatures();
+        e.features.forEach((s) => {
           s.attributes.selected = !0;
         }), await this.subDistrictControllerLayer.applyEdits({
-          updateFeatures: i.features
-        }), i = await this.signalMarkerLayer.queryFeatures(), console.log("marker count", i.features.length), i.features.forEach((s) => {
+          updateFeatures: e.features
+        }), e = await this.signalMarkerLayer.queryFeatures(), console.log("marker count", e.features.length), e.features.forEach((s) => {
           s.attributes.selected = !0;
         }), await this.signalMarkerLayer.applyEdits({
-          updateFeatures: i.features
-        }), i = await this.signalPictureLayer.queryFeatures(), console.log("picture count", i.features.length), i.features.forEach((s) => {
+          updateFeatures: e.features
+        }), e = await this.signalPictureLayer.queryFeatures(), console.log("picture count", e.features.length), e.features.forEach((s) => {
           s.attributes.selected = !0;
         }), await this.signalPictureLayer.applyEdits({
-          updateFeatures: i.features
+          updateFeatures: e.features
         });
         break;
       }
     }
   }
+  /**
+   * 加载支队图层
+   * 现场环境用url创建FeatureLayer有各种问题，改为用url创建Graphic，再将Graphic添加到FeatureLayer
+   */
+  async loadDetachmentLayer() {
+    const t = this.mapConfig.baseLayers;
+    if (!t)
+      return;
+    const e = t.find(
+      (a) => a.options.id === "shanghai_district"
+    );
+    if (!e)
+      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 !== "高架支队") {
+        let l = new b({
+          rings: a.geometry.rings
+        });
+        l = w(l);
+        const u = new y({
+          geometry: l,
+          attributes: {
+            ...a.attributes,
+            ObjectID: a.attributes.OBJECTID || a.attributes.ESRI_OID
+          }
+        });
+        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)
+            );
+            u.symbol = g ? g.symbol : o.defaultSymbol;
+          }
+        } else
+          u.symbol = {
+            type: "simple-fill",
+            color: [227, 237, 255, 0.4],
+            outline: {
+              color: [255, 195, 153],
+              width: 2
+            }
+          };
+        if (r.push(u), h && n !== "边防港航支队" && n !== "机场支队") {
+          const p = new y({
+            geometry: l.centroid,
+            symbol: { ...h.symbol, text: n }
+          });
+          r.push(p);
+        }
+      }
+    }), this.detachmentLayer.addMany(r), this.detachmentLayerLoaded = !0;
+  }
 }
 export {
-  P as default
+  Q as default
 };

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

@@ -2,6 +2,9 @@ import { IFindSignalControlAreaParams, ILayerVisibleParams, IResult, IShowSignal
 export default class SignalControlAreaController1 {
     private view;
     private hasGpu;
+    /** 支队图层 */
+    private detachmentLayer;
+    private detachmentLayerLoaded;
     /** 区控虚线图层 */
     private districtControllerDashLayer;
     /** 区控实线图层，区控符号由半透明实线+不透明虚线组成 */
@@ -19,6 +22,7 @@ export default class SignalControlAreaController1 {
     private subDistrictControllerOid;
     private signalOid;
     private popupEnabled;
+    private mapConfig;
     constructor(view: __esri.MapView | __esri.SceneView);
     /** 暂存等待绘制的区控graphic */
     private districtGraphics;
@@ -78,4 +82,9 @@ export default class SignalControlAreaController1 {
      * 重置所有graphic的置灰状态
      */
     private resetSelectedSymbol;
+    /**
+     * 加载支队图层
+     * 现场环境用url创建FeatureLayer有各种问题，改为用url创建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 L=require("@arcgis/core/core/reactiveUtils"),g=require("@arcgis/core/Graphic"),h=require("@arcgis/core/layers/FeatureLayer"),b=require("@turf/buffer"),C=require("@turf/convex"),w=require("@turf/helpers"),E=require("concaveman"),D=require("./district-controller.js"),y=require("./layer-symbol.js");function f(d){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(d){for(const t in d)if(t!=="default"){const s=Object.getOwnPropertyDescriptor(d,t);Object.defineProperty(e,t,s.get?s:{enumerable:!0,get:()=>d[t]})}}return e.default=d,Object.freeze(e)}const F=f(L),p=f(w);class k{constructor(e){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",this.districtControllerDashLayer=new h(y.districtDashLineLayerOptions),this.districtControllerDashLayer.spatialReference=e.spatialReference,this.districtControllerSolidLayer=new h(y.districtSolidLineLayerOptions),this.districtControllerSolidLayer.spatialReference=e.spatialReference,this.districtControllerSolidLayer.popupEnabled=this.popupEnabled,this.subDistrictControllerLayer=new h(y.subDistrictLayerOptions),this.subDistrictControllerLayer.spatialReference=e.spatialReference,this.subDistrictControllerLayer.popupEnabled=this.popupEnabled,this.signalMarkerLayer=new h(y.signalMarkerLayerOptions),this.signalMarkerLayer.spatialReference=e.spatialReference,this.signalMarkerLayer.popupEnabled=this.popupEnabled,this.signalPictureLayer=new h(y.signalPictureLayerOptions),this.signalPictureLayer.spatialReference=e.spatialReference,this.signalPictureLayer.popupEnabled=this.popupEnabled,this.signalClusterLayer=new h(y.signalClusterLayerOptions),this.signalClusterLayer.spatialReference=e.spatialReference,this.signalClusterLayer.popupEnabled=this.popupEnabled,this.view.map.addMany([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){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 D.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}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:o}=r.attributes;return this.districtControllerDashLayer.definitionExpression=`id = '${l}'`,this.districtControllerSolidLayer.definitionExpression=`id = '${l}'`,this.subDistrictControllerLayer.definitionExpression=`id = '${o}'`,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=C(n)}else{const n=E(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=b(r.geometry,t?200:30,{units:"meters"}),o=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(o):this.subDistrictGraphics.push(o);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"),o=i.getAttribute("id");switch(l){case"district":{let a=await this.districtControllerSolidLayer.queryFeatures();a.features.forEach(u=>{u.attributes.selected=u.attributes.id===o}),await this.districtControllerSolidLayer.applyEdits({updateFeatures:a.features}),a=await this.districtControllerDashLayer.queryFeatures(),a.features.forEach(u=>{u.attributes.selected=u.attributes.id===o}),await this.districtControllerDashLayer.applyEdits({updateFeatures:a.features});break}case"subDistrict":{let a=await this.subDistrictControllerLayer.queryFeatures();a.features.forEach(c=>{c.attributes.selected=c.attributes.id===o}),await this.subDistrictControllerLayer.applyEdits({updateFeatures:a.features}),a=await this.signalMarkerLayer.queryFeatures(),a.features.forEach(c=>{c.attributes.selected=c.attributes.subDistrictId===o});let u=await this.signalMarkerLayer.applyEdits({updateFeatures:a.features});console.log(u),a=await this.signalPictureLayer.queryFeatures(),a.features.forEach(c=>{c.attributes.selected=c.attributes.subDistrictId===o}),u=await this.signalPictureLayer.applyEdits({updateFeatures:a.features}),console.log(u);break}}F.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}}}}exports.default=k;
+"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;

package/package.json

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