gisviewer-vue3-arcgis 1.0.166 → 1.0.168

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

@@ -1,9 +1,10 @@
 import c from "@arcgis/core/Graphic";
 import p from "@arcgis/core/layers/GraphicsLayer";
-import m from "../../stores/index.mjs";
-class f {
+import { toRaw as m } from "vue";
+import g from "../../stores/index.mjs";
+class M {
   constructor(i) {
-    this.appDataStore = m.useAppDataStore, this.logTable = [
+    this.appDataStore = g.useAppDataStore, this.logTable = [
       [
         "uuid",
         "ptcId",
@@ -29,7 +30,7 @@ class f {
         "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 = JSON.parse(JSON.stringify(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 p({
       id: "vehicleLayer"
     }), this.view.map.add(this.vehicleLayer), this.rafSignal = requestAnimationFrame(() => this.render());
   }
@@ -350,5 +351,5 @@ class f {
   }
 }
 export {
-  f as default
+  M as default
 };

package/es/src/gis-map/utils/map-initializer.d.ts

@@ -11,6 +11,7 @@ export default class MapInitializer {
      */
     initialize(params: {
         container: HTMLElement;
+        mapConfig: any;
         markerClickCallback?: (type: string, id: string, detail: any, event?: any) => void;
         mapClickCallback?: (mapPoint: number[], screenPoint: number[], event?: any) => void;
     }): Promise<MapView | SceneView>;

package/es/src/gis-map/utils/map-initializer.mjs

@@ -1,20 +1,19 @@
-import y from "@arcgis/core/Basemap";
-import g from "@arcgis/core/config";
-import * as M from "@arcgis/core/core/reactiveUtils";
-import { Polygon as P, Polyline as L, Point as k } from "@arcgis/core/geometry";
-import * as f from "@arcgis/core/geometry/support/webMercatorUtils";
-import W from "@arcgis/core/layers/GeoJSONLayer";
-import z from "@arcgis/core/layers/MapImageLayer";
-import x from "@arcgis/core/layers/TileLayer";
-import S from "@arcgis/core/layers/WebTileLayer";
-import I from "@arcgis/core/Map";
-import O from "@arcgis/core/views/MapView";
-import R from "@arcgis/core/views/SceneView";
-import C from "@turf/destination";
-import * as H from "@turf/helpers";
-import G from "../stores/index.mjs";
+import C from "@arcgis/core/Basemap";
+import d from "@arcgis/core/config";
+import * as k from "@arcgis/core/core/reactiveUtils";
+import { Polygon as W, Polyline as z, Point as T } from "@arcgis/core/geometry";
+import * as w from "@arcgis/core/geometry/support/webMercatorUtils";
+import L from "@arcgis/core/layers/GeoJSONLayer";
+import x from "@arcgis/core/layers/MapImageLayer";
+import I from "@arcgis/core/layers/TileLayer";
+import R from "@arcgis/core/layers/WebTileLayer";
+import H from "@arcgis/core/Map";
+import G from "@arcgis/core/views/MapView";
+import O from "@arcgis/core/views/SceneView";
+import S from "@turf/destination";
+import * as B from "@turf/helpers";
 import N from "./custom-layer/custom-wmts-layer.mjs";
-function T(h, e) {
+function P(h, e) {
   return h && (h.startsWith("http://") || h.startsWith("https://") ? h : e + h);
 }
 class Z {
@@ -27,25 +26,25 @@ class Z {
    * @returns view
    */
   async initialize(e) {
-    const i = G.useAppDataStore, t = JSON.parse(JSON.stringify(i.mapConfig));
-    this.mapConfig = t;
-    const { container: a, markerClickCallback: c, mapClickCallback: d } = e;
-    g.assetsPath = `${t.assetsRoot}/ArcgisAssets`, g.fontsUrl = `${t.assetsRoot}/fonts`, g.apiKey = "AAPKf5a3e1044d7a4faeb3b1ec7060f5c68equIrP2KbRyL-t_b40Kk4GTWUQ1BFCyttvyQPQnWpFmBd7kp9gkrVihjfmcKBwxjW";
-    const n = new I();
-    if ((t == null ? void 0 : t.mapOptions.mode.toLowerCase()) === "2d" ? this.view = new O({
+    var p, u, b, v;
+    this.mapConfig = e.mapConfig;
+    const { container: t, markerClickCallback: s, mapClickCallback: a } = e;
+    d.assetsPath = `${this.mapConfig.assetsRoot}/ArcgisAssets`, d.fontsUrl = `${this.mapConfig.assetsRoot}/fonts`, d.apiKey = "AAPKf5a3e1044d7a4faeb3b1ec7060f5c68equIrP2KbRyL-t_b40Kk4GTWUQ1BFCyttvyQPQnWpFmBd7kp9gkrVihjfmcKBwxjW";
+    const n = new H();
+    if (((p = this.mapConfig) == null ? void 0 : p.mapOptions.mode.toLowerCase()) === "2d" ? this.view = new G({
       map: n,
-      container: a,
-      ...t.mapOptions
-    }) : this.view = new R({
+      container: t,
+      ...this.mapConfig.mapOptions
+    }) : this.view = new O({
       map: n,
-      container: a,
+      container: t,
       environment: {
         atmosphereEnabled: !0,
         lighting: {
           type: "virtual"
         }
       },
-      ...t == null ? void 0 : t.mapOptions
+      ...(u = this.mapConfig) == null ? void 0 : u.mapOptions
     }), this.view.popup.visibleElements = {
       closeButton: !0,
       collapseButton: !1,
@@ -54,35 +53,35 @@ class Z {
     }, this.view.popup.dockOptions = {
       buttonEnabled: !1,
       breakpoint: !1
-    }, this.view.on("click", async (s) => {
-      var b, v;
-      if (d) {
-        let o = s.mapPoint;
-        o.spatialReference.isWebMercator && (o = f.webMercatorToGeographic(
+    }, this.view.on("click", async (i) => {
+      var y, M;
+      if (a) {
+        let o = i.mapPoint;
+        o.spatialReference.isWebMercator && (o = w.webMercatorToGeographic(
           o
-        )), d(
+        )), a(
           [o.x, o.y],
-          [s.screenPoint.x, s.screenPoint.y],
-          s
+          [i.screenPoint.x, i.screenPoint.y],
+          i
         );
       }
       if (this.view.type === "3d") {
         const o = this.view.camera;
         if (this.view.spatialReference.isWebMercator) {
-          const p = f.webMercatorToGeographic(
+          const m = w.webMercatorToGeographic(
             o.position
-          ), w = {
+          ), f = {
             heading: o.heading,
             tilt: o.tilt,
-            position: p.toJSON()
+            position: m.toJSON()
           };
-          console.log(w), (b = navigator.clipboard) == null || b.writeText(JSON.stringify(w));
+          console.log(f), (y = navigator.clipboard) == null || y.writeText(JSON.stringify(f));
         } else
           console.log(o.toJSON());
         console.log(this.view.zoom, this.view.scale);
       } else {
         let o = this.view.center;
-        this.view.spatialReference.isWebMercator && (o = f.webMercatorToGeographic(
+        this.view.spatialReference.isWebMercator && (o = w.webMercatorToGeographic(
           o
         )), console.log({
           center: o.toJSON(),
@@ -90,101 +89,101 @@ class Z {
           scale: this.view.scale
         });
       }
-      const r = (v = (await this.view.hitTest(s)).results) == null ? void 0 : v.filter(
+      const r = (M = (await this.view.hitTest(i)).results) == null ? void 0 : M.filter(
         (o) => o.type === "graphic"
       );
       r.length > 0 && r.forEach((o) => {
-        var w;
-        const p = o.graphic;
-        (w = p.attributes) != null && w.type && c && c(
-          p.attributes.type,
-          p.attributes.id,
-          p.attributes,
-          s
+        var f;
+        const m = o.graphic;
+        (f = m.attributes) != null && f.type && s && s(
+          m.attributes.type,
+          m.attributes.id,
+          m.attributes,
+          i
         );
       });
-    }), t != null && t.baseLayers ? (console.log(t.baseLayers), t.baseLayers.forEach((s) => {
-      const l = T(s.url, t.assetsRoot);
-      switch (s.type.toLowerCase()) {
+    }), (b = this.mapConfig) != null && b.baseLayers ? this.mapConfig.baseLayers.forEach((i) => {
+      const c = P(i.url, this.mapConfig.assetsRoot);
+      switch (i.type.toLowerCase()) {
         case "webTile".toLowerCase(): {
-          const r = new S({
-            urlTemplate: l,
-            ...s.options
+          const r = new R({
+            urlTemplate: c,
+            ...i.options
           });
           n.add(r);
           break;
         }
         case "tile": {
-          const r = new x({
-            url: l,
-            ...s.options
+          const r = new I({
+            url: c,
+            ...i.options
           });
           n.add(r);
           break;
         }
         case "customWMTS".toLowerCase(): {
           const r = new N({
-            urlTemplate: l,
-            ...s.options
+            urlTemplate: c,
+            ...i.options
           });
           n.add(r);
           break;
         }
         case "mapImage".toLowerCase(): {
-          const r = new z({
-            url: l,
-            ...s.options
+          const r = new x({
+            url: c,
+            ...i.options
           });
-          n.add(r), console.log(r);
+          n.add(r);
           break;
         }
         case "arcgis": {
-          const r = new y(s.options);
+          const r = new C(i.options);
           n.basemap = r;
           break;
         }
       }
-    })) : n.basemap = new y({
+    }) : n.basemap = new C({
       style: {
         id: "arcgis/light-gray",
         language: "zh-CN"
       }
-    }), t != null && t.hdLayers) {
-      const s = t.hdLayers.map(
-        (l) => (
+    }), (v = this.mapConfig) != null && v.hdLayers) {
+      const i = this.mapConfig.hdLayers.map(
+        (c) => (
           // 图层文件为GeoJson格式, renderer和symbol使用autocast配置
-          new W({
-            url: T(l.url, t.assetsRoot),
-            ...l.options,
-            title: l.options.id
+          new L({
+            url: P(c.url, this.mapConfig.assetsRoot),
+            ...c.options,
+            title: c.options.id
           })
         )
       );
-      n.addMany(s);
+      n.addMany(i);
     }
-    this.view.ui.remove("attribution"), this.view.ui.add("compass", "top-left"), await this.view.when();
-    const m = this.mapConfig.camera;
-    let u;
+    this.view.ui.remove("attribution"), await this.view.when();
+    const g = this.mapConfig.camera;
+    let l;
     if (this.view.type === "2d") {
-      let s = this.view.center;
-      this.view.spatialReference.isWebMercator && (s = f.webMercatorToGeographic(
-        s
-      )), u = { center: [s.x, s.y], zoom: this.view.zoom };
+      let i = this.view.center;
+      this.view.spatialReference.isWebMercator && (i = w.webMercatorToGeographic(
+        i
+      )), l = { center: [i.x, i.y], zoom: this.view.zoom };
     } else {
-      let s = this.view.camera.position;
-      this.view.spatialReference.isWebMercator && (s = f.webMercatorToGeographic(
-        s
-      )), u = {
-        position: s,
+      let i = this.view.camera.position;
+      this.view.spatialReference.isWebMercator && (i = w.webMercatorToGeographic(
+        i
+      )), l = {
+        position: i,
         heading: this.view.camera.heading,
         tilt: this.view.camera.tilt
       };
     }
-    return m ? m.home = u : this.mapConfig.camera = { home: u }, this.view;
+    return g ? g.home = l : this.mapConfig.camera = { home: l }, this.view;
   }
   setLayerVisibility(e) {
-    const { id: i, visible: t } = e, a = this.view.map.findLayerById(i);
-    return a ? (a.visible = t, { status: 0, message: "ok" }) : { status: -1, message: "未找到图层" };
+    const { id: t, visible: s } = e, a = this.view.map.findLayerById(t);
+    return a ? (a.visible = s, { status: 0, message: "ok" }) : { status: -1, message: "未找到图层" };
   }
   /**
    * 设置地图中心点
@@ -192,19 +191,19 @@ class Z {
    * @returns
    */
   async setMapCenter(e) {
-    var i;
+    var t;
     if (!this.view)
       return { status: -1, message: "未初始化" };
     if (e.center || e.target) {
-      switch ((i = e.target) == null ? void 0 : i.type) {
+      switch ((t = e.target) == null ? void 0 : t.type) {
         case "point":
-          e.target = new k(e.target);
+          e.target = new T(e.target);
           break;
         case "polyline":
-          e.target = new L(e.target);
+          e.target = new z(e.target);
           break;
         case "polygon":
-          e.target = new P(e.target);
+          e.target = new W(e.target);
           break;
       }
       await this.view.goTo(e, { duration: (e.duration || 0) * 1e3 });
@@ -217,8 +216,8 @@ class Z {
   async lookAt(e) {
     if (this.view.type === "2d")
       return;
-    const i = e.tilt || 0, t = e.heading || 0;
-    if (i === 0)
+    const t = e.tilt || 0, s = e.heading || 0;
+    if (t === 0)
       await this.view.goTo(
         {
           position: {
@@ -226,16 +225,16 @@ class Z {
             y: e.center[1],
             z: e.height
           },
-          heading: t,
+          heading: s,
           tilt: 0
         },
         { duration: (e.duration || 2) * 1e3 }
       );
     else {
-      const a = Math.tan(i * Math.PI / 180) * e.height, c = C(
-        H.point(e.center),
+      const a = Math.tan(t * Math.PI / 180) * e.height, n = S(
+        B.point(e.center),
         a,
-        t + 180,
+        s + 180,
         {
           units: "meters"
         }
@@ -243,12 +242,12 @@ class Z {
       await this.view.goTo(
         {
           position: {
-            x: c.geometry.coordinates[0],
-            y: c.geometry.coordinates[1],
+            x: n.geometry.coordinates[0],
+            y: n.geometry.coordinates[1],
             z: e.height
           },
-          heading: t,
-          tilt: i
+          heading: s,
+          tilt: t
         },
         { duration: (e.duration || 2) * 1e3 }
       );
@@ -257,32 +256,32 @@ class Z {
   async setMapCamera(e) {
     if (!this.view)
       return { status: -1, message: "未初始化" };
-    const { name: i, duration: t = 0 } = e, { camera: a } = this.mapConfig;
+    const { name: t, duration: s = 0 } = e, { camera: a } = this.mapConfig;
     if (!a)
       return { status: -1, message: "未配置camera" };
-    const c = a[i];
-    return c ? (await this.view.goTo(c, { duration: t * 1e3 }), { status: 0, message: "成功" }) : { status: -1, message: "未配置camera" };
+    const n = a[t];
+    return n ? (await this.view.goTo(n, { duration: s * 1e3 }), { status: 0, message: "成功" }) : { status: -1, message: "未配置camera" };
   }
   /**
    * 经纬度转像素坐标，在地图移动时回调
    * */
-  requestCoordinateTransform(e, i) {
-    let t = 0;
-    const c = 1e3 / 30, d = M.watch(
+  requestCoordinateTransform(e, t) {
+    let s = 0;
+    const n = 1e3 / 30, g = k.watch(
       () => this.view.center,
       () => {
-        const n = this.transformPoints(e), m = Date.now();
-        m - t > c && (i(n), t = m);
+        const l = this.transformPoints(e), p = Date.now();
+        p - s > n && (t(l), s = p);
       }
     );
-    return this.handleIndex++, this.watchHandleMap.set(this.handleIndex, d), { handle: this.handleIndex, points: this.transformPoints(e) };
+    return this.handleIndex++, this.watchHandleMap.set(this.handleIndex, g), { handle: this.handleIndex, points: this.transformPoints(e) };
   }
   transformPoints(e) {
-    return e.map((i) => {
-      const t = new k({
-        x: i[0],
-        y: i[1]
-      }), a = this.view.toScreen(t);
+    return e.map((t) => {
+      const s = new T({
+        x: t[0],
+        y: t[1]
+      }), a = this.view.toScreen(s);
       return [a.x, a.y];
     });
   }
@@ -290,18 +289,18 @@ class Z {
    * 停止坐标转换回调
    * */
   cancelCoordinateTransform(e) {
-    const i = this.watchHandleMap.get(e);
-    i && (i.remove(), this.watchHandleMap.delete(e));
+    const t = this.watchHandleMap.get(e);
+    t && (t.remove(), this.watchHandleMap.delete(e));
   }
   /**
    * 设置地图zoom范围
    * */
   setMapZoomRange(e) {
-    const { min: i, max: t } = e;
-    !i && !t || (this.zoomWatchHandle && this.zoomWatchHandle.remove(), this.zoomWatchHandle = M.watch(
+    const { min: t, max: s } = e;
+    !t && !s || (this.zoomWatchHandle && this.zoomWatchHandle.remove(), this.zoomWatchHandle = k.watch(
       () => this.view.zoom,
       (a) => {
-        i && a <= i && (this.view.zoom = i), t && a >= t && (this.view.zoom = t);
+        t && a <= t && (this.view.zoom = t), s && a >= s && (this.view.zoom = s);
       }
     ));
   }

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

@@ -13,11 +13,12 @@ export default class SignalControlAreaController {
     locateSignalControlArea(params: {
         id: string;
     }): Promise<IResult>;
-    private showPopup;
     highlightSignalControlArea(params: {
         id: string;
     }): Promise<IResult>;
     resetHighlight(): IResult;
+    showSubSignalControlArea(params: any): IResult;
+    editSubSignalArea(): IResult;
     /**
      * 在区控\子区\路口图层中查找对应的graphic
      * @param id
@@ -31,6 +32,7 @@ export default class SignalControlAreaController {
      * @returns
      */
     private drawArea;
+    private getCrossGraphicInSubDistrict;
     /**
      * 生成路口点符号。在不同比例尺下，使用不同的符号
      * @param attributes