gisviewer-vue3-arcgis 1.0.253 → 1.0.255

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

@@ -1,25 +1,28 @@
-import M from "@arcgis/core/Basemap";
-import d from "@arcgis/core/config";
-import * as k from "@arcgis/core/core/reactiveUtils";
-import { Multipoint as P, Polygon as C, Polyline as z, Point as T } from "@arcgis/core/geometry";
-import * as u from "@arcgis/core/geometry/support/webMercatorUtils";
-import W from "@arcgis/core/layers/FeatureLayer";
+import L from "@arcgis/core/Basemap";
+import v from "@arcgis/core/config";
+import * as M from "@arcgis/core/core/reactiveUtils";
+import { Multipoint as z, Polygon as k, Polyline as W, Point as T } from "@arcgis/core/geometry";
+import * as b from "@arcgis/core/geometry/support/webMercatorUtils";
+import { webMercatorToGeographic as I } from "@arcgis/core/geometry/support/webMercatorUtils";
+import C from "@arcgis/core/Graphic";
+import G from "@arcgis/core/layers/FeatureLayer";
 import x from "@arcgis/core/layers/GeoJSONLayer";
-import I from "@arcgis/core/layers/GroupLayer";
-import G from "@arcgis/core/layers/IntegratedMesh3DTilesLayer";
-import S from "@arcgis/core/layers/MapImageLayer";
-import H from "@arcgis/core/layers/TileLayer";
+import S from "@arcgis/core/layers/GroupLayer";
+import H from "@arcgis/core/layers/IntegratedMesh3DTilesLayer";
+import B from "@arcgis/core/layers/MapImageLayer";
+import O from "@arcgis/core/layers/TileLayer";
 import R from "@arcgis/core/layers/WebTileLayer";
-import B from "@arcgis/core/layers/WMSLayer";
-import O from "@arcgis/core/Map";
-import N from "@arcgis/core/views/MapView";
+import E from "@arcgis/core/layers/WMSLayer";
+import N from "@arcgis/core/Map";
+import A from "@arcgis/core/views/MapView";
 import U from "@arcgis/core/views/SceneView";
-import E from "@turf/destination";
-import * as A from "@turf/helpers";
+import V from "@turf/destination";
+import * as j from "@turf/helpers";
+import D from "@arcgis/core/layers/GraphicsLayer";
 import J from "./custom-layer/custom-wmts-layer.mjs";
