gisviewer-vue3-arcgis 1.0.251 → 1.0.252

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

@@ -1,46 +1,47 @@
-import { Polygon as d } from "@arcgis/core/geometry";
-import * as l from "@arcgis/core/geometry/geometryEngine";
-import n from "@arcgis/core/Graphic";
-import c from "@arcgis/core/layers/GraphicsLayer";
-class u {
-  constructor(e, s) {
+import { Polygon as n } from "@arcgis/core/geometry";
+import * as y from "@arcgis/core/geometry/geometryEngine";
+import d from "@arcgis/core/Graphic";
+import c from "@arcgis/core/layers/FeatureLayer";
+import v from "@arcgis/core/layers/GraphicsLayer";
+class L {
+  constructor(e, t) {
     this.defaultPointSymbol = {
       type: "simple-marker",
       style: "circle",
       color: "yellow",
       size: 10
-    }, this.view = e, this.overlayLayer = new c({
-      ...s
+    }, this.view = e, this.overlayLayer = new v({
+      ...t
     }), this.view.map.layers.add(this.overlayLayer);
   }
   addMask(e) {
     this.removeMask();
-    const s = e.maskColor || [100, 100, 100, 0.8], i = e.maskSize || 100;
-    let r = new d({
+    const t = e.maskColor || [100, 100, 100, 0.8], i = e.maskSize || 100;
+    let r = new n({
       rings: [e.geometry.rings[0]]
     });
-    const t = r.centroid, a = l.geodesicBuffer(
-      t,
+    const s = r.centroid, a = y.geodesicBuffer(
+      s,
       i,
       "kilometers"
     );
-    let o = l.difference(
+    let o = y.difference(
       a,
       r
     );
     if (e.geometry.rings.length > 1)
-      for (let y = 1; y < e.geometry.rings.length; y++)
-        r = new d({
-          rings: [e.geometry.rings[y]]
-        }), o = l.difference(
+      for (let l = 1; l < e.geometry.rings.length; l++)
+        r = new n({
+          rings: [e.geometry.rings[l]]
+        }), o = y.difference(
           o,
           r
         );
-    const h = new n({
+    const h = new d({
       geometry: o,
       symbol: {
         type: "simple-fill",
-        color: s,
+        color: t,
         outline: {
           style: "long-dash",
           color: "white"
@@ -52,7 +53,7 @@ class u {
   }
   removeMask() {
     const e = this.overlayLayer.graphics.find(
-      (s) => s.getAttribute("type") === "mask"
+      (t) => t.getAttribute("type") === "mask"
     );
     e && this.overlayLayer.remove(e);
   }
@@ -61,50 +62,51 @@ class u {
    * @param params
    */
   addOverlays(e) {
-    let s = 0, i = 0;
+    let t = 0, i = 0;
+    e.defaultVisible == null && (e.defaultVisible = !0);
     for (const r of e.overlays) {
       r.properties ? (r.properties.type || (r.properties.type = e.type), r.properties.id || (r.properties.id = r.id)) : r.properties = { type: e.type, id: r.id };
-      const t = r.symbol || e.defaultSymbol || this.defaultPointSymbol;
+      const s = r.symbol || e.defaultSymbol || this.defaultPointSymbol, a = r.visible == null ? e.defaultVisible : r.visible;
       this.addOverlay(
         r,
-        t,
+        s,
         r.properties,
-        r.visible
-      ).message === "add" ? s++ : i++;
+        a
+      ).message === "add" ? t++ : i++;
     }
-    return { status: 0, message: `新增${s}, 更新${i}` };
+    return { status: 0, message: `新增${t}, 更新${i}` };
   }
   /**
    * 按type移除覆盖物
    * @param types
    */
   removeOverlaysByType(e) {
-    const s = this.overlayLayer.graphics.filter((i) => {
+    const t = this.overlayLayer.graphics.filter((i) => {
       const r = i.getAttribute("type");
       return e.includes(r);
     });
-    return this.overlayLayer.graphics.removeMany(s), { status: 0, message: `删除${s.length}` };
+    return this.overlayLayer.graphics.removeMany(t), { status: 0, message: `删除${t.length}` };
   }
   /**
    * 按id移除覆盖物
    * @param ids
    */
   removeOverlaysById(e) {
-    const s = this.overlayLayer.graphics.filter((i) => {
+    const t = this.overlayLayer.graphics.filter((i) => {
       const r = i.getAttribute("id");
       return e.includes(r);
     });
-    return this.overlayLayer.graphics.removeMany(s), { status: 0, message: `删除${s.length}` };
+    return this.overlayLayer.graphics.removeMany(t), { status: 0, message: `删除${t.length}` };
   }
   /**
    * 按id显示或隐藏覆盖物
    * @param ids
    * @param isShow
    */
-  isShowOverlaysByIds(e, s) {
+  isShowOverlaysByIds(e, t) {
     this.overlayLayer.graphics.map((i) => {
       const r = i.getAttribute("id");
-      e.includes(r) ? i.visible = s : i.visible = !s;
+      e.includes(r) ? i.visible = t : i.visible = !t;
     });
   }
   /**
@@ -147,7 +149,7 @@ class u {
   async findGraphic(e) {
     var r;
     return (r = (await this.view.hitTest(e)).results) == null ? void 0 : r.filter(
-      (t) => t.type === "graphic" && t.graphic.layer === this.overlayLayer
+      (s) => s.type === "graphic" && s.graphic.layer === this.overlayLayer
     );
   }
   /**
@@ -166,29 +168,23 @@ class u {
   showLayer() {
     this.overlayLayer.visible = !0;
   }
-  /**
-   * 添加点覆盖物
-   * @param overlay
-   * @param symbol
-   * @param properties
-   */
-  addPoint(e, s, i, r) {
-    let t, a = !0;
-    return e.id && (t = this.overlayLayer.graphics.find(
+  addOverlay(e, t, i, r) {
+    let s, a = !0;
+    return e.id && (s = this.overlayLayer.graphics.find(
       (o) => o.getAttribute("id") === e.id
-    )), t ? t.visible = r ?? t.visible : (r = r ?? !0, t = new n({
+    )), s ? s.visible = r : (s = new d({
       visible: r
-    }), this.overlayLayer.add(t), a = !1), t.geometry = e.geometry, t.symbol = s, t.attributes = i, { status: 0, message: a ? "add" : "update" };
+    }), this.overlayLayer.add(s), a = !1), s.geometry = e.geometry, s.symbol = t, s.attributes = i, { status: 0, message: a ? "add" : "update" };
   }
-  addOverlay(e, s, i, r) {
-    let t, a = !0;
-    return e.id && (t = this.overlayLayer.graphics.find(
-      (o) => o.getAttribute("id") === e.id
-    )), t ? t.visible = r ?? t.visible : (r = r ?? !0, t = new n({
-      visible: r
-    }), this.overlayLayer.add(t), a = !1), t.geometry = e.geometry, t.symbol = s, t.attributes = i, { status: 0, message: a ? "add" : "update" };
+  addClusterPoint(e) {
+    this.clusterLayer || (this.clusterLayer = new c({
+      id: "clusterPointLayer",
+      source: [],
+      outFields: ["*"],
+      geometryType: "point"
+    }), this.view.map.add(this.clusterLayer));
   }
 }
 export {
-  u as default
+  L as default
 };

package/es/src/gis-map/utils/signal-control-area/district-renderer.d.ts

@@ -1,4 +1,4 @@
-import { IResult } from '../../../types';
+import { IFindSignalControlAreaParams, IResult } from '../../../types';
 import DistrictController from './district-controller';
 export default class DistrictRenderer {
     private view;
@@ -33,7 +33,7 @@ export default class DistrictRenderer {
      * @param id 区控ID
      * @return 返回高亮区控的数量
      */
-    highlightDistrict(id: string): Promise<number>;
+    highlightDistrict(params: IFindSignalControlAreaParams): Promise<number>;
     filter(id: string): void;
     resetFilter(): void;
 }

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

@@ -101,9 +101,13 @@ class x {
    */
   async highlightDistrict(t) {
     const i = this.districtControllerDashLayer.definitionExpression;
-    this.districtControllerDashLayer.definitionExpression = `id = '${t}'`;
+    this.districtControllerDashLayer.definitionExpression = `id = '${t.id}'`;
     const e = await this.districtControllerDashLayer.queryFeatures(), r = e.features.length;
-    return r > 0 ? (this.districtControllerSolidLayer.definitionExpression = `id = '${t}'`, await n.viewGoto(this.view, e.features)) : this.districtControllerDashLayer.definitionExpression = i, r;
+    return r > 0 ? (this.districtControllerSolidLayer.definitionExpression = `id = '${t.id}'`, await n.viewGoto(
+      this.view,
+      e.features,
+      t.needZoom !== !1
+    )) : this.districtControllerDashLayer.definitionExpression = i, r;
   }
   filter(t) {
     const i = `id = '${t}'`;

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

@@ -21,15 +21,15 @@ class N {
    */
   async showSignalControlArea(e) {
     this.detachmentLayerLoaded || await this.loadDetachmentLayer(), await this.clearSignalControlArea(), this.districtRenderer.setVisible(!1), this.subDistrictRenderer.setVisible(!1), this.signalRenderer.setClusterVisible(!1), this.signalRenderer.setPointVisible(!1);
-    const t = [], i = [];
+    const t = [], s = [];
     for (const n of e.areaList) {
-      const s = new w(
+      const i = new w(
         n,
         e.style || ""
       );
-      t.push(s), i.push(...s.subDistricts);
+      t.push(i), s.push(...i.subDistricts);
     }
-    return this.districtRenderer.style = e.style || "", await this.districtRenderer.showDistricts(t), await this.subDistrictRenderer.showSubDistricts(i), await this.signalRenderer.showSignals(t), { status: 0, message: "ok" };
+    return this.districtRenderer.style = e.style || "", await this.districtRenderer.showDistricts(t), await this.subDistrictRenderer.showSubDistricts(s), await this.signalRenderer.showSignals(t), { status: 0, message: "ok" };
   }
   /**
    * 清空区控、子区、信号机
@@ -88,13 +88,13 @@ class N {
   async highlightSignalControlArea(e) {
     switch (this.view.closePopup(), e.type) {
       case "district":
-        return await this.districtRenderer.highlightDistrict(e.id) ? (this.subDistrictRenderer.filter(e), this.signalRenderer.filter(e), await this.subDistrictRenderer.showRoads(e), { status: 0, message: "ok" }) : { status: 1, message: "未找到区控" };
+        return await this.districtRenderer.highlightDistrict(e) ? (this.subDistrictRenderer.filter(e), this.signalRenderer.filter(e), await this.subDistrictRenderer.showRoads(e), { status: 0, message: "ok" }) : { status: 1, message: "未找到区控" };
       case "subDistrict": {
-        const { count: t, parentId: i } = await this.subDistrictRenderer.highlightSubDistrict(e.id);
-        return t > 0 ? (this.districtRenderer.filter(i), this.signalRenderer.filter(e), { status: 0, message: "ok" }) : { status: 1, message: "未找到子区" };
+        const { count: t, parentId: s } = await this.subDistrictRenderer.highlightSubDistrict(e);
+        return t > 0 ? (this.districtRenderer.filter(s), this.signalRenderer.filter(e), { status: 0, message: "ok" }) : { status: 1, message: "未找到子区" };
       }
       case "signal": {
-        const { districtId: t, subDistrictId: i, count: n } = await this.signalRenderer.highlightSignal(e.id);
+        const { districtId: t, subDistrictId: s, count: n } = await this.signalRenderer.highlightSignal(e.id);
         return n > 0 ? (this.districtRenderer.filter(t), this.subDistrictRenderer.filter(e), { status: 0, message: "ok" }) : { status: 1, message: "未找到信号机" };
       }
       default:
@@ -118,13 +118,13 @@ class N {
     if (!e)
       return;
     const t = e.find(
-      (i) => i.options.id === "shanghai_district"
+      (s) => s.options.id === "shanghai_district"
     );
     if (t)
       try {
         const n = await (await fetch(
           "/GisViewerAssets/ShangHai/Layers/district.json"
-        )).json(), s = [], { renderer: r, labelingInfo: d } = t.options;
+        )).json(), i = [], { renderer: r, labelingInfo: d } = t.options;
         n.features.forEach((c) => {
           const o = c.attributes.ZD_NAME;
           if (o !== "高架支队") {
@@ -154,17 +154,17 @@ class N {
                   width: 2
                 }
               };
-            if (s.push(a), d && o !== "边防港航支队" && o !== "机场支队") {
+            if (i.push(a), d && o !== "边防港航支队" && o !== "机场支队") {
               const h = new g({
                 geometry: l.centroid,
                 symbol: { ...d.symbol, text: o }
               });
-              s.push(h);
+              i.push(h);
             }
           }
-        }), this.detachmentLayer.addMany(s), this.detachmentLayerLoaded = !0;
-      } catch (i) {
-        console.error("加载支队图层失败:", i);
+        }), this.detachmentLayer.addMany(i), this.detachmentLayerLoaded = !0;
+      } catch (s) {
+        console.error("加载支队图层失败:", s);
         return;
       }
   }

package/es/src/gis-map/utils/signal-control-area/sub-district-renderer.d.ts

@@ -25,7 +25,7 @@ export default class SubDistrictRenderer {
      * @param id 子区ID
      * @return 返回高亮子区的数量以及区控id
      */
-    highlightSubDistrict(id: string): Promise<{
+    highlightSubDistrict(params: IFindSignalControlAreaParams): Promise<{
         count: number;
         parentId: string;
     }>;

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

@@ -238,9 +238,13 @@ class C {
   async highlightSubDistrict(e) {
     let s = "";
     const t = this.subDistrictPointLayer.definitionExpression;
-    this.subDistrictPointLayer.definitionExpression = `subDistrictId = '${e}'`;
+    this.subDistrictPointLayer.definitionExpression = `subDistrictId = '${e.id}'`;
     const r = await this.subDistrictPointLayer.queryFeatures(), i = r.features.length;
-    return i > 0 ? (this.subDistrictLineLayer.definitionExpression = `subDistrictId = '${e}'`, s = r.features[0].attributes.districtId, await v.viewGoto(this.view, r.features, !1)) : this.subDistrictPointLayer.definitionExpression = t, { count: i, parentId: s };
+    return i > 0 ? (this.subDistrictLineLayer.definitionExpression = `subDistrictId = '${e.id}'`, s = r.features[0].attributes.districtId, await v.viewGoto(
+      this.view,
+      r.features,
+      e.needZoom !== !1
+    )) : this.subDistrictPointLayer.definitionExpression = t, { count: i, parentId: s };
   }
   /**
    * 按照区控、子区id显示子区

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

@@ -104,6 +104,10 @@ export interface IPointSymbol {
     verticalOrigin?: string;
     color?: string;
     size?: number;
+    outline?: {
+        color?: string | number[];
+        width?: number;
+    };
 }
 export interface ILineSymbol {
     type: string;
@@ -139,7 +143,30 @@ export interface IOverlayParam {
     defaultSymbol?: IPointSymbol | ILineSymbol | IPolygonSymbol;
     defaultVisible?: boolean;
     overlays: Array<IOverlay>;
-    visible?: boolean;
+}
+export interface IClusterPointParams {
+    type?: string;
+    clusterSymbol?: IPointSymbol;
+    pointSymbol?: IPointSymbol;
+    points: IClusterLocation[];
+}
+export interface IClusterLocation {
+    id: string;
+    x: number;
+    y: number;
+    properties?: any;
+    visited?: boolean;
+    clusterId?: number;
+    symbol?: IPointSymbol;
+}
+export interface ICluster {
+    id: number;
+    items: IClusterLocation[];
+    count: number;
+    center: {
+        x: number;
+        y: number;
+    } | null;
 }
 export interface ISetMapCameraParams {
     name: string;
@@ -285,7 +312,7 @@ export interface IDistrictRoad {
 export interface IFindSignalControlAreaParams {
     type: string;
     id: string;
-    scale?: number;
+    needZoom?: boolean;
 }
 export interface INode {
     id: string;

package/lib/src/gis-map/gis-map.vue.d.ts

@@ -1,6 +1,7 @@
 import MapView from '@arcgis/core/views/MapView';
 import SceneView from '@arcgis/core/views/SceneView';
-import { IEditSignalControlAreaParams, IFindSignalControlAreaParams, IFindSumoParams, ILaneNumberParams, ILayerVisibleParams, ILookAtParams, IMaskParam, IOverlayParam, IQueueLengthParams, ISetMapCameraParams, ISetMapCenterParams, IShowEdpassDeviceParams, IShowGreenWaveBandParams, IShowJurisdictionParams, IShowOpenDriveFromFileParams, IShowSignalControlAreaParams, ISignalCountdownProps, ISplitOpenDriveLaneParams, IStartCrossBufferParam, IToggleTrafficInfoParams, IUnselectSumoParams } from '../types';
+import { IClusterPointParams, IEditSignalControlAreaParams, IFindSignalControlAreaParams, IFindSumoParams, ILaneNumberParams, ILayerVisibleParams, ILookAtParams, IMaskParam, IOverlayParam, IQueueLengthParams, ISetMapCameraParams, ISetMapCenterParams, IShowEdpassDeviceParams, IShowGreenWaveBandParams, IShowJurisdictionParams, IShowOpenDriveFromFileParams, IShowSignalControlAreaParams, ISignalCountdownProps, ISplitOpenDriveLaneParams, IStartCrossBufferParam, IToggleTrafficInfoParams, IUnselectSumoParams } from '../types';
+import DbscanCluster from './utils/dbscan-cluster';
 import EdpassDeviceController from './utils/edpass-device-controller';
 import GreenWaveBandController from './utils/green-wave-band-controller';
 import HoloFlow from './utils/holo-flow';
@@ -37,6 +38,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     greenWaveBandController: GreenWaveBandController;
     policeJurisdictionController: PoliceJurisdiction;
     edpassDeviceController: EdpassDeviceController;
+    dbscanCluster: DbscanCluster;
     showLogDiv: import("vue").Ref<boolean>;
     appDataStore: import("pinia").Store<"appData", {
         mapConfig: {};
@@ -113,6 +115,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     toggleTrafficObject: (params: IToggleTrafficInfoParams) => void;
     toggleVehicleInfo: (contentType: string) => void;
     addOverlays: (params: IOverlayParam) => Promise<import("../types").IResult>;
+    addClusterPoints: (params: IClusterPointParams) => Promise<void>;
     addMask: (params: IMaskParam) => void;
     removeMask: () => void;
     removeOverlaysByType: (types: string[]) => import("../types").IResult;

package/lib/src/gis-map/gis-map.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const n=require("vue"),D=require("./stores/index.js");require("./style/index.css");const at=require("./utils/detect-gpu.js"),nt=require("./utils/edpass-device-controller.js"),I=require("./utils/green-wave-band-controller/index.js"),rt=require("./utils/holo-flow/index.js"),st=require("./utils/holo-flow/signal-countdown-panel.vue.js"),ot=require("./utils/map-initializer.js"),M=require("./utils/open-drive-renderer/index.js"),x=require("./utils/overlay.js"),it=require("./utils/police-jurisdiction.js"),ct=require("./utils/queue-length.js"),z=require("./utils/road-config-tool/index.js"),lt=require("./utils/signal-control-area/edit-area.js"),ut=require("./utils/signal-control-area/show-area.js"),dt=require("./utils/traffic-flow.js"),mt={class:"gis-viewer"},pt={style:{position:"absolute",bottom:"80px",left:"10px","z-index":"9999"}},gt=n.defineComponent({__name:"gis-map",props:{config:{},assetsRoot:{}},emits:["mapLoaded","markerClick","mapClick","update:zoom"],setup(E,{expose:N,emit:P}){const h=n.ref(null);let r,p,l,i,a,s,f,t,u,o,g,y,C;const b=n.ref(!1);D.registerStore();const T=D.default.useAppDataStore,V=n.reactive([]),_=e=>Math.log2(591657527591555e-6/e);let v=null,q=null;const O=e=>{if(!Number.isFinite(e))return;const d=Math.round(e);d!==q&&(q=d,S("update:zoom",d))};at.default(),n.onMounted(async()=>{if(!h.value)return;document.addEventListener("keydown",m=>{m.ctrlKey&&m.key==="i"&&(b.value=!b.value)});const e=n.getCurrentInstance(),{$gisviewerAssetsRoot:d}=e.appContext.config.globalProperties,c=await(await fetch(B.config)).json();c.assetsRoot=B.assetsRoot||d,T.mapConfig=c,p=new ot.default,T.mapInitializer=p,r=await p.initialize({container:h.value,mapConfig:c,markerClickCallback:(m,A,L,tt)=>{S("markerClick",m,A,L,tt)},mapClickCallback:(m,A,L)=>{S("mapClick",m,A,L)}});const w=r.zoom??(r.scale?_(r.scale):void 0);typeof w=="number"&&O(w);const et=r.zoom!==void 0?r.watch("zoom",m=>{O(m)}):r.watch("scale",m=>{typeof m=="number"&&m>0&&O(_(m))});v=()=>et.remove(),a=new rt.default(r,V),await a.init(),S("mapLoaded")}),n.onUnmounted(()=>{o==null||o.clearSignalControlArea(),t==null||t.clearOpenDrive(),a.clearHoloTrace(),a.clearHoloSignal(),i==null||i.disconnectTrafficFlow(),v==null||v(),v=null});const H=n.computed(()=>r),G=()=>{const e=D.default.useAppDataStore;e.saveTrackLog=!0},Z=()=>{a.downloadTrackLog()},W=()=>{k("vehicleId")},j=()=>{k("plateNumber")},J=async e=>await p.setMapCenter(e),Q=async e=>await p.setMapCamera(e),U=e=>p.setMapZoom(e),K=async e=>await p.lookAt(e),F=e=>p.setLayerVisibility(e),X=(e,d)=>p.requestCoordinateTransform(e,d),Y=e=>{p.cancelCoordinateTransform(e)},R=e=>{p.setMapZoomRange(e)},$=e=>(l||(l=new z.default(r)),l.showLaneNumber(e)),ee=()=>{l==null||l.clearLaneNumber()},te=async e=>(l||(l=new z.default(r)),await l.initializeSearch(e)),ae=async()=>l==null?void 0:l.calCrossIndicatorArea(),ne=async()=>{},re=async(e,d)=>{i||(i=new dt.default(r)),i.connectTrafficFlow(e,d)},se=()=>{i==null||i.disconnectTrafficFlow()},oe=async e=>{a.handleVehicleTraceData(e)},ie=()=>{a.clearHoloTrace()},ce=e=>{a.setInterpolate(e)},le=async e=>{await a.handleSignalData(e)},ue=async e=>{await a.initializeLampGroup(e)},de=e=>{a.handleUniSignalData(e)},me=()=>{a.clearHoloSignal()},pe=e=>{i==null||i.toggleTrafficInfo(e),a==null||a.toggleTrafficInfo(e)},ge=e=>{a==null||a.togglePause(e)},fe=e=>{i==null||i.toggleTrafficObject(e),a==null||a.toggleTrafficObject(e)},k=e=>{a==null||a.updatePanelContent(e)},ye=async e=>(s||(s=new x.default(r)),s.addOverlays(e)),ve=e=>(s||(s=new x.default(r)),s.addMask(e)),Se=()=>{s==null||s.removeMask()},we=e=>s==null?void 0:s.removeOverlaysByType(e),he=e=>s==null?void 0:s.removeOverlaysById(e),Ce=()=>s==null?void 0:s.removeAllOverlays(),be=()=>{s==null||s.showAllOverlays()},Oe=e=>{f||(f=new ct.default(r)),f.updateQueueLength(e)},ke=()=>{f==null||f.removeQueueLength()},Ae=async(e,d)=>(t||(t=new M.default(r)),await t.showOpenDriveFromServer(e,d)),Le=async e=>(t||(t=new M.default(r)),await t.clearOpenDrive(),await t.showOpenDriveFromFile(e)),De=e=>t?t.setOpendriveVisibility(e):{status:-1,message:"未加载OpenDrive地图"},Te=async()=>await(t==null?void 0:t.clearOpenDrive()),Ve=async e=>t?await(t==null?void 0:t.findSumo(e)):{status:-1,message:"未加载OpenDrive地图"},_e=async e=>t?t.selectSumo(e):{status:-1,message:"未加载OpenDrive地图"},qe=async e=>t?t.unselectSumo(e):{status:-1,message:"未加载OpenDrive地图"},Be=async e=>t?await t.geometrySearch(e):{status:-1,message:"未加载OpenDrive地图"},Ie=async e=>t?await t.getSumoInfo(e):{status:-1,message:"未加载OpenDrive地图"},Me=async e=>t?await(t==null?void 0:t.splitLane(e)):{status:-1,message:"未加载OpenDrive地图"},xe=async()=>t?t==null?void 0:t.clearSplitLane():{status:-1,message:"未加载OpenDrive地图"},ze=async e=>(o||(o=new ut.default(r)),await o.showSignalControlArea(e)),Ee=async()=>await(o==null?void 0:o.clearSignalControlArea()),Ne=e=>o==null?void 0:o.setLayerVisibility(e),Pe=async e=>o?await(o==null?void 0:o.locateSignalControlArea(e)):{status:-1,message:"未加载信号控制区"},He=async e=>o?await o.highlightSignalControlArea(e):{status:-1,message:"未加载信号控制区"},Ge=()=>o?o.resetHighlight():{status:-1,message:"未加载信号控制区"},Ze=e=>(u||(u=new lt.default(r)),u.showSubSignalControlArea(e)),We=e=>u?u.editSubSignalControlArea(e):{status:-1,message:"未加载信号控制区"},je=()=>u?u.stopEditSubSignalControlArea():{status:-1,message:"未加载信号控制区"},Je=e=>u?u.selectSubSignalControlAreaCross(e):{status:-1,message:"未加载信号控制区"},Qe=e=>u?u.unselectSubSignalControlAreaCross(e):{status:-1,message:"未加载信号控制区"},Ue=e=>{if(!u)return{status:-1,message:"未加载信号控制区"}},Ke=e=>(g||(g=new I.default(r)),g.addGreenWaveBand(e)),Fe=()=>{if(!g)return{status:-1,message:"未加载绿波带"};g.stopAddGreenWaveBand()},Xe=async e=>(g||(g=new I.default(r)),await g.showGreenWaveBand(e)),Ye=async e=>(y||(y=new it.default(r)),await y.showJurisdiction(e)),Re=()=>{if(!y)return{status:-1,message:"未加载警务管辖区"};y.clearJurisdiction()},$e=async e=>(C||(C=new nt.default(r)),await C.setEdpassLayerVisibility(e)),B=E,S=P;return N({mapViewer:H,setLayerVisibility:F,setMapCenter:J,lookAt:K,setMapCamera:Q,setMapZoom:U,setMapZoomRange:R,requestCoordinateTransform:X,cancelCoordinateTransform:Y,addOverlays:ye,addMask:ve,removeMask:Se,showAllOverlays:be,removeOverlaysByType:we,removeOverlaysById:he,removeAllOverlays:Ce,showLaneNumber:$,clearLaneNumber:ee,initializeAreaTool:te,calCrossIndicatorArea:ae,calRoadIndicatorArea:ne,connectCarFlow:re,disconnectCarFlow:se,handleHoloVehicleTraceData:oe,clearHoloTrace:ie,initializeLampGroup:ue,handleUniSignalData:de,handleHoloSignalData:le,clearHoloSignal:me,setInterpolate:ce,toggleTrafficInfo:pe,toggleTrafficObject:fe,toggleVehicleInfo:k,togglePause:ge,updateQueueLength:Oe,removeQueueLength:ke,showOpenDriveFromServer:Ae,showOpenDriveFromFile:Le,clearOpenDrive:Te,setOpendriveVisibility:De,geometrySearchInOpenDrive:Be,findSumoInOpenDrive:Ve,selectSumoInOpenDrive:_e,unselectSumoInOpenDrive:qe,getSumoInfo:Ie,splitOpenDriveLane:Me,clearSplitOpenDriveLane:xe,showSignalControlArea:ze,clearSignalControlArea:Ee,setSignalControlAreaVisibility:Ne,locateSignalControlArea:Pe,highlightSignalControlArea:He,resetHighlightSignalControlArea:Ge,showSubSignalControlArea:Ze,editSubSignalControlArea:We,stopEditSubSignalControlArea:je,selectSubSignalControlAreaCross:Je,unselectSubSignalControlAreaCross:Qe,changeSubSignalControlAreaBorderVisibility:Ue,addGreenWaveBand:Ke,stopAddGreenWaveBand:Fe,showGreenWaveBand:Xe,showPoliceArea:Ye,clearPoliceArea:Re,setEdpassLayerVisibility:$e}),(e,d)=>(n.openBlock(),n.createElementBlock("div",mt,[n.createElementVNode("div",{class:"gis-viewer-main",ref_key:"mapContainer",ref:h},[n.withDirectives(n.createElementVNode("div",pt,[n.createElementVNode("button",{style:{"margin-right":"10px"},onClick:G}," 开始记录 "),n.createElementVNode("button",{style:{"margin-right":"10px"},onClick:Z}," 下载日志 "),n.createElementVNode("button",{style:{"margin-right":"10px"},onClick:W}," 显示车辆id "),n.createElementVNode("button",{onClick:j},"显示车辆号牌")],512),[[n.vShow,b.value]])],512),(n.openBlock(!0),n.createElementBlock(n.Fragment,null,n.renderList(V,(c,w)=>(n.openBlock(),n.createBlock(st.default,{key:w,"display-mode":c.displayMode,flash:c.flash,"road-id":c.crossId,"cross-id":c.roadId,"map-point":c.mapPoint,"stop-line":c.stopLine,position:c.position,rotation:c.rotation,scale:c.scale,"lamp-status":c.lampStatus},null,8,["display-mode","flash","road-id","cross-id","map-point","stop-line","position","rotation","scale","lamp-status"]))),128))]))}});exports.default=gt;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const r=require("vue"),T=require("./stores/index.js");require("./style/index.css");const rt=require("./utils/dbscan-cluster/index.js"),st=require("./utils/detect-gpu.js"),ot=require("./utils/edpass-device-controller.js"),M=require("./utils/green-wave-band-controller/index.js"),it=require("./utils/holo-flow/index.js"),ct=require("./utils/holo-flow/signal-countdown-panel.vue.js"),lt=require("./utils/map-initializer.js"),x=require("./utils/open-drive-renderer/index.js"),z=require("./utils/overlay.js"),ut=require("./utils/police-jurisdiction.js"),dt=require("./utils/queue-length.js"),E=require("./utils/road-config-tool/index.js"),mt=require("./utils/signal-control-area/edit-area.js"),pt=require("./utils/signal-control-area/show-area.js"),gt=require("./utils/traffic-flow.js"),ft={class:"gis-viewer"},yt={style:{position:"absolute",bottom:"80px",left:"10px","z-index":"9999"}},vt=r.defineComponent({__name:"gis-map",props:{config:{},assetsRoot:{}},emits:["mapLoaded","markerClick","mapClick","update:zoom"],setup(P,{expose:N,emit:H}){const C=r.ref(null);let n,p,l,i,a,s,f,t,u,o,g,y,h,b;const O=r.ref(!1);T.registerStore();const q=T.default.useAppDataStore,V=r.reactive([]),_=e=>Math.log2(591657527591555e-6/e);let v=null,B=null;const k=e=>{if(!Number.isFinite(e))return;const d=Math.round(e);d!==B&&(B=d,S("update:zoom",d))};st.default(),r.onMounted(async()=>{if(!C.value)return;document.addEventListener("keydown",m=>{m.ctrlKey&&m.key==="i"&&(O.value=!O.value)});const e=r.getCurrentInstance(),{$gisviewerAssetsRoot:d}=e.appContext.config.globalProperties,c=await(await fetch(I.config)).json();c.assetsRoot=I.assetsRoot||d,q.mapConfig=c,p=new lt.default,q.mapInitializer=p,n=await p.initialize({container:C.value,mapConfig:c,markerClickCallback:(m,L,D,at)=>{S("markerClick",m,L,D,at)},mapClickCallback:(m,L,D)=>{S("mapClick",m,L,D)}});const w=n.zoom??(n.scale?_(n.scale):void 0);typeof w=="number"&&k(w);const nt=n.zoom!==void 0?n.watch("zoom",m=>{k(m)}):n.watch("scale",m=>{typeof m=="number"&&m>0&&k(_(m))});v=()=>nt.remove(),a=new it.default(n,V),await a.init(),S("mapLoaded")}),r.onUnmounted(()=>{o==null||o.clearSignalControlArea(),t==null||t.clearOpenDrive(),a.clearHoloTrace(),a.clearHoloSignal(),i==null||i.disconnectTrafficFlow(),v==null||v(),v=null});const G=r.computed(()=>n),Z=()=>{const e=T.default.useAppDataStore;e.saveTrackLog=!0},W=()=>{a.downloadTrackLog()},j=()=>{A("vehicleId")},J=()=>{A("plateNumber")},Q=async e=>await p.setMapCenter(e),U=async e=>await p.setMapCamera(e),K=e=>p.setMapZoom(e),F=async e=>await p.lookAt(e),X=e=>p.setLayerVisibility(e),Y=(e,d)=>p.requestCoordinateTransform(e,d),R=e=>{p.cancelCoordinateTransform(e)},$=e=>{p.setMapZoomRange(e)},ee=e=>(l||(l=new E.default(n)),l.showLaneNumber(e)),te=()=>{l==null||l.clearLaneNumber()},ne=async e=>(l||(l=new E.default(n)),await l.initializeSearch(e)),ae=async()=>l==null?void 0:l.calCrossIndicatorArea(),re=async()=>{},se=async(e,d)=>{i||(i=new gt.default(n)),i.connectTrafficFlow(e,d)},oe=()=>{i==null||i.disconnectTrafficFlow()},ie=async e=>{a.handleVehicleTraceData(e)},ce=()=>{a.clearHoloTrace()},le=e=>{a.setInterpolate(e)},ue=async e=>{await a.handleSignalData(e)},de=async e=>{await a.initializeLampGroup(e)},me=e=>{a.handleUniSignalData(e)},pe=()=>{a.clearHoloSignal()},ge=e=>{i==null||i.toggleTrafficInfo(e),a==null||a.toggleTrafficInfo(e)},fe=e=>{a==null||a.togglePause(e)},ye=e=>{i==null||i.toggleTrafficObject(e),a==null||a.toggleTrafficObject(e)},A=e=>{a==null||a.updatePanelContent(e)},ve=async e=>(s||(s=new z.default(n)),s.addOverlays(e)),Se=async e=>(b||(b=new rt.default(n)),b.addClusterPoints(e)),we=e=>(s||(s=new z.default(n)),s.addMask(e)),Ce=()=>{s==null||s.removeMask()},he=e=>s==null?void 0:s.removeOverlaysByType(e),be=e=>s==null?void 0:s.removeOverlaysById(e),Oe=()=>s==null?void 0:s.removeAllOverlays(),ke=()=>{s==null||s.showAllOverlays()},Ae=e=>{f||(f=new dt.default(n)),f.updateQueueLength(e)},Le=()=>{f==null||f.removeQueueLength()},De=async(e,d)=>(t||(t=new x.default(n)),await t.showOpenDriveFromServer(e,d)),Te=async e=>(t||(t=new x.default(n)),await t.clearOpenDrive(),await t.showOpenDriveFromFile(e)),qe=e=>t?t.setOpendriveVisibility(e):{status:-1,message:"未加载OpenDrive地图"},Ve=async()=>await(t==null?void 0:t.clearOpenDrive()),_e=async e=>t?await(t==null?void 0:t.findSumo(e)):{status:-1,message:"未加载OpenDrive地图"},Be=async e=>t?t.selectSumo(e):{status:-1,message:"未加载OpenDrive地图"},Ie=async e=>t?t.unselectSumo(e):{status:-1,message:"未加载OpenDrive地图"},Me=async e=>t?await t.geometrySearch(e):{status:-1,message:"未加载OpenDrive地图"},xe=async e=>t?await t.getSumoInfo(e):{status:-1,message:"未加载OpenDrive地图"},ze=async e=>t?await(t==null?void 0:t.splitLane(e)):{status:-1,message:"未加载OpenDrive地图"},Ee=async()=>t?t==null?void 0:t.clearSplitLane():{status:-1,message:"未加载OpenDrive地图"},Pe=async e=>(o||(o=new pt.default(n)),await o.showSignalControlArea(e)),Ne=async()=>await(o==null?void 0:o.clearSignalControlArea()),He=e=>o==null?void 0:o.setLayerVisibility(e),Ge=async e=>o?await(o==null?void 0:o.locateSignalControlArea(e)):{status:-1,message:"未加载信号控制区"},Ze=async e=>o?await o.highlightSignalControlArea(e):{status:-1,message:"未加载信号控制区"},We=()=>o?o.resetHighlight():{status:-1,message:"未加载信号控制区"},je=e=>(u||(u=new mt.default(n)),u.showSubSignalControlArea(e)),Je=e=>u?u.editSubSignalControlArea(e):{status:-1,message:"未加载信号控制区"},Qe=()=>u?u.stopEditSubSignalControlArea():{status:-1,message:"未加载信号控制区"},Ue=e=>u?u.selectSubSignalControlAreaCross(e):{status:-1,message:"未加载信号控制区"},Ke=e=>u?u.unselectSubSignalControlAreaCross(e):{status:-1,message:"未加载信号控制区"},Fe=e=>{if(!u)return{status:-1,message:"未加载信号控制区"}},Xe=e=>(g||(g=new M.default(n)),g.addGreenWaveBand(e)),Ye=()=>{if(!g)return{status:-1,message:"未加载绿波带"};g.stopAddGreenWaveBand()},Re=async e=>(g||(g=new M.default(n)),await g.showGreenWaveBand(e)),$e=async e=>(y||(y=new ut.default(n)),await y.showJurisdiction(e)),et=()=>{if(!y)return{status:-1,message:"未加载警务管辖区"};y.clearJurisdiction()},tt=async e=>(h||(h=new ot.default(n)),await h.setEdpassLayerVisibility(e)),I=P,S=H;return N({mapViewer:G,setLayerVisibility:X,setMapCenter:Q,lookAt:F,setMapCamera:U,setMapZoom:K,setMapZoomRange:$,requestCoordinateTransform:Y,cancelCoordinateTransform:R,addOverlays:ve,addClusterPoints:Se,addMask:we,removeMask:Ce,showAllOverlays:ke,removeOverlaysByType:he,removeOverlaysById:be,removeAllOverlays:Oe,showLaneNumber:ee,clearLaneNumber:te,initializeAreaTool:ne,calCrossIndicatorArea:ae,calRoadIndicatorArea:re,connectCarFlow:se,disconnectCarFlow:oe,handleHoloVehicleTraceData:ie,clearHoloTrace:ce,initializeLampGroup:de,handleUniSignalData:me,handleHoloSignalData:ue,clearHoloSignal:pe,setInterpolate:le,toggleTrafficInfo:ge,toggleTrafficObject:ye,toggleVehicleInfo:A,togglePause:fe,updateQueueLength:Ae,removeQueueLength:Le,showOpenDriveFromServer:De,showOpenDriveFromFile:Te,clearOpenDrive:Ve,setOpendriveVisibility:qe,geometrySearchInOpenDrive:Me,findSumoInOpenDrive:_e,selectSumoInOpenDrive:Be,unselectSumoInOpenDrive:Ie,getSumoInfo:xe,splitOpenDriveLane:ze,clearSplitOpenDriveLane:Ee,showSignalControlArea:Pe,clearSignalControlArea:Ne,setSignalControlAreaVisibility:He,locateSignalControlArea:Ge,highlightSignalControlArea:Ze,resetHighlightSignalControlArea:We,showSubSignalControlArea:je,editSubSignalControlArea:Je,stopEditSubSignalControlArea:Qe,selectSubSignalControlAreaCross:Ue,unselectSubSignalControlAreaCross:Ke,changeSubSignalControlAreaBorderVisibility:Fe,addGreenWaveBand:Xe,stopAddGreenWaveBand:Ye,showGreenWaveBand:Re,showPoliceArea:$e,clearPoliceArea:et,setEdpassLayerVisibility:tt}),(e,d)=>(r.openBlock(),r.createElementBlock("div",ft,[r.createElementVNode("div",{class:"gis-viewer-main",ref_key:"mapContainer",ref:C},[r.withDirectives(r.createElementVNode("div",yt,[r.createElementVNode("button",{style:{"margin-right":"10px"},onClick:Z}," 开始记录 "),r.createElementVNode("button",{style:{"margin-right":"10px"},onClick:W}," 下载日志 "),r.createElementVNode("button",{style:{"margin-right":"10px"},onClick:j}," 显示车辆id "),r.createElementVNode("button",{onClick:J},"显示车辆号牌")],512),[[r.vShow,O.value]])],512),(r.openBlock(!0),r.createElementBlock(r.Fragment,null,r.renderList(V,(c,w)=>(r.openBlock(),r.createBlock(ct.default,{key:w,"display-mode":c.displayMode,flash:c.flash,"road-id":c.crossId,"cross-id":c.roadId,"map-point":c.mapPoint,"stop-line":c.stopLine,position:c.position,rotation:c.rotation,scale:c.scale,"lamp-status":c.lampStatus},null,8,["display-mode","flash","road-id","cross-id","map-point","stop-line","position","rotation","scale","lamp-status"]))),128))]))}});exports.default=vt;

package/lib/src/gis-map/index.d.ts

@@ -22,6 +22,7 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
     greenWaveBandController: import("./utils/green-wave-band-controller").default;
     policeJurisdictionController: import("./utils/police-jurisdiction").default;
     edpassDeviceController: import("./utils/edpass-device-controller").default;
+    dbscanCluster: import("./utils/dbscan-cluster").default;
     showLogDiv: import("vue").Ref<boolean>;
     appDataStore: import("pinia").Store<"appData", {
         mapConfig: {};
@@ -98,6 +99,7 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
     toggleTrafficObject: (params: import("../types").IToggleTrafficInfoParams) => void;
     toggleVehicleInfo: (contentType: string) => void;
     addOverlays: (params: import("../types").IOverlayParam) => Promise<import("../types").IResult>;
+    addClusterPoints: (params: import("../types").IClusterPointParams) => Promise<void>;
     addMask: (params: import("../types").IMaskParam) => void;
     removeMask: () => void;
     removeOverlaysByType: (types: string[]) => import("../types").IResult;

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

@@ -0,0 +1,51 @@
+import { IClusterPointParams } from 'packages/components/src/types';
+export default class DbscanCluster {
+    private view;
+    private clusterLayer;
+    private maxClusterSymbolSize;
+    private minClusterSymbolSize;
+    constructor(view: __esri.MapView | __esri.SceneView);
+    private zoomWatchHandle;
+    private locations;
+    private clusterMarkUrl;
+    private currentZoom;
+    /**
+     * 将地理位置转换为屏幕坐标
+     */
+    private locationToScreen;
+    /**
+     * 添加聚类点到视图
+     * @param params
+     */
+    addClusterPoints(params: IClusterPointParams): void;
+    private showClusters;
+    /**
+     * 获取邻居点
+     * @param locations
+     * @param index
+     * @param eps
+     * @returns
+     */
+    private getNeighbors;
+    /**
+     * 两点间的像素距离
+     * @param point1
+     * @param point2
+     * @returns
+     */
+    private getDistance;
+    /**
+     * 从聚类结果中创建聚类对象
+     * @param locations
+     * @returns
+     */
+    private createClusters;
+    /**
+     * 按照像素距离聚类
+     * @param locations
+     * @param eps
+     * @param minPoints
+     * @returns
+     */
+    private doPixelCluster;
+}

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

@@ -0,0 +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 g(l){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(l){for(const t in l)if(t!=="default"){const i=Object.getOwnPropertyDescriptor(l,t);Object.defineProperty(e,t,i.get?i:{enumerable:!0,get:()=>l[t]})}}return e.default=l,Object.freeze(e)}const C=g(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 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(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=C.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)}showClusters(e){let t=Number.MIN_VALUE,i=Number.MAX_VALUE;e.forEach(s=>{s.count>1&&(i=Math.min(i,s.count),t=Math.max(t,s.count))}),e.forEach(s=>{if(s.id!==-1){let r=i===t?(this.maxClusterSymbolSize+this.minClusterSymbolSize)/2:this.minClusterSymbolSize+(s.count-i)/(t-i)*(this.maxClusterSymbolSize-this.minClusterSymbolSize);r*=.75;const o=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(o)}else s.items.forEach(r=>{const o=new h({geometry:new m.Point({x:r.x,y:r.y}),attributes:r.properties,symbol:r.symbol});this.clusterLayer.add(o)})})}getNeighbors(e,t,i){const s=e[t];return e.filter(r=>r.id===s.id||r.visited?!1:this.getDistance(s,r)<=i)}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={},i=[];for(let r=0;r<e.length;r++){const o=e[r];o.clusterId===void 0||o.clusterId===-1?i.push(o):(t[o.clusterId]||(t[o.clusterId]=[]),t[o.clusterId].push(o))}const s=Object.keys(t).map((r,o)=>{const n=t[Number(r)],c=n.length,y=n.reduce((u,a)=>u+a.x,0),d=n.reduce((u,a)=>u+a.y,0),p=y/c,f=d/c;return{id:Number(r),items:n,count:c,center:{x:p,y:f}}});return i.length>0&&s.push({id:-1,items:i,count:i.length,center:null}),s}doPixelCluster(e,t,i){let s=0;e.forEach(r=>r.visited=!1);for(let r=0;r<e.length;r++){const o=e[r];if(o.visited)continue;o.visited=!0;const n=this.getNeighbors(e,r,t);n.length<i?o.clusterId=-1:(n.forEach(c=>{c.visited=!0,c.clusterId=s}),o.clusterId=s,s++)}return this.createClusters(e)}}exports.default=x;

package/lib/src/gis-map/utils/green-wave-band-controller/index.d.ts

@@ -24,6 +24,7 @@ export default class GreenWaveBandController {
     addGreenWaveBand(params: IEditSignalControlAreaParams): void;
     stopAddGreenWaveBand(): void;
     showGreenWaveBand(params: IShowGreenWaveBandParams): Promise<void>;
+    removeGreenWaveBand(bandId: string): void;
     /**
      * 显示所有路口，进入待选状态
      * @param nodeAttributes

package/lib/src/gis-map/utils/green-wave-band-controller/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const b=require("@arcgis/core/core/reactiveUtils.js"),m=require("@arcgis/core/geometry"),c=require("@arcgis/core/Graphic"),y=require("@arcgis/core/layers/GraphicsLayer"),u=require("axios");function g(n){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(n){for(const s in n)if(s!=="default"){const i=Object.getOwnPropertyDescriptor(n,s);Object.defineProperty(e,s,i.get?i:{enumerable:!0,get:()=>n[s]})}}return e.default=n,Object.freeze(e)}const p=g(b);class f{constructor(e){this.selectedNodeIds=[],this.nodeScale=5e3,this.hasGpu=!1,this.hasGpu=localStorage.getItem("gpu")!=="Unknown",this.view=e,this.roadsectLayer=new y({id:"roadsectLayer"}),this.view.map.add(this.roadsectLayer),this.allNodesLayer=new y({id:"allNodesLayer"}),this.view.map.add(this.allNodesLayer),this.bandLayer=new y({id:"bandLayer"}),this.view.map.add(this.bandLayer)}addGreenWaveBand(e){this.addNodeCallback=e.addCrossCallback,this.removeNodeCallback=e.removeCrossCallback,e.removeAllCrossCallback&&(this.removeAllNodeCallback=e.removeAllCrossCallback),this.selectedNodeIds=[],this.openDriveServer=e.odrServer,this.showAllNodes(e.crossesInArea),this.viewClickWatcher||(this.viewClickWatcher=this.view.on("click",s=>{this.handleViewClick(s)}))}stopAddGreenWaveBand(){var e;(e=this.viewClickWatcher)==null||e.remove(),this.viewClickWatcher=void 0,this.allNodesLayer.removeAll(),this.selectedNodeIds=[],this.roadsectLayer.removeAll(),this.bandLayer.removeAll()}async showGreenWaveBand(e){this.bandLayer.graphics.forEach(t=>{t.getAttribute("bandId")===e.bandId&&this.bandLayer.remove(t)}),this.roadsectLayer.graphics.forEach(t=>{t.getAttribute("bandId")===e.bandId&&this.roadsectLayer.remove(t)}),this.scaleWatcher||(this.scaleWatcher=p.watch(()=>this.view.scale,(t,o)=>{t>this.nodeScale&&o<=this.nodeScale?this.bandLayer.graphics.forEach(a=>{a.geometry.type==="point"&&(a.symbol=this.getShowNodeSymbol("marker"))}):t<=this.nodeScale&&o>this.nodeScale&&this.bandLayer.graphics.forEach(a=>{a.geometry.type==="point"&&(a.symbol=this.getShowNodeSymbol("picture"))})}));const s=new m.Polyline({paths:[e.coordinates]}),i=new c({geometry:s,symbol:this.getLineSymbol(!0,e),attributes:{bandId:e.bandId,type:"greenWaveBand",id:e.bandId}});this.roadsectLayer.add(i),await this.view.goTo(i),e.nodeList&&e.nodeList.forEach(t=>{const o=new c({geometry:{type:"point",x:t.longitude,y:t.latitude},symbol:this.getShowNodeSymbol("picture"),attributes:{...t,bandId:e.bandId,type:"greenWaveBandNode"}});this.bandLayer.add(o)})}showAllNodes(e){const s=[];e.forEach(i=>{s.push(new c({geometry:{type:"point",x:i.longitude,y:i.latitude},symbol:this.getEditableNodeSymbol(!1),attributes:{...i,selected:!1}}))}),this.allNodesLayer.addMany(s)}async handleViewClick(e){var a;const i=(a=(await this.view.hitTest(e,{include:[this.allNodesLayer]})).results)==null?void 0:a.filter(d=>d.type==="graphic");if(i.length===0)return;const t=i[0].graphic,o=t.getAttribute("id");if(this.selectedNodeIds.includes(o)){const d=this.selectedNodeIds.indexOf(o)+1;if(d===1)this.removeAllNodeCallback&&this.removeAllNodeCallback(),this.selectedNodeIds=[],this.allNodesLayer.graphics.forEach(r=>{r.setAttribute("selected",!1),r.symbol=this.getEditableNodeSymbol(!1),r.visible=!0}),this.roadsectLayer.removeAll();else{for(let r=d;r<this.selectedNodeIds.length;r++){this.removeNodeCallback&&this.removeNodeCallback({id:this.selectedNodeIds[r]});for(let l=0;l<this.roadsectLayer.graphics.length;l++){const h=this.roadsectLayer.graphics.getItemAt(l);(h.getAttribute("id")===this.selectedNodeIds[r]||!h.getAttribute("selected"))&&(this.roadsectLayer.remove(h),l--)}}this.selectedNodeIds=this.selectedNodeIds.slice(0,d),this.allNodesLayer.graphics.forEach(r=>{const l=this.selectedNodeIds.includes(r.getAttribute("id"));r.setAttribute("selected",l),r.symbol=this.getEditableNodeSymbol(l),r.visible=l}),await this.showDownstreamNodes(o)}}else{t.setAttribute("selected",!0),t.symbol=this.getEditableNodeSymbol(!0),this.selectedNodeIds.push(o),this.allNodesLayer.graphics.forEach(r=>{r.visible=r.getAttribute("selected")});let d=[];for(let r=0;r<this.roadsectLayer.graphics.length;r++){const l=this.roadsectLayer.graphics.getItemAt(r);l.getAttribute("id")===o?(l.symbol=this.getLineSymbol(!0),l.setAttribute("selected",!0),d=l.geometry.paths[0]):l.getAttribute("selected")||(this.roadsectLayer.remove(l),r--)}this.addNodeCallback&&this.addNodeCallback({...t.attributes,roadsect:d}),await this.showDownstreamNodes(o)}}async showDownstreamNodes(e){this.view.container.style.cursor="progress";const s=await u.get(`http://${this.openDriveServer}/api/computable/getDownstreamNodes`,{params:{nodeId:e}});if(s.status!==200||s.data.status!==0){this.view.container.style.cursor="default";return}s.data.result.forEach(t=>{this.allNodesLayer.graphics.forEach(o=>{if(o.getAttribute("nodeId")===t.id&&o.getAttribute("selected")===!1&&(o.visible=!0,t.coordinates)){const a=new c({geometry:{type:"polyline",paths:[t.coordinates]},symbol:this.getLineSymbol(!1),attributes:{...t,selected:!1}});this.roadsectLayer.add(a)}})}),this.view.container.style.cursor="default"}getLineSymbol(e,s){if(e){const i=(s==null?void 0:s.lineWidth)||4,t=(s==null?void 0:s.lineColor)||[55,125,34,255],o=(s==null?void 0:s.arrowColor)||[255,255,255,255];return Array.isArray(t)&&t.length===3&&t.push(255),Array.isArray(o)&&o.length===3&&o.push(255),{type:"cim",data:{type:"CIMSymbolReference",symbol:{type:"CIMLineSymbol",symbolLayers:[{type:"CIMVectorMarker",enable:!0,size:4,markerPlacement:{type:"CIMMarkerPlacementAlongLineSameSize",endings:"WithMarkers",placementTemplate:[40],angleToLine:!0},frame:{xmin:-5,ymin:-5,xmax:5,ymax:5},markerGraphics:[{type:"CIMMarkerGraphic",geometry:{paths:[[[i,-i],[3*i,0],[i,i]],[[-i,i],[-3*i,0],[-i,-i]]]},symbol:{type:"CIMLineSymbol",symbolLayers:[{type:"CIMSolidStroke",enable:!0,width:1.5,color:o}]}}]},{type:"CIMSolidStroke",enable:!0,width:i,color:t}]}}}}else return{type:"simple-line",color:"gray",width:2}}getShowNodeSymbol(e){return e==="marker"?{type:"simple-marker",style:"circle",color:[61,139,249],size:8,outline:{color:"white",width:1}}:this.getEditableNodeSymbol(!0)}getEditableNodeSymbol(e){return{type:"cim",data:{type:"CIMSymbolReference",primitiveOverrides:[{type:"CIMPrimitiveOverride",primitiveName:"textGraphic",propertyName:"TextString",valueExpressionInfo:{type:"CIMExpressionInfo",title:"Custom",expression:'Replace($feature.name, "与", "/") + "  " + $feature.signalId',returnType:"Default"}}],symbol:{type:"CIMPointSymbol",symbolLayers:[{type:"CIMVectorMarker",size:30,colorLocked:!0,anchorPointUnits:"Relative",frame:{xmin:-16,ymin:-16,xmax:16,ymax:16},markerGraphics:[{type:"CIMMarkerGraphic",primitiveName:"textGraphic",geometry:{x:0,y:0},symbol:{type:"CIMTextSymbol",height:12,horizontalAlignment:"Center",offsetX:0,offsetY:20,haloSize:2,haloSymbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[255,255,255,255]}]},symbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[0,0,0,255]}]},verticalAlignment:"Center"},textString:""}],scaleSymbolsProportionally:!0,respectFrame:!0},{type:"CIMPictureMarker",enable:!0,anchorPoint:{x:0,y:0},anchorPointUnits:"Relative",size:25,rotateClockwise:!0,textureFilter:"Picture",url:`/GisViewerAssets/Images/cross/${e?"gis_xhj_blue":"gis_xhj_gray"}.png`}]}}}}}exports.default=f;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const b=require("@arcgis/core/core/reactiveUtils.js"),m=require("@arcgis/core/geometry"),c=require("@arcgis/core/Graphic"),y=require("@arcgis/core/layers/GraphicsLayer"),u=require("axios");function g(n){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(n){for(const t in n)if(t!=="default"){const s=Object.getOwnPropertyDescriptor(n,t);Object.defineProperty(e,t,s.get?s:{enumerable:!0,get:()=>n[t]})}}return e.default=n,Object.freeze(e)}const p=g(b);class f{constructor(e){this.selectedNodeIds=[],this.nodeScale=5e3,this.hasGpu=!1,this.hasGpu=localStorage.getItem("gpu")!=="Unknown",this.view=e,this.roadsectLayer=new y({id:"roadsectLayer"}),this.view.map.add(this.roadsectLayer),this.allNodesLayer=new y({id:"allNodesLayer"}),this.view.map.add(this.allNodesLayer),this.bandLayer=new y({id:"bandLayer"}),this.view.map.add(this.bandLayer)}addGreenWaveBand(e){this.addNodeCallback=e.addCrossCallback,this.removeNodeCallback=e.removeCrossCallback,e.removeAllCrossCallback&&(this.removeAllNodeCallback=e.removeAllCrossCallback),this.selectedNodeIds=[],this.openDriveServer=e.odrServer,this.showAllNodes(e.crossesInArea),this.viewClickWatcher||(this.viewClickWatcher=this.view.on("click",t=>{this.handleViewClick(t)}))}stopAddGreenWaveBand(){var e;(e=this.viewClickWatcher)==null||e.remove(),this.viewClickWatcher=void 0,this.allNodesLayer.removeAll(),this.selectedNodeIds=[],this.roadsectLayer.removeAll(),this.bandLayer.removeAll()}async showGreenWaveBand(e){this.removeGreenWaveBand(e.bandId),this.scaleWatcher||(this.scaleWatcher=p.watch(()=>this.view.scale,(i,o)=>{i>this.nodeScale&&o<=this.nodeScale?this.bandLayer.graphics.forEach(a=>{a.geometry.type==="point"&&(a.symbol=this.getShowNodeSymbol("marker"))}):i<=this.nodeScale&&o>this.nodeScale&&this.bandLayer.graphics.forEach(a=>{a.geometry.type==="point"&&(a.symbol=this.getShowNodeSymbol("picture"))})}));const t=new m.Polyline({paths:[e.coordinates]}),s=new c({geometry:t,symbol:this.getLineSymbol(!0,e),attributes:{bandId:e.bandId,type:"greenWaveBand",id:e.bandId}});this.roadsectLayer.add(s),await this.view.goTo(s),e.nodeList&&e.nodeList.forEach(i=>{const o=new c({geometry:{type:"point",x:i.longitude,y:i.latitude},symbol:this.getShowNodeSymbol("picture"),attributes:{...i,bandId:e.bandId,type:"greenWaveBandNode"}});this.bandLayer.add(o)})}removeGreenWaveBand(e){let t=this.bandLayer.graphics.filter(s=>s.getAttribute("bandId")===e);this.bandLayer.removeMany(t.toArray()),t=this.roadsectLayer.graphics.filter(s=>s.getAttribute("bandId")===e),this.roadsectLayer.removeMany(t.toArray())}showAllNodes(e){const t=[];e.forEach(s=>{t.push(new c({geometry:{type:"point",x:s.longitude,y:s.latitude},symbol:this.getEditableNodeSymbol(!1),attributes:{...s,selected:!1}}))}),this.allNodesLayer.addMany(t)}async handleViewClick(e){var a;const s=(a=(await this.view.hitTest(e,{include:[this.allNodesLayer]})).results)==null?void 0:a.filter(d=>d.type==="graphic");if(s.length===0)return;const i=s[0].graphic,o=i.getAttribute("id");if(this.selectedNodeIds.includes(o)){const d=this.selectedNodeIds.indexOf(o)+1;if(d===1)this.removeAllNodeCallback&&this.removeAllNodeCallback(),this.selectedNodeIds=[],this.allNodesLayer.graphics.forEach(r=>{r.setAttribute("selected",!1),r.symbol=this.getEditableNodeSymbol(!1),r.visible=!0}),this.roadsectLayer.removeAll();else{for(let r=d;r<this.selectedNodeIds.length;r++){this.removeNodeCallback&&this.removeNodeCallback({id:this.selectedNodeIds[r]});for(let l=0;l<this.roadsectLayer.graphics.length;l++){const h=this.roadsectLayer.graphics.getItemAt(l);(h.getAttribute("id")===this.selectedNodeIds[r]||!h.getAttribute("selected"))&&(this.roadsectLayer.remove(h),l--)}}this.selectedNodeIds=this.selectedNodeIds.slice(0,d),this.allNodesLayer.graphics.forEach(r=>{const l=this.selectedNodeIds.includes(r.getAttribute("id"));r.setAttribute("selected",l),r.symbol=this.getEditableNodeSymbol(l),r.visible=l}),await this.showDownstreamNodes(o)}}else{i.setAttribute("selected",!0),i.symbol=this.getEditableNodeSymbol(!0),this.selectedNodeIds.push(o),this.allNodesLayer.graphics.forEach(r=>{r.visible=r.getAttribute("selected")});let d=[];for(let r=0;r<this.roadsectLayer.graphics.length;r++){const l=this.roadsectLayer.graphics.getItemAt(r);l.getAttribute("id")===o?(l.symbol=this.getLineSymbol(!0),l.setAttribute("selected",!0),d=l.geometry.paths[0]):l.getAttribute("selected")||(this.roadsectLayer.remove(l),r--)}this.addNodeCallback&&this.addNodeCallback({...i.attributes,roadsect:d}),await this.showDownstreamNodes(o)}}async showDownstreamNodes(e){this.view.container.style.cursor="progress";const t=await u.get(`http://${this.openDriveServer}/api/computable/getDownstreamNodes`,{params:{nodeId:e}});if(t.status!==200||t.data.status!==0){this.view.container.style.cursor="default";return}t.data.result.forEach(i=>{this.allNodesLayer.graphics.forEach(o=>{if(o.getAttribute("nodeId")===i.id&&o.getAttribute("selected")===!1&&(o.visible=!0,i.coordinates)){const a=new c({geometry:{type:"polyline",paths:[i.coordinates]},symbol:this.getLineSymbol(!1),attributes:{...i,selected:!1}});this.roadsectLayer.add(a)}})}),this.view.container.style.cursor="default"}getLineSymbol(e,t){if(e){const s=(t==null?void 0:t.lineWidth)||4,i=(t==null?void 0:t.lineColor)||[55,125,34,255],o=(t==null?void 0:t.arrowColor)||[255,255,255,255];return Array.isArray(i)&&i.length===3&&i.push(255),Array.isArray(o)&&o.length===3&&o.push(255),{type:"cim",data:{type:"CIMSymbolReference",symbol:{type:"CIMLineSymbol",symbolLayers:[{type:"CIMVectorMarker",enable:!0,size:4,markerPlacement:{type:"CIMMarkerPlacementAlongLineSameSize",endings:"WithMarkers",placementTemplate:[40],angleToLine:!0},frame:{xmin:-5,ymin:-5,xmax:5,ymax:5},markerGraphics:[{type:"CIMMarkerGraphic",geometry:{paths:[[[s,-s],[3*s,0],[s,s]],[[-s,s],[-3*s,0],[-s,-s]]]},symbol:{type:"CIMLineSymbol",symbolLayers:[{type:"CIMSolidStroke",enable:!0,width:1.5,color:o}]}}]},{type:"CIMSolidStroke",enable:!0,width:s,color:i}]}}}}else return{type:"simple-line",color:"gray",width:2}}getShowNodeSymbol(e){return e==="marker"?{type:"simple-marker",style:"circle",color:[61,139,249],size:8,outline:{color:"white",width:1}}:this.getEditableNodeSymbol(!0)}getEditableNodeSymbol(e){return{type:"cim",data:{type:"CIMSymbolReference",primitiveOverrides:[{type:"CIMPrimitiveOverride",primitiveName:"textGraphic",propertyName:"TextString",valueExpressionInfo:{type:"CIMExpressionInfo",title:"Custom",expression:'Replace($feature.name, "与", "/") + "  " + $feature.signalId',returnType:"Default"}}],symbol:{type:"CIMPointSymbol",symbolLayers:[{type:"CIMVectorMarker",size:30,colorLocked:!0,anchorPointUnits:"Relative",frame:{xmin:-16,ymin:-16,xmax:16,ymax:16},markerGraphics:[{type:"CIMMarkerGraphic",primitiveName:"textGraphic",geometry:{x:0,y:0},symbol:{type:"CIMTextSymbol",height:12,horizontalAlignment:"Center",offsetX:0,offsetY:20,haloSize:2,haloSymbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[255,255,255,255]}]},symbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[0,0,0,255]}]},verticalAlignment:"Center"},textString:""}],scaleSymbolsProportionally:!0,respectFrame:!0},{type:"CIMPictureMarker",enable:!0,anchorPoint:{x:0,y:0},anchorPointUnits:"Relative",size:25,rotateClockwise:!0,textureFilter:"Picture",url:`/GisViewerAssets/Images/cross/${e?"gis_xhj_blue":"gis_xhj_gray"}.png`}]}}}}}exports.default=f;

package/lib/src/gis-map/utils/overlay.d.ts

@@ -2,7 +2,7 @@ import Graphic from '@arcgis/core/Graphic';
 import GraphicsLayer from '@arcgis/core/layers/GraphicsLayer';
 import MapView from '@arcgis/core/views/MapView';
 import SceneView from '@arcgis/core/views/SceneView';
-import { IMaskParam, IOverlay, IOverlayParam, IPointSymbol, IResult } from '../../types';
+import { IClusterPointParams, IMaskParam, IOverlayParam, IResult } from '../../types';
 interface IOverlayOptions {
     id: string;
 }
@@ -73,13 +73,8 @@ export default class Overlay {
      * @memberof Overlay
      */
     showLayer(): void;
-    /**
-     * 添加点覆盖物
-     * @param overlay
-     * @param symbol
-     * @param properties
-     */
-    addPoint(overlay: IOverlay, symbol: IPointSymbol, properties: any, visible?: boolean): IResult;
     private addOverlay;
+    private clusterLayer;
+    addClusterPoint(params: IClusterPointParams): void;
 }
 export {};