gisviewer-vue3-arcgis 1.0.253 → 1.0.255

package/es/src/gis-map/utils/dbscan-cluster/index.mjs

@@ -1,30 +1,30 @@
 import * as f from "@arcgis/core/core/reactiveUtils";
-import { Point as u } from "@arcgis/core/geometry";
+import { Point as h } from "@arcgis/core/geometry";
 import m from "@arcgis/core/Graphic";
 import b from "@arcgis/core/layers/GraphicsLayer";
-class M {
-  constructor(e) {
-    this.maxClusterSymbolSize = 50, this.minClusterSymbolSize = 25, this.zoomWatchHandle = null, this.locations = [], this.clusterMarkUrl = "", this.currentZoom = 0, this.view = e, this.currentZoom = e.zoom, this.clusterLayer = new b(), this.view.map.add(this.clusterLayer);
+class I {
+  constructor(t) {
+    this.maxClusterSymbolSize = 50, this.minClusterSymbolSize = 25, this.clusterRadius = 120, this.minClusterPoints = 2, this.zoomWatchHandle = null, this.locations = [], this.clusterMarkUrl = "", this.currentZoom = 0, this.view = t, this.currentZoom = t.zoom, this.clusterLayer = new b(), this.view.map.add(this.clusterLayer);
   }
   /**
    * 将地理位置转换为屏幕坐标
    */
   locationToScreen() {
-    this.locations.forEach((e) => {
-      const s = this.view.toScreen(
-        new u({ x: e.x, y: e.y })
+    this.locations.forEach((t) => {
+      const r = this.view.toScreen(
+        new h({ x: t.x, y: t.y })
       );
-      e.properties.screenX = s.x, e.properties.screenY = s.y;
+      t.properties.screenX = r.x, t.properties.screenY = r.y;
     });
   }
   /**
    * 添加聚类点到视图
    * @param params
    */
-  addClusterPoints(e) {
+  addClusterPoints(t) {
     var i;
-    this.locations = e.points, this.clusterMarkUrl = ((i = e.clusterSymbol) == null ? void 0 : i.url) || "/GisViewerAssets/Images/cross/gis_xhj_blue.png", e.points.forEach((r) => {
-      r.symbol || (r.symbol = e.pointSymbol || {
+    this.locations = t.points, this.clusterMarkUrl = ((i = t.clusterSymbol) == null ? void 0 : i.url) || "/GisViewerAssets/Images/cross/gis_xhj_blue.png", this.locations = this.locations.filter((e) => e.x !== null && e.y !== null && !isNaN(e.x) && !isNaN(e.y)), this.locations.forEach((e) => {
+      e.x = Number(e.x), e.y = Number(e.y), e.symbol || (e.symbol = t.pointSymbol || {
         type: "simple-marker",
         style: "circle",
         color: "#3388ff",
@@ -37,28 +37,39 @@ class M {
     }), this.zoomWatchHandle || (this.zoomWatchHandle = f.watch(
       () => this.view.zoom,
       () => {
-        Math.abs(this.currentZoom - this.view.zoom) >= 1 && (this.currentZoom = this.view.zoom, this.locationToScreen(), this.clusterLayer.removeAll(), this.addClusterPoints(e));
+        if (Math.abs(this.currentZoom - this.view.zoom) >= 1) {
+          this.currentZoom = this.view.zoom, this.locationToScreen(), console.time("cluster");
+          const e = this.doPixelCluster(
+            this.clusterRadius,
+            this.minClusterPoints
+          );
+          console.timeEnd("cluster"), this.showClusters(e);
+        }
       }
-    )), this.locationToScreen(), console.time("cluster");
-    const s = this.doPixelCluster(e.points, 120, 3);
-    console.timeEnd("cluster"), this.showClusters(s);
+    )), this.locationToScreen();
+    const r = this.doPixelCluster(
+      this.clusterRadius,
+      this.minClusterPoints
+    );
+    this.showClusters(r);
   }
   removeAllClusterPoints() {
-    var e;
-    (e = this.zoomWatchHandle) == null || e.remove(), this.zoomWatchHandle = null, this.clusterLayer.removeAll();
+    var t;
+    (t = this.zoomWatchHandle) == null || t.remove(), this.zoomWatchHandle = null, this.clusterLayer.removeAll();
   }
-  showClusters(e) {
-    let s = Number.MIN_VALUE, i = Number.MAX_VALUE;
-    e.forEach((r) => {
-      r.count > 1 && (i = Math.min(i, r.count), s = Math.max(s, r.count));
-    }), e.forEach((r) => {
-      if (r.id !== -1) {
-        let t = i === s ? (this.maxClusterSymbolSize + this.minClusterSymbolSize) / 2 : this.minClusterSymbolSize + (r.count - i) / (s - i) * (this.maxClusterSymbolSize - this.minClusterSymbolSize);
-        t *= 0.75;
-        const o = new m({
-          geometry: new u({ x: r.center.x, y: r.center.y }),
+  showClusters(t) {
+    this.clusterLayer.removeAll();
+    let r = Number.MIN_VALUE, i = Number.MAX_VALUE;
+    t.forEach((e) => {
+      e.count > 1 && (i = Math.min(i, e.count), r = Math.max(r, e.count));
+    }), t.forEach((e) => {
+      if (e.id !== -1) {
+        let s = i === r ? (this.maxClusterSymbolSize + this.minClusterSymbolSize) / 2 : this.minClusterSymbolSize + (e.count - i) / (r - i) * (this.maxClusterSymbolSize - this.minClusterSymbolSize);
+        s *= 0.75;
+        const l = (e.count.toString().length * 8 + 6) / 2, c = new m({
+          geometry: new h({ x: e.center.x, y: e.center.y }),
           attributes: {
-            count: r.count
+            count: e.count
           },
           symbol: {
             type: "cim",
@@ -84,7 +95,7 @@ class M {
                   // 聚合数量
                   {
                     type: "CIMVectorMarker",
-                    size: t,
+                    size: s,
                     colorLocked: !0,
                     anchorPointUnits: "Relative",
                     frame: { xmin: -16, ymin: -16, xmax: 16, ymax: 16 },
@@ -95,11 +106,11 @@ class M {
                         geometry: {
                           rings: [
                             [
-                              [-15, 40],
-                              [15, 40],
-                              [15, 20],
-                              [-15, 20],
-                              [-15, 40]
+                              [-l, 40],
+                              [l, 40],
+                              [l, 20],
+                              [-l, 20],
+                              [-l, 40]
                             ]
                           ]
                         },
@@ -158,7 +169,7 @@ class M {
                       y: 0
                     },
                     anchorPointUnits: "Relative",
-                    size: t,
+                    size: s,
                     rotateClockwise: !0,
                     textureFilter: "Picture",
                     url: this.clusterMarkUrl
@@ -168,13 +179,18 @@ class M {
             }
           }
         });
-        this.clusterLayer.add(o);
+        this.clusterLayer.add(c);
       } else
-        r.items.forEach((t) => {
+        e.items.forEach((s) => {
           const o = new m({
-            geometry: new u({ x: t.x, y: t.y }),
-            attributes: t.properties,
-            symbol: t.symbol
+            geometry: new h({ x: s.x, y: s.y }),
+            attributes: {
+              ...s,
+              ...s.properties,
+              type: "clusterPoint",
+              id: s.id
+            },
+            symbol: s.symbol
           });
           this.clusterLayer.add(o);
         });
@@ -187,9 +203,8 @@ class M {
    * @param eps
    * @returns
    */
-  getNeighbors(e, s, i) {
-    const r = e[s];
-    return e.filter((t) => t.id === r.id || t.visited ? !1 : this.getDistance(r, t) <= i);
+  getNeighbors(t, r) {
+    return this.locations.filter((i) => i.id === t.id || i.visited ? !1 : this.getDistance(t, i) <= r);
   }
   /**
    * 两点间的像素距离
@@ -197,9 +212,9 @@ class M {
    * @param point2
    * @returns
    */
-  getDistance(e, s) {
+  getDistance(t, r) {
     return Math.sqrt(
-      Math.pow(e.properties.screenX - s.properties.screenX, 2) + Math.pow(e.properties.screenY - s.properties.screenY, 2)
+      Math.pow(t.properties.screenX - r.properties.screenX, 2) + Math.pow(t.properties.screenY - r.properties.screenY, 2)
     );
   }
   /**
@@ -207,30 +222,30 @@ class M {
    * @param locations
    * @returns
    */
-  createClusters(e) {
-    const s = {}, i = [];
-    for (let t = 0; t < e.length; t++) {
-      const o = e[t];
-      o.clusterId === void 0 || o.clusterId === -1 ? i.push(o) : (s[o.clusterId] || (s[o.clusterId] = []), s[o.clusterId].push(o));
+  createClusters(t) {
+    const r = {}, i = [];
+    for (let s = 0; s < t.length; s++) {
+      const o = t[s];
+      o.clusterId === void 0 || o.clusterId === -1 ? i.push(o) : (r[o.clusterId] || (r[o.clusterId] = []), r[o.clusterId].push(o));
     }
-    const r = Object.keys(s).map((t, o) => {
-      const l = s[Number(t)], n = l.length, h = l.reduce((c, a) => c + a.x, 0), y = l.reduce((c, a) => c + a.y, 0), p = h / n, d = y / n;
+    const e = Object.keys(r).map((s, o) => {
+      const n = r[Number(s)], l = n.length, c = n.reduce((a, u) => a + u.x, 0), y = n.reduce((a, u) => a + u.y, 0), d = c / l, p = y / l;
       return {
-        id: Number(t),
-        items: l,
-        count: n,
+        id: Number(s),
+        items: n,
+        count: l,
         center: {
-          x: p,
-          y: d
+          x: d,
+          y: p
         }
       };
     });
-    return i.length > 0 && r.push({
+    return i.length > 0 && e.push({
       id: -1,
       items: i,
       count: i.length,
       center: null
-    }), r;
+    }), e;
   }
   /**
    * 按照像素距离聚类
@@ -239,22 +254,24 @@ class M {
    * @param minPoints
    * @returns
    */
-  doPixelCluster(e, s, i) {
-    let r = 0;
-    e.forEach((t) => t.visited = !1);
-    for (let t = 0; t < e.length; t++) {
-      const o = e[t];
-      if (o.visited)
+  doPixelCluster(t, r) {
+    let i = 0;
+    this.locations.forEach((e) => {
+      e.visited = !1, e.clusterId = void 0;
+    });
+    for (let e = 0; e < this.locations.length; e++) {
+      const s = this.locations[e];
+      if (s.visited)
         continue;
-      o.visited = !0;
-      const l = this.getNeighbors(e, t, s);
-      l.length < i ? o.clusterId = -1 : (l.forEach((n) => {
-        n.visited = !0, n.clusterId = r;
-      }), o.clusterId = r, r++);
+      s.visited = !0;
+      const o = this.getNeighbors(s, t);
+      o.length < r ? s.clusterId = -1 : (o.forEach((n) => {
+        n.visited = !0, n.clusterId = i;
+      }), s.clusterId = i, i++);
     }
-    return this.createClusters(e);
+    return this.createClusters(this.locations);
   }
 }
 export {
-  M as default
+  I as default
 };

package/es/src/gis-map/utils/map-initializer.d.ts

@@ -16,7 +16,7 @@ export default class MapInitializer {
         markerClickCallback?: (type: string, id: string, detail: any, event?: any) => void;
         mapClickCallback?: (mapPoint: number[], screenPoint: number[], event?: any) => void;
     }): Promise<MapView | SceneView>;
-    setLayerVisibility(params: ILayerVisibleParams): IResult;
+    setLayerVisibility(params: ILayerVisibleParams): Promise<IResult>;
     /**
      * 设置地图中心点
      * @param params
@@ -53,4 +53,13 @@ export default class MapInitializer {
         min?: number;
         max?: number;
     }): void;
+    /** 支队图层 */
+    private detachmentLayer;
+    private detachmentLayerLoaded;
+    /**
+     * 加载支队图层
+     * 现场环境用url创建FeatureLayer有各种问题，
+     * 改为图层导出为json，用json创建Graphic，再将Graphic添加到FeatureLayer
+     */
+    private loadDetachmentLayer;
 }