-class ae {
+class me {
   constructor() {
-    this.mapConfig = {}, this.watchHandleMap = /* @__PURE__ */ new Map(), this.handleIndex = 0, this.zoomWatchHandle = null;
+    this.mapConfig = {}, this.watchHandleMap = /* @__PURE__ */ new Map(), this.handleIndex = 0, this.zoomWatchHandle = null, this.detachmentLayerLoaded = !1;
   }
   processUrl(e) {
     return e && (e.startsWith("http://") || e.startsWith("https://") ? e : e.startsWith("{{") ? e.replace("{{geoServer}}", this.mapConfig.geoServer) : this.mapConfig.assetsRoot + e);
@@ -30,19 +33,19 @@ class ae {
    * @returns view
    */
   async initialize(e) {
-    var w, v, b, y;
+    var p, u, g, f;
     this.mapConfig = e.mapConfig;
     const { container: i, markerClickCallback: s, mapClickCallback: a } = e;
-    d.assetsPath = `${this.mapConfig.assetsRoot}/ArcgisAssets`, d.fontsUrl = `${this.mapConfig.assetsRoot}/fonts`, d.apiKey = "AAPKf5a3e1044d7a4faeb3b1ec7060f5c68equIrP2KbRyL-t_b40Kk4GTWUQ1BFCyttvyQPQnWpFmBd7kp9gkrVihjfmcKBwxjW";
-    const r = new O();
-    ((w = this.mapConfig) == null ? void 0 : w.mapOptions.mode.toLowerCase()) === "2d" ? (this.view = new N({
-      map: r,
+    v.assetsPath = `${this.mapConfig.assetsRoot}/ArcgisAssets`, v.fontsUrl = `${this.mapConfig.assetsRoot}/fonts`, v.apiKey = "AAPKf5a3e1044d7a4faeb3b1ec7060f5c68equIrP2KbRyL-t_b40Kk4GTWUQ1BFCyttvyQPQnWpFmBd7kp9gkrVihjfmcKBwxjW";
+    const o = new N();
+    ((p = this.mapConfig) == null ? void 0 : p.mapOptions.mode.toLowerCase()) === "2d" ? (this.view = new A({
+      map: o,
       container: i,
       ...this.mapConfig.mapOptions
     }), this.view.on("drag", (t) => {
       t.button === 2 && t.stopPropagation();
     })) : this.view = new U({
-      map: r,
+      map: o,
       container: i,
       environment: {
         atmosphereEnabled: !0,
@@ -50,7 +53,7 @@ class ae {
           type: "virtual"
         }
       },
-      ...(v = this.mapConfig) == null ? void 0 : v.mapOptions
+      ...(u = this.mapConfig) == null ? void 0 : u.mapOptions
     }), this.view.popup.visibleElements = {
       closeButton: !0,
       collapseButton: !1,
@@ -60,69 +63,69 @@ class ae {
       buttonEnabled: !1,
       breakpoint: !1
     }, this.view.on("click", async (t) => {
-      var h, f;
+      var h, y;
       if (a) {
-        let o = t.mapPoint;
-        o.spatialReference.isWebMercator && (o = u.webMercatorToGeographic(
-          o
+        let n = t.mapPoint;
+        n.spatialReference.isWebMercator && (n = b.webMercatorToGeographic(
+          n
         )), a(
-          [o.x, o.y],
+          [n.x, n.y],
           [t.screenPoint.x, t.screenPoint.y],
           t
         );
       }
       if (this.view.type === "3d") {
-        const o = this.view.camera;
+        const n = this.view.camera;
         if (this.view.spatialReference.isWebMercator) {
-          const l = u.webMercatorToGeographic(
-            o.position
-          ), p = {
-            heading: o.heading,
-            tilt: o.tilt,
-            position: l.toJSON()
+          const w = b.webMercatorToGeographic(
+            n.position
+          ), d = {
+            heading: n.heading,
+            tilt: n.tilt,
+            position: w.toJSON()
           };
-          console.log(p), (h = navigator.clipboard) == null || h.writeText(JSON.stringify(p));
+          console.log(d), (h = navigator.clipboard) == null || h.writeText(JSON.stringify(d));
         } else
-          console.log(o.toJSON());
+          console.log(n.toJSON());
         console.log(this.view.zoom, this.view.scale);
       } else {
-        let o = this.view.center;
-        this.view.spatialReference.isWebMercator && (o = u.webMercatorToGeographic(
-          o
+        let n = this.view.center;
+        this.view.spatialReference.isWebMercator && (n = b.webMercatorToGeographic(
+          n
         )), console.log({
-          center: o.toJSON(),
+          center: n.toJSON(),
           zoom: this.view.zoom,
           scale: this.view.scale
         });
       }
-      const c = (f = (await this.view.hitTest(t)).results) == null ? void 0 : f.filter(
-        (o) => o.type === "graphic"
+      const c = (y = (await this.view.hitTest(t)).results) == null ? void 0 : y.filter(
+        (n) => n.type === "graphic"
       );
-      c.length > 0 && c.forEach((o) => {
-        var p;
-        const l = o.graphic;
-        (p = l.attributes) != null && p.type && s && s(
-          l.attributes.type,
-          l.attributes.id,
-          l.attributes,
+      c.length > 0 && c.forEach((n) => {
+        var d;
+        const w = n.graphic;
+        (d = w.attributes) != null && d.type && s && s(
+          w.attributes.type,
+          w.attributes.id,
+          w.attributes,
           t
         );
       });
     });
     {
-      let t = 0, n = !1;
+      let t = 0, r = !1;
       this.view.on("pointer-move", async (c) => {
-        var f;
+        var y;
         const h = performance.now();
-        if (!(n || h - t < 100)) {
-          t = h, n = !0;
+        if (!(r || h - t < 100)) {
+          t = h, r = !0;
           try {
-            const l = (f = (await this.view.hitTest(c)).results) == null ? void 0 : f.some(
-              (L) => L.type === "graphic"
-            ), p = this.view.container;
-            p && (p.style.cursor = l ? "pointer" : "default");
+            const w = (y = (await this.view.hitTest(c)).results) == null ? void 0 : y.some(
+              (P) => P.type === "graphic"
+            ), d = this.view.container;
+            d && (d.style.cursor = w ? "pointer" : "default");
           } finally {
-            n = !1;
+            r = !1;
           }
         }
       });
@@ -130,106 +133,103 @@ class ae {
     if (this.view.on("pointer-leave", () => {
       const t = this.view.container;
       t && (t.style.cursor = "default");
-    }), (b = this.mapConfig) != null && b.baseLayers ? this.mapConfig.baseLayers.forEach((t) => {
-      const n = this.processUrl(t.url);
+    }), (g = this.mapConfig) != null && g.baseLayers ? this.mapConfig.baseLayers.forEach((t) => {
+      const r = this.processUrl(t.url);
       let c = null;
       switch (t.type.toLowerCase()) {
         case "webTile".toLowerCase(): {
           c = new R({
-            urlTemplate: n,
+            urlTemplate: r,
             ...t.options
           });
           break;
         }
         case "tile": {
-          c = new H({
-            url: n,
+          c = new O({
+            url: r,
             ...t.options
           });
           break;
         }
         case "customwmts".toLowerCase(): {
           c = new J({
-            urlTemplate: n,
+            urlTemplate: r,
             ...t.options
           });
           break;
         }
         case "mapimage".toLowerCase(): {
-          c = new S({
-            url: n,
+          c = new B({
+            url: r,
             ...t.options
           });
           break;
         }
         case "arcgis": {
-          const h = new M(t.options);
-          r.basemap = h;
+          const h = new L(t.options);
+          o.basemap = h;
           break;
         }
         case "feature": {
-          c = new W({ url: n, ...t.options });
+          c = new G({ url: r, ...t.options });
           break;
         }
         case "3dtiles": {
-          c = new G({
-            url: n,
+          c = new H({
+            url: r,
             ...t.options
           });
           break;
         }
         case "wms": {
-          c = new B({
-            url: n,
+          c = new E({
+            url: r,
             ...t.options
           });
           break;
         }
-        default:
-          console.warn(`不支持的图层类型: ${t.type}`);
-          break;
       }
       if (c)
         if (t.group) {
-          let h = r.findLayerById(t.group);
-          h && h.type === "group" ? h.add(c) : (h = new I({
+          let h = o.findLayerById(t.group);
+          h && h.type === "group" ? h.add(c) : (h = new S({
             id: t.group,
             title: t.groupTitle,
             visibilityMode: "inherited",
             layers: [c],
             visible: t.groupVisible !== !1
-          }), r.add(h));
+          }), o.add(h));
         } else
-          r.add(c);
-    }) : r.basemap = new M({
+          o.add(c);
+    }) : o.basemap = new L({
       style: {
         id: "arcgis/light-gray",
         language: "zh-CN"
       }
-    }), (y = this.mapConfig) != null && y.hdLayers) {
+    }), (f = this.mapConfig) != null && f.hdLayers) {
       const t = this.mapConfig.hdLayers.map(
-        (n) => (
+        (r) => (
           // 图层文件为GeoJson格式, renderer和symbol使用autocast配置
           new x({
-            url: this.processUrl(n.url),
-            ...n.options,
-            title: n.options.id
+            url: this.processUrl(r.url),
+            ...r.options,
+            title: r.options.id
           })
         )
       );
-      r.addMany(t);
+      o.addMany(t);
     }
     this.view.ui.remove("attribution"), await this.view.when();
-    const g = this.mapConfig.camera;
+    const l = this.mapConfig.camera;
     let m;
     if (this.view.type === "2d") {
       let t = this.view.center;
-      this.view.spatialReference.isWebMercator && (t = u.webMercatorToGeographic(
+      this.view.spatialReference.isWebMercator && (t = b.webMercatorToGeographic(
         t
       )), m = { center: [t.x, t.y], zoom: this.view.zoom };
     } else {
       let t = this.view.camera.position;
-      this.view.spatialReference.isWebMercator && (t = u.webMercatorToGeographic(
+      this.view.spatialReference.isWebMercator && (t = b.webMercatorToGeographic(
         t
       )), m = {
         position: t,
@@ -237,11 +237,16 @@ class ae {
         tilt: this.view.camera.tilt
       };
     }
-    return g ? g.home = m : this.mapConfig.camera = { home: m }, this.view;
+    return l ? l.home = m : this.mapConfig.camera = { home: m }, this.view;
   }
-  setLayerVisibility(e) {
-    const { id: i, visible: s } = e, a = this.view.map.findLayerById(i);
-    return a ? (a.visible = s, { status: 0, message: "ok" }) : { status: -1, message: "未找到图层" };
+  async setLayerVisibility(e) {
+    const { id: i, visible: s } = e;
+    if (i === "shanghai_district")
+      return this.detachmentLayerLoaded ? this.detachmentLayer.visible = s : await this.loadDetachmentLayer(), { status: 0, message: "ok" };
+    {
+      const a = this.view.map.findLayerById(i);
+      return a ? (a.visible = s, { status: 0, message: "ok" }) : { status: -1, message: "未找到图层" };
+    }
   }
   /**
    * 设置地图中心点
@@ -258,13 +263,13 @@ class ae {
           e.target = new T(e.target);
           break;
         case "polyline":
-          e.target = new z(e.target);
+          e.target = new W(e.target);
           break;
         case "polygon":
-          e.target = new C(e.target);
+          e.target = new k(e.target);
           break;
         case "multipoint":
-          e.target = new P(e.target);
+          e.target = new z(e.target);
           break;
       }
       await this.view.goTo(e, { duration: (e.duration || 0) * 1e3 });
@@ -295,8 +300,8 @@ class ae {
         { duration: (e.duration || 2) * 1e3 }
       );
     else {
-      const a = Math.tan(i * Math.PI / 180) * e.height, r = E(
-        A.point(e.center),
+      const a = Math.tan(i * Math.PI / 180) * e.height, o = V(
+        j.point(e.center),
         a,
         s + 180,
         {
@@ -306,8 +311,8 @@ class ae {
       await this.view.goTo(
         {
           position: {
-            x: r.geometry.coordinates[0],
-            y: r.geometry.coordinates[1],
+            x: o.geometry.coordinates[0],
+            y: o.geometry.coordinates[1],
             z: e.height
           },
           heading: s,
@@ -323,22 +328,22 @@ class ae {
     const { name: i, duration: s = 0 } = e, { camera: a } = this.mapConfig;
     if (!a)
       return { status: -1, message: "未配置camera" };
-    const r = a[i];
-    return r ? (await this.view.goTo(r, { duration: s * 1e3 }), { status: 0, message: "成功" }) : { status: -1, message: "未配置camera" };
+    const o = a[i];
+    return o ? (await this.view.goTo(o, { duration: s * 1e3 }), { status: 0, message: "成功" }) : { status: -1, message: "未配置camera" };
   }
   /**
    * 经纬度转像素坐标，在地图移动时回调
    * */
   requestCoordinateTransform(e, i) {
     let s = 0;
-    const r = 1e3 / 30, g = k.watch(
+    const o = 1e3 / 30, l = M.watch(
       () => this.view.center,
       () => {
-        const m = this.transformPoints(e), w = Date.now();
-        w - s > r && (i(m), s = w);
+        const m = this.transformPoints(e), p = Date.now();
+        p - s > o && (i(m), s = p);
       }
     );
-    return this.handleIndex++, this.watchHandleMap.set(this.handleIndex, g), { handle: this.handleIndex, points: this.transformPoints(e) };
+    return this.handleIndex++, this.watchHandleMap.set(this.handleIndex, l), { handle: this.handleIndex, points: this.transformPoints(e) };
   }
   transformPoints(e) {
     return e.map((i) => {
@@ -361,14 +366,79 @@ class ae {
    * */
   setMapZoomRange(e) {
     const { min: i, max: s } = e;
-    !i && !s || (this.zoomWatchHandle && this.zoomWatchHandle.remove(), this.zoomWatchHandle = k.watch(
+    !i && !s || (this.zoomWatchHandle && this.zoomWatchHandle.remove(), this.zoomWatchHandle = M.watch(
       () => this.view.zoom,
       (a) => {
         i && a <= i && (this.view.zoom = i), s && a >= s && (this.view.zoom = s);
       }
     ));
   }
+  /**
+   * 加载支队图层
+   * 现场环境用url创建FeatureLayer有各种问题，
+   * 改为图层导出为json，用json创建Graphic，再将Graphic添加到FeatureLayer
+   */
+  async loadDetachmentLayer() {
+    this.detachmentLayer = new D({
+      id: "detachmentLayer",
+      title: "支队图层",
+      effect: void 0
+    }), this.view.map.add(this.detachmentLayer);
+    const e = this.mapConfig.baseLayers;
+    if (!e)
+      return;
+    const i = e.find(
+      (s) => s.options.id === "shanghai_district"
+    );
+    if (i)
+      try {
+        const a = await (await fetch(
+          "/GisViewerAssets/ShangHai/Layers/district.json"
+        )).json(), o = [], { renderer: l, labelingInfo: m } = i.options;
+        a.features.forEach((p) => {
+          const u = p.attributes.ZD_NAME;
+          if (u !== "高架支队") {
+            let g = new k({
+              rings: p.geometry.rings
+            });
+            g = I(g);
+            const f = new C({
+              geometry: g,
+              attributes: p.attributes
+            });
+            if (l) {
+              if (l.type === "simple")
+                f.symbol = l.symbol;
+              else if (l.type === "unique-value") {
+                const t = f.getAttribute("OBJECTID"), r = l.uniqueValueInfos.find(
+                  (c) => c.value == t
+                );
+                f.symbol = r ? r.symbol : l.defaultSymbol;
+              }
+            } else
+              f.symbol = {
+                type: "simple-fill",
+                color: [227, 237, 255, 0.4],
+                outline: {
+                  color: [255, 195, 153],
+                  width: 2
+                }
+              };
+            if (o.push(f), m && u !== "边防港航支队" && u !== "机场支队") {
+              const t = new C({
+                geometry: g.centroid,
+                symbol: { ...m.symbol, text: u }
+              });
+              o.push(t);
+            }
+          }
+        }), this.detachmentLayer.addMany(o), this.detachmentLayerLoaded = !0;
+      } catch (s) {
+        console.error("加载支队图层失败:", s);
+        return;
+      }
+  }
 }
 export {
-  ae as default
+  me as default
 };

package/es/src/gis-map/utils/signal-control-area/cross-renderer.d.ts

@@ -0,0 +1,9 @@
+import DistrictController from './district-controller';
+export default class CrossRenderer {
+    private view;
+    private crossLayer;
+    private crossGraphics;
+    private crossGraphicSymbol;
+    constructor(view: __esri.MapView | __esri.SceneView);
+    showCrosses(controllers: DistrictController[]): Promise<void>;
+}

package/es/src/gis-map/utils/signal-control-area/cross-renderer.mjs

@@ -0,0 +1,145 @@
+import s from "@arcgis/core/Graphic";
+import a from "@arcgis/core/layers/GraphicsLayer";
+class p {
+  constructor(r) {
+    this.crossGraphics = [], this.crossGraphicSymbol = {
+      type: "cim",
+      data: {
+        type: "CIMSymbolReference",
+        primitiveOverrides: [
+          {
+            type: "CIMPrimitiveOverride",
+            primitiveName: "textGraphic",
+            propertyName: "TextString",
+            valueExpressionInfo: {
+              type: "CIMExpressionInfo",
+              title: "Custom",
+              expression: 'Replace($feature.name, "与", "/") + "  " + $feature.signalId',
+              returnType: "Default"
+            }
+          }
+        ],
+        symbol: {
+          type: "CIMPointSymbol",
+          symbolLayers: [
+            {
+              type: "CIMVectorMarker",
+              size: 32,
+              colorLocked: !0,
+              anchorPointUnits: "Relative",
+              frame: { xmin: -16, ymin: -16, xmax: 16, ymax: 16 },
+              markerGraphics: [
+                {
+                  type: "CIMMarkerGraphic",
+                  primitiveName: "textGraphic",
+                  geometry: { x: 0, y: 0 },
+                  symbol: {
+                    type: "CIMTextSymbol",
+                    height: 12,
+                    horizontalAlignment: "Center",
+                    offsetX: 0,
+                    offsetY: 18,
+                    haloSize: 1,
+                    haloSymbol: {
+                      type: "CIMPolygonSymbol",
+                      symbolLayers: [
+                        {
+                          type: "CIMSolidFill",
+                          enable: !0,
+                          color: [255, 255, 255, 255]
+                        }
+                      ]
+                    },
+                    symbol: {
+                      type: "CIMPolygonSymbol",
+                      symbolLayers: [
+                        {
+                          type: "CIMSolidFill",
+                          enable: !0,
+                          color: [0, 0, 0, 255]
+                        }
+                      ]
+                    },
+                    verticalAlignment: "Center"
+                  },
+                  textString: ""
+                }
+              ],
+              scaleSymbolsProportionally: !0,
+              respectFrame: !0
+            },
+            {
+              type: "CIMPictureMarker",
+              enable: !0,
+              anchorPoint: {
+                x: 0,
+                y: 0
+              },
+              anchorPointUnits: "Relative",
+              size: 20,
+              rotateClockwise: !0,
+              textureFilter: "Picture",
+              url: "/GisViewerAssets/Images/cross/gis_xhj_blue.png"
+            }
+          ]
+        }
+      }
+    }, this.view = r, this.crossLayer = new a(), this.view.map.add(this.crossLayer);
+  }
+  async showCrosses(r) {
+    this.crossLayer.removeAll(), r.forEach((i) => {
+      i.signals.forEach((e) => {
+        const t = new s({
+          geometry: {
+            type: "point",
+            longitude: e.longitude,
+            latitude: e.latitude
+          },
+          symbol: this.crossGraphicSymbol,
+          attributes: {
+            id: e.id,
+            name: e.name,
+            signalId: e.signalId,
+            nodeId: e.nodeId || e.id,
+            districtId: i.id,
+            districtName: i.name,
+            subDistrictId: "",
+            subDistrictName: "",
+            isKey: e.isKey,
+            type: "signal",
+            selected: !0
+          }
+        });
+        this.crossGraphics.push(t);
+      }), i.subDistricts.forEach((e) => {
+        e.signals.forEach((t) => {
+          const o = new s({
+            geometry: {
+              type: "point",
+              longitude: t.longitude,
+              latitude: t.latitude
+            },
+            symbol: this.crossGraphicSymbol,
+            attributes: {
+              id: t.id,
+              name: t.name,
+              signalId: t.signalId,
+              nodeId: t.nodeId || t.id,
+              districtId: i.id,
+              districtName: i.name,
+              subDistrictId: e.id,
+              subDistrictName: e.name,
+              isKey: t.isKey,
+              type: "signal",
+              selected: !0
+            }
+          });
+          this.crossGraphics.push(o);
+        });
+      });
+    }), this.crossLayer.addMany(this.crossGraphics);
+  }
+}
+export {
+  p as default
+};