gisviewer-vue3-arcgis 1.0.173 → 1.0.175

package/es/src/gis-map/utils/holo-flow/signal-holo-flow-lsr.mjs

@@ -1,11 +1,11 @@
-import * as w from "@arcgis/core/core/reactiveUtils";
+import * as d from "@arcgis/core/core/reactiveUtils";
 import { Point as f } from "@arcgis/core/geometry";
-import * as d from "@arcgis/core/geometry/support/webMercatorUtils.js";
+import * as w from "@arcgis/core/geometry/support/webMercatorUtils.js";
 import P from "@arcgis/core/layers/GraphicsLayer";
-import g from "./signal-holo-flow.mjs";
-class S extends g {
-  constructor(n, a) {
-    super(n), this.stopLineLayer = new P(), this.watchHandle = null, this.stopLineMap = /* @__PURE__ */ new Map(), this.countdownPanelProps = a, this.view.map.add(this.stopLineLayer);
+import m from "./signal-holo-flow.mjs";
+class M extends m {
+  constructor(n, s) {
+    super(n), this.stopLineLayer = new P(), this.watchHandle = null, this.stopLineMap = /* @__PURE__ */ new Map(), this.countdownPanelProps = s, this.view.map.add(this.stopLineLayer);
   }
   async initializeLayer() {
     var p, l;
@@ -14,17 +14,17 @@ class S extends g {
     if (!n)
       return;
     n = this.mapConfig.assetsRoot + "/" + n, (await (await fetch(n)).json()).features.forEach((t) => {
-      const { roadId: o, nodeId: e, angle: s, destinationPoint: i } = t.properties, { coordinates: r } = t.geometry, h = this.stopLineMap.get(e);
+      const { roadId: o, nodeId: e, angle: a, destinationPoint: i } = t.properties, { coordinates: r } = t.geometry, h = this.stopLineMap.get(e);
       h ? h.set(o, {
         coord: r,
         panelPoint: i,
-        angle: s
+        angle: a
       }) : this.stopLineMap.set(
         e,
         /* @__PURE__ */ new Map([
           [
             o,
-            { coord: r, panelPoint: i, angle: s }
+            { coord: r, panelPoint: i, angle: a }
           ]
         ])
       );
@@ -32,26 +32,25 @@ class S extends g {
   }
   getPanelScale() {
     const n = this.view.scale;
-    let a = 1;
-    return n < 1e3 ? a = 1 : n < 2e3 ? a = 0.8 : a = 0.4, a;
+    let s = 1;
+    return n < 1e3 ? s = 1 : n < 2e3 ? s = 0.8 : n < 4e3 ? s = 0.4 : s = 0, s;
   }
   async handleSignalData(n) {
-    this.watchHandle || (this.watchHandle = w.watch(
+    this.watchHandle || (this.watchHandle = d.watch(
       () => this.view.extent,
       () => {
-        console.log("extent changed");
         const t = this.getPanelScale();
         for (const o of this.countdownPanelProps) {
           t !== this.currentPanelScale && (o.scale = t);
           const { mapPoint: e } = o;
-          let s = new f({
+          let a = new f({
             x: e[0],
             y: e[1]
           });
-          this.view.spatialReference.isWebMercator && (s = d.geographicToWebMercator(
-            s
+          this.view.spatialReference.isWebMercator && (a = w.geographicToWebMercator(
+            a
           ));
-          const i = this.view.toScreen(s);
+          const i = this.view.toScreen(a);
           if (o.position.left = i.x, o.position.top = i.y, this.view.type === "3d") {
             const r = this.getPanelRotation(o.stopLine);
             o.rotation = r;
@@ -60,7 +59,7 @@ class S extends g {
         this.currentPanelScale = t;
       }
     ));
-    const a = n.crossId, c = this.stopLineMap.get(a);
+    const s = n.crossId, c = this.stopLineMap.get(s);
     if (!c)
       return;
     const p = n.phaseCountDownList, l = /* @__PURE__ */ new Map();
@@ -75,33 +74,33 @@ class S extends g {
         continue;
       let e = l.get(o);
       if (e || (e = {}, l.set(o, e)), !t.direction) {
-        console.log(`没有找到对应的方向${a}--${JSON.stringify(t)}`);
+        console.log(`没有找到对应的方向${s}--${JSON.stringify(t)}`);
         continue;
       }
-      const s = t.direction.toLowerCase(), i = t.color === 1 ? "red" : t.color === 2 ? "yellow" : "green";
-      s === "u" ? (e.uNumber = t.leftTime, e.uColor = i) : s === "l" ? (e.lNumber = t.leftTime, e.lColor = i) : s === "s" ? (e.sNumber = t.leftTime, e.sColor = i) : s === "r" && (e.rNumber = t.leftTime, e.rColor = i);
+      const a = t.direction.toLowerCase(), i = t.color === 1 ? "red" : t.color === 2 ? "yellow" : "green";
+      a === "u" ? (e.uNumber = t.leftTime, e.uColor = i) : a === "l" ? (e.lNumber = t.leftTime, e.lColor = i) : a === "s" ? (e.sNumber = t.leftTime, e.sColor = i) : a === "r" && (e.rNumber = t.leftTime, e.rColor = i);
     }
     l.forEach((t, o) => {
       const e = c.get(o);
       if (!e)
         return;
-      const s = this.countdownPanelProps.find(
-        (i) => i.crossId === a && i.roadId === o
+      const a = this.countdownPanelProps.find(
+        (i) => i.crossId === s && i.roadId === o
       );
-      if (s)
-        s.lampStatus = t;
+      if (a)
+        a.lampStatus = t;
       else {
         let i = new f({
           x: e.panelPoint[0],
           y: e.panelPoint[1]
         });
-        this.view.spatialReference.isWebMercator && (i = d.geographicToWebMercator(
+        this.view.spatialReference.isWebMercator && (i = w.geographicToWebMercator(
           i
         ));
         const r = this.view.toScreen(i), h = this.getPanelRotation(e.coord);
-        console.log(i.toJSON(), r), this.countdownPanelProps.push({
+        console.log(o, h), this.countdownPanelProps.push({
           displayMode: "complex",
-          crossId: a,
+          crossId: s,
           roadId: o,
           mapPoint: e.panelPoint,
           // 定位点地理坐标
@@ -128,12 +127,12 @@ class S extends g {
    * @returns
    */
   getPanelRotation(n) {
-    const a = n[0];
+    const s = n[0];
     let c = new f({
-      x: a[0],
-      y: a[1]
+      x: s[0],
+      y: s[1]
     });
-    this.view.spatialReference.isWebMercator && (c = d.geographicToWebMercator(
+    this.view.spatialReference.isWebMercator && (c = w.geographicToWebMercator(
       c
     ));
     const p = this.view.toScreen(c), l = n[n.length - 1];
@@ -141,13 +140,13 @@ class S extends g {
       x: l[0],
       y: l[1]
     });
-    this.view.spatialReference.isWebMercator && (t = d.geographicToWebMercator(
+    this.view.spatialReference.isWebMercator && (t = w.geographicToWebMercator(
       t
     ));
-    const o = this.view.toScreen(t), e = o.x - p.x, s = o.y - p.y;
-    return Math.atan2(s, e) * (180 / Math.PI);
+    const o = this.view.toScreen(t), e = o.x - p.x, a = o.y - p.y;
+    return Math.atan2(a, e) * (180 / Math.PI);
   }
 }
 export {
-  S as default
+  M as default
 };

package/es/src/gis-map/utils/holo-flow/signal-holo-flow.mjs

@@ -186,7 +186,7 @@ class v {
   drawCountdownText(e, t) {
     const a = e.getContext("2d");
     a.clearRect(0, 0, e.width, e.height), a.font = "24px Digital", a.textBaseline = "middle", a.textAlign = "center", a.fillStyle = t.stageRemainingTime <= t.stageAllRedTime ? "red" : t.stageRemainingTime <= t.stageAllRedTime + t.stageYellowTime ? "yellow" : "lime", a.fillText(
-      `${t.stageRemainingTime.toFixed(0)}`,
+      t.stageRemainingTime.toFixed(0),
       e.width / 2,
       e.height / 2
     );

package/es/src/gis-map/utils/holo-flow/trace-holo-flow.d.ts

@@ -4,6 +4,7 @@ export default class TraceHoloFlow {
     constructor(view: __esri.View);
     init(): Promise<void>;
     downloadLog(): void;
+    private nullDataCount;
     /**
      * 处理全息流轨迹数据
      * */

package/es/src/gis-map/utils/holo-flow/trace-holo-flow.mjs

@@ -1,46 +1,51 @@
 import * as f from "@arcgis/core/views/3d/externalRenderers";
-import R from "./trace-renderer-external.mjs";
-import T from "./trace-renderer-layer.mjs";
+import T from "./trace-renderer-external.mjs";
+import R from "./trace-renderer-layer.mjs";
 class L {
   constructor(e) {
-    e.type === "3d" ? (this.traceRenderer = new R(e), f.add(
+    this.nullDataCount = 0, e.type === "3d" ? (this.traceRenderer = new T(e), f.add(
       e,
       this.traceRenderer
-    )) : this.traceRenderer = new T(e);
+    )) : this.traceRenderer = new R(e);
   }
   async init() {
     await this.traceRenderer.init();
   }
   downloadLog() {
-    const e = this.traceRenderer.getLog().map((i) => i.join(",")).join(`
-`).replace(/null/g, ""), o = new Blob([e], { type: "text/csv;charset=utf-8;" }), s = URL.createObjectURL(o), r = document.createElement("a");
-    r.setAttribute("href", s), r.setAttribute("download", "trace-log.csv"), r.style.visibility = "hidden", document.body.appendChild(r), r.click(), document.body.removeChild(r);
+    const e = this.traceRenderer.getLog().map((s) => s.join(",")).join(`
+`).replace(/null/g, ""), c = new Blob([e], { type: "text/csv;charset=utf-8;" }), o = URL.createObjectURL(c), r = document.createElement("a");
+    r.setAttribute("href", o), r.setAttribute("download", "trace-log.csv"), r.style.visibility = "hidden", document.body.appendChild(r), r.click(), document.body.removeChild(r);
   }
   /**
    * 处理全息流轨迹数据
    * */
   async handleVehicleTraceData(e) {
-    const { newVehList: o, updateVehList: s, deleteVehList: r, jgsj: i } = e, n = e.crossId || "", l = [], a = [];
-    if (o && o.length > 0) {
-      for (const c of o) {
-        c.localTimestamp || (c.localTimestamp = i || Date.now());
-        const t = this.buildVehicleTrackData(c, n);
+    const { newVehList: c, updateVehList: o, deleteVehList: r, jgsj: s } = e;
+    if (!c && !o && !r) {
+      this.nullDataCount++, this.nullDataCount > 1 && (this.clearTrace(), this.nullDataCount = 0);
+      return;
+    }
+    const i = e.crossId || "", l = [], a = [];
+    if (c && c.length > 0) {
+      for (const n of c) {
+        n.localTimestamp || (n.localTimestamp = s || Date.now());
+        const t = this.buildVehicleTrackData(n, i);
         t && l.push(t);
       }
       await this.traceRenderer.addVehicles(l);
     }
-    if (s && s.length > 0) {
-      for (const c of s) {
-        const t = this.buildVehicleTrackData(c, n);
+    if (o && o.length > 0) {
+      for (const n of o) {
+        const t = this.buildVehicleTrackData(n, i);
         t && a.push(t);
       }
       await this.traceRenderer.updateVehicles(a);
     }
     if (r && r.length > 0) {
-      const c = r.map(
-        (t) => n + "-" + (t.ptcId || t.vehno || t.vehNo)
+      const n = r.map(
+        (t) => i + "-" + (t.ptcId || t.vehno || t.vehNo)
       );
-      this.traceRenderer.deleteVehicles(c);
+      this.traceRenderer.deleteVehicles(n);
     }
   }
   /**
@@ -74,19 +79,19 @@ class L {
   setInterpolate(e) {
     this.traceRenderer.setInterpolate(e);
   }
-  buildVehicleTrackData(e, o) {
-    const s = e.longitude, r = e.latitude, i = e.ptcId, n = Number(e.ptcType), l = e.heading, a = Number(e.vehicleType), c = Number(e.vehicleColor), t = e.plateNo || e.plateno, h = Number(e.plateColor), d = e.timestamp, p = e.localTimestamp, u = e.roadLayer ? String(e.roadLayer) : "1", g = e.step, m = e.speed;
-    if (!(n < 0 || n > 8))
+  buildVehicleTrackData(e, c) {
+    const o = e.longitude, r = e.latitude, s = e.ptcId, i = Number(e.ptcType), l = e.heading, a = Number(e.vehicleType), n = Number(e.vehicleColor), t = e.plateNo || e.plateno, h = Number(e.plateColor), d = e.timestamp, p = e.localTimestamp, u = e.roadLayer ? String(e.roadLayer) : "1", g = e.step, m = e.speed;
+    if (!(i < 0 || i > 8))
       return {
-        ptcId: i,
-        crossId: o,
-        vehicleId: o + "-" + i,
-        x: s,
+        ptcId: s,
+        crossId: c,
+        vehicleId: c + "-" + s,
+        x: o,
         y: r,
-        ptcType: n,
+        ptcType: i,
         vehicleType: a,
-        heading: n === 2 ? -l : l,
-        vehicleColor: c,
+        heading: i === 2 ? -l : l,
+        vehicleColor: n,
         showName: t && t !== "" && t !== "0" && t !== "000000" ? t : "",
         plateNo: t,
         plateColor: h,

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

@@ -1,9 +1,9 @@
 import g from "@arcgis/core/Graphic";
-import * as C from "@arcgis/core/core/promiseUtils";
+import * as k from "@arcgis/core/core/promiseUtils";
 import * as $ from "@arcgis/core/core/reactiveUtils.js";
 import { Polygon as L, Point as F } from "@arcgis/core/geometry";
 import * as S from "@arcgis/core/geometry/geometryEngine";
-import k from "@arcgis/core/layers/FeatureLayer";
+import C from "@arcgis/core/layers/FeatureLayer";
 import w from "@arcgis/core/layers/GraphicsLayer";
 import * as D from "@turf/helpers";
 import { lineSliceAlong as x } from "@turf/line-slice-along";
@@ -14,9 +14,9 @@ import G from "pako";
 import { watch as E } from "vue";
 import R from "../../stores/index.mjs";
 import T from "../common-utils.mjs";
-class O {
+class M {
   constructor(e) {
-    this.junctionNames = /* @__PURE__ */ new Map(), this.junctionScale = 5e3, this.xodrBorder = [], this.projectName = "", this.openDriveServer = "", this.currentSectionCode = "", this.selectedSectionIds = [], this.currentJunctionId = "", this.view = e, this.laneLayer = new k({
+    this.junctionNames = /* @__PURE__ */ new Map(), this.junctionScale = 5e3, this.xodrBorder = [], this.projectName = "", this.openDriveServer = "", this.currentSectionCode = "", this.selectedSectionIds = [], this.currentJunctionId = "", this.view = e, this.laneLayer = new C({
       id: "OpenDriveLane",
       fields: [
         {
@@ -239,7 +239,7 @@ class O {
           }
         ]
       }
-    }), this.roadNameLayer = new k({
+    }), this.roadNameLayer = new C({
       id: "OpenDriveRoadName",
       fields: [
         {
@@ -302,7 +302,7 @@ class O {
     ]);
   }
   static getInstance(e) {
-    return this.instance || (this.instance = new O(e)), this.instance;
+    return this.instance || (this.instance = new M(e)), this.instance;
   }
   async makeMd5FromFile(e) {
     var t;
@@ -456,8 +456,8 @@ class O {
             const v = Number(y.id);
             if (v === 0)
               continue;
-            const I = y.type, M = [...y.outerPath], A = y.innerPath.concat(
-              M.reverse()
+            const I = y.type, O = [...y.outerPath], A = y.innerPath.concat(
+              O.reverse()
             );
             if (A.length <= 3) {
               console.warn(`lane ${v} has less than 3 points`);
@@ -548,7 +548,7 @@ class O {
    * 监听鼠标移动事件，高亮显示鼠标所在路段和路口
    */
   monitorMouseMove() {
-    const e = C.debounce(async (t) => {
+    const e = k.debounce(async (t) => {
       var c;
       const o = (c = (await this.view.hitTest(t, {
         include: [this.laneLayer, this.junctionLayer]
@@ -632,7 +632,7 @@ class O {
    * 监听鼠标点击事件，获取高亮要素的拓扑信息
    */
   monitorMouseClick() {
-    const e = C.debounce(async (t) => {
+    const e = k.debounce(async (t) => {
       var a;
       const o = (a = (await this.view.hitTest(t, {
         include: [this.highlightLayer, this.junctionLayer, this.sectionLayer]
@@ -1100,10 +1100,9 @@ class O {
     if (t === "marker")
       return {
         type: "picture-marker",
-        url: `/GisViewerAssets/Images/xhj_${s ? 1 : 2}.png`,
-        width: "18px",
-        height: "28px",
-        yOffset: "12px"
+        url: `/GisViewerAssets/Images/cross/${s ? "gis_xhj_blue" : "gis_lkcz_xz"}.png`,
+        width: "32px",
+        height: "32px"
       };
     if (t === "picture")
       return s ? {
@@ -1144,7 +1143,7 @@ class O {
                       height: 12,
                       horizontalAlignment: "Center",
                       offsetX: 0,
-                      offsetY: s ? 50 : 40,
+                      offsetY: s ? 25 : 15,
                       haloSize: 2,
                       haloSymbol: {
                         type: "CIMPolygonSymbol",
@@ -1183,24 +1182,22 @@ class O {
                   y: 0
                 },
                 anchorPointUnits: "Relative",
-                size: 45,
+                size: 32,
                 rotateClockwise: !0,
                 textureFilter: "Picture",
-                url: "/GisViewerAssets/Images/xhj_1.png",
-                offsetY: s ? 22 : 15
+                url: "/GisViewerAssets/Images/cross/gis_xhj_blue.png"
               }
             ]
           }
         }
       } : {
         type: "picture-marker",
-        url: "/GisViewerAssets/Images/xhj_2.png",
-        width: "27px",
-        height: "42px",
-        yOffset: "22px"
+        url: "/GisViewerAssets/Images/cross/gis_lkcz_xz.png",
+        width: "32px",
+        height: "32px"
       };
   }
 }
 export {
-  O as default
+  M as default
 };

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

@@ -5,8 +5,10 @@ export default class SignalControlAreaController {
     private subDistrictControllerLayer;
     private crossLayer;
     private highlightLayer;
-    private watchHandle?;
+    private scaleWatcher?;
+    private clickWatcher?;
     private readonly crossScale;
+    private openDriveServer;
     constructor(view: __esri.MapView | __esri.SceneView);
     showSignalControlArea(params: any): IResult;
     clearSignalControlArea(): IResult;
@@ -18,7 +20,18 @@ export default class SignalControlAreaController {
     }): Promise<IResult>;
     resetHighlight(): IResult;
     showSubSignalControlArea(params: any): IResult;
-    editSubSignalArea(): IResult;
+    /**
+     * 点击路口时
+     * @param event
+     * @returns
+     */
+    private handleViewClick;
+    private showNearbyCrosses;
+    /**
+     * 编辑子区的路口
+     * @returns
+     */
+    editSubSignalArea(): Promise<IResult>;
     /**
      * 在区控\子区\路口图层中查找对应的graphic
      * @param id
@@ -32,7 +45,12 @@ export default class SignalControlAreaController {
      * @returns
      */
     private drawArea;
-    private getCrossGraphicInSubDistrict;
+    /**
+     * 显示子区时路口的样式
+     * @param attributes
+     * @returns
+     */
+    private getCrossSymbolInSubDistrict;
     /**
      * 生成路口点符号。在不同比例尺下，使用不同的符号
      * @param attributes