gisviewer-vue3-arcgis 1.0.259 → 1.0.263

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

@@ -1,19 +1,19 @@
-import g from "@arcgis/core/Graphic";
+import I from "@arcgis/core/Graphic";
 import * as C from "@arcgis/core/core/promiseUtils";
 import * as $ from "@arcgis/core/core/reactiveUtils.js";
-import { Polygon as S, Point as P } from "@arcgis/core/geometry";
+import { Polygon as S, Point as F } from "@arcgis/core/geometry";
 import * as L from "@arcgis/core/geometry/geometryEngine";
 import D from "@arcgis/core/layers/FeatureLayer";
-import w from "@arcgis/core/layers/GraphicsLayer";
-import * as k from "@turf/helpers";
+import v from "@arcgis/core/layers/GraphicsLayer";
+import * as G from "@turf/helpers";
 import { lineSliceAlong as x } from "@turf/line-slice-along";
-import b from "axios";
-import { XMLParser as F } from "fast-xml-parser";
-import J from "md5";
-import G from "pako";
+import w from "axios";
+import { XMLParser as J } from "fast-xml-parser";
+import E from "md5";
+import M from "pako";
 import { watch as R } from "vue";
-import E from "../../stores/index.mjs";
-import T from "../common-utils.mjs";
+import T from "../../stores/index.mjs";
+import A from "../common-utils.mjs";
 class O {
   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 D({
@@ -73,6 +73,11 @@ class O {
           name: "toNode",
           alias: "终点路口",
           type: "string"
+        },
+        {
+          name: "roadsectBaseIds",
+          alias: "基本段编号",
+          type: "string"
         }
       ],
       objectIdField: "ObjectID",
@@ -289,7 +294,7 @@ class O {
           }
         }
       ]
