gisviewer-vue3-arcgis 1.0.253 → 1.0.254

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.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) => {
+    this.locations.forEach((t) => {
       const s = this.view.toScreen(
-        new u({ x: e.x, y: e.y })
+        new h({ x: t.x, y: t.y })
       );
-      e.properties.screenX = s.x, e.properties.screenY = s.y;
+      t.properties.screenX = s.x, t.properties.screenY = s.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,33 @@ 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(120, 3);
+          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 s = this.doPixelCluster(120, 3);
+    this.showClusters(s);
   }
   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) {
+  showClusters(t) {
+    this.clusterLayer.removeAll();
     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 }),
+    t.forEach((e) => {
+      e.count > 1 && (i = Math.min(i, e.count), s = Math.max(s, 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;
+        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 +89,7 @@ class M {
                   // 聚合数量
                   {
                     type: "CIMVectorMarker",
-                    size: t,
+                    size: r,
                     colorLocked: !0,
                     anchorPointUnits: "Relative",
                     frame: { xmin: -16, ymin: -16, xmax: 16, ymax: 16 },
@@ -95,11 +100,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 +163,7 @@ class M {
                       y: 0
                     },
                     anchorPointUnits: "Relative",
-                    size: t,
+                    size: r,
                     rotateClockwise: !0,
                     textureFilter: "Picture",
                     url: this.clusterMarkUrl
@@ -168,13 +173,17 @@ class M {
             }
           }
         });
-        this.clusterLayer.add(o);
+        this.clusterLayer.add(c);
       } else
-        r.items.forEach((t) => {
+        e.items.forEach((r) => {
           const o = new m({
-            geometry: new u({ x: t.x, y: t.y }),
-            attributes: t.properties,
-            symbol: t.symbol
+            geometry: new h({ x: r.x, y: r.y }),
+            attributes: {
+              ...r.properties,
+              type: "clusterPoint",
+              id: r.id
+            },
+            symbol: r.symbol
           });
           this.clusterLayer.add(o);
         });
@@ -187,9 +196,9 @@ 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, s, i) {
+    const e = t[s];
+    return t.filter((r) => r.id === e.id || r.visited ? !1 : this.getDistance(e, r) <= i);
   }
   /**
    * 两点间的像素距离
@@ -197,9 +206,9 @@ class M {
    * @param point2
    * @returns
    */
-  getDistance(e, s) {
+  getDistance(t, s) {
     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 - s.properties.screenX, 2) + Math.pow(t.properties.screenY - s.properties.screenY, 2)
     );
   }
   /**
@@ -207,30 +216,30 @@ class M {
    * @param locations
    * @returns
    */
-  createClusters(e) {
+  createClusters(t) {
     const s = {}, i = [];
-    for (let t = 0; t < e.length; t++) {
-      const o = e[t];
+    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 = 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(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;
       return {
-        id: Number(t),
-        items: l,
-        count: n,
+        id: Number(r),
+        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 +248,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, s) {
+    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)
         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++);
+      r.visited = !0;
+      const o = this.getNeighbors(this.locations, e, t);
+      o.length < s ? r.clusterId = -1 : (o.forEach((n) => {
+        n.visited = !0, n.clusterId = i;
+      }), r.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/signal-control-area/district-controller.mjs

@@ -1,4 +1,4 @@
-import h from "pako";
+import d from "pako";
 import c from "../common-utils.mjs";
 class e {
   constructor(o, s) {
@@ -10,15 +10,15 @@ class e {
           try {
             const a = t.mapConnectList, n = new Uint8Array(
               window.atob(a).split("").map((r) => r.charCodeAt(0))
-            ), l = h.inflate(n, { to: "string" }), d = JSON.parse(l);
+            ), l = d.inflate(n, { to: "string" }), h = JSON.parse(l);
             i.roadConnections.push(
-              ...d.map((r) => ({
+              ...h.map((r) => ({
                 id: r.roadsectId,
                 coordinates: JSON.parse(r.geomData).coordinates,
                 districtId: i.parentId,
                 subDistrictId: i.id
               }))
-            ), console.log(i.roadConnections);
+            );
           } catch (a) {
             console.error("解压子区路段连接信息失败:", a);
           }

package/es/src/types/index.d.ts

@@ -146,8 +146,8 @@ export interface IOverlayParam {
 }
 export interface IClusterPointParams {
     type?: string;
-    clusterSymbol?: IPointSymbol;
-    pointSymbol?: IPointSymbol;
+    clusterSymbol?: any;
+    pointSymbol?: any;
     points: IClusterLocation[];
 }
 export interface IClusterLocation {

package/lib/src/gis-map/utils/dbscan-cluster/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const b=require("@arcgis/core/core/reactiveUtils"),m=require("@arcgis/core/geometry"),h=require("@arcgis/core/Graphic"),S=require("@arcgis/core/layers/GraphicsLayer");function C(n){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(n){for(const t in n)if(t!=="default"){const o=Object.getOwnPropertyDescriptor(n,t);Object.defineProperty(e,t,o.get?o:{enumerable:!0,get:()=>n[t]})}}return e.default=n,Object.freeze(e)}const g=C(b);class x{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 S,this.view.map.add(this.clusterLayer)}locationToScreen(){this.locations.forEach(e=>{const t=this.view.toScreen(new m.Point({x:e.x,y:e.y}));e.properties.screenX=t.x,e.properties.screenY=t.y})}addClusterPoints(e){var o;this.locations=e.points,this.clusterMarkUrl=((o=e.clusterSymbol)==null?void 0:o.url)||"/GisViewerAssets/Images/cross/gis_xhj_blue.png",e.points.forEach(s=>{s.symbol||(s.symbol=e.pointSymbol||{type:"simple-marker",style:"circle",color:"#3388ff",size:8,outline:{color:"#ffffff",width:1}})}),this.zoomWatchHandle||(this.zoomWatchHandle=g.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))})),this.locationToScreen(),console.time("cluster");const t=this.doPixelCluster(e.points,120,3);console.timeEnd("cluster"),this.showClusters(t)}removeAllClusterPoints(){var e;(e=this.zoomWatchHandle)==null||e.remove(),this.zoomWatchHandle=null,this.clusterLayer.removeAll()}showClusters(e){let t=Number.MIN_VALUE,o=Number.MAX_VALUE;e.forEach(s=>{s.count>1&&(o=Math.min(o,s.count),t=Math.max(t,s.count))}),e.forEach(s=>{if(s.id!==-1){let r=o===t?(this.maxClusterSymbolSize+this.minClusterSymbolSize)/2:this.minClusterSymbolSize+(s.count-o)/(t-o)*(this.maxClusterSymbolSize-this.minClusterSymbolSize);r*=.75;const i=new h({geometry:new m.Point({x:s.center.x,y:s.center.y}),attributes:{count:s.count},symbol:{type:"cim",data:{type:"CIMSymbolReference",primitiveOverrides:[{type:"CIMPrimitiveOverride",primitiveName:"textGraphic",propertyName:"TextString",valueExpressionInfo:{type:"CIMExpressionInfo",title:"Custom",expression:"$feature.count",returnType:"Default"}}],symbol:{type:"CIMPointSymbol",symbolLayers:[{type:"CIMVectorMarker",size:r,colorLocked:!0,anchorPointUnits:"Relative",frame:{xmin:-16,ymin:-16,xmax:16,ymax:16},markerGraphics:[{type:"CIMMarkerGraphic",geometry:{rings:[[[-15,40],[15,40],[15,20],[-15,20],[-15,40]]]},symbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[2,72,200,255]},{type:"CIMSolidStroke",enable:!0,width:5,color:[2,72,200,128]}]}},{type:"CIMMarkerGraphic",primitiveName:"textGraphic",geometry:{x:0,y:0},symbol:{type:"CIMTextSymbol",height:16,horizontalAlignment:"Center",offsetX:0,offsetY:30,symbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[255,255,255,255]}]},verticalAlignment:"Center"},textString:""}],scaleSymbolsProportionally:!0,respectFrame:!0},{type:"CIMPictureMarker",enable:!0,anchorPoint:{x:0,y:0},anchorPointUnits:"Relative",size:r,rotateClockwise:!0,textureFilter:"Picture",url:this.clusterMarkUrl}]}}}});this.clusterLayer.add(i)}else s.items.forEach(r=>{const i=new h({geometry:new m.Point({x:r.x,y:r.y}),attributes:r.properties,symbol:r.symbol});this.clusterLayer.add(i)})})}getNeighbors(e,t,o){const s=e[t];return e.filter(r=>r.id===s.id||r.visited?!1:this.getDistance(s,r)<=o)}getDistance(e,t){return Math.sqrt(Math.pow(e.properties.screenX-t.properties.screenX,2)+Math.pow(e.properties.screenY-t.properties.screenY,2))}createClusters(e){const t={},o=[];for(let r=0;r<e.length;r++){const i=e[r];i.clusterId===void 0||i.clusterId===-1?o.push(i):(t[i.clusterId]||(t[i.clusterId]=[]),t[i.clusterId].push(i))}const s=Object.keys(t).map((r,i)=>{const l=t[Number(r)],c=l.length,y=l.reduce((u,a)=>u+a.x,0),d=l.reduce((u,a)=>u+a.y,0),p=y/c,f=d/c;return{id:Number(r),items:l,count:c,center:{x:p,y:f}}});return o.length>0&&s.push({id:-1,items:o,count:o.length,center:null}),s}doPixelCluster(e,t,o){let s=0;e.forEach(r=>r.visited=!1);for(let r=0;r<e.length;r++){const i=e[r];if(i.visited)continue;i.visited=!0;const l=this.getNeighbors(e,r,t);l.length<o?i.clusterId=-1:(l.forEach(c=>{c.visited=!0,c.clusterId=s}),i.clusterId=s,s++)}return this.createClusters(e)}}exports.default=x;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const b=require("@arcgis/core/core/reactiveUtils"),m=require("@arcgis/core/geometry"),y=require("@arcgis/core/Graphic"),g=require("@arcgis/core/layers/GraphicsLayer");function x(c){const t=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(c){for(const r in c)if(r!=="default"){const i=Object.getOwnPropertyDescriptor(c,r);Object.defineProperty(t,r,i.get?i:{enumerable:!0,get:()=>c[r]})}}return t.default=c,Object.freeze(t)}const S=x(b);class C{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 g,this.view.map.add(this.clusterLayer)}locationToScreen(){this.locations.forEach(t=>{const r=this.view.toScreen(new m.Point({x:t.x,y:t.y}));t.properties.screenX=r.x,t.properties.screenY=r.y})}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=>{e.x=Number(e.x),e.y=Number(e.y),e.symbol||(e.symbol=t.pointSymbol||{type:"simple-marker",style:"circle",color:"#3388ff",size:8,outline:{color:"#ffffff",width:1}})}),this.zoomWatchHandle||(this.zoomWatchHandle=S.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(120,3);console.timeEnd("cluster"),this.showClusters(e)}})),this.locationToScreen();const r=this.doPixelCluster(120,3);this.showClusters(r)}removeAllClusterPoints(){var t;(t=this.zoomWatchHandle)==null||t.remove(),this.zoomWatchHandle=null,this.clusterLayer.removeAll()}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*=.75;const l=(e.count.toString().length*8+6)/2,a=new y({geometry:new m.Point({x:e.center.x,y:e.center.y}),attributes:{count:e.count},symbol:{type:"cim",data:{type:"CIMSymbolReference",primitiveOverrides:[{type:"CIMPrimitiveOverride",primitiveName:"textGraphic",propertyName:"TextString",valueExpressionInfo:{type:"CIMExpressionInfo",title:"Custom",expression:"$feature.count",returnType:"Default"}}],symbol:{type:"CIMPointSymbol",symbolLayers:[{type:"CIMVectorMarker",size:s,colorLocked:!0,anchorPointUnits:"Relative",frame:{xmin:-16,ymin:-16,xmax:16,ymax:16},markerGraphics:[{type:"CIMMarkerGraphic",geometry:{rings:[[[-l,40],[l,40],[l,20],[-l,20],[-l,40]]]},symbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[2,72,200,255]},{type:"CIMSolidStroke",enable:!0,width:5,color:[2,72,200,128]}]}},{type:"CIMMarkerGraphic",primitiveName:"textGraphic",geometry:{x:0,y:0},symbol:{type:"CIMTextSymbol",height:16,horizontalAlignment:"Center",offsetX:0,offsetY:30,symbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[255,255,255,255]}]},verticalAlignment:"Center"},textString:""}],scaleSymbolsProportionally:!0,respectFrame:!0},{type:"CIMPictureMarker",enable:!0,anchorPoint:{x:0,y:0},anchorPointUnits:"Relative",size:s,rotateClockwise:!0,textureFilter:"Picture",url:this.clusterMarkUrl}]}}}});this.clusterLayer.add(a)}else e.items.forEach(s=>{const o=new y({geometry:new m.Point({x:s.x,y:s.y}),attributes:{...s.properties,type:"clusterPoint",id:s.id},symbol:s.symbol});this.clusterLayer.add(o)})})}getNeighbors(t,r,i){const e=t[r];return t.filter(s=>s.id===e.id||s.visited?!1:this.getDistance(e,s)<=i)}getDistance(t,r){return Math.sqrt(Math.pow(t.properties.screenX-r.properties.screenX,2)+Math.pow(t.properties.screenY-r.properties.screenY,2))}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,a=n.reduce((u,h)=>u+h.x,0),d=n.reduce((u,h)=>u+h.y,0),f=a/l,p=d/l;return{id:Number(s),items:n,count:l,center:{x:f,y:p}}});return i.length>0&&e.push({id:-1,items:i,count:i.length,center:null}),e}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;s.visited=!0;const o=this.getNeighbors(this.locations,e,t);o.length<r?s.clusterId=-1:(o.forEach(n=>{n.visited=!0,n.clusterId=i}),s.clusterId=i,i++)}return this.createClusters(this.locations)}}exports.default=C;

