gisviewer-vue3-arcgis 1.0.143 → 1.0.144

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

@@ -1,19 +1,21 @@
-import p from "@arcgis/core/Graphic";
+import m from "@arcgis/core/Graphic";
 import * as k from "@arcgis/core/core/promiseUtils";
 import { Polygon as O } from "@arcgis/core/geometry";
 import * as L from "@arcgis/core/geometry/geometryEngine";
-import j from "@arcgis/core/layers/FeatureLayer";
-import b from "@arcgis/core/layers/GraphicsLayer";
-import g from "axios";
+import S from "@arcgis/core/layers/FeatureLayer";
+import w from "@arcgis/core/layers/GraphicsLayer";
+import y from "axios";
 import F from "md5";
-import G from "pako";
-import A from "../common-utils.mjs";
-class S {
+import j from "pako";
+import { watch as $ } from "vue";
+import M from "../../stores/index.mjs";
+import G from "../common-utils.mjs";
+class A {
   constructor(e) {
     this.junctionNames = /* @__PURE__ */ new Map(), this.projectName = "", this.openDriveServer = "", this.currentSectionCode = "", this.currentJunctionId = "", this.view = e, this.view.popup.visibleElements = {
       collapseButton: !1,
       actionBar: !1
-    }, this.laneLayer = new j({
+    }, this.laneLayer = new S({
       id: "OpenDriveLane",
       fields: [
         {
@@ -231,7 +233,7 @@ class S {
           }
         ]
       }
-    }), this.roadNameLayer = new j({
+    }), this.roadNameLayer = new S({
       id: "OpenDriveRoadName",
       fields: [
         {
@@ -281,7 +283,7 @@ class S {
           }
         }
       ]
-    }), this.junctionLayer = new b({ id: "OpenDriveJunction" }), this.sectionLayer = new b({ id: "OpenDriveSection" }), this.highlightLayer = new b({ id: "OpenDriveHighlight" }), this.flashLayer = new b({ id: "OpenDriveFlash" }), this.drawLayer = new b({ id: "Draw" }), this.view.map.addMany([
+    }), this.junctionLayer = new w({ id: "OpenDriveJunction" }), this.sectionLayer = new w({ id: "OpenDriveSection" }), this.highlightLayer = new w({ id: "OpenDriveHighlight" }), this.flashLayer = new w({ id: "OpenDriveFlash" }), this.drawLayer = new w({ id: "Draw" }), this.view.map.addMany([
       this.laneLayer,
       this.junctionLayer,
       this.sectionLayer,
@@ -292,14 +294,14 @@ class S {
     ]);
   }
   static getInstance(e) {
-    return this.instance || (this.instance = new S(e)), this.instance;
+    return this.instance || (this.instance = new A(e)), this.instance;
   }
   async makeMd5FromFile(e) {
     try {
-      const i = await (await fetch(e)).text();
-      return { status: 0, message: "ok", result: F(i) };
-    } catch (t) {
-      return { status: -1, message: t.message };
+      const t = await (await fetch(e)).text();
+      return { status: 0, message: "ok", result: F(t) };
+    } catch (i) {
+      return { status: -1, message: i.message };
     }
   }
   /**
@@ -308,17 +310,17 @@ class S {
    * @returns
    */
   async showOpenDriveFromFile(e) {
-    var h, f;
+    var h, p;
     this.openDriveClickCallback = e.selectedCallback, console.time("md5用时");
-    const t = await this.makeMd5FromFile(e.file);
-    if (t.status !== 0)
-      return t;
-    this.projectName = t.result, console.timeEnd("md5用时"), this.openDriveServer = e.server, await this.makeMd5FromFile(e.file);
-    const i = `http://${this.openDriveServer}/api/openDrive/uploadXodr`;
+    const i = await this.makeMd5FromFile(e.file);
+    if (i.status !== 0)
+      return i;
+    this.projectName = i.result, console.timeEnd("md5用时"), this.openDriveServer = e.server, await this.makeMd5FromFile(e.file);
+    const t = `http://${this.openDriveServer}/api/openDrive/uploadXodr`;
     let o;
     try {
-      o = await g.post(
-        i,
+      o = await y.post(
+        t,
         {},
         {
           params: {
@@ -334,22 +336,22 @@ class S {
       return { status: -1, message: o.statusText };
     console.time("渲染用时");
     const s = o.data.result.geoSetting;
-    A.setGeoData(
+    G.setGeoData(
       s.geoReference,
       s.offsetX,
       s.offsetY
     );
-    let l = o.data.result.json;
-    l.startsWith(window.location.protocol) || (l = `${window.location.protocol}//${e.server}${l}`);
-    const n = await (await fetch(l)).arrayBuffer(), r = G.inflate(n, { to: "string" }), c = JSON.parse(r);
+    let n = o.data.result.json;
+    n.startsWith(window.location.protocol) || (n = `${window.location.protocol}//${e.server}${n}`);
+    const r = await (await fetch(n)).arrayBuffer(), a = j.inflate(r, { to: "string" }), c = JSON.parse(a);
     await this.showAllLanes(
       c,
       ((h = e.options) == null ? void 0 : h.showJunctionLane) || !1,
-      ((f = e.options) == null ? void 0 : f.showRoadName) || !0
+      ((p = e.options) == null ? void 0 : p.showRoadName) || !0
     );
-    const m = o.data.result.junctions;
-    if (this.showJunction(m), e.options && e.options.centerMap !== !1) {
-      const d = A.transformPointProjection([0, 0]);
+    const g = o.data.result.junctions;
+    if (this.showJunction(g), e.options && e.options.centerMap !== !1) {
+      const d = G.transformPointProjection([0, 0]);
       await this.view.goTo(d);
     }
     return this.mouseMoveHandler || this.monitorMouseMove(), this.mouseClickHandler || this.monitorMouseClick(), console.timeEnd("渲染用时"), { status: 0, message: "ok" };
@@ -359,10 +361,10 @@ class S {
    * @param server
    * @param projectName
    */
-  async showOpenDriveFromServer(e, t) {
-    const i = `http://${e}/api/openDrive/analyzeXodr`, o = await g.get(i, {
+  async showOpenDriveFromServer(e, i) {
+    const t = `http://${e}/api/openDrive/analyzeXodr`, o = await y.get(t, {
       headers: {
-        projectName: t
+        projectName: i
       },
       params: {
         analyze: !1,
@@ -373,8 +375,8 @@ class S {
       throw new Error(`OpenDriveRenderer: ${o.statusText}`);
     let s = o.data.result.json;
     s.startsWith(window.location.protocol) || (s = `${window.location.protocol}//${e}${s}`);
-    const a = await (await fetch(s)).arrayBuffer(), n = G.inflate(a, { to: "string" }), r = JSON.parse(n);
-    return await this.showAllLanes(r, !1, !1), { status: 0, message: "ok" };
+    const l = await (await fetch(s)).arrayBuffer(), r = j.inflate(l, { to: "string" }), a = JSON.parse(r);
+    return await this.showAllLanes(a, !1, !1), { status: 0, message: "ok" };
   }
   /**
    * 显示所有车道
@@ -383,87 +385,87 @@ class S {
    * @param showRoadName 是否显示道路名称
    * @returns
    */
-  async showAllLanes(e, t, i) {
+  async showAllLanes(e, i, t) {
     const o = await this.laneLayer.queryFeatures();
     return o.features.length > 0 && this.laneLayer.applyEdits({
       deleteFeatures: o.features
-    }), this.roadNameLayer.visible = i, new Promise((s) => {
-      let l = 0;
+    }), this.roadNameLayer.visible = t, new Promise((s) => {
+      let n = 0;
       this.allLaneGraphics = [], this.allRefLineGraphics = [];
-      const a = [];
-      for (const r of e) {
-        if (!t && r.junction !== "-1")
+      const l = [];
+      for (const a of e) {
+        if (!i && a.junction !== "-1")
           continue;
-        const { id: c, refLine: m } = r;
-        let h = r.name;
+        const { id: c, refLine: g } = a;
+        let h = a.name;
         h.includes("(") && (h = h.slice(0, h.indexOf("("))), h = h.replace(/(.)/g, "$1 ");
-        const f = new p({
+        const p = new m({
           geometry: {
             type: "polyline",
-            paths: [m]
+            paths: [g]
           },
           attributes: {
-            ObjectID: l++,
+            ObjectID: n++,
             roadId: c,
             roadName: h
           }
         });
-        this.allRefLineGraphics.push(f), r.laneSections.sort((d, y) => Number(d.id) - Number(y.id));
-        for (let d = 0; d < r.laneSections.length; d++) {
-          const y = r.laneSections[d], u = Number(y.id);
-          for (const w of y.lanePaths) {
-            const v = Number(w.id);
+        this.allRefLineGraphics.push(p), a.laneSections.sort((d, f) => Number(d.id) - Number(f.id));
+        for (let d = 0; d < a.laneSections.length; d++) {
+          const f = a.laneSections[d], b = Number(f.id);
+          for (const u of f.lanePaths) {
+            const v = Number(u.id);
             if (v === 0)
               continue;
-            const C = w.type, I = w.innerPath.concat(
-              w.outerPath.reverse()
+            const C = u.type, I = u.innerPath.concat(
+              u.outerPath.reverse()
             );
             if (I.length <= 3) {
               console.warn(`lane ${v} has less than 3 points`);
               continue;
             }
-            I.push(w.innerPath[0]);
+            I.push(u.innerPath[0]);
             const N = new O({
               rings: [I]
             });
             if (N) {
-              const D = new p({
+              const D = new m({
                 geometry: N,
                 attributes: {
-                  ObjectID: l++,
-                  id: `${c}+${u}+${v}`,
-                  fromNode: r.fromNode,
-                  toNode: r.toNode,
+                  ObjectID: n++,
+                  id: `${c}+${b}+${v}`,
+                  fromNode: a.fromNode,
+                  toNode: a.toNode,
                   roadId: c,
-                  roadName: r.name,
-                  sectionId: u,
+                  roadName: a.name,
+                  sectionId: b,
                   sectionIndex: d,
                   laneId: v,
                   type: C,
                   sumoId: ""
                 }
               });
-              this.allLaneGraphics.push(D), a.push(D);
+              this.allLaneGraphics.push(D), l.push(D);
             }
           }
         }
       }
-      const n = setInterval(() => {
-        if (a.length > 0 || this.allRefLineGraphics.length > 0) {
-          if (a.length > 0) {
-            const r = a.splice(0, 100);
+      const r = setInterval(() => {
+        if (l.length > 0 || this.allRefLineGraphics.length > 0) {
+          if (l.length > 0) {
+            const a = l.splice(0, 100);
             this.laneLayer.applyEdits({
-              addFeatures: r
+              addFeatures: a
             });
           }
           if (this.allRefLineGraphics.length > 0) {
-            const r = this.allRefLineGraphics.splice(0, 10);
+            const a = this.allRefLineGraphics.splice(0, 10);
             this.roadNameLayer.applyEdits({
-              addFeatures: r
+              addFeatures: a
             });
           }
         } else
-          clearInterval(n), s();
+          clearInterval(r), s();
       }, 10);
     });
   }
@@ -473,30 +475,30 @@ class S {
    * @returns
    */
   showJunction(e) {
-    const t = [];
-    for (const i of e) {
-      if (!i)
+    const i = [];
+    for (const t of e) {
+      if (!t)
         continue;
-      this.junctionNames.set(i.id, i.name), i.nodeType = i.type;
-      const o = new p({
+      this.junctionNames.set(t.id, t.name), t.nodeType = t.type;
+      const o = new m({
         geometry: {
           type: "point",
-          x: i.coordinates[0],
-          y: i.coordinates[1]
+          x: t.coordinates[0],
+          y: t.coordinates[1]
         },
         attributes: {
-          ...i,
+          ...t,
           selected: !1,
           type: "OpenDriveJunction"
         },
         symbol: {
           type: "picture-marker",
-          url: i.crossId ? "/GisViewerAssets/Images/point_green.png" : "/GisViewerAssets/Images/point_yellow.png",
+          url: t.crossId ? "/GisViewerAssets/Images/point_green.png" : "/GisViewerAssets/Images/point_yellow.png",
           width: 30,
           height: 30
         },
         popupTemplate: {
-          title: i.name,
+          title: t.name,
           content: [
             {
               type: "fields",
@@ -514,9 +516,9 @@ class S {
           ]
         }
       });
-      t.push(o);
+      i.push(o);
     }
-    this.junctionLayer.addMany(t);
+    this.junctionLayer.addMany(i);
   }
   /**
    * 监听鼠标移动事件，高亮显示鼠标所在路段和路口
@@ -524,32 +526,32 @@ class S {
   monitorMouseMove() {
     const e = k.debounce(async (t) => {
       var l;
-      const o = (l = (await this.view.hitTest(t, {
+      const s = (l = (await this.view.hitTest(t, {
         include: [this.laneLayer, this.junctionLayer]
       })).results) == null ? void 0 : l.filter(
-        (a) => a.type === "graphic"
+        (r) => r.type === "graphic"
       );
-      if (o.length === 0) {
+      if (s.length === 0) {
         this.currentSectionCode !== "" && (this.currentSectionCode = "", this.highlightGraphic = void 0, this.highlightLayer.removeAll()), this.currentJunctionId !== "" && (this.currentJunctionId = "", this.view.closePopup());
         return;
       }
-      const s = o[0];
-      if (this.hitGraphic = s.graphic, s.layer.id === "OpenDriveLane") {
-        const a = `${this.hitGraphic.getAttribute(
+      const n = s[0];
+      if (this.hitGraphic = n.graphic, n.layer.id === "OpenDriveLane") {
+        const r = `${this.hitGraphic.getAttribute(
           "roadId"
         )}+${this.hitGraphic.getAttribute("sectionId")}`;
-        if (a === this.currentSectionCode || this.sectionLayer.graphics.findIndex(
-          (u) => u.getAttribute("id") === a
+        if (r === this.currentSectionCode || this.sectionLayer.graphics.findIndex(
+          (u) => u.getAttribute("id") === r
         ) >= 0)
           return;
-        this.currentSectionCode = a;
-        const r = this.allLaneGraphics.filter(
-          (u) => `${u.attributes.roadId}+${u.attributes.sectionId}` === a
-        ), c = L.union(
-          r.map((u) => u.geometry)
-        ), m = this.hitGraphic.getAttribute("fromNode"), h = this.hitGraphic.getAttribute("toNode"), f = this.junctionNames.get(m) || m, d = this.junctionNames.get(h) || h;
-        this.highlightGraphic = new p({
-          geometry: c,
+        this.currentSectionCode = r;
+        const c = this.allLaneGraphics.filter(
+          (u) => `${u.attributes.roadId}+${u.attributes.sectionId}` === r
+        ), g = L.union(
+          c.map((u) => u.geometry)
+        ), h = this.hitGraphic.getAttribute("fromNode"), p = this.hitGraphic.getAttribute("toNode"), d = this.junctionNames.get(h) || h, f = this.junctionNames.get(p) || p;
+        this.highlightGraphic = new m({
+          geometry: g,
           symbol: {
             type: "simple-fill",
             color: [0, 255, 255, 0.5],
@@ -561,11 +563,11 @@ class S {
           },
           attributes: {
             type: "OpenDriveSection",
-            id: a,
+            id: r,
             selected: !1,
-            fromNodeName: f,
-            toNodeName: d,
-            laneCount: r.length
+            fromNodeName: d,
+            toNodeName: f,
+            laneCount: c.length
           },
           popupTemplate: {
             title: this.hitGraphic.getAttribute("roadName"),
@@ -590,16 +592,16 @@ class S {
             ]
           }
         }), this.highlightLayer.removeAll(), this.highlightLayer.add(this.highlightGraphic);
-        const y = this.view.toMap(t);
+        const b = this.view.toMap(t);
         this.view.openPopup({
           features: [this.highlightGraphic],
-          location: y
+          location: b
         });
-      } else if (s.layer.id === "OpenDriveJunction") {
-        const a = this.hitGraphic.getAttribute("id");
-        if (a === this.currentJunctionId)
+      } else if (n.layer.id === "OpenDriveJunction") {
+        const r = this.hitGraphic.getAttribute("id");
+        if (r === this.currentJunctionId)
           return;
-        this.currentJunctionId = a, this.view.openPopup({
+        this.currentJunctionId = r, this.view.openPopup({
           features: [this.hitGraphic],
           location: this.hitGraphic.geometry
         });
@@ -609,67 +611,81 @@ class S {
       e(t).catch(() => {
       });
     });
+    const i = M.useAppDataStore;
+    $(
+      () => i.isSketching,
+      () => {
+        var t;
+        i.isSketching ? (t = this.mouseMoveHandler) == null || t.remove() : this.mouseMoveHandler = this.view.on(
+          "pointer-move",
+          async (o) => {
+            e(o).catch(() => {
+            });
+          }
+        );
+      }
+    );
   }
   /**
    * 监听鼠标点击事件，获取高亮要素的拓扑信息
    */
   monitorMouseClick() {
-    const e = k.debounce(async (t) => {
-      var n;
-      const o = (n = (await this.view.hitTest(t, {
+    const e = k.debounce(async (i) => {
+      var r;
+      const o = (r = (await this.view.hitTest(i, {
         include: [this.highlightLayer, this.junctionLayer, this.sectionLayer]
-      })).results) == null ? void 0 : n.filter(
-        (r) => r.type === "graphic"
+      })).results) == null ? void 0 : r.filter(
+        (a) => a.type === "graphic"
       );
       if (o.length === 0)
         return;
-      const s = o[0].graphic, l = s.getAttribute("type"), a = s.getAttribute("id");
-      if (l === "OpenDriveJunction")
+      const s = o[0].graphic, n = s.getAttribute("type"), l = s.getAttribute("id");
+      if (n === "OpenDriveJunction")
         if (s.getAttribute("selected") === !1) {
-          const r = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, c = await g.get(r, {
+          const a = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, c = await y.get(a, {
             params: {
-              id: a,
+              id: l,
               projectName: this.projectName
             }
           });
           c.status === 200 && c.data.status === 0 && (this.openDriveClickCallback && this.openDriveClickCallback({
             type: "OpenDriveJunction",
-            id: a,
+            id: l,
             details: c.data.result
           }), s.setAttribute("selected", !0), s.symbol.url = "/GisViewerAssets/Images/point_red.png", this.increasePictureMarkerSize(s, 50));
         } else {
           this.openDriveClickCallback && this.openDriveClickCallback({
             type: "OpenDriveJunction",
-            id: a,
+            id: l,
             details: void 0
           }), s.setAttribute("selected", !1);
-          const r = s.getAttribute("crossId");
-          s.symbol.url = r ? "/GisViewerAssets/Images/point_green.png" : "/GisViewerAssets/Images/point_yellow.png", this.decreasePictureMarkerSize(s, 30);
+          const a = s.getAttribute("crossId");
+          s.symbol.url = a ? "/GisViewerAssets/Images/point_green.png" : "/GisViewerAssets/Images/point_yellow.png", this.decreasePictureMarkerSize(s, 30);
         }
-      else if (l === "OpenDriveSection")
+      else if (n === "OpenDriveSection")
         if (s.getAttribute("selected"))
           this.sectionLayer.remove(s), this.openDriveClickCallback && this.openDriveClickCallback({
             type: "OpenDriveSection",
-            id: a,
+            id: l,
             details: void 0
           });
         else {
           this.highlightLayer.remove(s), this.sectionLayer.add(s), s.setAttribute("selected", !0);
-          const r = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, c = await g.get(r, {
+          const a = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, c = await y.get(a, {
             params: {
-              id: a,
+              id: l,
               projectName: this.projectName
             }
           });
           c.status === 200 && c.data.status === 0 && this.openDriveClickCallback && (s.setAttribute("edgeId", c.data.result.obj_id), this.openDriveClickCallback({
             type: "OpenDriveSection",
-            id: a,
+            id: l,
             details: c.data.result
           }));
         }
     });
-    this.mouseClickHandler = this.view.on("immediate-click", async (t) => {
-      e(t).catch(() => {
+    this.mouseClickHandler = this.view.on("immediate-click", async (i) => {
+      e(i).catch(() => {
       });
     });
   }
@@ -678,15 +694,15 @@ class S {
    * @param graphic
    * @param targetSize
    */
-  increasePictureMarkerSize(e, t) {
-    const i = setInterval(() => {
+  increasePictureMarkerSize(e, i) {
+    const t = setInterval(() => {
       const o = e.symbol, s = o.width;
-      s < t ? e.symbol = {
+      s < i ? e.symbol = {
         type: "picture-marker",
         url: o.url,
         width: s + 1,
         height: s + 1
-      } : clearInterval(i);
+      } : clearInterval(t);
     }, 20);
   }
   /**
@@ -694,47 +710,47 @@ class S {
    * @param graphic
    * @param targetSize
    */
-  decreasePictureMarkerSize(e, t) {
-    const i = setInterval(() => {
+  decreasePictureMarkerSize(e, i) {
+    const t = setInterval(() => {
       const o = e.symbol, s = o.width;
-      s > t ? e.symbol = {
+      s > i ? e.symbol = {
         type: "picture-marker",
         url: o.url,
         width: s - 1,
         height: s - 1
-      } : clearInterval(i);
+      } : clearInterval(t);
     }, 20);
   }
   async getSumoInfo(e) {
     switch (e.type) {
       case "junction": {
-        const t = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, i = await g.get(t, {
+        const i = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, t = await y.get(i, {
           params: {
             id: e.id,
             projectName: this.projectName
           }
         });
-        return i.status === 200 ? i.data : { status: -1, message: `路口信息查询失败: ${e.id}` };
+        return t.status === 200 ? t.data : { status: -1, message: `路口信息查询失败: ${e.id}` };
       }
       case "edge": {
-        const t = e.id.split("#");
-        let i = t[0];
-        i.startsWith("-") && (i = i.slice(1));
+        const i = e.id.split("#");
+        let t = i[0];
+        t.startsWith("-") && (t = t.slice(1));
         let o = 0;
-        t.length === 2 && (o = Number(t[1]));
+        i.length === 2 && (o = Number(i[1]));
         const s = this.allLaneGraphics.find(
-          (l) => l.getAttribute("roadId") === i && l.getAttribute("sectionIndex") === o
+          (n) => n.getAttribute("roadId") === t && n.getAttribute("sectionIndex") === o
         );
         if (s) {
-          const l = `${i}+${s.getAttribute(
+          const n = `${t}+${s.getAttribute(
             "sectionId"
-          )}`, a = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, n = await g.get(a, {
+          )}`, l = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, r = await y.get(l, {
             params: {
-              id: l,
+              id: n,
               projectName: this.projectName
             }
           });
-          return n.status === 200 ? n.data : { status: -1, message: `路段信息查询失败: ${l}` };
+          return r.status === 200 ? r.data : { status: -1, message: `路段信息查询失败: ${n}` };
         } else
           return { status: -1, message: "未知类型" };
       }
@@ -746,13 +762,13 @@ class S {
    * 清除OpenDrive内容
    */
   async clearOpenDrive() {
-    var t, i;
+    var i, t;
     let e = await this.laneLayer.queryFeatures();
     e.features.length > 0 && await this.laneLayer.applyEdits({
       deleteFeatures: e.features
     }), e = await this.roadNameLayer.queryFeatures(), e.features.length > 0 && await this.roadNameLayer.applyEdits({
       deleteFeatures: e.features
-    }), this.highlightLayer.removeAll(), this.junctionLayer.removeAll(), this.sectionLayer.removeAll(), this.flashLayer.removeAll(), (t = this.mouseMoveHandler) == null || t.remove(), this.mouseMoveHandler = void 0, (i = this.mouseClickHandler) == null || i.remove(), this.mouseClickHandler = void 0;
+    }), this.highlightLayer.removeAll(), this.junctionLayer.removeAll(), this.sectionLayer.removeAll(), this.flashLayer.removeAll(), (i = this.mouseMoveHandler) == null || i.remove(), this.mouseMoveHandler = void 0, (t = this.mouseClickHandler) == null || t.remove(), this.mouseClickHandler = void 0;
   }
   /**
    * 用sumo的id定位车道、基本段、路段
@@ -760,30 +776,30 @@ class S {
    * @returns
    */
   async findSumo(e) {
-    const { type: t, id: i } = e, o = e.flash === void 0 ? !0 : e.flash;
-    if (t === "junction")
-      return await this.findJunction(i, o);
-    if (t === "edge") {
-      const s = i.split("+");
+    const { type: i, id: t } = e, o = e.flash === void 0 ? !0 : e.flash;
+    if (i === "junction")
+      return await this.findJunction(t, o);
+    if (i === "edge") {
+      const s = t.split("+");
       if (s.length > 2)
         return { status: -1, message: "id格式错误" };
-      const l = s.length === 2 ? Number(s[1]) : void 0, a = s[0].split("#");
-      if (a.length > 2)
+      const n = s.length === 2 ? Number(s[1]) : void 0, l = s[0].split("#");
+      if (l.length > 2)
         return { status: -1, message: "id格式错误" };
-      const n = a[0], r = a.length === 2 ? Number(a[1]) : void 0;
-      return await this.findLane({ roadsectId: n, segmentId: r, laneId: l, flash: o });
+      const r = l[0], a = l.length === 2 ? Number(l[1]) : void 0;
+      return await this.findLane({ roadsectId: r, segmentId: a, laneId: n, flash: o });
     } else
       return { status: -1, message: "未知类型" };
   }
-  async findJunction(e, t) {
-    const i = this.junctionLayer.graphics.find(
+  async findJunction(e, i) {
+    const t = this.junctionLayer.graphics.find(
       (o) => o.attributes.id === e
     );
-    if (!i)
+    if (!t)
       return { status: -1, message: "未找到。请检查路口编号" };
-    if (t) {
-      const o = new p({
-        geometry: i.geometry,
+    if (i) {
+      const o = new m({
+        geometry: t.geometry,
         symbol: {
           type: "simple-marker",
           style: "circle",
@@ -797,7 +813,7 @@ class S {
       });
       this.flashGraphic(o);
     }
-    return await this.view.goTo(i.geometry, { duration: 1e3 }), { status: 0, message: "ok" };
+    return await this.view.goTo(t.geometry, { duration: 1e3 }), { status: 0, message: "ok" };
   }
   /**
    * 用sumo的id定位车道、基本段、路段
@@ -805,41 +821,41 @@ class S {
    * @returns
    */
   async findLane(e) {
-    let { roadsectId: t, segmentId: i, laneId: o } = e;
-    t.startsWith("-") && (t = t.slice(1));
+    let { roadsectId: i, segmentId: t, laneId: o } = e;
+    i.startsWith("-") && (i = i.slice(1));
     let s = this.allLaneGraphics.filter(
-      (n) => n.attributes.roadId === t
+      (r) => r.attributes.roadId === i
     );
     if (s.length === 0)
       return { status: -1, message: "未找到。请检查路段编号" };
-    if (i !== void 0) {
-      const n = [];
-      if (s.forEach((r) => {
-        const c = Number(r.attributes.sectionId);
-        n.indexOf(c) === -1 && n.push(c);
-      }), n.sort((r, c) => r - c), i > n.length - 1)
+    if (t !== void 0) {
+      const r = [];
+      if (s.forEach((a) => {
+        const c = Number(a.attributes.sectionId);
+        r.indexOf(c) === -1 && r.push(c);
+      }), r.sort((a, c) => a - c), t > r.length - 1)
         return { status: -1, message: "未找到。请检查基本段编号" };
-      i = n[i], s = s.filter(
-        (r) => Number(r.attributes.sectionId) === i
+      t = r[t], s = s.filter(
+        (a) => Number(a.attributes.sectionId) === t
       );
     }
     if (o !== void 0) {
-      const n = [];
-      if (s.forEach((r) => {
-        const c = Number(r.attributes.laneId);
-        n.indexOf(c) === -1 && n.push(c);
-      }), n.sort((r, c) => r - c), o > n.length - 1)
+      const r = [];
+      if (s.forEach((a) => {
+        const c = Number(a.attributes.laneId);
+        r.indexOf(c) === -1 && r.push(c);
+      }), r.sort((a, c) => a - c), o > r.length - 1)
         return { status: -1, message: "未找到。请检查车道编号" };
-      o = n[o], s = s.filter(
-        (r) => Number(r.attributes.laneId) === o
+      o = r[o], s = s.filter(
+        (a) => Number(a.attributes.laneId) === o
       );
     }
-    const l = s.map(
-      (n) => n.geometry
-    ), a = L.union(l);
+    const n = s.map(
+      (r) => r.geometry
+    ), l = L.union(n);
     if (e.flash) {
-      const n = new p({
-        geometry: a,
+      const r = new m({
+        geometry: l,
         symbol: {
           type: "simple-fill",
           color: [255, 0, 0, 0.5],
@@ -850,9 +866,9 @@ class S {
           }
         }
       });
-      this.flashGraphic(n);
+      this.flashGraphic(r);
     }
-    return await this.view.goTo(a, { duration: 1e3 }), { status: 0, message: "ok" };
+    return await this.view.goTo(l, { duration: 1e3 }), { status: 0, message: "ok" };
   }
   /**
    * graphic渐隐渐显闪烁
@@ -860,9 +876,9 @@ class S {
    */
   flashGraphic(e) {
     this.flashLayer.removeAll(), this.flashLayer.add(e);
-    let t = 0, i = !0;
+    let i = 0, t = !0;
     const o = setInterval(() => {
-      i ? (this.flashLayer.opacity -= 0.02, this.flashLayer.opacity <= 0.1 && (i = !1, t++)) : (this.flashLayer.opacity += 0.02, this.flashLayer.opacity >= 1 && (i = !0)), t >= 5 && (this.flashLayer.removeAll(), this.flashLayer.opacity = 1, clearInterval(o));
+      t ? (this.flashLayer.opacity -= 0.02, this.flashLayer.opacity <= 0.1 && (t = !1, i++)) : (this.flashLayer.opacity += 0.02, this.flashLayer.opacity >= 1 && (t = !0)), i >= 5 && (this.flashLayer.removeAll(), this.flashLayer.opacity = 1, clearInterval(o));
     }, 10);
   }
   /**
@@ -871,20 +887,20 @@ class S {
    * @returns
    */
   unselectSumo(e) {
-    if ((!e || e.type === "junction") && this.junctionLayer.graphics.forEach((t) => {
-      if ((!e || !e.id || e.id === "" || e.id === t.getAttribute("id")) && t.getAttribute("selected")) {
-        t.setAttribute("selected", !1);
-        const i = t.getAttribute("crossId");
-        t.symbol.url = i ? "/GisViewerAssets/Images/point_green.png" : "/GisViewerAssets/Images/point_yellow.png", this.decreasePictureMarkerSize(t, 30);
+    if ((!e || e.type === "junction") && this.junctionLayer.graphics.forEach((i) => {
+      if ((!e || !e.id || e.id === "" || e.id === i.getAttribute("id")) && i.getAttribute("selected")) {
+        i.setAttribute("selected", !1);
+        const t = i.getAttribute("crossId");
+        i.symbol.url = t ? "/GisViewerAssets/Images/point_green.png" : "/GisViewerAssets/Images/point_yellow.png", this.decreasePictureMarkerSize(i, 30);
       }
     }), !e || e.type === "edge")
       if (!e || !e.id || e.id === "")
         this.sectionLayer.removeAll();
       else {
-        const t = this.sectionLayer.graphics.find(
-          (i) => i.getAttribute("edgeId") === e.id
+        const i = this.sectionLayer.graphics.find(
+          (t) => t.getAttribute("edgeId") === e.id
         );
-        t && this.sectionLayer.remove(t);
+        i && this.sectionLayer.remove(i);
       }
     return { status: 0, message: "ok" };
   }
@@ -896,24 +912,24 @@ class S {
   selectSumo(e) {
     switch (e.type) {
       case "junction":
-        return this.junctionLayer.graphics.forEach((t) => {
-          if (e.id === t.getAttribute("id"))
-            return t.setAttribute("selected", !0), t.symbol.url = "/GisViewerAssets/Images/point_red.png", this.increasePictureMarkerSize(t, 50), { status: 0, message: "ok" };
+        return this.junctionLayer.graphics.forEach((i) => {
+          if (e.id === i.getAttribute("id"))
+            return i.setAttribute("selected", !0), i.symbol.url = "/GisViewerAssets/Images/point_red.png", this.increasePictureMarkerSize(i, 50), { status: 0, message: "ok" };
         }), { status: -1, message: "未找到路口" };
       case "edge": {
-        const t = e.id.split("#");
-        let i = t[0];
-        i.startsWith("-") && (i = i.slice(1));
+        const i = e.id.split("#");
+        let t = i[0];
+        t.startsWith("-") && (t = t.slice(1));
         let o = 0;
-        t.length === 2 && (o = Number(t[1]));
+        i.length === 2 && (o = Number(i[1]));
         const s = this.allLaneGraphics.filter(
-          (l) => l.getAttribute("roadId") === i && l.getAttribute("sectionIndex") === o
+          (n) => n.getAttribute("roadId") === t && n.getAttribute("sectionIndex") === o
         );
         if (s.length > 0) {
-          const l = L.union(
-            s.map((n) => n.geometry)
-          ), a = new p({
-            geometry: l,
+          const n = L.union(
+            s.map((r) => r.geometry)
+          ), l = new m({
+            geometry: n,
             symbol: {
               type: "simple-fill",
               color: [0, 255, 255, 0.5],
@@ -929,7 +945,7 @@ class S {
               selected: !0
             }
           });
-          return this.sectionLayer.add(a), { status: 0, message: "ok" };
+          return this.sectionLayer.add(l), { status: 0, message: "ok" };
         } else
           return { status: -1, message: "未找到路段" };
       }
@@ -942,5 +958,5 @@ class S {
   }
 }
 export {
-  S as default
+  A as default
 };