gisviewer-vue3-arcgis 1.0.254 → 1.0.256

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

@@ -4,17 +4,17 @@ import m from "@arcgis/core/Graphic";
 import b from "@arcgis/core/layers/GraphicsLayer";
 class I {
   constructor(t) {
-    this.maxClusterSymbolSize = 50, this.minClusterSymbolSize = 25, 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);
+    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((t) => {
-      const s = this.view.toScreen(
+      const r = this.view.toScreen(
         new h({ x: t.x, y: t.y })
       );
-      t.properties.screenX = s.x, t.properties.screenY = s.y;
+      t.properties.screenX = r.x, t.properties.screenY = r.y;
     });
   }
   /**
@@ -39,13 +39,19 @@ class I {
       () => {
         if (Math.abs(this.currentZoom - this.view.zoom) >= 1) {
           this.currentZoom = this.view.zoom, this.locationToScreen(), console.time("cluster");
-          const e = this.doPixelCluster(120, 3);
+          const e = this.doPixelCluster(
+            this.clusterRadius,
+            this.minClusterPoints
+          );
           console.timeEnd("cluster"), this.showClusters(e);
         }
       }
     )), this.locationToScreen();
-    const s = this.doPixelCluster(120, 3);
-    this.showClusters(s);
+    const r = this.doPixelCluster(
+      this.clusterRadius,
+      this.minClusterPoints
+    );
+    this.showClusters(r);
   }
   removeAllClusterPoints() {
     var t;
@@ -53,13 +59,13 @@ class I {
   }
   showClusters(t) {
     this.clusterLayer.removeAll();
-    let s = Number.MIN_VALUE, i = Number.MAX_VALUE;
+    let r = Number.MIN_VALUE, i = Number.MAX_VALUE;
     t.forEach((e) => {
-      e.count > 1 && (i = Math.min(i, e.count), s = Math.max(s, e.count));
+      e.count > 1 && (i = Math.min(i, e.count), r = Math.max(r, e.count));
     }), t.forEach((e) => {
       if (e.id !== -1) {
-        let r = i === s ? (this.maxClusterSymbolSize + this.minClusterSymbolSize) / 2 : this.minClusterSymbolSize + (e.count - i) / (s - i) * (this.maxClusterSymbolSize - this.minClusterSymbolSize);
-        r *= 0.75;
+        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: {
@@ -89,7 +95,7 @@ class I {
                   // 聚合数量
                   {
                     type: "CIMVectorMarker",
-                    size: r,
+                    size: s,
                     colorLocked: !0,
                     anchorPointUnits: "Relative",
                     frame: { xmin: -16, ymin: -16, xmax: 16, ymax: 16 },
@@ -163,7 +169,7 @@ class I {
                       y: 0
                     },
                     anchorPointUnits: "Relative",
-                    size: r,
+                    size: s,
                     rotateClockwise: !0,
                     textureFilter: "Picture",
                     url: this.clusterMarkUrl
@@ -175,15 +181,16 @@ class I {
         });
         this.clusterLayer.add(c);
       } else
-        e.items.forEach((r) => {
+        e.items.forEach((s) => {
           const o = new m({
-            geometry: new h({ x: r.x, y: r.y }),
+            geometry: new h({ x: s.x, y: s.y }),
             attributes: {
-              ...r.properties,
+              ...s,
+              ...s.properties,
               type: "clusterPoint",
-              id: r.id
+              id: s.id
             },
-            symbol: r.symbol
+            symbol: s.symbol
           });
           this.clusterLayer.add(o);
         });
@@ -196,9 +203,8 @@ class I {
    * @param eps
    * @returns
    */
-  getNeighbors(t, s, i) {
-    const e = t[s];
-    return t.filter((r) => r.id === e.id || r.visited ? !1 : this.getDistance(e, r) <= i);
+  getNeighbors(t, r) {
+    return this.locations.filter((i) => i.id === t.id || i.visited ? !1 : this.getDistance(t, i) <= r);
   }
   /**
    * 两点间的像素距离
@@ -206,9 +212,9 @@ class I {
    * @param point2
    * @returns
    */
-  getDistance(t, s) {
+  getDistance(t, r) {
     return Math.sqrt(
-      Math.pow(t.properties.screenX - s.properties.screenX, 2) + Math.pow(t.properties.screenY - s.properties.screenY, 2)
+      Math.pow(t.properties.screenX - r.properties.screenX, 2) + Math.pow(t.properties.screenY - r.properties.screenY, 2)
     );
   }
   /**
@@ -217,15 +223,15 @@ class I {
    * @returns
    */
   createClusters(t) {
-    const s = {}, i = [];
-    for (let r = 0; r < t.length; r++) {
-      const o = t[r];
-      o.clusterId === void 0 || o.clusterId === -1 ? i.push(o) : (s[o.clusterId] || (s[o.clusterId] = []), s[o.clusterId].push(o));
+    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 e = Object.keys(s).map((r, o) => {
-      const n = s[Number(r)], 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;
+    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(r),
+        id: Number(s),
         items: n,
         count: l,
         center: {
@@ -248,20 +254,20 @@ class I {
    * @param minPoints
    * @returns
    */
-  doPixelCluster(t, s) {
+  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 r = this.locations[e];
-      if (r.visited)
+      const s = this.locations[e];
+      if (s.visited)
         continue;
-      r.visited = !0;
-      const o = this.getNeighbors(this.locations, e, t);
-      o.length < s ? r.clusterId = -1 : (o.forEach((n) => {
+      s.visited = !0;
+      const o = this.getNeighbors(s, t);
+      o.length < r ? s.clusterId = -1 : (o.forEach((n) => {
         n.visited = !0, n.clusterId = i;
-      }), r.clusterId = i, i++);
+      }), s.clusterId = i, i++);
     }
     return this.createClusters(this.locations);
   }

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;
 }