gisviewer-vue3-arcgis 1.0.266 → 1.0.267

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

@@ -1,12 +1,12 @@
 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 { Multipoint as W, Polygon as k, Polyline as I, 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 { webMercatorToGeographic as G } 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 x from "@arcgis/core/layers/FeatureLayer";
+import P from "@arcgis/core/layers/GeoJSONLayer";
 import S from "@arcgis/core/layers/GroupLayer";
 import H from "@arcgis/core/layers/IntegratedMesh3DTilesLayer";
 import B from "@arcgis/core/layers/MapImageLayer";
@@ -15,9 +15,9 @@ import R from "@arcgis/core/layers/WebTileLayer";
 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 V from "@turf/destination";
-import * as j from "@turf/helpers";
+import j from "@arcgis/core/views/SceneView";
+import U from "@turf/destination";
+import * as V from "@turf/helpers";
 import D from "@arcgis/core/layers/GraphicsLayer";
 import J from "./custom-layer/custom-wmts-layer.mjs";
 class me {
@@ -35,7 +35,7 @@ class me {
   async initialize(e) {
     var p, u, g, f;
     this.mapConfig = e.mapConfig;
-    const { container: i, markerClickCallback: s, mapClickCallback: a } = e;
+    const { container: i, markerClickCallback: s, mapClickCallback: r } = e;
     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({
@@ -44,7 +44,7 @@ class me {
       ...this.mapConfig.mapOptions
     }), this.view.on("drag", (t) => {
       t.button === 2 && t.stopPropagation();
-    })) : this.view = new U({
+    })) : this.view = new j({
       map: o,
       container: i,
       environment: {
@@ -64,46 +64,46 @@ class me {
       breakpoint: !1
     }, this.view.on("click", async (t) => {
       var h, y;
-      if (a) {
-        let n = t.mapPoint;
-        n.spatialReference.isWebMercator && (n = b.webMercatorToGeographic(
-          n
-        )), a(
-          [n.x, n.y],
+      if (r) {
+        let c = t.mapPoint;
+        c.spatialReference.isWebMercator && (c = b.webMercatorToGeographic(
+          c
+        )), r(
+          [c.x, c.y],
           [t.screenPoint.x, t.screenPoint.y],
           t
         );
       }
       if (this.view.type === "3d") {
-        const n = this.view.camera;
+        const c = this.view.camera;
         if (this.view.spatialReference.isWebMercator) {
           const w = b.webMercatorToGeographic(
-            n.position
+            c.position
           ), d = {
-            heading: n.heading,
-            tilt: n.tilt,
+            heading: c.heading,
+            tilt: c.tilt,
             position: w.toJSON()
           };
           console.log(d), (h = navigator.clipboard) == null || h.writeText(JSON.stringify(d));
         } else
-          console.log(n.toJSON());
+          console.log(c.toJSON());
         console.log(this.view.zoom, this.view.scale);
       } else {
-        let n = this.view.center;
-        this.view.spatialReference.isWebMercator && (n = b.webMercatorToGeographic(
-          n
+        let c = this.view.center;
+        this.view.spatialReference.isWebMercator && (c = b.webMercatorToGeographic(
+          c
         )), console.log({
-          center: n.toJSON(),
+          center: c.toJSON(),
           zoom: this.view.zoom,
           scale: this.view.scale
         });
       }
-      const c = (y = (await this.view.hitTest(t)).results) == null ? void 0 : y.filter(
-        (n) => n.type === "graphic"
+      const n = (y = (await this.view.hitTest(t)).results) == null ? void 0 : y.filter(
+        (c) => c.type === "graphic"
       );
-      c.length > 0 && c.forEach((n) => {
+      n.length > 0 && n.forEach((c) => {
         var d;
-        const w = n.graphic;
+        const w = c.graphic;
         (d = w.attributes) != null && d.type && s && s(
           w.attributes.type,
           w.attributes.id,
@@ -113,19 +113,19 @@ class me {
       });
     });
     {
-      let t = 0, r = !1;
-      this.view.on("pointer-move", async (c) => {
+      let t = 0, a = !1;
+      this.view.on("pointer-move", async (n) => {
         var y;
         const h = performance.now();
-        if (!(r || h - t < 100)) {
-          t = h, r = !0;
+        if (!(a || h - t < 100)) {
+          t = h, a = !0;
           try {
-            const w = (y = (await this.view.hitTest(c)).results) == null ? void 0 : y.some(
-              (P) => P.type === "graphic"
+            const w = (y = (await this.view.hitTest(n)).results) == null ? void 0 : y.some(
+              (z) => z.type === "graphic"
             ), d = this.view.container;
             d && (d.style.cursor = w ? "pointer" : "default");
           } finally {
-            r = !1;
+            a = !1;
           }
         }
       });
@@ -134,33 +134,33 @@ class me {
       const t = this.view.container;
       t && (t.style.cursor = "default");
     }), (g = this.mapConfig) != null && g.baseLayers ? this.mapConfig.baseLayers.forEach((t) => {
-      const r = this.processUrl(t.url);
-      let c = null;
+      const a = this.processUrl(t.url);
+      let n = null;
       switch (t.type.toLowerCase()) {
         case "webTile".toLowerCase(): {
-          c = new R({
-            urlTemplate: r,
+          n = new R({
+            urlTemplate: a,
             ...t.options
           });
           break;
         }
         case "tile": {
-          c = new O({
-            url: r,
+          n = new O({
+            url: a,
             ...t.options
           });
           break;
         }
         case "customwmts".toLowerCase(): {
-          c = new J({
-            urlTemplate: r,
+          n = new J({
+            urlTemplate: a,
             ...t.options
           });
           break;
         }
         case "mapimage".toLowerCase(): {
-          c = new B({
-            url: r,
+          n = new B({
+            url: a,
             ...t.options
           });
           break;
@@ -171,36 +171,43 @@ class me {
           break;
         }
         case "feature": {
-          c = new G({ url: r, ...t.options });
+          n = new x({ url: a, ...t.options });
           break;
         }
         case "3dtiles": {
-          c = new H({
-            url: r,
+          n = new H({
+            url: a,
             ...t.options
           });
           break;
         }
         case "wms": {
-          c = new E({
-            url: r,
+          n = new E({
+            url: a,
+            ...t.options
+          });
+          break;
+        }
+        case "geojson": {
+          n = new P({
+            url: a,
             ...t.options
           });
           break;
         }
       }
-      if (c)
+      if (n)
         if (t.group) {
           let h = o.findLayerById(t.group);
-          h && h.type === "group" ? h.add(c) : (h = new S({
+          h && h.type === "group" ? h.add(n) : (h = new S({
             id: t.group,
             title: t.groupTitle,
             visibilityMode: "inherited",
-            layers: [c],
+            layers: [n],
             visible: t.groupVisible !== !1
           }), o.add(h));
         } else
-          o.add(c);
+          o.add(n);
     }) : o.basemap = new L({
       style: {
         id: "arcgis/light-gray",
@@ -208,12 +215,12 @@ class me {
       }
     }), (f = this.mapConfig) != null && f.hdLayers) {
       const t = this.mapConfig.hdLayers.map(
-        (r) => (
+        (a) => (
           // 图层文件为GeoJson格式, renderer和symbol使用autocast配置
-          new x({
-            url: this.processUrl(r.url),
-            ...r.options,
-            title: r.options.id
+          new P({
+            url: this.processUrl(a.url),
+            ...a.options,
+            title: a.options.id
           })
         )
       );
@@ -244,8 +251,8 @@ class me {
     if (i === "shanghai_district")
       return !this.detachmentLayerLoaded && e.visible ? await this.loadDetachmentLayer() : this.detachmentLayer && (this.detachmentLayer.visible = s), { status: 0, message: "ok" };
     {
-      const a = this.view.map.findLayerById(i);
-      return a ? (a.visible = s, { status: 0, message: "ok" }) : { status: -1, message: "未找到图层" };
+      const r = this.view.map.findLayerById(i);
+      return r ? (r.visible = s, { status: 0, message: "ok" }) : { status: -1, message: "未找到图层" };
     }
   }
   /**
@@ -263,13 +270,13 @@ class me {
           e.target = new T(e.target);
           break;
         case "polyline":
-          e.target = new W(e.target);
+          e.target = new I(e.target);
           break;
         case "polygon":
           e.target = new k(e.target);
           break;
         case "multipoint":
-          e.target = new z(e.target);
+          e.target = new W(e.target);
           break;
       }
       await this.view.goTo(e, { duration: (e.duration || 0) * 1e3 });
@@ -300,9 +307,9 @@ class me {
         { duration: (e.duration || 2) * 1e3 }
       );
     else {
-      const a = Math.tan(i * Math.PI / 180) * e.height, o = V(
-        j.point(e.center),
-        a,
+      const r = Math.tan(i * Math.PI / 180) * e.height, o = U(
+        V.point(e.center),
+        r,
         s + 180,
         {
           units: "meters"
@@ -325,10 +332,10 @@ class me {
   async setMapCamera(e) {
     if (!this.view)
       return { status: -1, message: "未初始化" };
-    const { name: i, duration: s = 0 } = e, { camera: a } = this.mapConfig;
-    if (!a)
+    const { name: i, duration: s = 0 } = e, { camera: r } = this.mapConfig;
+    if (!r)
       return { status: -1, message: "未配置camera" };
-    const o = a[i];
+    const o = r[i];
     return o ? (await this.view.goTo(o, { duration: s * 1e3 }), { status: 0, message: "成功" }) : { status: -1, message: "未配置camera" };
   }
   /**
@@ -350,8 +357,8 @@ class me {
       const s = new T({
         x: i[0],
         y: i[1]
-      }), a = this.view.toScreen(s);
-      return [a.x, a.y];
+      }), r = this.view.toScreen(s);
+      return [r.x, r.y];
     });
   }
   /**
@@ -368,8 +375,8 @@ class me {
     const { min: i, max: s } = e;
     !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);
+      (r) => {
+        i && r <= i && (this.view.zoom = i), s && r >= s && (this.view.zoom = s);
       }
     ));
   }
@@ -392,16 +399,16 @@ class me {
     );
     if (i)
       try {
-        const a = await (await fetch(
+        const r = await (await fetch(
           "/GisViewerAssets/ShangHai/Layers/district.json"
         )).json(), o = [], { renderer: l, labelingInfo: m } = i.options;
-        a.features.forEach((p) => {
+        r.features.forEach((p) => {
           const u = p.attributes.ZD_NAME;
           if (u !== "高架支队") {
             let g = new k({
               rings: p.geometry.rings
             });
-            g = I(g);
+            g = G(g);
             const f = new C({
               geometry: g,
               attributes: p.attributes
@@ -410,10 +417,10 @@ class me {
               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
+                const t = f.getAttribute("OBJECTID"), a = l.uniqueValueInfos.find(
+                  (n) => n.value == t
                 );
-                f.symbol = r ? r.symbol : l.defaultSymbol;
+                f.symbol = a ? a.symbol : l.defaultSymbol;
               }
             } else
               f.symbol = {

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

@@ -1,7 +1,7 @@
 import { Point as h } from "@arcgis/core/geometry";
 import u from "@arcgis/core/Graphic";
-import d from "@arcgis/core/layers/GraphicsLayer";
-class C {
+import p from "@arcgis/core/layers/GraphicsLayer";
+class x {
   constructor(e) {
     this.crossGraphicSymbol = {
       type: "cim",
@@ -85,26 +85,28 @@ class C {
           ]
         }
       }
-    }, this.locations = [], this.clusteredLocations = [], this.filteredLocations = [], this.currentShowMode = "scatter", this.symbolScale = 5e3, this.oldScale = 0, this.clusterRadius = 120, this.minClusterPoints = 2, this.maxClusterSymbolSize = 50, this.minClusterSymbolSize = 25, this.view = e, this.crossLayer = new d(), this.view.map.add(this.crossLayer), this.oldScale = e.scale;
+    }, this.locations = [], this.clusteredLocations = [], this.filteredLocations = [], this.currentShowMode = "scatter", this.symbolScale = 5e3, this.oldScale = 0, this.clusterRadius = 120, this.minClusterPoints = 2, this.maxClusterSymbolSize = 50, this.minClusterSymbolSize = 25, this.view = e, this.crossLayer = new p(), this.view.map.add(this.crossLayer), this.oldScale = e.scale;
   }
   async addCrosses(e) {
     e.forEach((t) => {
-      t.signals.forEach((r) => {
-        r.longitude && r.latitude && !isNaN(r.longitude) && !isNaN(r.latitude) && this.locations.push({
-          id: r.id,
-          x: r.longitude,
-          y: r.latitude,
+      t.signals.forEach((i) => {
+        i.longitude && i.latitude && !isNaN(i.longitude) && !isNaN(i.latitude) && this.locations.push({
+          id: i.id,
+          x: i.longitude,
+          y: i.latitude,
           visited: !1,
           filtered: !1,
           clusterId: void 0,
           properties: {
-            ...r,
+            ...i,
             districtId: t.id,
-            subDistrictId: ""
+            districtName: t.name,
+            subDistrictId: "",
+            subDistrictName: ""
           }
         });
-      }), t.subDistricts.forEach((r) => {
-        r.signals.forEach((s) => {
+      }), t.subDistricts.forEach((i) => {
+        i.signals.forEach((s) => {
           s.longitude && s.latitude && !isNaN(s.longitude) && !isNaN(s.latitude) && this.locations.push({
             id: s.id,
             x: s.longitude,
@@ -115,7 +117,9 @@ class C {
             properties: {
               ...s,
               districtId: t.id,
-              subDistrictId: r.id
+              districtName: t.name,
+              subDistrictId: i.id,
+              subDistrictName: i.name
             }
           });
         });
@@ -137,7 +141,7 @@ class C {
    */
   clearCrosses() {
     var e;
-    console.log("Clearing crosses"), this.crossLayer.removeAll(), this.locations = [], this.clusteredLocations = [], (e = this.zoomWatchHandle) == null || e.remove();
+    this.crossLayer.removeAll(), this.locations = [], this.clusteredLocations = [], (e = this.zoomWatchHandle) == null || e.remove();
   }
   /**
    * 更新散点符号
@@ -174,16 +178,42 @@ class C {
     const e = [];
     this.locations.forEach((t) => {
       if (!t.filtered) {
-        const r = new u({
+        const i = new u({
           geometry: {
             type: "point",
             longitude: t.x,
             latitude: t.y
           },
           symbol: this.getCrossSymbol(t.properties),
-          attributes: t.properties
+          attributes: t.properties,
+          popupTemplate: {
+            title: "{name}信号机",
+            content: [
+              {
+                type: "fields",
+                fieldInfos: [
+                  {
+                    fieldName: "signalId",
+                    label: "信号机编号"
+                  },
+                  {
+                    fieldName: "nodeId",
+                    label: "路口编号"
+                  },
+                  {
+                    fieldName: "districtName",
+                    label: "区控名称"
+                  },
+                  {
+                    fieldName: "subDistrictName",
+                    label: "子区名称"
+                  }
+                ]
+              }
+            ]
+          }
         });
-        e.push(r);
+        e.push(i);
       }
     }), this.crossLayer.addMany(e);
   }
@@ -196,17 +226,17 @@ class C {
   filter(e) {
     this.locations.forEach((t) => {
       if (e.type === "district")
-        t.filtered = t.properties.districtId === e.id;
+        t.filtered = t.properties.districtId !== e.id;
       else if (e.type === "subDistrict")
-        t.filtered = t.properties.subDistrictId === e.id;
-      else if (e.type === "signal" && (t.filtered = t.id === e.id, t.filtered))
+        t.filtered = t.properties.subDistrictId !== e.id;
+      else if (e.type === "signal" && (t.filtered = t.id !== e.id, t.filtered))
         return t.properties;
     });
   }
   resetFilter() {
     this.locations.forEach((e) => {
       e.filtered = !1;
-    });
+    }), this.currentShowMode === "scatter" ? this.showScatter() : this.currentShowMode === "cluster" && this.showCluster();
   }
   /**
    * 根据当前比例尺更新路口符号
@@ -330,7 +360,7 @@ class C {
    * @returns
    */
   getNeighbors(e, t) {
-    return this.clusteredLocations.filter((r) => r.id === e.id || r.visited ? !1 : this.getDistance(e, r) <= t);
+    return this.clusteredLocations.filter((i) => i.id === e.id || i.visited ? !1 : this.getDistance(e, i) <= t);
   }
   /**
    * 两点间的像素距离
@@ -352,24 +382,24 @@ class C {
     const e = {}, t = [];
     for (const s of this.clusteredLocations)
       s.clusterId === void 0 || s.clusterId === -1 ? t.push(s) : (e[s.clusterId] || (e[s.clusterId] = []), e[s.clusterId].push(s));
-    const r = Object.keys(e).map((s, i) => {
-      const o = e[Number(s)], a = o.length, l = o.reduce((n, y) => n + y.x, 0), c = o.reduce((n, y) => n + y.y, 0), m = l / a, p = c / a;
+    const i = Object.keys(e).map((s, r) => {
+      const o = e[Number(s)], a = o.length, l = o.reduce((n, m) => n + m.x, 0), c = o.reduce((n, m) => n + m.y, 0), y = l / a, d = c / a;
       return {
         id: Number(s),
         items: o,
         count: a,
         center: {
-          x: m,
-          y: p
+          x: y,
+          y: d
         }
       };
     });
-    return t.length > 0 && r.push({
+    return t.length > 0 && i.push({
       id: -1,
       items: t,
       count: t.length,
       center: null
-    }), r;
+    }), i;
   }
   /**
    * 按照像素距离聚类
@@ -380,13 +410,13 @@ class C {
    */
   doPixelCluster(e) {
     let t = 0;
-    for (let r = 0; r < this.clusteredLocations.length; r++) {
-      const s = this.clusteredLocations[r];
+    for (let i = 0; i < this.clusteredLocations.length; i++) {
+      const s = this.clusteredLocations[i];
       if (s.visited)
         continue;
       s.visited = !0;
-      const i = this.getNeighbors(s, e);
-      i.length < this.minClusterPoints ? s.clusterId = -1 : (i.forEach((o) => {
+      const r = this.getNeighbors(s, e);
+      r.length < this.minClusterPoints ? s.clusterId = -1 : (r.forEach((o) => {
         o.visited = !0, o.clusterId = t;
       }), s.clusterId = t, t++);
     }
@@ -394,13 +424,13 @@ class C {
   }
   showClusterResult(e) {
     this.crossLayer.removeAll();
-    let t = Number.MIN_VALUE, r = Number.MAX_VALUE;
+    let t = Number.MIN_VALUE, i = Number.MAX_VALUE;
     e.forEach((s) => {
-      s.count > 1 && (r = Math.min(r, s.count), t = Math.max(t, s.count));
+      s.count > 1 && (i = Math.min(i, s.count), t = Math.max(t, s.count));
     }), e.forEach((s) => {
       if (s.id !== -1) {
-        let i = r === t ? (this.maxClusterSymbolSize + this.minClusterSymbolSize) / 2 : this.minClusterSymbolSize + (s.count - r) / (t - r) * (this.maxClusterSymbolSize - this.minClusterSymbolSize);
-        i *= 0.75;
+        let r = i === t ? (this.maxClusterSymbolSize + this.minClusterSymbolSize) / 2 : this.minClusterSymbolSize + (s.count - i) / (t - i) * (this.maxClusterSymbolSize - this.minClusterSymbolSize);
+        r *= 0.75;
         const l = (s.count.toString().length * 8 + 6) / 2, c = new u({
           geometry: new h({ x: s.center.x, y: s.center.y }),
           attributes: {
@@ -430,7 +460,7 @@ class C {
                   // 聚合数量
                   {
                     type: "CIMVectorMarker",
-                    size: i,
+                    size: r,
                     colorLocked: !0,
                     anchorPointUnits: "Relative",
                     frame: { xmin: -16, ymin: -16, xmax: 16, ymax: 16 },
@@ -504,7 +534,7 @@ class C {
                       y: 0
                     },
                     anchorPointUnits: "Relative",
-                    size: i,
+                    size: r,
                     rotateClockwise: !0,
                     textureFilter: "Picture",
                     url: "/GisViewerAssets/Images/cross/gis_xhj_blue.png"
@@ -516,16 +546,42 @@ class C {
         });
         this.crossLayer.add(c);
       } else
-        s.items.forEach((i) => {
+        s.items.forEach((r) => {
           const o = new u({
-            geometry: new h({ x: i.x, y: i.y }),
+            geometry: new h({ x: r.x, y: r.y }),
             attributes: {
-              ...i,
-              ...i.properties,
+              ...r,
+              ...r.properties,
               type: "clusterPoint",
-              id: i.id
+              id: r.id
             },
-            symbol: this.crossGraphicSymbol
+            symbol: this.crossGraphicSymbol,
+            popupTemplate: {
+              title: "{name}信号机",
+              content: [
+                {
+                  type: "fields",
+                  fieldInfos: [
+                    {
+                      fieldName: "signalId",
+                      label: "信号机编号"
+                    },
+                    {
+                      fieldName: "nodeId",
+                      label: "路口编号"
+                    },
+                    {
+                      fieldName: "districtName",
+                      label: "区控名称"
+                    },
+                    {
+                      fieldName: "subDistrictName",
+                      label: "子区名称"
+                    }
+                  ]
+                }
+              ]
+            }
           });
           this.crossLayer.add(o);
         });
@@ -533,5 +589,5 @@ class C {
   }
 }
 export {
-  C as default
+  x as default
 };

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

@@ -1,3 +1,6 @@
+/**
+ * 信控区域
+ */
 import { IFindSignalControlAreaParams, ILayerVisibleParams, IResult, IShowSignalControlAreaParams } from '../../../types';
 export default class SignalControlAreaController1 {
     private view;