-    }), 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.splitLaneLayer = new w({ id: "SplitLane" }), this.borderLayer = new w({ id: "OpenDriveBorder" }), this.view.map.addMany([
+    }), this.junctionLayer = new v({ id: "OpenDriveJunction" }), this.sectionLayer = new v({ id: "OpenDriveSection" }), this.highlightLayer = new v({ id: "OpenDriveHighlight" }), this.flashLayer = new v({ id: "OpenDriveFlash" }), this.drawLayer = new v({ id: "Draw" }), this.splitLaneLayer = new v({ id: "SplitLane" }), this.borderLayer = new v({ id: "OpenDriveBorder" }), this.view.map.addMany([
       this.laneLayer,
       this.sectionLayer,
       this.roadNameLayer,
@@ -307,14 +312,14 @@ class O {
   async makeMd5FromFile(e) {
     var t;
     try {
-      const o = await (await fetch(e)).text();
-      let n = (t = new F({
+      const s = await (await fetch(e)).text();
+      let r = (t = new J({
         ignoreAttributes: !1,
         allowBooleanAttributes: !0
-      }).parse(o).OpenDRIVE.userData) == null ? void 0 : t.border;
-      return n ? n = JSON.parse(n) : n = [], { status: 0, message: "ok", result: { md5: J(o), border: n } };
-    } catch (s) {
-      return { status: -1, message: s.message };
+      }).parse(s).OpenDRIVE.userData) == null ? void 0 : t.border;
+      return r ? r = JSON.parse(r) : r = [], { status: 0, message: "ok", result: { md5: E(s), border: r } };
+    } catch (o) {
+      return { status: -1, message: o.message };
     }
   }
   /**
@@ -323,20 +328,20 @@ class O {
    * @returns
    */
   async showOpenDriveFromFile(e) {
-    var y, m, f;
+    var d, y, h;
     this.openDriveClickCallback = e.selectedCallback, this.scaleWatch = $.watch(
       () => this.view.scale,
-      (d, u) => {
-        d > this.junctionScale && u <= this.junctionScale ? this.updateAllJunctionSymbol("marker") : d <= this.junctionScale && u > this.junctionScale && this.updateAllJunctionSymbol("picture");
+      (u, p) => {
+        u > this.junctionScale && p <= this.junctionScale ? this.updateAllJunctionSymbol("marker") : u <= this.junctionScale && p > this.junctionScale && this.updateAllJunctionSymbol("picture");
       }
     );
     let t = e.file.split("/").pop() || "";
-    t = t.split(".").slice(0, -1).join("."), console.log(`OpenDriveRenderer: 显示OpenDrive文件 ${t}`), this.openDriveServer = e.server;
-    const s = `http://${this.openDriveServer}/api/openDrive/uploadXodr`;
-    let o;
+    t = t.split(".").slice(0, -1).join("."), this.openDriveServer = e.server;
+    const o = `http://${this.openDriveServer}/api/openDrive/uploadXodr`;
+    let s;
     try {
-      o = await b.post(
-        s,
+      s = await w.post(
+        o,
         {},
         {
           params: {
@@ -345,36 +350,42 @@ class O {
           }
         }
       );
-    } catch (d) {
-      return { status: -1, message: d.message };
+    } catch (u) {
+      return { status: -1, message: u.message };
     }
-    if (o.status !== 200)
-      return { status: -1, message: o.statusText };
+    if (s.status !== 200)
+      return { status: -1, message: s.statusText };
     console.time("渲染用时");
-    const i = o.data.result.geoSetting;
-    T.setGeoData(
+    const i = s.data.result.geoSetting;
+    A.setGeoData(
       i.geoReference,
       i.offsetX,
       i.offsetY
     );
-    let c = o.data.result.json;
-    c.startsWith(window.location.protocol) || (c = `${window.location.protocol}//${e.server}${c}`);
-    const a = await (await fetch(c)).arrayBuffer(), r = G.inflate(a, { to: "string" }), l = JSON.parse(r);
+    let l = s.data.result.json;
+    l.startsWith(window.location.protocol) || (l = `${window.location.protocol}//${e.server}${l}`);
+    const r = await fetch(l);
+    let a;
+    if (l.endsWith("bin")) {
+      const u = await r.arrayBuffer(), p = M.inflate(u, { to: "string" });
+      a = JSON.parse(p);
+    } else
+      a = await r.json();
     if (await this.showAllLanes(
-      l,
-      ((y = e.options) == null ? void 0 : y.showJunctionLane) || !1,
-      ((m = e.options) == null ? void 0 : m.showRoadName) || !0
-    ), ((f = e.options) == null ? void 0 : f.showJunctionPoint) !== !1) {
-      const d = o.data.result.junctions;
-      this.showJunction(d);
+      a,
+      ((d = e.options) == null ? void 0 : d.showJunctionLane) || !1,
+      ((y = e.options) == null ? void 0 : y.showRoadName) || !0
+    ), ((h = e.options) == null ? void 0 : h.showJunctionPoint) !== !1) {
+      const u = s.data.result.junctions;
+      this.showJunction(u);
     }
     e.options && e.options.centerMap !== !1 && await this.view.goTo(this.allLaneGraphics), this.mouseMoveHandler || this.monitorMouseMove(), this.mouseClickHandler || this.monitorMouseClick();
-    const p = E.useAppDataStore;
+    const n = T.useAppDataStore;
     return R(
-      () => p.isSketching,
+      () => n.isSketching,
       () => {
-        var d, u;
-        p.isSketching ? ((d = this.mouseMoveHandler) == null || d.remove(), this.mouseMoveHandler = void 0, (u = this.mouseClickHandler) == null || u.remove(), this.mouseClickHandler = void 0) : (this.monitorMouseMove(), this.monitorMouseClick());
+        var u, p;
+        n.isSketching ? ((u = this.mouseMoveHandler) == null || u.remove(), this.mouseMoveHandler = void 0, (p = this.mouseClickHandler) == null || p.remove(), this.mouseClickHandler = void 0) : (this.monitorMouseMove(), this.monitorMouseClick());
       }
     ), console.timeEnd("渲染用时"), { status: 0, message: "ok" };
   }
@@ -384,7 +395,7 @@ class O {
    * @param projectName
    */
   async showOpenDriveFromServer(e, t) {
-    const s = `http://${e}/api/openDrive/analyzeXodr`, o = await b.get(s, {
+    const o = `http://${e}/api/openDrive/analyzeXodr`, s = await w.get(o, {
       headers: {
         projectName: t
       },
@@ -393,12 +404,18 @@ class O {
         compressed: !0
       }
     });
-    if (o.status !== 200)
-      throw new Error(`OpenDriveRenderer: ${o.statusText}`);
-    let i = o.data.result.json;
+    if (s.status !== 200)
+      throw new Error(`OpenDriveRenderer: ${s.statusText}`);
+    let i = s.data.result.json;
     i.startsWith(window.location.protocol) || (i = `${window.location.protocol}//${e}${i}`);
-    const n = await (await fetch(i)).arrayBuffer(), a = G.inflate(n, { to: "string" }), r = JSON.parse(a);
-    return console.log(r), await this.showAllLanes(r, !1, !1), { status: 0, message: "ok" };
+    const l = await fetch(i);
+    let r;
+    if (i.endsWith("bin")) {
+      const a = await l.arrayBuffer(), c = M.inflate(a, { to: "string" });
+      r = JSON.parse(c);
+    } else
+      r = await l.json();
+    return await this.showAllLanes(r, !1, !1), { status: 0, message: "ok" };
   }
   /**
    * 显示所有车道
@@ -407,87 +424,89 @@ class O {
    * @param showRoadName 是否显示道路名称
    * @returns
    */
-  async showAllLanes(e, t, s) {
-    console.log(e);
-    const o = await this.laneLayer.queryFeatures();
-    return o.features.length > 0 && this.laneLayer.applyEdits({
-      deleteFeatures: o.features
-    }), this.roadNameLayer.visible = s, new Promise((i) => {
-      let c = 0;
+  async showAllLanes(e, t, o) {
+    const s = await this.laneLayer.queryFeatures();
+    return s.features.length > 0 && this.laneLayer.applyEdits({
+      deleteFeatures: s.features
+    }), this.roadNameLayer.visible = o, new Promise((i) => {
+      var c;
+      let l = 0;
       this.allLaneGraphics = [], this.allRefLineGraphics = [];
-      const n = [];
-      for (const r of e) {
-        if (!t && r.junction !== "-1")
+      const r = [];
+      for (const n of e) {
+        if (!t && n.junction !== "-1")
           continue;
-        const { id: l, refLine: h } = r;
-        let p = r.name;
-        p.includes("(") && (p = p.slice(0, p.indexOf("("))), p = p.replace(/(.)/g, "$1 ");
-        const y = new g({
+        const { id: d, refLine: y } = n;
+        let h = n.name;
+        h.includes("(") && (h = h.slice(0, h.indexOf("("))), h = h.replace(/(.)/g, "$1 ");
+        const u = new I({
           geometry: {
             type: "polyline",
-            paths: [h]
+            paths: [y]
           },
           attributes: {
-            ObjectID: c++,
-            roadId: l,
-            roadName: p
+            ObjectID: l++,
+            roadId: d,
+            roadName: h
           }
         });
-        this.allRefLineGraphics.push(y), r.laneSections.sort((m, f) => Number(m.id) - Number(f.id));
-        for (let m = 0; m < r.laneSections.length; m++) {
-          const f = r.laneSections[m], d = Number(f.id);
-          for (const u of f.lanePaths) {
-            const v = Number(u.id);
-            if (v === 0)
+        this.allRefLineGraphics.push(u), n.laneSections.sort((p, g) => Number(p.id) - Number(g.id));
+        for (let p = 0; p < n.laneSections.length; p++) {
+          const g = n.laneSections[p], m = Number(g.id);
+          for (const f of g.lanePaths) {
+            const b = Number(f.id);
+            if (b === 0)
               continue;
-            const I = u.type, M = [...u.outerPath], A = u.innerPath.concat(
-              M.reverse()
+            const B = f.type, P = [...f.outerPath], N = f.innerPath.concat(
+              P.reverse()
             );
-            if (A.length <= 3) {
-              console.warn(`lane ${v} has less than 3 points`);
+            if (N.length <= 3) {
+              console.warn(`lane ${b} has less than 3 points`);
               continue;
             }
-            A.push(u.innerPath[0]);
-            const N = new S({
-              rings: [A]
+            N.push(f.innerPath[0]);
+            const k = new S({
+              rings: [N]
             });
-            if (N) {
-              const j = new g({
-                geometry: N,
+            if (k) {
+              const j = new I({
+                geometry: k,
                 attributes: {
-                  ObjectID: c++,
-                  id: `${l}+${d}+${v}`,
-                  fromNode: r.fromNode,
-                  toNode: r.toNode,
-                  roadId: String(l),
-                  roadName: r.name,
-                  sectionId: String(d),
-                  sectionIndex: m,
-                  laneId: v,
-                  type: I,
+                  ObjectID: l++,
+                  id: `${d}+${m}+${b}`,
+                  fromNode: n.fromNode,
+                  toNode: n.toNode,
+                  roadId: String(d),
+                  roadName: n.name,
+                  sectionId: String(m),
+                  sectionIndex: p,
+                  laneId: b,
+                  type: B,
                   sumoId: "",
                   // 记录左右边线的起始点，用于按长度高亮车道的一部分
-                  leftLine: u.innerPath,
-                  rightLine: u.outerPath
+                  leftLine: f.innerPath,
+                  rightLine: f.outerPath,
+                  // array转为逗号分隔的字符串
+                  roadsectBaseIds: (c = g.roadsectBaseIds) == null ? void 0 : c.toString()
                 }
               });
-              this.allLaneGraphics.push(j), n.push(j);
+              this.allLaneGraphics.push(j), r.push(j);
             }
           }
         }
       }
       const a = setInterval(() => {
-        if (n.length > 0 || this.allRefLineGraphics.length > 0) {
-          if (n.length > 0) {
-            const r = n.splice(0, 100);
+        if (r.length > 0 || this.allRefLineGraphics.length > 0) {
+          if (r.length > 0) {
+            const n = r.splice(0, 100);
             this.laneLayer.applyEdits({
-              addFeatures: r
+              addFeatures: n
             });
           }
           if (this.allRefLineGraphics.length > 0) {
-            const r = this.allRefLineGraphics.splice(0, 10);
+            const n = this.allRefLineGraphics.splice(0, 10);
             this.roadNameLayer.applyEdits({
-              addFeatures: r
+              addFeatures: n
             });
           }
         } else
@@ -502,28 +521,28 @@ class O {
    */
   showJunction(e) {
     const t = [];
-    let s;
-    this.xodrBorder.length > 0 && (s = new S({
+    let o;
+    this.xodrBorder.length > 0 && (o = new S({
       rings: [this.xodrBorder]
     }));
-    for (const o of e)
-      if (o && (this.junctionNames.set(o.id, o.name), o.nodeType = o.type, o.crossId)) {
-        const i = new P({
-          x: o.coordinates[0],
-          y: o.coordinates[1]
+    for (const s of e)
+      if (s && (this.junctionNames.set(s.id, s.name), s.nodeType = s.type, s.crossId)) {
+        const i = new F({
+          x: s.coordinates[0],
+          y: s.coordinates[1]
         });
-        let c = !0;
-        if (s && (c = L.contains(s, i)), c) {
-          const n = new g({
+        let l = !0;
+        if (o && (l = L.contains(o, i)), l) {
+          const r = new I({
             geometry: i,
             attributes: {
-              ...o,
+              ...s,
               selected: !1,
               type: "OpenDriveJunction"
             },
-            symbol: this.getCrossGraphicSymbol(o, "marker")
+            symbol: this.getCrossGraphicSymbol(s, "marker")
           });
-          t.push(n);
+          t.push(r);
         }
       }
     this.junctionLayer.addMany(t);
@@ -533,32 +552,32 @@ class O {
    */
   monitorMouseMove() {
     const e = C.debounce(async (t) => {
-      var c;
-      const o = (c = (await this.view.hitTest(t, {
+      var l;
+      const s = (l = (await this.view.hitTest(t, {
         include: [this.laneLayer, this.junctionLayer]
-      })).results) == null ? void 0 : c.filter(
-        (n) => n.type === "graphic"
+      })).results) == null ? void 0 : l.filter(
+        (r) => r.type === "graphic"
       );
-      if (o.length === 0) {
+      if (s.length === 0) {
         this.currentSectionCode !== "" && (this.currentSectionCode = "", this.highlightLayer.removeAll()), this.currentJunctionId !== "" && (this.currentJunctionId = ""), this.view.closePopup();
         return;
       }
-      const i = o[0];
+      const i = s[0];
       if (this.hitGraphic = i.graphic, i.layer.id === "OpenDriveLane") {
-        const n = `${this.hitGraphic.getAttribute(
+        const r = `${this.hitGraphic.getAttribute(
           "roadId"
-        )}+${this.hitGraphic.getAttribute("sectionId")}`;
-        if (this.currentSectionCode === n || this.selectedSectionIds.includes(n) || this.sectionLayer.graphics.findIndex(
-          (d) => d.getAttribute("id") === n
+        )}+${this.hitGraphic.getAttribute("sectionId")}`, a = this.hitGraphic.getAttribute("roadsectBaseIds");
+        if (this.currentSectionCode === r || this.selectedSectionIds.includes(a) || this.sectionLayer.graphics.findIndex(
+          (m) => m.getAttribute("id") === r
         ) >= 0)
           return;
-        this.currentSectionCode = n;
-        const r = this.allLaneGraphics.filter(
-          (d) => `${d.attributes.roadId}+${d.attributes.sectionId}` === n
-        ), l = L.union(
-          r.map((d) => d.geometry)
-        ), h = this.hitGraphic.getAttribute("fromNode"), p = this.hitGraphic.getAttribute("toNode"), y = this.junctionNames.get(h) || h, m = this.junctionNames.get(p) || p, f = new g({
-          geometry: l,
+        this.currentSectionCode = r;
+        const n = this.allLaneGraphics.filter(
+          (m) => `${m.attributes.roadId}+${m.attributes.sectionId}` === r
+        ), d = L.union(
+          n.map((m) => m.geometry)
+        ), y = this.hitGraphic.getAttribute("fromNode"), h = this.hitGraphic.getAttribute("toNode"), u = this.junctionNames.get(y) || y, p = this.junctionNames.get(h) || h, g = new I({
+          geometry: d,
           symbol: {
             type: "simple-fill",
             color: [0, 255, 255, 0.5],
@@ -570,11 +589,12 @@ class O {
           },
           attributes: {
             type: "OpenDriveSection",
-            id: n,
+            id: r,
             selected: !1,
-            fromNodeName: y,
-            toNodeName: m,
-            laneCount: r.length
+            fromNodeName: u,
+            toNodeName: p,
+            laneCount: n.length,
+            roadsectBaseIds: this.hitGraphic.getAttribute("roadsectBaseIds")
           },
           popupTemplate: {
             title: this.hitGraphic.getAttribute("roadName"),
@@ -599,12 +619,12 @@ class O {
             ]
           }
         });
-        this.highlightLayer.removeAll(), this.highlightLayer.add(f);
+        this.highlightLayer.removeAll(), this.highlightLayer.add(g);
       } else if (i.layer.id === "OpenDriveJunction") {
-        const n = this.hitGraphic.getAttribute("id");
-        if (n === this.currentJunctionId)
+        const r = this.hitGraphic.getAttribute("id");
+        if (r === this.currentJunctionId)
           return;
-        this.currentJunctionId = n;
+        this.currentJunctionId = r;
       }
     });
     this.mouseMoveHandler = this.view.on("pointer-move", async (t) => {
@@ -618,26 +638,26 @@ class O {
   monitorMouseClick() {
     const e = C.debounce(async (t) => {
       var a;
-      const o = (a = (await this.view.hitTest(t, {
+      const s = (a = (await this.view.hitTest(t, {
         include: [this.highlightLayer, this.junctionLayer, this.sectionLayer]
       })).results) == null ? void 0 : a.filter(
-        (r) => r.type === "graphic"
+        (c) => c.type === "graphic"
       );
-      if (o.length === 0)
+      if (s.length === 0)
         return;
-      const i = o[0].graphic, c = i.getAttribute("type"), n = i.getAttribute("id");
-      if (c === "OpenDriveJunction")
+      const i = s[0].graphic, l = i.getAttribute("type"), r = i.getAttribute("id");
+      if (l === "OpenDriveJunction")
         if (i.getAttribute("selected") === !1) {
-          const r = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, l = await b.get(r, {
+          const c = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, n = await w.get(c, {
             params: {
-              id: n,
+              id: r,
               projectName: this.projectName
             }
           });
-          l.status === 200 && l.data.status === 0 && (this.openDriveClickCallback && this.openDriveClickCallback({
+          n.status === 200 && n.data.status === 0 && (this.openDriveClickCallback && this.openDriveClickCallback({
             type: "OpenDriveJunction",
-            id: n,
-            details: l.data.result
+            id: r,
+            details: n.data.result
           }), i.setAttribute("selected", !0), i.symbol = {
             type: "picture-marker",
             url: "/GisViewerAssets/Images/point_red.png",
@@ -647,37 +667,40 @@ class O {
         } else
           this.openDriveClickCallback && this.openDriveClickCallback({
             type: "OpenDriveJunction",
-            id: n,
+            id: r,
             details: void 0
           }), i.setAttribute("selected", !1), i.symbol = this.getCrossGraphicSymbol(
             i.attributes,
             this.view.scale < this.junctionScale ? "picture" : "marker"
           );
-      else if (c === "OpenDriveSection")
-        if (i.layer.id === "OpenDriveHighlight") {
-          this.highlightLayer.remove(i), this.sectionLayer.add(i), i.setAttribute("selected", !0), this.selectedSectionIds.push(n);
-          const r = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, l = await b.get(r, {
-            params: {
-              id: n,
-              projectName: this.projectName
+      else
+        l === "OpenDriveSection" && (i.layer.id === "OpenDriveHighlight" ? (this.highlightLayer.removeAll(), this.sectionLayer.removeAll(), this.selectedSectionIds = [], this.sectionLayer.add(i), i.setAttribute("selected", !0), this.selectedSectionIds.push(r), this.splitLaneLayer.graphics.filter(
+          (n) => n.getAttribute("roadsectBaseIds") === i.getAttribute("roadsectBaseIds")
+        ).forEach(
+          (n) => n.symbol = {
+            type: "simple-fill",
+            color: [255, 69, 0],
+            outline: {
+              color: "red",
+              width: 2
             }
-          });
-          if (l.status === 200 && l.data.status === 0 && this.openDriveClickCallback) {
-            const h = l.data.result.obj_id;
-            i.setAttribute("edgeId", h), this.openDriveClickCallback({
-              type: "OpenDriveSection",
-              id: h,
-              details: l.data.result
-            });
           }
-        } else
-          this.sectionLayer.remove(i), this.selectedSectionIds = this.selectedSectionIds.filter(
-            (r) => r !== n
-          ), this.openDriveClickCallback && this.openDriveClickCallback({
-            type: "OpenDriveSection",
-            id: i.getAttribute("edgeId"),
-            details: void 0
-          });
+        )) : (this.splitLaneLayer.graphics.filter(
+          (n) => n.getAttribute("roadsectBaseIds") === i.getAttribute("roadsectBaseIds")
+        ).forEach(
+          (n) => n.symbol = {
+            type: "simple-fill",
+            color: [255, 0, 0, 0.8],
+            outline: {
+              color: "red",
+              width: 1
+            }
+          }
+        ), this.sectionLayer.remove(i), this.selectedSectionIds = [], this.openDriveClickCallback && this.openDriveClickCallback({
+          type: "OpenDriveSection",
+          id: i.getAttribute("edgeId"),
+          details: void 0
+        })));
     });
     this.mouseClickHandler = this.view.on("immediate-click", async (t) => {
       e(t).catch(() => {
@@ -690,14 +713,14 @@ class O {
    * @param targetSize
    */
   increasePictureMarkerSize(e, t) {
-    const s = setInterval(() => {
-      const o = e.symbol, i = o.width;
+    const o = setInterval(() => {
+      const s = e.symbol, i = s.width;
       i < t ? e.symbol = {
         type: "picture-marker",
-        url: o.url,
+        url: s.url,
         width: i + 1,
         height: i + 1
-      } : clearInterval(s);
+      } : clearInterval(o);
     }, 20);
   }
   /**
@@ -706,46 +729,46 @@ class O {
    * @param targetSize
    */
   decreasePictureMarkerSize(e, t) {
-    const s = setInterval(() => {
-      const o = e.symbol, i = o.width;
+    const o = setInterval(() => {
+      const s = e.symbol, i = s.width;
       i > t ? e.symbol = {
         type: "picture-marker",
-        url: o.url,
+        url: s.url,
         width: i - 1,
         height: i - 1
-      } : clearInterval(s);
+      } : clearInterval(o);
     }, 20);
   }
   async getSumoInfo(e) {
     switch (e.type) {
       case "junction": {
-        const t = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, s = await b.get(t, {
+        const t = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, o = await w.get(t, {
           params: {
             id: e.id,
             projectName: this.projectName
           }
         });
-        return s.status === 200 ? s.data : { status: -1, message: `路口信息查询失败: ${e.id}` };
+        return o.status === 200 ? o.data : { status: -1, message: `路口信息查询失败: ${e.id}` };
       }
       case "edge": {
         const t = e.id.split("#");
-        let s = t[0];
-        s.startsWith("-") && (s = s.slice(1));
-        let o = 0;
-        t.length === 2 && (o = Number(t[1]));
+        let o = t[0];
+        o.startsWith("-") && (o = o.slice(1));
+        let s = 0;
+        t.length === 2 && (s = Number(t[1]));
         const i = this.allLaneGraphics.find(
-          (c) => c.getAttribute("roadId") === s && c.getAttribute("sectionIndex") === o
+          (l) => l.getAttribute("roadId") === o && l.getAttribute("sectionIndex") === s
         );
         if (i) {
-          const c = `${s}+${i.getAttribute(
+          const l = `${o}+${i.getAttribute(
             "sectionId"
-          )}`, n = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, a = await b.get(n, {
+          )}`, r = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, a = await w.get(r, {
             params: {
-              id: c,
+              id: l,
               projectName: this.projectName
             }
           });
-          return a.status === 200 ? a.data : { status: -1, message: `路段信息查询失败: ${c}` };
+          return a.status === 200 ? a.data : { status: -1, message: `路段信息查询失败: ${l}` };
         } else
           return { status: -1, message: "未知类型" };
       }
@@ -760,13 +783,13 @@ class O {
    * 清除OpenDrive内容
    */
   async clearOpenDrive() {
-    var t, s, o;
+    var t, o, s;
     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(), this.borderLayer.removeAll(), (t = this.mouseMoveHandler) == null || t.remove(), this.mouseMoveHandler = void 0, (s = this.mouseClickHandler) == null || s.remove(), this.mouseClickHandler = void 0, (o = this.scaleWatch) == null || o.remove(), this.scaleWatch = void 0;
+    }), this.highlightLayer.removeAll(), this.junctionLayer.removeAll(), this.sectionLayer.removeAll(), this.flashLayer.removeAll(), this.borderLayer.removeAll(), (t = this.mouseMoveHandler) == null || t.remove(), this.mouseMoveHandler = void 0, (o = this.mouseClickHandler) == null || o.remove(), this.mouseClickHandler = void 0, (s = this.scaleWatch) == null || s.remove(), this.scaleWatch = void 0;
   }
   /**
    * 用sumo的id定位车道、基本段、路段
@@ -774,30 +797,30 @@ class O {
    * @returns
    */
   async findSumo(e) {
-    const { type: t, id: s } = e, o = e.flash === void 0 ? !0 : e.flash;
+    const { type: t, id: o } = e, s = e.flash === void 0 ? !0 : e.flash;
     if (t === "junction")
-      return await this.findJunction(s, o);
+      return await this.findJunction(o, s);
     if (t === "edge") {
-      const i = s.split("_");
+      const i = o.split("_");
       if (i.length > 2)
         return { status: -1, message: "id格式错误" };
-      const c = i.length === 2 ? Number(i[1]) : void 0, n = i[0].split("#");
-      if (n.length > 2)
+      const l = i.length === 2 ? Number(i[1]) : void 0, r = i[0].split("#");
+      if (r.length > 2)
         return { status: -1, message: "id格式错误" };
-      const a = n[0], r = n.length === 2 ? Number(n[1]) : void 0;
-      return await this.findLane({ roadsectId: a, segmentId: r, laneId: c, flash: o });
+      const a = r[0], c = r.length === 2 ? Number(r[1]) : void 0;
+      return await this.findLane({ roadsectId: a, segmentId: c, laneId: l, flash: s });
     } else
       return { status: -1, message: "未知类型" };
   }
   async findJunction(e, t) {
-    const s = this.junctionLayer.graphics.find(
-      (o) => o.attributes.id === e
+    const o = this.junctionLayer.graphics.find(
+      (s) => s.attributes.id === e
     );
-    if (!s)
+    if (!o)
       return { status: -1, message: "未找到。请检查路口编号" };
     if (t) {
-      const o = new g({
-        geometry: s.geometry,
+      const s = new I({
+        geometry: o.geometry,
         symbol: {
           type: "simple-marker",
           style: "circle",
@@ -809,9 +832,9 @@ class O {
           }
         }
       });
-      this.flashGraphic(o);
+      this.flashGraphic(s);
     }
-    return await this.view.goTo(s.geometry, { duration: 1e3 }), { status: 0, message: "ok" };
+    return await this.view.goTo(o.geometry, { duration: 1e3 }), { status: 0, message: "ok" };
   }
   /**
    * 用sumo的id定位车道、基本段、路段
@@ -819,41 +842,41 @@ class O {
    * @returns
    */
   async findLane(e) {
-    let { roadsectId: t, segmentId: s, laneId: o } = e;
+    let { roadsectId: t, segmentId: o, laneId: s } = e;
     t.startsWith("-") && (t = t.slice(1));
     let i = this.allLaneGraphics.filter(
       (a) => a.attributes.roadId === t
     );
     if (i.length === 0)
       return { status: -1, message: "未找到。请检查路段编号" };
-    if (s !== void 0) {
+    if (o !== void 0) {
       const a = [];
-      if (i.forEach((r) => {
-        const l = Number(r.attributes.sectionId);
-        a.indexOf(l) === -1 && a.push(l);
-      }), a.sort((r, l) => r - l), s > a.length - 1)
+      if (i.forEach((c) => {
+        const n = Number(c.attributes.sectionId);
+        a.indexOf(n) === -1 && a.push(n);
+      }), a.sort((c, n) => c - n), o > a.length - 1)
         return { status: -1, message: "未找到。请检查基本段编号" };
-      s = a[s], i = i.filter(
-        (r) => Number(r.attributes.sectionId) === s
+      o = a[o], i = i.filter(
+        (c) => Number(c.attributes.sectionId) === o
       );
     }
-    if (o !== void 0) {
+    if (s !== void 0) {
       const a = [];
-      if (i.forEach((r) => {
-        const l = Number(r.attributes.laneId);
-        a.indexOf(l) === -1 && a.push(l);
-      }), a.sort((r, l) => r - l), o > a.length - 1)
+      if (i.forEach((c) => {
+        const n = Number(c.attributes.laneId);
+        a.indexOf(n) === -1 && a.push(n);
+      }), a.sort((c, n) => c - n), s > a.length - 1)
         return { status: -1, message: "未找到。请检查车道编号" };
-      o = a[o], i = i.filter(
-        (r) => Number(r.attributes.laneId) === o
+      s = a[s], i = i.filter(
+        (c) => Number(c.attributes.laneId) === s
       );
     }
-    const c = i.map(
+    const l = i.map(
       (a) => a.geometry
-    ), n = L.union(c);
+    ), r = L.union(l);
     if (e.flash) {
-      const a = new g({
-        geometry: n,
+      const a = new I({
+        geometry: r,
         symbol: {
           type: "simple-fill",
           color: [0, 255, 255, 0.6],
@@ -865,7 +888,7 @@ class O {
       });
       this.flashGraphic(a);
     }
-    return await this.view.goTo(n, { duration: 1e3 }), { status: 0, message: "ok" };
+    return await this.view.goTo(r, { duration: 1e3 }), { status: 0, message: "ok" };
   }
   /**
    * graphic渐隐渐显闪烁
@@ -873,9 +896,9 @@ class O {
    */
   flashGraphic(e) {
     this.flashLayer.removeAll(), this.flashLayer.add(e);
-    let t = 0, s = !0;
-    const o = setInterval(() => {
-      s ? (this.flashLayer.opacity -= 0.02, this.flashLayer.opacity <= 0.1 && (s = !1, t++)) : (this.flashLayer.opacity += 0.02, this.flashLayer.opacity >= 1 && (s = !0)), t >= 5 && (this.flashLayer.removeAll(), this.flashLayer.opacity = 1, clearInterval(o));
+    let t = 0, o = !0;
+    const s = setInterval(() => {
+      o ? (this.flashLayer.opacity -= 0.02, this.flashLayer.opacity <= 0.1 && (o = !1, t++)) : (this.flashLayer.opacity += 0.02, this.flashLayer.opacity >= 1 && (o = !0)), t >= 5 && (this.flashLayer.removeAll(), this.flashLayer.opacity = 1, clearInterval(s));
     }, 10);
   }
   /**
@@ -884,17 +907,17 @@ class O {
    * @returns
    */
   unselectSumo(e) {
-    if ((!e || e.type === "junction") && this.junctionLayer.graphics.forEach((t) => {
+    if (e ? e.type === "junction" && this.junctionLayer.graphics.forEach((t) => {
       (!e || !e.id || e.id === "" || e.id === t.getAttribute("id")) && t.getAttribute("selected") && (t.setAttribute("selected", !1), t.symbol = this.getCrossGraphicSymbol(
         t.attributes,
         this.view.scale < this.junctionScale ? "picture" : "marker"
       ));
-    }), !e || e.type === "edge") {
+    }) : (this.highlightLayer.removeAll(), this.sectionLayer.removeAll(), this.selectedSectionIds = [], this.splitLaneLayer.removeAll()), !e || e.type === "edge") {
       let t;
-      !e || !e.id || e.id === "" ? t = this.sectionLayer.graphics.toArray() : t = this.sectionLayer.graphics.filter((s) => s.getAttribute("edgeId") === e.id).toArray(), t.length > 0 && (t.forEach((s) => {
-        const o = s.getAttribute("id");
+      !e || !e.id || e.id === "" ? t = this.sectionLayer.graphics.toArray() : t = this.sectionLayer.graphics.filter((o) => o.getAttribute("edgeId") === e.id).toArray(), t.length > 0 && (t.forEach((o) => {
+        const s = o.getAttribute("id");
         this.selectedSectionIds = this.selectedSectionIds.filter(
-          (i) => i !== o
+          (i) => i !== s
         );
       }), this.sectionLayer.removeMany(t));
     }
@@ -914,25 +937,25 @@ class O {
         }), { status: -1, message: "未找到路口" };
       case "edge": {
         const t = e.id.split("#");
-        let s = String(t[0]);
-        s.startsWith("-") && (s = s.slice(1));
-        let o = 0;
-        t.length === 2 && (o = Number(t[1]));
+        let o = String(t[0]);
+        o.startsWith("-") && (o = o.slice(1));
+        let s = 0;
+        t.length === 2 && (s = Number(t[1]));
         let i = [];
         if (t.length === 1 ? i = this.allLaneGraphics.filter(
-          (c) => c.getAttribute("roadId") === s
+          (l) => l.getAttribute("roadId") === o
         ) : t.length === 2 && (i = this.allLaneGraphics.filter(
-          (c) => c.getAttribute("roadId") === s && c.getAttribute("sectionIndex") === o
+          (l) => l.getAttribute("roadId") === o && l.getAttribute("sectionIndex") === s
         )), i.length > 0) {
-          const c = /* @__PURE__ */ new Map();
-          return i.forEach((n) => {
-            const a = n.getAttribute("roadId") + "+" + n.getAttribute("sectionId");
+          const l = /* @__PURE__ */ new Map();
+          return i.forEach((r) => {
+            const a = r.getAttribute("roadId") + "+" + r.getAttribute("sectionId");
             this.selectedSectionIds.includes(a) || this.selectedSectionIds.push(a);
-            let r = c.get(a);
-            r ? r.push(n.geometry) : (r = [n.geometry], c.set(a, r));
-          }), c.forEach(async (n, a) => {
-            const r = L.union(n), l = new g({
-              geometry: r,
+            let c = l.get(a);
+            c ? c.push(r.geometry) : (c = [r.geometry], l.set(a, c));
+          }), l.forEach(async (r, a) => {
+            const c = L.union(r), n = new I({
+              geometry: c,
               symbol: {
                 type: "simple-fill",
                 color: [0, 255, 255, 0.5],
@@ -949,7 +972,7 @@ class O {
                 selected: !0
               }
             });
-            this.sectionLayer.add(l), await this.view.goTo(l);
+            this.sectionLayer.add(n), await this.view.goTo(n);
           }), { status: 0, message: "ok" };
         } else
           return { status: -1, message: "未找到路段" };
@@ -961,94 +984,99 @@ class O {
   async geometrySearch(e) {
     const t = new S({
       rings: [e]
-    }), s = await this.laneLayer.queryFeatures({
+    }), o = await this.laneLayer.queryFeatures({
       geometry: t,
       outFields: ["*"]
-    }), o = [], i = [];
-    for (const a of s.features) {
-      const r = a.getAttribute("roadId"), l = a.getAttribute("sectionIndex"), h = `${r}#${l}`;
-      if (o.indexOf(h) === -1) {
-        o.push(h), this.selectSumo({
+    }), s = [], i = [];
+    for (const a of o.features) {
+      const c = a.getAttribute("roadId"), n = a.getAttribute("sectionIndex"), d = `${c}#${n}`;
+      if (s.indexOf(d) === -1) {
+        s.push(d), this.selectSumo({
           type: "edge",
-          id: h
+          id: d
         });
-        const p = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, y = await b.get(p, {
+        const y = `http://${this.openDriveServer}/api/sumo/getSumoEdge`, h = await w.get(y, {
           params: {
-            id: `${r}+${a.getAttribute("sectionId")}`,
+            id: `${c}+${a.getAttribute("sectionId")}`,
             projectName: this.projectName
           }
         });
-        y.status === 200 && y.data.status === 0 && i.push(y.data.result);
+        h.status === 200 && h.data.status === 0 && i.push(h.data.result);
       }
     }
-    const c = this.junctionLayer.graphics.filter((a) => {
-      const r = a.geometry;
-      return L.contains(t, r);
-    }), n = [];
-    for (const a of c) {
-      const r = a.getAttribute("id");
+    const l = this.junctionLayer.graphics.filter((a) => {
+      const c = a.geometry;
+      return L.contains(t, c);
+    }), r = [];
+    for (const a of l) {
+      const c = a.getAttribute("id");
       this.selectSumo({
         type: "junction",
-        id: r
+        id: c
       });
-      const l = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, h = await b.get(l, {
+      const n = `http://${this.openDriveServer}/api/sumo/getSumoJunction`, d = await w.get(n, {
         params: {
-          id: r,
+          id: c,
           projectName: this.projectName
         }
       });
-      h.status === 200 && h.data.status === 0 && n.push(h.data.result);
+      d.status === 200 && d.data.status === 0 && r.push(d.data.result);
     }
     return {
       status: 0,
       message: "ok",
       result: {
-        junctions: n,
+        junctions: r,
         edges: i
       }
     };
   }
+  /**
+   * 封闭车道，使用sumo的id
+   * @param params
+   * @returns
+   */
   async splitLane(e) {
-    const s = e.id.split("_");
-    if (s.length !== 2)
+    const o = e.id.split("_");
+    if (o.length !== 2)
       return { status: -1, message: "车道编号格式错误" };
-    const o = Number(s[1]), i = s[0].split("#"), c = i.length === 2 ? Number(i[1]) : 0;
-    let n = i[0];
-    n.startsWith("-") && (n = n.slice(1));
-    const a = this.allLaneGraphics.filter((I) => I.getAttribute("roadId") === n && I.getAttribute("sectionIndex") === c);
+    const s = Number(o[1]), i = o[0].split("#"), l = i.length === 2 ? Number(i[1]) : 0;
+    let r = i[0];
+    r.startsWith("-") && (r = r.slice(1));
+    const a = this.allLaneGraphics.filter((b) => b.getAttribute("roadId") === r && b.getAttribute("sectionIndex") === l);
     if (a.length === 0)
       return { status: -1, message: "未找到路段" };
-    const r = a.length - o, l = a.find(
-      (I) => Math.abs(I.getAttribute("laneId")) === r
+    const c = a.length - s, n = a.find(
+      (b) => Math.abs(b.getAttribute("laneId")) === c
     );
-    if (!l)
+    if (!n)
       return { status: -1, message: "未找到车道" };
-    const h = e.start || 0, p = e.end || 100, y = k.lineString(l.getAttribute("leftLine")), m = x(y, h, p, {
+    const d = e.start || 0, y = e.end || 100, h = G.lineString(n.getAttribute("leftLine")), u = x(h, d, y, {
       units: "meters"
-    }), f = k.lineString(l.getAttribute("rightLine")), d = x(f, h, p, {
+    }), p = G.lineString(n.getAttribute("rightLine")), g = x(p, d, y, {
       units: "meters"
-    }), u = m.geometry.coordinates.concat(
-      d.geometry.coordinates.reverse()
+    }), m = u.geometry.coordinates.concat(
+      g.geometry.coordinates.reverse()
     );
-    u.push(u[u.length - 1]);
-    const v = new g({
+    m.push(m[m.length - 1]);
+    const f = new I({
       geometry: new S({
-        rings: [u]
+        rings: [m]
       }),
       attributes: {
-        ObjectID: l.getAttribute("ObjectID"),
-        id: l.getAttribute("id"),
-        fromNode: l.getAttribute("fromNode"),
-        toNode: l.getAttribute("toNode"),
-        roadId: l.getAttribute("roadId"),
-        roadName: l.getAttribute("roadName"),
-        sectionId: l.getAttribute("sectionId"),
-        sectionIndex: l.getAttribute("sectionIndex"),
-        laneId: l.getAttribute("laneId"),
-        type: l.getAttribute("type"),
-        sumoId: l.getAttribute("sumoId"),
-        leftLine: m.geometry.coordinates,
-        rightLine: d.geometry.coordinates
+        ObjectID: n.getAttribute("ObjectID"),
+        id: n.getAttribute("id"),
+        fromNode: n.getAttribute("fromNode"),
+        toNode: n.getAttribute("toNode"),
+        roadId: n.getAttribute("roadId"),
+        roadName: n.getAttribute("roadName"),
+        sectionId: n.getAttribute("sectionId"),
+        sectionIndex: n.getAttribute("sectionIndex"),
+        laneId: n.getAttribute("laneId"),
+        type: n.getAttribute("type"),
+        sumoId: n.getAttribute("sumoId"),
+        leftLine: u.geometry.coordinates,
+        rightLine: g.geometry.coordinates
       },
       symbol: {
         type: "simple-fill",
@@ -1058,20 +1086,97 @@ class O {
         }
       }
     });
-    return this.splitLaneLayer.add(v), this.view.goTo(v), { status: 0, message: "ok", result: { coordinates: u } };
+    return this.splitLaneLayer.add(f), A.viewGoto(this.view, [f]), { status: 0, message: "ok", result: { coordinates: m } };
+  }
+  /**
+   * 封闭车道，使用可计算路网的id
+   * @param params
+   */
+  blockLane(e) {
+    const t = this.allLaneGraphics.filter((s) => {
+      var l;
+      let i = String(s.getAttribute("laneId"));
+      return i.startsWith("-") && (i = i.slice(1)), s.getAttribute("roadId") === e.roadsectId && ((l = s.getAttribute("roadsectBaseIds")) == null ? void 0 : l.includes(e.roadsectBaseId)) && i === String(e.laneId);
+    }), o = t.map((s) => {
+      const i = s.clone();
+      return console.log(
+        t[0].getAttribute("roadsectBaseIds"),
+        this.selectedSectionIds,
+        this.selectedSectionIds.includes(
+          t[0].getAttribute("roadsectBaseIds")
+        )
+      ), i.symbol = {
+        type: "simple-fill",
+        color: this.selectedSectionIds.includes(
+          t[0].getAttribute("roadsectBaseIds")
+        ) ? [255, 69, 0, 0.8] : [255, 0, 0, 0.8],
+        outline: {
+          color: "red"
+        }
+      }, i;
+    });
+    this.splitLaneLayer.addMany(o), A.viewGoto(this.view, o);
   }
   clearSplitLane() {
     this.splitLaneLayer.removeAll();
   }
+  selectComputable(e) {
+    if (e.type === "roadsectBase") {
+      this.allLaneGraphics.forEach((o) => {
+        o.getAttribute("roadsectBaseIds") || console.log(o.attributes);
+      });
+      const t = this.allLaneGraphics.filter((o) => {
+        var s;
+        return (s = o.getAttribute("roadsectBaseIds")) == null ? void 0 : s.includes(e.id);
+      });
+      if (t.length > 0) {
+        const o = L.union(
+          t.map((r) => r.geometry)
+        ), s = t[0].getAttribute("roadsectBaseIds"), i = new I({
+          geometry: o,
+          symbol: {
+            type: "simple-fill",
+            color: [0, 255, 255, 0.5],
+            style: "solid",
+            outline: {
+              color: [0, 255, 255],
+              width: 1
+            }
+          },
+          attributes: {
+            type: "OpenDriveSection",
+            roadsectBaseIds: s
+          }
+        });
+        this.sectionLayer.removeAll(), this.sectionLayer.add(i), A.viewGoto(this.view, [i]), this.selectedSectionIds = [s];
+        const l = this.splitLaneLayer.graphics.filter(
+          (r) => {
+            var a;
+            return (a = r.getAttribute("roadsectBaseIds")) == null ? void 0 : a.includes(e.id);
+          }
+        );
+        l.length > 0 && l.forEach(
+          (r) => r.symbol = {
+            type: "simple-fill",
+            color: [255, 69, 0],
+            outline: {
+              color: "red",
+              width: 2
+            }
+          }
+        );
+      }
+    }
+  }
   /**
    * 更新所有路口的symbol
    * @param symbolStyle
    */
   updateAllJunctionSymbol(e) {
     const t = this.junctionLayer.graphics.clone();
-    this.junctionLayer.removeAll(), t.forEach((s) => {
-      s.getAttribute("selected") || (s.symbol = this.getCrossGraphicSymbol(
-        s.attributes,
+    this.junctionLayer.removeAll(), t.forEach((o) => {
+      o.getAttribute("selected") || (o.symbol = this.getCrossGraphicSymbol(
+        o.attributes,
         e
       ));
     }), this.junctionLayer.addMany(t.toArray());
@@ -1083,16 +1188,16 @@ class O {
    * @returns
    */
   getCrossGraphicSymbol(e, t) {
-    const s = e.crossId !== "" && e.crossId !== void 0 && e.crossId !== null;
+    const o = e.crossId !== "" && e.crossId !== void 0 && e.crossId !== null;
     if (t === "marker")
       return {
         type: "picture-marker",
-        url: `/GisViewerAssets/Images/cross/${s ? "gis_xhj_blue" : "gis_lkcz_xz"}.png`,
+        url: `/GisViewerAssets/Images/cross/${o ? "gis_xhj_blue" : "gis_lkcz_xz"}.png`,
         width: "32px",
         height: "32px"
       };
     if (t === "picture")
-      return s ? {
+      return o ? {
         type: "cim",
         data: {
           type: "CIMSymbolReference",
@@ -1130,7 +1235,7 @@ class O {
                       height: 12,
                       horizontalAlignment: "Center",
                       offsetX: 0,
-                      offsetY: s ? 25 : 15,
+                      offsetY: o ? 25 : 15,
                       haloSize: 2,
                       haloSymbol: {
                         type: "CIMPolygonSymbol",