gisviewer-vue3-arcgis 1.0.258 → 1.0.262

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

@@ -1,20 +1,19 @@
-import * as f from "@arcgis/core/core/reactiveUtils";
 import { Point as h } from "@arcgis/core/geometry";
 import m from "@arcgis/core/Graphic";
-import b from "@arcgis/core/layers/GraphicsLayer";
-class I {
+import p from "@arcgis/core/layers/GraphicsLayer";
+class S {
   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);
+    this.maxClusterSymbolSize = 50, this.minClusterSymbolSize = 25, this.clusterRadius = 120, this.minClusterPoints = 2, this.zoomWatchHandle = null, this.locations = [], this.clusteredLocations = [], this.clusterMarkUrl = "", this.currentZoom = 0, this.view = t, this.currentZoom = t.zoom, this.clusterLayer = new p(), this.view.map.add(this.clusterLayer);
   }
   /**
    * 将地理位置转换为屏幕坐标
    */
   locationToScreen() {
-    this.locations.forEach((t) => {
-      const r = this.view.toScreen(
+    this.clusteredLocations = [], this.locations.forEach((t) => {
+      const s = this.view.toScreen(
         new h({ x: t.x, y: t.y })
       );
-      t.properties.screenX = r.x, t.properties.screenY = r.y;
+      s.x > 0 && s.y > 0 && (t.properties.screenX = s.x, t.properties.screenY = s.y, t.visited = !1, t.clusterId = void 0, this.clusteredLocations.push(t));
     });
   }
   /**
@@ -22,8 +21,8 @@ class I {
    * @param params
    */
   addClusterPoints(t) {
-    var i;
-    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) => {
+    var r;
+    this.locations = t.points, this.clusterMarkUrl = ((r = t.clusterSymbol) == null ? void 0 : r.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",
@@ -34,24 +33,21 @@ class I {
           width: 1
         }
       });
-    }), this.zoomWatchHandle || (this.zoomWatchHandle = f.watch(
-      () => this.view.zoom,
-      () => {
-        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.zoomWatchHandle || (this.zoomWatchHandle = this.view.watch("stationary", () => {
+      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();
-    const r = this.doPixelCluster(
+    })), this.locationToScreen();
+    const s = this.doPixelCluster(
       this.clusterRadius,
       this.minClusterPoints
     );
-    this.showClusters(r);
+    this.showClusters(s);
   }
   removeAllClusterPoints() {
     var t;
@@ -59,14 +55,14 @@ class I {
   }
   showClusters(t) {
     this.clusterLayer.removeAll();
-    let r = Number.MIN_VALUE, i = Number.MAX_VALUE;
+    let s = Number.MIN_VALUE, r = Number.MAX_VALUE;
     t.forEach((e) => {
-      e.count > 1 && (i = Math.min(i, e.count), r = Math.max(r, e.count));
+      e.count > 1 && (r = Math.min(r, e.count), s = Math.max(s, 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({
+        let i = r === s ? (this.maxClusterSymbolSize + this.minClusterSymbolSize) / 2 : this.minClusterSymbolSize + (e.count - r) / (s - r) * (this.maxClusterSymbolSize - this.minClusterSymbolSize);
+        i *= 0.75;
+        const n = (e.count.toString().length * 8 + 6) / 2, c = new m({
           geometry: new h({ x: e.center.x, y: e.center.y }),
           attributes: {
             count: e.count
@@ -95,7 +91,7 @@ class I {
                   // 聚合数量
                   {
                     type: "CIMVectorMarker",
-                    size: s,
+                    size: i,
                     colorLocked: !0,
                     anchorPointUnits: "Relative",
                     frame: { xmin: -16, ymin: -16, xmax: 16, ymax: 16 },
@@ -106,11 +102,11 @@ class I {
                         geometry: {
                           rings: [
                             [
-                              [-l, 40],
-                              [l, 40],
-                              [l, 20],
-                              [-l, 20],
-                              [-l, 40]
+                              [-n, 40],
+                              [n, 40],
+                              [n, 20],
+                              [-n, 20],
+                              [-n, 40]
                             ]
                           ]
                         },
@@ -169,7 +165,7 @@ class I {
                       y: 0
                     },
                     anchorPointUnits: "Relative",
-                    size: s,
+                    size: i,
                     rotateClockwise: !0,
                     textureFilter: "Picture",
                     url: this.clusterMarkUrl
@@ -181,16 +177,16 @@ class I {
         });
         this.clusterLayer.add(c);
       } else
-        e.items.forEach((s) => {
+        e.items.forEach((i) => {
           const o = new m({
-            geometry: new h({ x: s.x, y: s.y }),
+            geometry: new h({ x: i.x, y: i.y }),
             attributes: {
-              ...s,
-              ...s.properties,
+              ...i,
+              ...i.properties,
               type: "clusterPoint",
-              id: s.id
+              id: i.id
             },
-            symbol: s.symbol
+            symbol: i.symbol
           });
           this.clusterLayer.add(o);
         });
@@ -203,8 +199,8 @@ class I {
    * @param eps
    * @returns
    */
-  getNeighbors(t, r) {
-    return this.locations.filter((i) => i.id === t.id || i.visited ? !1 : this.getDistance(t, i) <= r);
+  getNeighbors(t, s) {
+    return this.clusteredLocations.filter((r) => r.id === t.id || r.visited ? !1 : this.getDistance(t, r) <= s);
   }
   /**
    * 两点间的像素距离
@@ -212,9 +208,9 @@ class I {
    * @param point2
    * @returns
    */
-  getDistance(t, r) {
+  getDistance(t, s) {
     return Math.sqrt(
-      Math.pow(t.properties.screenX - r.properties.screenX, 2) + Math.pow(t.properties.screenY - r.properties.screenY, 2)
+      Math.pow(t.properties.screenX - s.properties.screenX, 2) + Math.pow(t.properties.screenY - s.properties.screenY, 2)
     );
   }
   /**
@@ -222,30 +218,28 @@ class I {
    * @param locations
    * @returns
    */
-  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 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;
+  createClusters() {
+    const t = {}, s = [];
+    for (const e of this.clusteredLocations)
+      e.clusterId === void 0 || e.clusterId === -1 ? s.push(e) : (t[e.clusterId] || (t[e.clusterId] = []), t[e.clusterId].push(e));
+    const r = Object.keys(t).map((e, i) => {
+      const o = t[Number(e)], l = o.length, n = o.reduce((u, a) => u + a.x, 0), c = o.reduce((u, a) => u + a.y, 0), y = n / l, d = c / l;
       return {
-        id: Number(s),
-        items: n,
+        id: Number(e),
+        items: o,
         count: l,
         center: {
-          x: d,
-          y: p
+          x: y,
+          y: d
         }
       };
     });
-    return i.length > 0 && e.push({
+    return s.length > 0 && r.push({
       id: -1,
-      items: i,
-      count: i.length,
+      items: s,
+      count: s.length,
       center: null
-    }), e;
+    }), r;
   }
   /**
    * 按照像素距离聚类
@@ -254,24 +248,21 @@ class I {
    * @param minPoints
    * @returns
    */
-  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)
+  doPixelCluster(t, s) {
+    let r = 0;
+    for (let e = 0; e < this.clusteredLocations.length; e++) {
+      const i = this.clusteredLocations[e];
+      if (i.visited)
         continue;
-      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++);
+      i.visited = !0;
+      const o = this.getNeighbors(i, t);
+      o.length < s ? i.clusterId = -1 : (o.forEach((l) => {
+        l.visited = !0, l.clusterId = r;
+      }), i.clusterId = r, r++);
     }
-    return this.createClusters(this.locations);
+    return this.createClusters();
   }
 }
 export {
-  I as default
+  S as default
 };

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

@@ -242,7 +242,7 @@ class me {
   async setLayerVisibility(e) {
     const { id: i, visible: s } = e;
     if (i === "shanghai_district")
-      return !this.detachmentLayerLoaded && e.visible ? await this.loadDetachmentLayer() : this.detachmentLayer.visible = s, { status: 0, message: "ok" };
+      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: "未找到图层" };

package/es/src/gis-map/utils/open-drive-renderer/index.d.ts

@@ -1,4 +1,4 @@
-import { IFindSumoParams, IResult, IShowOpenDriveFromFileParams, ISplitOpenDriveLaneParams, IUnselectSumoParams } from '../../../types';
+import { IBlockOpenDriveLaneParams, IFindSumoParams, IResult, IShowOpenDriveFromFileParams, ISplitOpenDriveLaneParams, IUnselectSumoParams } from '../../../types';
 export default class OpenDriveRenderer {
     private static instance;
     static getInstance(view: __esri.MapView | __esri.SceneView): OpenDriveRenderer;
@@ -113,6 +113,7 @@ export default class OpenDriveRenderer {
     selectSumo(params: IFindSumoParams): Promise<IResult>;
     geometrySearch(coordinate: number[][]): Promise<IResult>;
     splitLane(params: ISplitOpenDriveLaneParams): Promise<IResult>;
+    blockOpenDriveLane(params: IBlockOpenDriveLaneParams): void;
     clearSplitLane(): void;
     /**
      * 更新所有路口的symbol