gisviewer-vue3-arcgis 1.0.184 → 1.0.186

package/es/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/es/src/gis-map/gis-map.vue.mjs

@@ -1,4 +1,4 @@
-import { defineComponent as Be, ref as k, reactive as Ne, onMounted as ze, getCurrentInstance as Qe, onUnmounted as je, computed as Ee, openBlock as C, createElementBlock as A, createElementVNode as g, withDirectives as Ze, vShow as $e, Fragment as qe, renderList as Ke, createBlock as Ue } from "vue";
+import { defineComponent as Be, ref as k, reactive as Ne, onMounted as ze, getCurrentInstance as Qe, onUnmounted as je, computed as Ee, openBlock as h, createElementBlock as A, createElementVNode as g, withDirectives as Ze, vShow as $e, Fragment as qe, renderList as Ke, createBlock as Ue } from "vue";
 import b, { registerStore as Ge } from "./stores/index.mjs";
 import "./style/index.css";
 import Je from "./utils/holo-flow/index.mjs";
@@ -19,7 +19,7 @@ const Fe = { class: "gis-viewer" }, et = { style: { position: "absolute", bottom
   emits: ["mapLoaded", "markerClick", "mapClick"],
   setup(M, { expose: _, emit: x }) {
     const d = k(null);
-    let o, u, c, s, n, r, p, t, a;
+    let o, l, c, s, n, r, p, t, a;
     const f = k(!1);
     Ge();
     const H = b.useAppDataStore, v = Ne([]);
@@ -29,15 +29,15 @@ const Fe = { class: "gis-viewer" }, et = { style: { position: "absolute", bottom
       document.addEventListener("keydown", (m) => {
         m.ctrlKey && m.key === "i" && (f.value = !f.value);
       });
-      const e = Qe(), { $gisviewerAssetsRoot: l } = e.appContext.config.globalProperties, i = await (await fetch(O.config)).json();
-      i.assetsRoot = O.assetsRoot || l, H.mapConfig = i, u = new We(), o = await u.initialize({
+      const e = Qe(), { $gisviewerAssetsRoot: u } = e.appContext.config.globalProperties, i = await (await fetch(O.config)).json();
+      i.assetsRoot = O.assetsRoot || u, H.mapConfig = i, l = new We(), o = await l.initialize({
         container: d.value,
         mapConfig: i,
-        markerClickCallback: (m, w, h, Ve) => {
-          y("markerClick", m, w, h, Ve);
+        markerClickCallback: (m, w, C, Ve) => {
+          y("markerClick", m, w, C, Ve);
         },
-        mapClickCallback: (m, w, h) => {
-          y("mapClick", m, w, h);
+        mapClickCallback: (m, w, C) => {
+          y("mapClick", m, w, C);
         }
       }), n = new Je(o, v), await n.init(), y("mapLoaded");
     }), je(() => {
@@ -52,15 +52,15 @@ const Fe = { class: "gis-viewer" }, et = { style: { position: "absolute", bottom
       S("vehicleId");
     }, z = () => {
       S("plateNumber");
-    }, Q = async (e) => await u.setMapCenter(e), j = async (e) => await u.setMapCamera(e), E = async (e) => await u.lookAt(e), Z = (e) => u.setLayerVisibility(e), $ = (e, l) => u.requestCoordinateTransform(e, l), q = (e) => {
-      u.cancelCoordinateTransform(e);
+    }, Q = async (e) => await l.setMapCenter(e), j = async (e) => await l.setMapCamera(e), E = async (e) => await l.lookAt(e), Z = (e) => l.setLayerVisibility(e), $ = (e, u) => l.requestCoordinateTransform(e, u), q = (e) => {
+      l.cancelCoordinateTransform(e);
     }, K = (e) => {
-      u.setMapZoomRange(e);
+      l.setMapZoomRange(e);
     }, U = (e) => (c || (c = new T(o)), c.showLaneNumber(e)), G = () => {
       c == null || c.clearLaneNumber();
     }, J = async (e) => (c || (c = new T(o)), await c.initializeSearch(e)), R = async () => c == null ? void 0 : c.calCrossIndicatorArea(), W = async () => {
-    }, X = async (e, l) => {
-      s || (s = new Ye(o)), s.connectTrafficFlow(e, l);
+    }, X = async (e, u) => {
+      s || (s = new Ye(o)), s.connectTrafficFlow(e, u);
     }, Y = () => {
       s == null || s.disconnectTrafficFlow();
     }, F = async (e) => {
@@ -89,10 +89,10 @@ const Fe = { class: "gis-viewer" }, et = { style: { position: "absolute", bottom
       p || (p = new Xe(o)), p.updateQueueLength(e);
     }, fe = () => {
       p == null || p.removeQueueLength();
-    }, Se = async (e, l) => (t || (t = new D(o)), await t.showOpenDriveFromServer(e, l)), ye = async (e) => (t || (t = new D(o)), await t.clearOpenDrive(), await t.showOpenDriveFromFile(e)), we = async () => await (t == null ? void 0 : t.clearOpenDrive()), he = async (e) => t ? await (t == null ? void 0 : t.findSumo(e)) : {
+    }, Se = async (e, u) => (t || (t = new D(o)), await t.showOpenDriveFromServer(e, u)), ye = async (e) => (t || (t = new D(o)), await t.clearOpenDrive(), await t.showOpenDriveFromFile(e)), we = async () => await (t == null ? void 0 : t.clearOpenDrive()), Ce = async (e) => t ? await (t == null ? void 0 : t.findSumo(e)) : {
       status: -1,
       message: "未加载OpenDrive地图"
-    }, Ce = async (e) => t ? t.selectSumo(e) : {
+    }, he = async (e) => t ? t.selectSumo(e) : {
       status: -1,
       message: "未加载OpenDrive地图"
     }, ve = async (e) => t ? t.unselectSumo(e) : {
@@ -112,10 +112,7 @@ const Fe = { class: "gis-viewer" }, et = { style: { position: "absolute", bottom
       message: "未加载OpenDrive地图"
     }, De = (e) => (a || (a = new I(o)), a.showSignalControlArea(e)), Le = () => {
       a == null || a.clearSignalControlArea();
-    }, Te = async (e) => a ? await a.locateSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, Ie = async (e) => a ? await a.highlightSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, Me = () => a ? a.resetHighlight() : { status: -1, message: "未加载信号控制区" }, _e = (e) => (a || (a = new I(o)), a.showSubSignalControlArea(e)), xe = (e, l) => a ? a.editSubSignalArea(
-      e,
-      l
-    ) : { status: -1, message: "未加载信号控制区" }, He = (e) => a ? a.selectSubSignalControlAreaCross(e) : { status: -1, message: "未加载信号控制区" }, Pe = (e) => a ? a.unselectSubSignalControlAreaCross(e) : { status: -1, message: "未加载信号控制区" }, O = M, y = x;
+    }, Te = async (e) => a ? await a.locateSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, Ie = async (e) => a ? await a.highlightSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, Me = () => a ? a.resetHighlight() : { status: -1, message: "未加载信号控制区" }, _e = (e) => (a || (a = new I(o)), a.showSubSignalControlArea(e)), xe = (e) => a ? a.editSubSignalControlArea(e) : { status: -1, message: "未加载信号控制区" }, He = (e) => a ? a.selectSubSignalControlAreaCross(e) : { status: -1, message: "未加载信号控制区" }, Pe = (e) => a ? a.unselectSubSignalControlAreaCross(e) : { status: -1, message: "未加载信号控制区" }, O = M, y = x;
     return _({
       mapViewer: P,
       setLayerVisibility: Z,
@@ -154,8 +151,8 @@ const Fe = { class: "gis-viewer" }, et = { style: { position: "absolute", bottom
       showOpenDriveFromFile: ye,
       clearOpenDrive: we,
       geometrySearchInOpenDrive: Oe,
-      findSumoInOpenDrive: he,
-      selectSumoInOpenDrive: Ce,
+      findSumoInOpenDrive: Ce,
+      selectSumoInOpenDrive: he,
       unselectSumoInOpenDrive: ve,
       getSumoInfo: ke,
       splitOpenDriveLane: Ae,
@@ -169,7 +166,7 @@ const Fe = { class: "gis-viewer" }, et = { style: { position: "absolute", bottom
       editSubSignalControlArea: xe,
       selectSubSignalControlAreaCross: He,
       unselectSubSignalControlAreaCross: Pe
-    }), (e, l) => (C(), A("div", Fe, [
+    }), (e, u) => (h(), A("div", Fe, [
       g("div", {
         class: "gis-viewer-main",
         ref_key: "mapContainer",
@@ -193,7 +190,7 @@ const Fe = { class: "gis-viewer" }, et = { style: { position: "absolute", bottom
           [$e, f.value]
         ])
       ], 512),
-      (C(!0), A(qe, null, Ke(v, (i, m) => (C(), Ue(Re, {
+      (h(!0), A(qe, null, Ke(v, (i, m) => (h(), Ue(Re, {
         key: m,
         "display-mode": i.displayMode,
         "road-id": i.crossId,

package/es/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/es/src/gis-map/utils/holo-flow/signal-holo-flow-lsr.mjs

@@ -1,6 +1,6 @@
-import * as d from "@arcgis/core/core/reactiveUtils";
+import * as w from "@arcgis/core/core/reactiveUtils";
 import { Point as f } from "@arcgis/core/geometry";
-import * as w from "@arcgis/core/geometry/support/webMercatorUtils.js";
+import * as d from "@arcgis/core/geometry/support/webMercatorUtils.js";
 import P from "@arcgis/core/layers/GraphicsLayer";
 import m from "./signal-holo-flow.mjs";
 class M extends m {
@@ -36,7 +36,7 @@ class M extends m {
     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 = d.watch(
+    this.watchHandle || (this.watchHandle = w.watch(
       () => this.view.extent,
       () => {
         const t = this.getPanelScale();
@@ -47,7 +47,7 @@ class M extends m {
             x: e[0],
             y: e[1]
           });
-          this.view.spatialReference.isWebMercator && (a = w.geographicToWebMercator(
+          this.view.spatialReference.isWebMercator && (a = d.geographicToWebMercator(
             a
           ));
           const i = this.view.toScreen(a);
@@ -94,11 +94,11 @@ class M extends m {
           x: e.panelPoint[0],
           y: e.panelPoint[1]
         });
-        this.view.spatialReference.isWebMercator && (i = w.geographicToWebMercator(
+        this.view.spatialReference.isWebMercator && (i = d.geographicToWebMercator(
           i
         ));
         const r = this.view.toScreen(i), h = this.getPanelRotation(e.coord);
-        console.log(o, h), this.countdownPanelProps.push({
+        this.countdownPanelProps.push({
           displayMode: "complex",
           crossId: s,
           roadId: o,
@@ -132,7 +132,7 @@ class M extends m {
       x: s[0],
       y: s[1]
     });
-    this.view.spatialReference.isWebMercator && (c = w.geographicToWebMercator(
+    this.view.spatialReference.isWebMercator && (c = d.geographicToWebMercator(
       c
     ));
     const p = this.view.toScreen(c), l = n[n.length - 1];
@@ -140,7 +140,7 @@ class M extends m {
       x: l[0],
       y: l[1]
     });
-    this.view.spatialReference.isWebMercator && (t = w.geographicToWebMercator(
+    this.view.spatialReference.isWebMercator && (t = d.geographicToWebMercator(
       t
     ));
     const o = this.view.toScreen(t), e = o.x - p.x, a = o.y - p.y;

package/es/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

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

@@ -1,10 +1,10 @@
-import c from "@arcgis/core/Graphic";
-import p from "@arcgis/core/layers/GraphicsLayer";
+import p from "@arcgis/core/Graphic";
+import g from "@arcgis/core/layers/GraphicsLayer";
 import { toRaw as m } from "vue";
-import g from "../../stores/index.mjs";
-class P {
+import u from "../../stores/index.mjs";
+class v {
   constructor(i) {
-    this.appDataStore = g.useAppDataStore, this.logTable = [
+    this.hasGpu = !1, this.appDataStore = u.useAppDataStore, this.logTable = [
       [
         "uuid",
         "ptcId",
@@ -30,9 +30,53 @@ class P {
         "step",
         "receiveTimestamp"
       ]
-    ], this.needInterpolate = !0, this.isPaused = !1, this.showVehiclePlate = !1, this.showGroundVehicle = !0, this.showElevatedVehicle = !0, this.historyPositionMap = /* @__PURE__ */ new Map(), this.vehicleObjectMap = /* @__PURE__ */ new Map(), this.view = i, this.mapConfig = m(this.appDataStore.mapConfig), this.vehicleLayer = new p({
+    ], this.needInterpolate = !0, this.isPaused = !1, this.showVehiclePlate = !1, this.showGroundVehicle = !0, this.showElevatedVehicle = !0, this.historyPositionMap = /* @__PURE__ */ new Map(), this.vehicleObjectMap = /* @__PURE__ */ new Map(), this.view = i, this.mapConfig = m(this.appDataStore.mapConfig), this.vehicleLayer = new g({
       id: "vehicleLayer"
-    }), this.view.map.add(this.vehicleLayer), this.rafSignal = requestAnimationFrame(() => this.render());
+    }), this.view.map.add(this.vehicleLayer);
+    const t = this.getRendererText(), e = this.getGpuText(t);
+    this.hasGpu = e !== "Unknown", this.hasGpu && (this.rafSignal = requestAnimationFrame(() => this.render())), console.log("rendererText: ", t), console.log("gpuText: ", e);
+  }
+  getRendererText() {
+    try {
+      const i = document.createElement("canvas"), t = i.getContext("webgl") || i.getContext("experimental-webgl");
+      if (!t)
+        return "Unknown";
+      const e = t.getExtension("WEBGL_debug_renderer_info");
+      return e && t.getParameter(e.UNMASKED_RENDERER_WEBGL) || "Unknown";
+    } catch {
+      return "Unknown";
+    }
+  }
+  em(i) {
+    const t = [], e = i.split("");
+    for (let s = 0; s < e.length; s++)
+      if (e[s] === "(")
+        t.push(s);
+      else if (e[s] === ")") {
+        const r = t.pop();
+        r !== void 0 && (e.splice(r, s - r + 1), s = r - 1);
+      }
+    return e.join("");
+  }
+  el(i) {
+    return this.em(i).replace(/\/PCIe\/SSE2/g, "").replace(/\s+/g, " ").trim();
+  }
+  getGpuText(i) {
+    try {
+      if (/, or similar$/.test(i) || /SwiftShader/.test(i))
+        return "Unknown";
+      if (/^ANGLE/.test(i)) {
+        const t = i.match(/\((.+)\)$/);
+        if (t) {
+          const e = t[1], s = e.split(/,\s*/g);
+          let r = s[1];
+          return /^ANGLE Metal Renderer: /.test(r) && (r = i.split(": ")[1].split(",")[0]), s.length === 1 && (r = s[0].split(" ").slice(1).join(" ")), /Direct3D/.test(r) && (r = r.split("Direct3D")[0].trim()), r;
+        }
+      }
+    } catch {
+      return "Unknown";
+    }
+    return this.el(i);
   }
   getLog() {
     return this.logTable;
@@ -46,28 +90,26 @@ class P {
         return;
       }
       const e = i.map((s) => {
-        const { vehicleId: o, heading: a, localTimestamp: h } = s, l = Number(s.x), n = Number(s.y);
-        this.historyPositionMap.set(o, [
-          { pos: [l, n, 0], heading: a, time: h }
-        ]);
-        const r = new c({
+        const { vehicleId: r, heading: o, localTimestamp: h } = s, n = Number(s.x), l = Number(s.y), a = new p({
           geometry: {
             type: "point",
-            x: l,
-            y: n
+            x: n,
+            y: l
           },
           attributes: {
             ...s,
             type: "trackVehicle"
           },
-          symbol: this.createCIMSymbol(s)
+          symbol: this.hasGpu ? this.createCIMSymbol(s) : this.createMarkerSymbol()
         });
-        return r.visible = !1, this.vehicleObjectMap.set(o, {
-          graphic: r,
+        return this.hasGpu && (a.visible = !1, this.historyPositionMap.set(r, [
+          { pos: [n, l, 0], heading: o, time: h }
+        ]), this.vehicleObjectMap.set(r, {
+          graphic: a,
           data: s,
           waitForDelete: !1,
           isMoving: !1
-        }), r;
+        })), a;
       });
       this.vehicleLayer.addMany(e), t();
     });
@@ -80,25 +122,42 @@ class P {
       }
       const e = [];
       i.forEach((s) => {
-        const { vehicleId: o, heading: a, localTimestamp: h } = s, l = Number(s.x), n = Number(s.y), r = this.vehicleObjectMap.get(o);
-        r ? (r.data = s, r.graphic.attributes = {
-          ...s,
-          type: "trackVehicle"
-        }, this.historyPositionMap.get(
-          o
-        ).push({
-          pos: [l, n, 0],
-          heading: a,
-          time: h
-        })) : e.push(s);
+        const { vehicleId: r, heading: o, localTimestamp: h } = s, n = Number(s.x), l = Number(s.y);
+        if (this.hasGpu) {
+          const a = this.vehicleObjectMap.get(r);
+          a ? (a.data = s, a.graphic.attributes = {
+            ...s,
+            type: "trackVehicle"
+          }, this.historyPositionMap.get(
+            r
+          ).push({
+            pos: [n, l, 0],
+            heading: o,
+            time: h
+          })) : e.push(s);
+        } else {
+          const a = this.vehicleLayer.graphics.find(
+            (c) => c.getAttribute("vehicleId") == s.vehicleId
+          );
+          a ? a.geometry = {
+            type: "point",
+            x: n,
+            y: l
+          } : e.push(s);
+        }
       }), this.addVehicles(e), t();
     });
   }
   deleteVehicles(i) {
-    this.isPaused || i.forEach((t) => {
+    this.isPaused || (this.hasGpu ? i.forEach((t) => {
       const e = this.vehicleObjectMap.get(t);
       e && (e.waitForDelete = !0);
-    });
+    }) : i.forEach((t) => {
+      const e = this.vehicleLayer.graphics.find(
+        (s) => s.getAttribute("vehicleId") == t
+      );
+      e && this.vehicleLayer.remove(e);
+    }));
   }
   clearVehicles() {
     this.vehicleLayer.removeAll(), this.vehicleObjectMap.clear(), this.historyPositionMap.clear();
@@ -121,7 +180,7 @@ class P {
     i.name === "vehiclePlate" && (this.showVehiclePlate = i.visible);
   }
   togglePause(i) {
-    this.isPaused = i, this.isPaused ? cancelAnimationFrame(this.rafSignal) : this.rafSignal = requestAnimationFrame(() => this.render());
+    this.isPaused = i, this.isPaused && this.rafSignal ? cancelAnimationFrame(this.rafSignal) : this.rafSignal = requestAnimationFrame(() => this.render());
   }
   updatePanelContent(i) {
     console.log(i);
@@ -139,11 +198,11 @@ class P {
     if (!t || !e || !e.isMoving && t.length <= 2)
       return;
     e.isMoving = !0, (e.graphic.getAttribute("roadLayer") || "1") === "1" ? e.graphic.visible = this.showGroundVehicle : e.graphic.visible = this.showElevatedVehicle, e.segmentStartTime || (e.segmentStartTime = Date.now(), e.segmentTotalTime = t[1].time - t[0].time);
-    const o = Date.now() - e.segmentStartTime, a = Math.min(
+    const r = Date.now() - e.segmentStartTime, o = Math.min(
       1,
-      o / e.segmentTotalTime
+      r / e.segmentTotalTime
     );
-    if (a === 1)
+    if (o === 1)
       if (t.shift(), t.length === 1) {
         e.waitForDelete ? (this.vehicleLayer.remove(e.graphic), this.vehicleObjectMap.delete(i), this.historyPositionMap.delete(i)) : (e.segmentStartTime = void 0, e.segmentTotalTime = void 0, e.graphic.visible = !1, e.isMoving = !1);
         return;
@@ -154,12 +213,12 @@ class P {
           y: t[0].pos[1]
         };
     else {
-      const h = t[0].pos[0] + (t[1].pos[0] - t[0].pos[0]) * a, l = t[0].pos[1] + (t[1].pos[1] - t[0].pos[1]) * a, n = t[0].heading + (t[1].heading - t[0].heading) * a;
+      const h = t[0].pos[0] + (t[1].pos[0] - t[0].pos[0]) * o, n = t[0].pos[1] + (t[1].pos[1] - t[0].pos[1]) * o, l = t[0].heading + (t[1].heading - t[0].heading) * o;
       e.graphic.geometry = {
         type: "point",
         x: h,
-        y: l
-      }, e.data.heading = n, e.graphic.symbol = this.createCIMSymbol(e.data);
+        y: n
+      }, e.data.heading = l, e.graphic.symbol = this.hasGpu ? this.createCIMSymbol(e.data) : this.createMarkerSymbol();
     }
   }
   /**
@@ -258,6 +317,17 @@ class P {
       }
     };
   }
+  createMarkerSymbol() {
+    return {
+      type: "simple-marker",
+      color: "green",
+      size: 5,
+      outline: {
+        color: "white",
+        width: 1
+      }
+    };
+  }
   /**
    * 根据车身颜色属性返回对应的车辆图标
    * @param carColor
@@ -351,5 +421,5 @@ class P {
   }
 }
 export {
-  P as default
+  v as default
 };

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

@@ -1,4 +1,4 @@
-import { IResult } from '../../../types';
+import { IEditSignalControlAreaParams, IResult, IShowSignalControlAreaParams } from '../../../types';
 export default class SignalControlAreaController {
     private view;
     private districtControllerLayer;
@@ -15,10 +15,7 @@ export default class SignalControlAreaController {
      * @param params
      * @returns
      */
-    showSignalControlArea(params: {
-        areaList: any[];
-        style?: string;
-    }): IResult;
+    showSignalControlArea(params: IShowSignalControlAreaParams): IResult;
     clearSignalControlArea(): IResult;
     locateSignalControlArea(params: {
         id: string;
@@ -34,6 +31,7 @@ export default class SignalControlAreaController {
      * @returns
      */
     private handleViewClick;
+    private crossIdsInDistrict;
     /**
      * 显示周边的路口
      * @param crossIds
@@ -46,12 +44,7 @@ export default class SignalControlAreaController {
      * 编辑子区的路口
      * @returns
      */
-    editSubSignalArea(addCrossCallback: (params: {
-        id: string;
-        name: string;
-    }) => void, removeCrossCallback: (params: {
-        id: string;
-    }) => void): Promise<IResult>;
+    editSubSignalControlArea(params: IEditSignalControlAreaParams): Promise<IResult>;
     /**
      * 从外部接口选中一个路口
      * @param id