package/lib/src/gis-map/utils/signal-control-area/district-controller.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const h=require("pako"),c=require("../common-utils.js");class r{constructor(o,s){this.parentName="",this.signals=[],this.subDistricts=[],this.areaColor=this.getDarkNonGrayColor(),this.signalCount=0,this.subDistrictCount=0,this.roadConnections=[],this.id=o.name,this.name=o.areaDesc,this.parentId=o.parentId,s==="alarm"&&(this.areaColor=[255,0,0]);for(const t of o.children)if(t.children){const i=new r(t,s);if(i.id=t.id,i.name=`SS ${t.name}`,i.parentId=this.id,i.parentName=this.name,i.areaColor=this.getDarkNonGrayColor(t.id),this.subDistricts.push(i),this.subDistrictCount++,this.signalCount+=i.signalCount,t.mapConnectList)try{const a=t.mapConnectList,n=new Uint8Array(window.atob(a).split("").map(e=>e.charCodeAt(0))),l=h.inflate(n,{to:"string"}),d=JSON.parse(l);i.roadConnections.push(...d.map(e=>({id:e.roadsectId,coordinates:JSON.parse(e.geomData).coordinates,districtId:i.parentId,subDistrictId:i.id}))),console.log(i.roadConnections)}catch(a){console.error("解压子区路段连接信息失败:",a)}}else if(c.default.isCoordinateValid(t)){const i={id:t.id,name:t.name,parentId:t.parentId,latitude:Number(t.latitude),longitude:Number(t.longitude),signalId:t.signalId,nodeId:t.nodeId,isKey:t.isKey===1};this.signals.push(i),this.signalCount++}}getAllSignalCoordinates(){const o=[];for(const s of this.signals)o.push([s.longitude,s.latitude]);for(const s of this.subDistricts)o.push(...s.getAllSignalCoordinates());return o}getDarkNonGrayColor(o){let s,t,i;if(o){const a=this.cyrb53(o);s=((a&16711680)>>16)%200,t=((a&65280)>>8)%200,i=(a&255)%200}else s=Math.floor(Math.random()*256),t=Math.floor(Math.random()*256),i=Math.floor(Math.random()*256);return[s,t,i]}cyrb53(o,s=0){let t=3735928559^s,i=1103547991^s;for(let a=0,n;a<o.length;a++)n=o.charCodeAt(a),t=Math.imul(t^n,2654435761),i=Math.imul(i^n,1597334677);return t=Math.imul(t^t>>>16,2246822507),t^=Math.imul(i^i>>>13,3266489909),i=Math.imul(i^i>>>16,2246822507),i^=Math.imul(t^t>>>13,3266489909),4294967296*(2097151&i)+(t>>>0)}}exports.default=r;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const h=require("pako"),c=require("../common-utils.js");class r{constructor(s,o){this.parentName="",this.signals=[],this.subDistricts=[],this.areaColor=this.getDarkNonGrayColor(),this.signalCount=0,this.subDistrictCount=0,this.roadConnections=[],this.id=s.name,this.name=s.areaDesc,this.parentId=s.parentId,o==="alarm"&&(this.areaColor=[255,0,0]);for(const t of s.children)if(t.children){const i=new r(t,o);if(i.id=t.id,i.name=`SS ${t.name}`,i.parentId=this.id,i.parentName=this.name,i.areaColor=this.getDarkNonGrayColor(t.id),this.subDistricts.push(i),this.subDistrictCount++,this.signalCount+=i.signalCount,t.mapConnectList)try{const a=t.mapConnectList,e=new Uint8Array(window.atob(a).split("").map(n=>n.charCodeAt(0))),l=h.inflate(e,{to:"string"}),d=JSON.parse(l);i.roadConnections.push(...d.map(n=>({id:n.roadsectId,coordinates:JSON.parse(n.geomData).coordinates,districtId:i.parentId,subDistrictId:i.id})))}catch(a){console.error("解压子区路段连接信息失败:",a)}}else if(c.default.isCoordinateValid(t)){const i={id:t.id,name:t.name,parentId:t.parentId,latitude:Number(t.latitude),longitude:Number(t.longitude),signalId:t.signalId,nodeId:t.nodeId,isKey:t.isKey===1};this.signals.push(i),this.signalCount++}}getAllSignalCoordinates(){const s=[];for(const o of this.signals)s.push([o.longitude,o.latitude]);for(const o of this.subDistricts)s.push(...o.getAllSignalCoordinates());return s}getDarkNonGrayColor(s){let o,t,i;if(s){const a=this.cyrb53(s);o=((a&16711680)>>16)%200,t=((a&65280)>>8)%200,i=(a&255)%200}else o=Math.floor(Math.random()*256),t=Math.floor(Math.random()*256),i=Math.floor(Math.random()*256);return[o,t,i]}cyrb53(s,o=0){let t=3735928559^o,i=1103547991^o;for(let a=0,e;a<s.length;a++)e=s.charCodeAt(a),t=Math.imul(t^e,2654435761),i=Math.imul(i^e,1597334677);return t=Math.imul(t^t>>>16,2246822507),t^=Math.imul(i^i>>>13,3266489909),i=Math.imul(i^i>>>16,2246822507),i^=Math.imul(t^t>>>13,3266489909),4294967296*(2097151&i)+(t>>>0)}}exports.default=r;

package/lib/src/types/index.d.ts

@@ -146,8 +146,8 @@ export interface IOverlayParam {
 }
 export interface IClusterPointParams {
     type?: string;
-    clusterSymbol?: IPointSymbol;
-    pointSymbol?: IPointSymbol;
+    clusterSymbol?: any;
+    pointSymbol?: any;
     points: IClusterLocation[];
 }
 export interface IClusterLocation {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gisviewer-vue3-arcgis",
-  "version": "1.0.253",
+  "version": "1.0.254",
   "main": "lib/index.js",
   "module": "es/index.mjs",
   "files": [