gisviewer-vue3-arcgis 1.0.184 → 1.0.186

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

@@ -1,19 +1,19 @@
-import * as g from "@arcgis/core/core/reactiveUtils.js";
-import c from "@arcgis/core/Graphic";
+import * as p from "@arcgis/core/core/reactiveUtils.js";
+import n from "@arcgis/core/Graphic";
 import y from "@arcgis/core/layers/GraphicsLayer";
-import p from "@turf/buffer";
-import b from "@turf/convex";
-import * as n from "@turf/helpers";
-import d from "axios";
+import d from "@turf/buffer";
+import g from "@turf/convex";
+import * as a from "@turf/helpers";
+import b from "axios";
 import f from "concaveman";
 import C from "../../stores/index.mjs";
 import v from "./district-controller.mjs";
-class N {
+class P {
   constructor(e) {
-    var s;
-    this.crossScale = 5e3, this.view = e;
+    var i;
+    this.crossScale = 5e3, this.crossIdsInDistrict = [], this.view = e;
     const r = C.useAppDataStore.mapConfig;
-    this.openDriveServer = (s = r.openDriveServer) == null ? void 0 : s.url, this.districtControllerLayer = new y({
+    this.openDriveServer = (i = r.openDriveServer) == null ? void 0 : i.url, this.districtControllerLayer = new y({
       id: "districtControllerLayer"
     }), this.subDistrictControllerLayer = new y({
       id: "subDistrictControllerLayer",
@@ -48,27 +48,27 @@ class N {
       );
       this.drawArea(r, !0);
     }
-    return this.scaleWatcher = g.watch(
+    return this.scaleWatcher = p.watch(
       () => this.view.scale,
       (t, r) => {
-        t > this.crossScale && r <= this.crossScale ? (this.crossLayer.graphics.forEach((s) => {
-          s.symbol = this.getCrossGraphicSymbol(
-            s.attributes,
+        t > this.crossScale && r <= this.crossScale ? (this.crossLayer.graphics.forEach((i) => {
+          i.symbol = this.getCrossGraphicSymbol(
+            i.attributes,
             "marker"
           );
-        }), this.highlightLayer.graphics.forEach((s) => {
-          s.getAttribute("type") === "cross" && (s.symbol = this.getCrossGraphicSymbol(
-            s.attributes,
+        }), this.highlightLayer.graphics.forEach((i) => {
+          i.getAttribute("type") === "cross" && (i.symbol = this.getCrossGraphicSymbol(
+            i.attributes,
             "marker"
           ));
-        })) : t <= this.crossScale && r > this.crossScale && (this.crossLayer.graphics.forEach((s) => {
-          s.symbol = this.getCrossGraphicSymbol(
-            s.attributes,
+        })) : t <= this.crossScale && r > this.crossScale && (this.crossLayer.graphics.forEach((i) => {
+          i.symbol = this.getCrossGraphicSymbol(
+            i.attributes,
             "picture"
           );
-        }), this.highlightLayer.graphics.forEach((s) => {
-          s.getAttribute("type") === "cross" && (s.symbol = this.getCrossGraphicSymbol(
-            s.attributes,
+        }), this.highlightLayer.graphics.forEach((i) => {
+          i.getAttribute("type") === "cross" && (i.symbol = this.getCrossGraphicSymbol(
+            i.attributes,
             "picture"
           ));
         }));
@@ -90,27 +90,27 @@ class N {
     if (!e.id || e.id === "")
       return { status: 1, message: "请输入id" };
     this.highlightLayer.removeAll(), this.districtControllerLayer.visible = !1;
-    const t = this.districtControllerLayer.graphics.filter((i) => i.getAttribute("id") === e.id).toArray().map((i) => {
-      const a = i.clone();
-      return a.symbol.style = "none", a;
+    const t = this.districtControllerLayer.graphics.filter((s) => s.getAttribute("id") === e.id).toArray().map((s) => {
+      const o = s.clone();
+      return o.symbol.style = "none", o;
     }), r = this.subDistrictControllerLayer.graphics.filter(
-      (i) => i.getAttribute("id") === e.id || i.getAttribute("parentId") === e.id
-    ).toArray().map((i) => i.clone()), s = this.crossLayer.graphics.filter(
-      (i) => i.getAttribute("id") === e.id || i.getAttribute("districtId") === e.id || i.getAttribute("subDistrictId") === e.id
-    ).toArray().map((i) => i.clone());
-    if (t.length > 0 && this.highlightLayer.addMany(t), r.length > 0 && this.highlightLayer.addMany(r), s.length > 0 && this.highlightLayer.addMany(s), this.highlightLayer.graphics.length === 0)
+      (s) => s.getAttribute("id") === e.id || s.getAttribute("parentId") === e.id
+    ).toArray().map((s) => s.clone()), i = this.crossLayer.graphics.filter(
+      (s) => s.getAttribute("id") === e.id || s.getAttribute("districtId") === e.id || s.getAttribute("subDistrictId") === e.id
+    ).toArray().map((s) => s.clone());
+    if (t.length > 0 && this.highlightLayer.addMany(t), r.length > 0 && this.highlightLayer.addMany(r), i.length > 0 && this.highlightLayer.addMany(i), this.highlightLayer.graphics.length === 0)
       return { status: 1, message: "未找到" };
     if (t.length > 0)
       await this.view.goTo(t);
     else if (r.length > 0) {
-      const i = r[0].geometry.centroid;
+      const s = r[0].geometry.centroid;
       await this.view.goTo({
-        target: i,
+        target: s,
         scale: this.crossScale - 500
       });
     } else
-      s.length > 1 ? await this.view.goTo(s) : await this.view.goTo({
-        target: s[0].geometry,
+      i.length > 1 ? await this.view.goTo(i) : await this.view.goTo({
+        target: i[0].geometry,
         scale: 1500
       });
     return { status: 0, message: "ok" };
@@ -120,16 +120,16 @@ class N {
   }
   showSubSignalControlArea(e) {
     this.crossLayer.removeAll(), this.crossLayer.visible = !0;
-    const r = e.children.map((s) => {
-      const i = { ...s, selected: !0 };
-      return new c({
+    const r = e.children.map((i) => {
+      const s = { ...i, selected: !0 };
+      return new n({
         geometry: {
           type: "point",
-          x: s.longitude,
-          y: s.latitude
+          x: i.longitude,
+          y: i.latitude
         },
-        symbol: this.getCrossSymbolInSubDistrict(i),
-        attributes: i
+        symbol: this.getCrossSymbolInSubDistrict(s),
+        attributes: s
       });
     });
     return this.crossLayer.addMany(r), this.view.goTo(r), { status: 0, message: "ok" };
@@ -140,23 +140,23 @@ class N {
    * @returns
    */
   async handleViewClick(e) {
-    var i;
-    const r = (i = (await this.view.hitTest(e, {
+    var s;
+    const r = (s = (await this.view.hitTest(e, {
       include: [this.crossLayer]
-    })).results) == null ? void 0 : i.filter(
-      (a) => a.type === "graphic"
+    })).results) == null ? void 0 : s.filter(
+      (o) => o.type === "graphic"
     );
     if (r.length === 0)
       return;
-    const s = r[0].graphic;
-    s.getAttribute("selected") ? s.getAttribute("signalId") && (this.removeCrossCallback && this.removeCrossCallback({ id: s.getAttribute("id") }), s.setAttribute("selected", !1), s.symbol = this.getCrossSymbolInSubDistrict(
-      s.attributes
-    )) : (s.getAttribute("signalId") && (this.addCrossCallback && this.addCrossCallback({
-      id: s.getAttribute("id"),
-      name: s.getAttribute("name")
-    }), s.setAttribute("selected", !0), s.symbol = this.getCrossSymbolInSubDistrict(
-      s.attributes
-    )), await this.showNearbyCrosses(s.getAttribute("id")));
+    const i = r[0].graphic;
+    i.getAttribute("selected") ? i.getAttribute("signalId") && (this.removeCrossCallback && this.removeCrossCallback({ id: i.getAttribute("id") }), i.setAttribute("selected", !1), i.symbol = this.getCrossSymbolInSubDistrict(
+      i.attributes
+    )) : (i.getAttribute("signalId") && (this.addCrossCallback && this.addCrossCallback({
+      id: i.getAttribute("id"),
+      name: i.getAttribute("name")
+    }), i.setAttribute("selected", !0), i.symbol = this.getCrossSymbolInSubDistrict(
+      i.attributes
+    )), await this.showNearbyCrosses(i.getAttribute("id")));
   }
   /**
    * 显示周边的路口
@@ -164,37 +164,36 @@ class N {
    * @returns
    */
   async showNearbyCrosses(e) {
-    const t = await d.get(
+    const t = await b.get(
       `http://${this.openDriveServer}/api/computable/getRelatedJunctionsForJunction`,
       { params: { junctionIds: e } }
     );
     if (t.status === 200)
       if (t.data.status === 0) {
-        const r = t.data.result, s = [];
-        return r.forEach(
-          (i) => {
-            const { junctionId: a } = i;
-            if (!this.crossLayer.graphics.some(
-              (l) => l.getAttribute("id") === a
-            )) {
-              const l = new c({
-                geometry: {
-                  type: "point",
-                  x: i.lon,
-                  y: i.lat
-                },
-                symbol: this.getCrossSymbolInSubDistrict(i),
-                attributes: {
-                  id: i.junctionId,
-                  name: i.name,
-                  signalId: i.signalId,
-                  selected: !1
-                }
-              });
-              s.push(l);
+        const r = t.data.result, i = [];
+        for (const s of r) {
+          const { junctionId: o } = s;
+          if (s.signalId && !this.crossIdsInDistrict.includes(o) || this.crossLayer.graphics.some(
+            (c) => c.getAttribute("id") === o
+          ))
+            continue;
+          const m = new n({
+            geometry: {
+              type: "point",
+              x: s.lon,
+              y: s.lat
+            },
+            symbol: this.getCrossSymbolInSubDistrict(s),
+            attributes: {
+              id: o,
+              name: s.name,
+              signalId: s.signalId,
+              selected: !1
             }
-          }
-        ), this.crossLayer.addMany(s), { status: 0, message: "ok" };
+          });
+          i.push(m);
+        }
+        return this.crossLayer.addMany(i), { status: 0, message: "ok" };
       } else
         return { status: -1, message: t.data.message };
     else
@@ -204,13 +203,33 @@ class N {
    * 编辑子区的路口
    * @returns
    */
-  async editSubSignalArea(e, t) {
+  async editSubSignalControlArea(e) {
     if (this.openDriveServer) {
-      this.addCrossCallback = e, this.removeCrossCallback = t, this.clickWatcher || (this.clickWatcher = this.view.on("click", async (s) => {
+      this.crossIdsInDistrict = e.crossesInArea.map((s) => s.id);
+      const t = a.featureCollection(
+        e.crossesInArea.map((s) => a.point([s.x, s.y]))
+      ), r = g(t);
+      r && (this.districtControllerLayer.removeAll(), this.districtControllerLayer.add(
+        new n({
+          geometry: {
+            type: "polygon",
+            rings: r.geometry.coordinates
+          },
+          symbol: {
+            type: "simple-fill",
+            style: "none",
+            outline: {
+              color: [61, 139, 249],
+              width: 3,
+              style: "long-dash"
+            }
+          }
+        })
+      )), this.addCrossCallback = e.addCrossCallback, this.removeCrossCallback = e.removeCrossCallback, this.clickWatcher || (this.clickWatcher = this.view.on("click", async (s) => {
         await this.handleViewClick(s);
       }));
-      const r = this.crossLayer.graphics.toArray().map((s) => s.getAttribute("id")).join(",");
-      return await this.showNearbyCrosses(r);
+      const i = this.crossLayer.graphics.toArray().map((s) => s.getAttribute("id")).join(",");
+      return await this.showNearbyCrosses(i);
     } else
       return { status: 1, message: "未配置OpenDriveServer" };
   }
@@ -260,31 +279,31 @@ class N {
   drawArea(e, t) {
     const r = e.getAllCrossCoordinates();
     if (r.length >= 2) {
-      let i = null;
+      let s = null;
       if (r.length === 2)
-        i = n.lineString(r);
+        s = a.lineString(r);
       else {
         if (t) {
-          const h = n.featureCollection(
-            r.map((u) => n.point(u))
+          const h = a.featureCollection(
+            r.map((u) => a.point(u))
           );
-          i = b(h);
+          s = g(h);
         } else {
           const h = f(r, 0.5);
-          h.length >= 4 && (i = n.polygon([h]));
+          h.length >= 4 && (s = a.polygon([h]));
         }
-        i || (i = n.lineString(r));
+        s || (s = a.lineString(r));
       }
-      const a = p(
-        i.geometry,
+      const o = d(
+        s.geometry,
         // 区控面积更大，需要更大的缓冲半径
         t ? 200 : 30,
         {
           units: "meters"
         }
       );
-      let o;
-      t ? o = [
+      let l;
+      t ? l = [
         {
           fieldName: "id",
           label: "区控编号"
@@ -297,7 +316,7 @@ class N {
           fieldName: "subDistrictCount",
           label: "子区数量"
         }
-      ] : o = [
+      ] : l = [
         {
           fieldName: "parentName",
           label: "所属区控"
@@ -307,7 +326,7 @@ class N {
           label: "路口数量"
         }
       ];
-      const l = {
+      const m = {
         type: "signalControlArea",
         id: e.id,
         name: e.name,
@@ -315,10 +334,10 @@ class N {
         parentName: e.parentName,
         crossCount: e.crossCount,
         subDistrictCount: e.subDistrictCount
-      }, m = new c({
+      }, c = new n({
         geometry: {
           type: "polygon",
-          rings: a.geometry.coordinates
+          rings: o.geometry.coordinates
         },
         symbol: {
           type: "simple-fill",
@@ -330,44 +349,44 @@ class N {
             style: t ? "long-dash" : "solid"
           }
         },
-        attributes: l,
+        attributes: m,
         popupTemplate: {
           title: `${t ? "区控" : "子区"}  ${e.name}`,
           content: [
             {
               type: "fields",
-              fieldInfos: o
+              fieldInfos: l
             }
           ]
         }
       });
-      t ? this.districtControllerLayer.add(m) : this.subDistrictControllerLayer.add(m);
+      t ? this.districtControllerLayer.add(c) : this.subDistrictControllerLayer.add(c);
     }
-    for (const i of e.subDistricts)
-      this.drawArea(i, !1);
-    const s = [];
-    e.crosses.forEach((i) => {
-      const a = {
+    for (const s of e.subDistricts)
+      this.drawArea(s, !1);
+    const i = [];
+    e.crosses.forEach((s) => {
+      const o = {
         type: "cross",
-        id: i.id,
-        name: i.name,
+        id: s.id,
+        name: s.name,
         color: e.areaColor,
-        signalId: i.signalId,
+        signalId: s.signalId,
         districtId: t ? e.id : e.parentId,
         districtName: t ? e.name : e.parentName,
         subDistrictId: t ? "" : e.id,
         subDistrictName: t ? "" : e.name,
-        isKey: i.isKey
-      }, o = new c({
+        isKey: s.isKey
+      }, l = new n({
         geometry: {
           type: "point",
-          x: i.longitude,
-          y: i.latitude
+          x: s.longitude,
+          y: s.latitude
         },
-        symbol: this.getCrossGraphicSymbol(a, "marker"),
-        attributes: a,
+        symbol: this.getCrossGraphicSymbol(o, "marker"),
+        attributes: o,
         popupTemplate: {
-          title: i.name,
+          title: s.name,
           content: [
             {
               type: "fields",
@@ -393,8 +412,8 @@ class N {
           ]
         }
       });
-      s.push(o);
-    }), this.crossLayer.addMany(s);
+      i.push(l);
+    }), this.crossLayer.addMany(i);
   }
   /**
    * 显示子区时路口的样式
@@ -500,7 +519,7 @@ class N {
    * @returns
    */
   getCrossGraphicSymbol(e, t) {
-    const { isKey: r, color: s } = e;
+    const { isKey: r, color: i } = e;
     if (t === "marker")
       return r ? {
         type: "picture-marker",
@@ -510,7 +529,7 @@ class N {
       } : {
         type: "simple-marker",
         style: "circle",
-        color: s,
+        color: i,
         size: 8,
         outline: {
           color: "white",
@@ -607,5 +626,5 @@ class N {
   }
 }
 export {
-  N as default
+  P as default
 };

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

@@ -270,3 +270,21 @@ export interface ISignalCountdownProps {
         rColor?: string;
     };
 }
+export interface IShowSignalControlAreaParams {
+    areaList: any[];
+    style?: string;
+}
+export interface IEditSignalControlAreaParams {
+    crossesInArea: {
+        id: string;
+        x: number;
+        y: number;
+    }[];
+    addCrossCallback: (params: {
+        id: string;
+        name: string;
+    }) => void;
+    removeCrossCallback: (params: {
+        id: string;
+    }) => void;
+}

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

@@ -1,6 +1,6 @@
 import MapView from '@arcgis/core/views/MapView';
 import SceneView from '@arcgis/core/views/SceneView';
-import { IFindSumoParams, ILaneNumberParams, ILayerVisibleParams, ILookAtParams, IMaskParam, IOverlayParam, IQueueLengthParams, ISetMapCameraParams, ISetMapCenterParams, IShowOpenDriveFromFileParams, ISignalCountdownProps, ISplitOpenDriveLaneParams, IStartCrossBufferParam, IToggleTrafficInfoParams, IUnselectSumoParams } from '../types';
+import { IEditSignalControlAreaParams, IFindSumoParams, ILaneNumberParams, ILayerVisibleParams, ILookAtParams, IMaskParam, IOverlayParam, IQueueLengthParams, ISetMapCameraParams, ISetMapCenterParams, IShowOpenDriveFromFileParams, IShowSignalControlAreaParams, ISignalCountdownProps, ISplitOpenDriveLaneParams, IStartCrossBufferParam, IToggleTrafficInfoParams, IUnselectSumoParams } from '../types';
 import HoloFlow from './utils/holo-flow';
 import MapInitializer from './utils/map-initializer';
 import OpenDriveRenderer from './utils/open-drive-renderer';
@@ -115,10 +115,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         status: number;
         message: string;
     }>;
-    showSignalControlArea: (params: {
-        areaList: any[];
-        style?: string;
-    }) => import("../types").IResult;
+    showSignalControlArea: (params: IShowSignalControlAreaParams) => import("../types").IResult;
     clearSignalControlArea: () => void;
     locateSignalControlArea: (params: {
         id: string;
@@ -128,12 +125,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     }) => Promise<import("../types").IResult>;
     resetHighlightSignalControlArea: () => import("../types").IResult;
     showSubSignalControlArea: (params: any) => import("../types").IResult;
-    editSubSignalControlArea: (addCrossCallback: (params: {
-        id: string;
-        name: string;
-    }) => void, removeCrossCallback: (params: {
-        id: string;
-    }) => void) => Promise<import("../types").IResult> | {
+    editSubSignalControlArea: (params: IEditSignalControlAreaParams) => Promise<import("../types").IResult> | {
         status: number;
         message: string;
     };

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"),h=require("./stores/index.js");require("./style/index.css");const Me=require("./utils/holo-flow/index.js"),Ve=require("./utils/holo-flow/signal-countdown-panel.vue.js"),Ne=require("./utils/map-initializer.js"),O=require("./utils/open-drive-renderer/index.js"),b=require("./utils/overlay.js"),Be=require("./utils/queue-length.js"),A=require("./utils/road-config-tool/index.js"),L=require("./utils/signal-control-area-controller/index.js"),He=require("./utils/traffic-flow.js"),Pe={class:"gis-viewer"},Ee={style:{position:"absolute",bottom:"80px",left:"10px","z-index":"9999"}},ze=n.defineComponent({__name:"gis-map",props:{config:{},assetsRoot:{}},emits:["mapLoaded","markerClick","mapClick"],setup(D,{expose:T,emit:_}){const p=n.ref(null);let i,m,l,o,r,s,g,t,a;const f=n.ref(!1);h.registerStore();const I=h.default.useAppDataStore,C=n.reactive([]);n.onMounted(async()=>{if(!p.value)return;document.addEventListener("keydown",d=>{d.ctrlKey&&d.key==="i"&&(f.value=!f.value)});const e=n.getCurrentInstance(),{$gisviewerAssetsRoot:u}=e.appContext.config.globalProperties,c=await(await fetch(k.config)).json();c.assetsRoot=k.assetsRoot||u,I.mapConfig=c,m=new Ne.default,i=await m.initialize({container:p.value,mapConfig:c,markerClickCallback:(d,v,w,qe)=>{y("markerClick",d,v,w,qe)},mapClickCallback:(d,v,w)=>{y("mapClick",d,v,w)}}),r=new Me.default(i,C),await r.init(),y("mapLoaded")}),n.onUnmounted(()=>{a==null||a.clearSignalControlArea(),t==null||t.clearOpenDrive(),r.clearHoloTrace(),r.clearHoloSignal(),o==null||o.disconnectTrafficFlow()});const x=n.computed(()=>i),q=()=>{const e=h.default.useAppDataStore;e.saveTrackLog=!0},M=()=>{r.downloadTrackLog()},V=()=>{S("vehicleId")},N=()=>{S("plateNumber")},B=async e=>await m.setMapCenter(e),H=async e=>await m.setMapCamera(e),P=async e=>await m.lookAt(e),E=e=>m.setLayerVisibility(e),z=(e,u)=>m.requestCoordinateTransform(e,u),j=e=>{m.cancelCoordinateTransform(e)},Q=e=>{m.setMapZoomRange(e)},Z=e=>(l||(l=new A.default(i)),l.showLaneNumber(e)),K=()=>{l==null||l.clearLaneNumber()},U=async e=>(l||(l=new A.default(i)),await l.initializeSearch(e)),G=async()=>l==null?void 0:l.calCrossIndicatorArea(),J=async()=>{},W=async(e,u)=>{o||(o=new He.default(i)),o.connectTrafficFlow(e,u)},X=()=>{o==null||o.disconnectTrafficFlow()},Y=async e=>{r.handleVehicleTraceData(e)},F=()=>{r.clearHoloTrace()},R=e=>{r.setInterpolate(e)},$=async e=>{await r.handleSignalData(e)},ee=()=>{r.clearHoloSignal()},te=e=>{o==null||o.toggleTrafficInfo(e),r==null||r.toggleTrafficInfo(e)},ae=e=>{r==null||r.togglePause(e)},ne=e=>{o==null||o.toggleTrafficObject(e),r==null||r.toggleTrafficObject(e)},S=e=>{r==null||r.updatePanelContent(e)},re=async e=>(s||(s=new b.default(i)),s.addOverlays(e)),se=e=>(s||(s=new b.default(i)),s.addMask(e)),oe=()=>{s==null||s.removeMask()},ie=e=>s==null?void 0:s.removeOverlaysByType(e),ce=e=>s==null?void 0:s.removeOverlaysById(e),le=()=>s==null?void 0:s.removeAllOverlays(),ue=()=>{s==null||s.showAllOverlays()},me=e=>{g||(g=new Be.default(i)),g.updateQueueLength(e)},de=()=>{g==null||g.removeQueueLength()},ge=async(e,u)=>(t||(t=new O.default(i)),await t.showOpenDriveFromServer(e,u)),pe=async e=>(t||(t=new O.default(i)),await t.clearOpenDrive(),await t.showOpenDriveFromFile(e)),fe=async()=>await(t==null?void 0:t.clearOpenDrive()),Se=async e=>t?await(t==null?void 0:t.findSumo(e)):{status:-1,message:"未加载OpenDrive地图"},ye=async e=>t?t.selectSumo(e):{status:-1,message:"未加载OpenDrive地图"},ve=async e=>t?t.unselectSumo(e):{status:-1,message:"未加载OpenDrive地图"},we=async e=>t?await t.geometrySearch(e):{status:-1,message:"未加载OpenDrive地图"},he=async e=>t?await t.getSumoInfo(e):{status:-1,message:"未加载OpenDrive地图"},Ce=async e=>t?await(t==null?void 0:t.splitLane(e)):{status:-1,message:"未加载OpenDrive地图"},ke=async()=>t?t==null?void 0:t.clearSplitLane():{status:-1,message:"未加载OpenDrive地图"},Oe=e=>(a||(a=new L.default(i)),a.showSignalControlArea(e)),be=()=>{a==null||a.clearSignalControlArea()},Ae=async e=>a?await a.locateSignalControlArea(e):{status:-1,message:"未加载信号控制区"},Le=async e=>a?await a.highlightSignalControlArea(e):{status:-1,message:"未加载信号控制区"},De=()=>a?a.resetHighlight():{status:-1,message:"未加载信号控制区"},Te=e=>(a||(a=new L.default(i)),a.showSubSignalControlArea(e)),_e=(e,u)=>a?a.editSubSignalArea(e,u):{status:-1,message:"未加载信号控制区"},Ie=e=>a?a.selectSubSignalControlAreaCross(e):{status:-1,message:"未加载信号控制区"},xe=e=>a?a.unselectSubSignalControlAreaCross(e):{status:-1,message:"未加载信号控制区"},k=D,y=_;return T({mapViewer:x,setLayerVisibility:E,setMapCenter:B,lookAt:P,setMapCamera:H,setMapZoomRange:Q,requestCoordinateTransform:z,cancelCoordinateTransform:j,addOverlays:re,addMask:se,removeMask:oe,showAllOverlays:ue,removeOverlaysByType:ie,removeOverlaysById:ce,removeAllOverlays:le,showLaneNumber:Z,clearLaneNumber:K,initializeAreaTool:U,calCrossIndicatorArea:G,calRoadIndicatorArea:J,connectCarFlow:W,disconnectCarFlow:X,handleHoloVehicleTraceData:Y,clearHoloTrace:F,handleHoloSignalData:$,clearHoloSignal:ee,setInterpolate:R,toggleTrafficInfo:te,toggleTrafficObject:ne,toggleVehicleInfo:S,togglePause:ae,updateQueueLength:me,removeQueueLength:de,showOpenDriveFromServer:ge,showOpenDriveFromFile:pe,clearOpenDrive:fe,geometrySearchInOpenDrive:we,findSumoInOpenDrive:Se,selectSumoInOpenDrive:ye,unselectSumoInOpenDrive:ve,getSumoInfo:he,splitOpenDriveLane:Ce,clearSplitOpenDriveLane:ke,showSignalControlArea:Oe,clearSignalControlArea:be,locateSignalControlArea:Ae,highlightSignalControlArea:Le,resetHighlightSignalControlArea:De,showSubSignalControlArea:Te,editSubSignalControlArea:_e,selectSubSignalControlAreaCross:Ie,unselectSubSignalControlAreaCross:xe}),(e,u)=>(n.openBlock(),n.createElementBlock("div",Pe,[n.createElementVNode("div",{class:"gis-viewer-main",ref_key:"mapContainer",ref:p},[n.withDirectives(n.createElementVNode("div",Ee,[n.createElementVNode("button",{style:{"margin-right":"10px"},onClick:q}," 开始记录 "),n.createElementVNode("button",{style:{"margin-right":"10px"},onClick:M}," 下载日志 "),n.createElementVNode("button",{style:{"margin-right":"10px"},onClick:V}," 显示车辆id "),n.createElementVNode("button",{onClick:N},"显示车辆号牌")],512),[[n.vShow,f.value]])],512),(n.openBlock(!0),n.createElementBlock(n.Fragment,null,n.renderList(C,(c,d)=>(n.openBlock(),n.createBlock(Ve.default,{key:d,"display-mode":c.displayMode,"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","road-id","cross-id","map-point","stop-line","position","rotation","scale","lamp-status"]))),128))]))}});exports.default=ze;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const n=require("vue"),h=require("./stores/index.js");require("./style/index.css");const Me=require("./utils/holo-flow/index.js"),Ve=require("./utils/holo-flow/signal-countdown-panel.vue.js"),Ne=require("./utils/map-initializer.js"),O=require("./utils/open-drive-renderer/index.js"),b=require("./utils/overlay.js"),Be=require("./utils/queue-length.js"),A=require("./utils/road-config-tool/index.js"),L=require("./utils/signal-control-area-controller/index.js"),He=require("./utils/traffic-flow.js"),Pe={class:"gis-viewer"},Ee={style:{position:"absolute",bottom:"80px",left:"10px","z-index":"9999"}},ze=n.defineComponent({__name:"gis-map",props:{config:{},assetsRoot:{}},emits:["mapLoaded","markerClick","mapClick"],setup(D,{expose:T,emit:_}){const p=n.ref(null);let i,u,l,o,r,s,g,t,a;const f=n.ref(!1);h.registerStore();const I=h.default.useAppDataStore,C=n.reactive([]);n.onMounted(async()=>{if(!p.value)return;document.addEventListener("keydown",d=>{d.ctrlKey&&d.key==="i"&&(f.value=!f.value)});const e=n.getCurrentInstance(),{$gisviewerAssetsRoot:m}=e.appContext.config.globalProperties,c=await(await fetch(k.config)).json();c.assetsRoot=k.assetsRoot||m,I.mapConfig=c,u=new Ne.default,i=await u.initialize({container:p.value,mapConfig:c,markerClickCallback:(d,v,w,qe)=>{y("markerClick",d,v,w,qe)},mapClickCallback:(d,v,w)=>{y("mapClick",d,v,w)}}),r=new Me.default(i,C),await r.init(),y("mapLoaded")}),n.onUnmounted(()=>{a==null||a.clearSignalControlArea(),t==null||t.clearOpenDrive(),r.clearHoloTrace(),r.clearHoloSignal(),o==null||o.disconnectTrafficFlow()});const x=n.computed(()=>i),q=()=>{const e=h.default.useAppDataStore;e.saveTrackLog=!0},M=()=>{r.downloadTrackLog()},V=()=>{S("vehicleId")},N=()=>{S("plateNumber")},B=async e=>await u.setMapCenter(e),H=async e=>await u.setMapCamera(e),P=async e=>await u.lookAt(e),E=e=>u.setLayerVisibility(e),z=(e,m)=>u.requestCoordinateTransform(e,m),j=e=>{u.cancelCoordinateTransform(e)},Q=e=>{u.setMapZoomRange(e)},Z=e=>(l||(l=new A.default(i)),l.showLaneNumber(e)),K=()=>{l==null||l.clearLaneNumber()},U=async e=>(l||(l=new A.default(i)),await l.initializeSearch(e)),G=async()=>l==null?void 0:l.calCrossIndicatorArea(),J=async()=>{},W=async(e,m)=>{o||(o=new He.default(i)),o.connectTrafficFlow(e,m)},X=()=>{o==null||o.disconnectTrafficFlow()},Y=async e=>{r.handleVehicleTraceData(e)},F=()=>{r.clearHoloTrace()},R=e=>{r.setInterpolate(e)},$=async e=>{await r.handleSignalData(e)},ee=()=>{r.clearHoloSignal()},te=e=>{o==null||o.toggleTrafficInfo(e),r==null||r.toggleTrafficInfo(e)},ae=e=>{r==null||r.togglePause(e)},ne=e=>{o==null||o.toggleTrafficObject(e),r==null||r.toggleTrafficObject(e)},S=e=>{r==null||r.updatePanelContent(e)},re=async e=>(s||(s=new b.default(i)),s.addOverlays(e)),se=e=>(s||(s=new b.default(i)),s.addMask(e)),oe=()=>{s==null||s.removeMask()},ie=e=>s==null?void 0:s.removeOverlaysByType(e),ce=e=>s==null?void 0:s.removeOverlaysById(e),le=()=>s==null?void 0:s.removeAllOverlays(),ue=()=>{s==null||s.showAllOverlays()},me=e=>{g||(g=new Be.default(i)),g.updateQueueLength(e)},de=()=>{g==null||g.removeQueueLength()},ge=async(e,m)=>(t||(t=new O.default(i)),await t.showOpenDriveFromServer(e,m)),pe=async e=>(t||(t=new O.default(i)),await t.clearOpenDrive(),await t.showOpenDriveFromFile(e)),fe=async()=>await(t==null?void 0:t.clearOpenDrive()),Se=async e=>t?await(t==null?void 0:t.findSumo(e)):{status:-1,message:"未加载OpenDrive地图"},ye=async e=>t?t.selectSumo(e):{status:-1,message:"未加载OpenDrive地图"},ve=async e=>t?t.unselectSumo(e):{status:-1,message:"未加载OpenDrive地图"},we=async e=>t?await t.geometrySearch(e):{status:-1,message:"未加载OpenDrive地图"},he=async e=>t?await t.getSumoInfo(e):{status:-1,message:"未加载OpenDrive地图"},Ce=async e=>t?await(t==null?void 0:t.splitLane(e)):{status:-1,message:"未加载OpenDrive地图"},ke=async()=>t?t==null?void 0:t.clearSplitLane():{status:-1,message:"未加载OpenDrive地图"},Oe=e=>(a||(a=new L.default(i)),a.showSignalControlArea(e)),be=()=>{a==null||a.clearSignalControlArea()},Ae=async e=>a?await a.locateSignalControlArea(e):{status:-1,message:"未加载信号控制区"},Le=async e=>a?await a.highlightSignalControlArea(e):{status:-1,message:"未加载信号控制区"},De=()=>a?a.resetHighlight():{status:-1,message:"未加载信号控制区"},Te=e=>(a||(a=new L.default(i)),a.showSubSignalControlArea(e)),_e=e=>a?a.editSubSignalControlArea(e):{status:-1,message:"未加载信号控制区"},Ie=e=>a?a.selectSubSignalControlAreaCross(e):{status:-1,message:"未加载信号控制区"},xe=e=>a?a.unselectSubSignalControlAreaCross(e):{status:-1,message:"未加载信号控制区"},k=D,y=_;return T({mapViewer:x,setLayerVisibility:E,setMapCenter:B,lookAt:P,setMapCamera:H,setMapZoomRange:Q,requestCoordinateTransform:z,cancelCoordinateTransform:j,addOverlays:re,addMask:se,removeMask:oe,showAllOverlays:ue,removeOverlaysByType:ie,removeOverlaysById:ce,removeAllOverlays:le,showLaneNumber:Z,clearLaneNumber:K,initializeAreaTool:U,calCrossIndicatorArea:G,calRoadIndicatorArea:J,connectCarFlow:W,disconnectCarFlow:X,handleHoloVehicleTraceData:Y,clearHoloTrace:F,handleHoloSignalData:$,clearHoloSignal:ee,setInterpolate:R,toggleTrafficInfo:te,toggleTrafficObject:ne,toggleVehicleInfo:S,togglePause:ae,updateQueueLength:me,removeQueueLength:de,showOpenDriveFromServer:ge,showOpenDriveFromFile:pe,clearOpenDrive:fe,geometrySearchInOpenDrive:we,findSumoInOpenDrive:Se,selectSumoInOpenDrive:ye,unselectSumoInOpenDrive:ve,getSumoInfo:he,splitOpenDriveLane:Ce,clearSplitOpenDriveLane:ke,showSignalControlArea:Oe,clearSignalControlArea:be,locateSignalControlArea:Ae,highlightSignalControlArea:Le,resetHighlightSignalControlArea:De,showSubSignalControlArea:Te,editSubSignalControlArea:_e,selectSubSignalControlAreaCross:Ie,unselectSubSignalControlAreaCross:xe}),(e,m)=>(n.openBlock(),n.createElementBlock("div",Pe,[n.createElementVNode("div",{class:"gis-viewer-main",ref_key:"mapContainer",ref:p},[n.withDirectives(n.createElementVNode("div",Ee,[n.createElementVNode("button",{style:{"margin-right":"10px"},onClick:q}," 开始记录 "),n.createElementVNode("button",{style:{"margin-right":"10px"},onClick:M}," 下载日志 "),n.createElementVNode("button",{style:{"margin-right":"10px"},onClick:V}," 显示车辆id "),n.createElementVNode("button",{onClick:N},"显示车辆号牌")],512),[[n.vShow,f.value]])],512),(n.openBlock(!0),n.createElementBlock(n.Fragment,null,n.renderList(C,(c,d)=>(n.openBlock(),n.createBlock(Ve.default,{key:d,"display-mode":c.displayMode,"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","road-id","cross-id","map-point","stop-line","position","rotation","scale","lamp-status"]))),128))]))}});exports.default=ze;

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

@@ -104,10 +104,7 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
         status: number;
         message: string;
     }>;
-    showSignalControlArea: (params: {
-        areaList: any[];
-        style?: string | undefined;
-    }) => import("../types").IResult;
+    showSignalControlArea: (params: import("../types").IShowSignalControlAreaParams) => import("../types").IResult;
     clearSignalControlArea: () => void;
     locateSignalControlArea: (params: {
         id: string;
@@ -117,12 +114,7 @@ export declare const GisMap: import("@easyest/utils/dist/lib/withinstall").SFCWi
     }) => Promise<import("../types").IResult>;
     resetHighlightSignalControlArea: () => import("../types").IResult;
     showSubSignalControlArea: (params: any) => import("../types").IResult;
-    editSubSignalControlArea: (addCrossCallback: (params: {
-        id: string;
-        name: string;
-    }) => void, removeCrossCallback: (params: {
-        id: string;
-    }) => void) => Promise<import("../types").IResult> | {
+    editSubSignalControlArea: (params: import("../types").IEditSignalControlAreaParams) => Promise<import("../types").IResult> | {
         status: number;
         message: string;
     };

package/lib/src/gis-map/utils/holo-flow/signal-holo-flow-lsr.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const P=require("@arcgis/core/core/reactiveUtils"),u=require("@arcgis/core/geometry"),g=require("@arcgis/core/geometry/support/webMercatorUtils.js"),m=require("@arcgis/core/layers/GraphicsLayer"),y=require("./signal-holo-flow.js");function w(f){const t=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(f){for(const i in f)if(i!=="default"){const l=Object.getOwnPropertyDescriptor(f,i);Object.defineProperty(t,i,l.get?l:{enumerable:!0,get:()=>f[i]})}}return t.default=f,Object.freeze(t)}const L=w(P),d=w(g);class M extends y.default{constructor(t,i){super(t),this.stopLineLayer=new m,this.watchHandle=null,this.stopLineMap=new Map,this.countdownPanelProps=i,this.view.map.add(this.stopLineLayer)}async initializeLayer(){var p,c;console.time("初始化停止线图层");let t=(c=(p=this.mapConfig.holoFlow)==null?void 0:p.signal)==null?void 0:c.stopLineLayer;if(!t)return;t=this.mapConfig.assetsRoot+"/"+t,(await(await fetch(t)).json()).features.forEach(o=>{const{roadId:n,nodeId:e,angle:a,destinationPoint:s}=o.properties,{coordinates:r}=o.geometry,h=this.stopLineMap.get(e);h?h.set(n,{coord:r,panelPoint:s,angle:a}):this.stopLineMap.set(e,new Map([[n,{coord:r,panelPoint:s,angle:a}]]))}),console.timeEnd("初始化停止线图层")}getPanelScale(){const t=this.view.scale;let i=1;return t<1e3?i=1:t<2e3?i=.8:t<4e3?i=.4:i=0,i}async handleSignalData(t){this.watchHandle||(this.watchHandle=L.watch(()=>this.view.extent,()=>{const o=this.getPanelScale();for(const n of this.countdownPanelProps){o!==this.currentPanelScale&&(n.scale=o);const{mapPoint:e}=n;let a=new u.Point({x:e[0],y:e[1]});this.view.spatialReference.isWebMercator&&(a=d.geographicToWebMercator(a));const s=this.view.toScreen(a);if(n.position.left=s.x,n.position.top=s.y,this.view.type==="3d"){const r=this.getPanelRotation(n.stopLine);n.rotation=r}}this.currentPanelScale=o}));const i=t.crossId,l=this.stopLineMap.get(i);if(!l)return;const p=t.phaseCountDownList,c=new Map;for(const o of p){let n="";for(let r of o.roadIdList)if(r.startsWith("-")&&(r=r.slice(1)),l.has(r)){n=r;break}if(!n)continue;let e=c.get(n);if(e||(e={},c.set(n,e)),!o.direction){console.log(`没有找到对应的方向${i}--${JSON.stringify(o)}`);continue}const a=o.direction.toLowerCase(),s=o.color===1?"red":o.color===2?"yellow":"green";a==="u"?(e.uNumber=o.leftTime,e.uColor=s):a==="l"?(e.lNumber=o.leftTime,e.lColor=s):a==="s"?(e.sNumber=o.leftTime,e.sColor=s):a==="r"&&(e.rNumber=o.leftTime,e.rColor=s)}c.forEach((o,n)=>{const e=l.get(n);if(!e)return;const a=this.countdownPanelProps.find(s=>s.crossId===i&&s.roadId===n);if(a)a.lampStatus=o;else{let s=new u.Point({x:e.panelPoint[0],y:e.panelPoint[1]});this.view.spatialReference.isWebMercator&&(s=d.geographicToWebMercator(s));const r=this.view.toScreen(s),h=this.getPanelRotation(e.coord);console.log(n,h),this.countdownPanelProps.push({displayMode:"complex",crossId:i,roadId:n,mapPoint:e.panelPoint,stopLine:e.coord,position:{left:r.x,top:r.y},rotation:h,scale:this.getPanelScale(),lampStatus:o})}})}clearSignal(){var t;this.stopLineLayer.removeAll(),this.countdownPanelProps.length=0,(t=this.watchHandle)==null||t.remove(),this.watchHandle=null}getPanelRotation(t){const i=t[0];let l=new u.Point({x:i[0],y:i[1]});this.view.spatialReference.isWebMercator&&(l=d.geographicToWebMercator(l));const p=this.view.toScreen(l),c=t[t.length-1];let o=new u.Point({x:c[0],y:c[1]});this.view.spatialReference.isWebMercator&&(o=d.geographicToWebMercator(o));const n=this.view.toScreen(o),e=n.x-p.x,a=n.y-p.y;return Math.atan2(a,e)*(180/Math.PI)}}exports.default=M;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const P=require("@arcgis/core/core/reactiveUtils"),d=require("@arcgis/core/geometry"),g=require("@arcgis/core/geometry/support/webMercatorUtils.js"),m=require("@arcgis/core/layers/GraphicsLayer"),y=require("./signal-holo-flow.js");function w(f){const t=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(f){for(const n in f)if(n!=="default"){const l=Object.getOwnPropertyDescriptor(f,n);Object.defineProperty(t,n,l.get?l:{enumerable:!0,get:()=>f[n]})}}return t.default=f,Object.freeze(t)}const L=w(P),u=w(g);class M extends y.default{constructor(t,n){super(t),this.stopLineLayer=new m,this.watchHandle=null,this.stopLineMap=new Map,this.countdownPanelProps=n,this.view.map.add(this.stopLineLayer)}async initializeLayer(){var p,c;console.time("初始化停止线图层");let t=(c=(p=this.mapConfig.holoFlow)==null?void 0:p.signal)==null?void 0:c.stopLineLayer;if(!t)return;t=this.mapConfig.assetsRoot+"/"+t,(await(await fetch(t)).json()).features.forEach(o=>{const{roadId:i,nodeId:e,angle:a,destinationPoint:s}=o.properties,{coordinates:r}=o.geometry,h=this.stopLineMap.get(e);h?h.set(i,{coord:r,panelPoint:s,angle:a}):this.stopLineMap.set(e,new Map([[i,{coord:r,panelPoint:s,angle:a}]]))}),console.timeEnd("初始化停止线图层")}getPanelScale(){const t=this.view.scale;let n=1;return t<1e3?n=1:t<2e3?n=.8:t<4e3?n=.4:n=0,n}async handleSignalData(t){this.watchHandle||(this.watchHandle=L.watch(()=>this.view.extent,()=>{const o=this.getPanelScale();for(const i of this.countdownPanelProps){o!==this.currentPanelScale&&(i.scale=o);const{mapPoint:e}=i;let a=new d.Point({x:e[0],y:e[1]});this.view.spatialReference.isWebMercator&&(a=u.geographicToWebMercator(a));const s=this.view.toScreen(a);if(i.position.left=s.x,i.position.top=s.y,this.view.type==="3d"){const r=this.getPanelRotation(i.stopLine);i.rotation=r}}this.currentPanelScale=o}));const n=t.crossId,l=this.stopLineMap.get(n);if(!l)return;const p=t.phaseCountDownList,c=new Map;for(const o of p){let i="";for(let r of o.roadIdList)if(r.startsWith("-")&&(r=r.slice(1)),l.has(r)){i=r;break}if(!i)continue;let e=c.get(i);if(e||(e={},c.set(i,e)),!o.direction){console.log(`没有找到对应的方向${n}--${JSON.stringify(o)}`);continue}const a=o.direction.toLowerCase(),s=o.color===1?"red":o.color===2?"yellow":"green";a==="u"?(e.uNumber=o.leftTime,e.uColor=s):a==="l"?(e.lNumber=o.leftTime,e.lColor=s):a==="s"?(e.sNumber=o.leftTime,e.sColor=s):a==="r"&&(e.rNumber=o.leftTime,e.rColor=s)}c.forEach((o,i)=>{const e=l.get(i);if(!e)return;const a=this.countdownPanelProps.find(s=>s.crossId===n&&s.roadId===i);if(a)a.lampStatus=o;else{let s=new d.Point({x:e.panelPoint[0],y:e.panelPoint[1]});this.view.spatialReference.isWebMercator&&(s=u.geographicToWebMercator(s));const r=this.view.toScreen(s),h=this.getPanelRotation(e.coord);this.countdownPanelProps.push({displayMode:"complex",crossId:n,roadId:i,mapPoint:e.panelPoint,stopLine:e.coord,position:{left:r.x,top:r.y},rotation:h,scale:this.getPanelScale(),lampStatus:o})}})}clearSignal(){var t;this.stopLineLayer.removeAll(),this.countdownPanelProps.length=0,(t=this.watchHandle)==null||t.remove(),this.watchHandle=null}getPanelRotation(t){const n=t[0];let l=new d.Point({x:n[0],y:n[1]});this.view.spatialReference.isWebMercator&&(l=u.geographicToWebMercator(l));const p=this.view.toScreen(l),c=t[t.length-1];let o=new d.Point({x:c[0],y:c[1]});this.view.spatialReference.isWebMercator&&(o=u.geographicToWebMercator(o));const i=this.view.toScreen(o),e=i.x-p.x,a=i.y-p.y;return Math.atan2(a,e)*(180/Math.PI)}}exports.default=M;

package/lib/src/gis-map/utils/holo-flow/trace-renderer-layer.d.ts

@@ -3,10 +3,15 @@ export default class TraceRendererLayer implements ITraceRendererInterface {
     private view;
     private readonly vehicleLayer;
     private mapConfig;
+    private hasGpu;
     private rafSignal;
     private appDataStore;
     private logTable;
     constructor(view: __esri.MapView);
+    private getRendererText;
+    private em;
+    private el;
+    private getGpuText;
     getLog(): (string | number)[][];
     init(): Promise<void>;
     private needInterpolate;
@@ -45,6 +50,7 @@ export default class TraceRendererLayer implements ITraceRendererInterface {
      * @returns
      */
     private createCIMSymbol;
+    private createMarkerSymbol;
     /**
      * 根据车身颜色属性返回对应的车辆图标
      * @param carColor