gisviewer-vue3-arcgis 1.0.266 → 1.0.268

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

@@ -1,12 +1,12 @@
 import L from "@arcgis/core/Basemap";
 import v from "@arcgis/core/config";
 import * as M from "@arcgis/core/core/reactiveUtils";
-import { Multipoint as z, Polygon as k, Polyline as W, Point as T } from "@arcgis/core/geometry";
+import { Multipoint as W, Polygon as k, Polyline as I, Point as T } from "@arcgis/core/geometry";
 import * as b from "@arcgis/core/geometry/support/webMercatorUtils";
-import { webMercatorToGeographic as I } from "@arcgis/core/geometry/support/webMercatorUtils";
+import { webMercatorToGeographic as G } from "@arcgis/core/geometry/support/webMercatorUtils";
 import C from "@arcgis/core/Graphic";
-import G from "@arcgis/core/layers/FeatureLayer";
-import x from "@arcgis/core/layers/GeoJSONLayer";
+import x from "@arcgis/core/layers/FeatureLayer";
+import P from "@arcgis/core/layers/GeoJSONLayer";
 import S from "@arcgis/core/layers/GroupLayer";
 import H from "@arcgis/core/layers/IntegratedMesh3DTilesLayer";
 import B from "@arcgis/core/layers/MapImageLayer";
@@ -15,9 +15,9 @@ import R from "@arcgis/core/layers/WebTileLayer";
 import E from "@arcgis/core/layers/WMSLayer";
 import N from "@arcgis/core/Map";
 import A from "@arcgis/core/views/MapView";
-import U from "@arcgis/core/views/SceneView";
-import V from "@turf/destination";
-import * as j from "@turf/helpers";
+import j from "@arcgis/core/views/SceneView";
+import U from "@turf/destination";
+import * as V from "@turf/helpers";
 import D from "@arcgis/core/layers/GraphicsLayer";
 import J from "./custom-layer/custom-wmts-layer.mjs";
 class me {
@@ -35,7 +35,7 @@ class me {
   async initialize(e) {
     var p, u, g, f;
     this.mapConfig = e.mapConfig;
-    const { container: i, markerClickCallback: s, mapClickCallback: a } = e;
+    const { container: i, markerClickCallback: s, mapClickCallback: r } = e;
     v.assetsPath = `${this.mapConfig.assetsRoot}/ArcgisAssets`, v.fontsUrl = `${this.mapConfig.assetsRoot}/fonts`, v.apiKey = "AAPKf5a3e1044d7a4faeb3b1ec7060f5c68equIrP2KbRyL-t_b40Kk4GTWUQ1BFCyttvyQPQnWpFmBd7kp9gkrVihjfmcKBwxjW";
     const o = new N();
     ((p = this.mapConfig) == null ? void 0 : p.mapOptions.mode.toLowerCase()) === "2d" ? (this.view = new A({
@@ -44,7 +44,7 @@ class me {
       ...this.mapConfig.mapOptions
     }), this.view.on("drag", (t) => {
       t.button === 2 && t.stopPropagation();
-    })) : this.view = new U({
+    })) : this.view = new j({
       map: o,
       container: i,
       environment: {
@@ -64,46 +64,46 @@ class me {
       breakpoint: !1
     }, this.view.on("click", async (t) => {
       var h, y;
-      if (a) {
-        let n = t.mapPoint;
-        n.spatialReference.isWebMercator && (n = b.webMercatorToGeographic(
-          n
-        )), a(
-          [n.x, n.y],
+      if (r) {
+        let c = t.mapPoint;
+        c.spatialReference.isWebMercator && (c = b.webMercatorToGeographic(
+          c
+        )), r(
+          [c.x, c.y],
           [t.screenPoint.x, t.screenPoint.y],
           t
         );
       }
       if (this.view.type === "3d") {
-        const n = this.view.camera;
+        const c = this.view.camera;
         if (this.view.spatialReference.isWebMercator) {
           const w = b.webMercatorToGeographic(
-            n.position
+            c.position
           ), d = {
-            heading: n.heading,
-            tilt: n.tilt,
+            heading: c.heading,
+            tilt: c.tilt,
             position: w.toJSON()
           };
           console.log(d), (h = navigator.clipboard) == null || h.writeText(JSON.stringify(d));
         } else
-          console.log(n.toJSON());
+          console.log(c.toJSON());
         console.log(this.view.zoom, this.view.scale);
       } else {
-        let n = this.view.center;
-        this.view.spatialReference.isWebMercator && (n = b.webMercatorToGeographic(
-          n
+        let c = this.view.center;
+        this.view.spatialReference.isWebMercator && (c = b.webMercatorToGeographic(
+          c
         )), console.log({
-          center: n.toJSON(),
+          center: c.toJSON(),
           zoom: this.view.zoom,
           scale: this.view.scale
         });
       }
-      const c = (y = (await this.view.hitTest(t)).results) == null ? void 0 : y.filter(
-        (n) => n.type === "graphic"
+      const n = (y = (await this.view.hitTest(t)).results) == null ? void 0 : y.filter(
+        (c) => c.type === "graphic"
       );
-      c.length > 0 && c.forEach((n) => {
+      n.length > 0 && n.forEach((c) => {
         var d;
-        const w = n.graphic;
+        const w = c.graphic;
         (d = w.attributes) != null && d.type && s && s(
           w.attributes.type,
           w.attributes.id,
@@ -113,19 +113,19 @@ class me {
       });
     });
     {
-      let t = 0, r = !1;
-      this.view.on("pointer-move", async (c) => {
+      let t = 0, a = !1;
+      this.view.on("pointer-move", async (n) => {
         var y;
         const h = performance.now();
-        if (!(r || h - t < 100)) {
-          t = h, r = !0;
+        if (!(a || h - t < 100)) {
+          t = h, a = !0;
           try {
-            const w = (y = (await this.view.hitTest(c)).results) == null ? void 0 : y.some(
-              (P) => P.type === "graphic"
+            const w = (y = (await this.view.hitTest(n)).results) == null ? void 0 : y.some(
+              (z) => z.type === "graphic"
             ), d = this.view.container;
             d && (d.style.cursor = w ? "pointer" : "default");
           } finally {
-            r = !1;
+            a = !1;
           }
         }
       });
@@ -134,33 +134,33 @@ class me {
       const t = this.view.container;
       t && (t.style.cursor = "default");
     }), (g = this.mapConfig) != null && g.baseLayers ? this.mapConfig.baseLayers.forEach((t) => {
-      const r = this.processUrl(t.url);
-      let c = null;
+      const a = this.processUrl(t.url);
+      let n = null;
       switch (t.type.toLowerCase()) {
         case "webTile".toLowerCase(): {
-          c = new R({
-            urlTemplate: r,
+          n = new R({
+            urlTemplate: a,
             ...t.options
           });
           break;
         }
         case "tile": {
-          c = new O({
-            url: r,
+          n = new O({
+            url: a,
             ...t.options
           });
           break;
         }
         case "customwmts".toLowerCase(): {
-          c = new J({
-            urlTemplate: r,
+          n = new J({
+            urlTemplate: a,
             ...t.options
           });
           break;
         }
         case "mapimage".toLowerCase(): {
-          c = new B({
-            url: r,
+          n = new B({
+            url: a,
             ...t.options
           });
           break;
@@ -171,36 +171,43 @@ class me {
           break;
         }
         case "feature": {
-          c = new G({ url: r, ...t.options });
+          n = new x({ url: a, ...t.options });
           break;
         }
         case "3dtiles": {
-          c = new H({
-            url: r,
+          n = new H({
+            url: a,
             ...t.options
           });
           break;
         }
         case "wms": {
-          c = new E({
-            url: r,
+          n = new E({
+            url: a,
+            ...t.options
+          });
+          break;
+        }
+        case "geojson": {
+          n = new P({
+            url: a,
             ...t.options
           });
           break;
         }
       }
-      if (c)
+      if (n)
         if (t.group) {
           let h = o.findLayerById(t.group);
-          h && h.type === "group" ? h.add(c) : (h = new S({
+          h && h.type === "group" ? h.add(n) : (h = new S({
             id: t.group,
             title: t.groupTitle,
             visibilityMode: "inherited",
-            layers: [c],
+            layers: [n],
             visible: t.groupVisible !== !1
           }), o.add(h));
         } else
-          o.add(c);
+          o.add(n);
     }) : o.basemap = new L({
       style: {
         id: "arcgis/light-gray",
@@ -208,12 +215,12 @@ class me {
       }
     }), (f = this.mapConfig) != null && f.hdLayers) {
       const t = this.mapConfig.hdLayers.map(
-        (r) => (
+        (a) => (
           // 图层文件为GeoJson格式, renderer和symbol使用autocast配置
-          new x({
-            url: this.processUrl(r.url),
-            ...r.options,
-            title: r.options.id
+          new P({
+            url: this.processUrl(a.url),
+            ...a.options,
+            title: a.options.id
           })
         )
       );
@@ -244,8 +251,8 @@ class me {
     if (i === "shanghai_district")
       return !this.detachmentLayerLoaded && e.visible ? await this.loadDetachmentLayer() : this.detachmentLayer && (this.detachmentLayer.visible = s), { status: 0, message: "ok" };
     {
-      const a = this.view.map.findLayerById(i);
-      return a ? (a.visible = s, { status: 0, message: "ok" }) : { status: -1, message: "未找到图层" };
+      const r = this.view.map.findLayerById(i);
+      return r ? (r.visible = s, { status: 0, message: "ok" }) : { status: -1, message: "未找到图层" };
     }
   }
   /**
@@ -263,13 +270,13 @@ class me {
           e.target = new T(e.target);
           break;
         case "polyline":
-          e.target = new W(e.target);
+          e.target = new I(e.target);
           break;
         case "polygon":
           e.target = new k(e.target);
           break;
         case "multipoint":
-          e.target = new z(e.target);
+          e.target = new W(e.target);
           break;
       }
       await this.view.goTo(e, { duration: (e.duration || 0) * 1e3 });
@@ -300,9 +307,9 @@ class me {
         { duration: (e.duration || 2) * 1e3 }
       );
     else {
-      const a = Math.tan(i * Math.PI / 180) * e.height, o = V(
-        j.point(e.center),
-        a,
+      const r = Math.tan(i * Math.PI / 180) * e.height, o = U(
+        V.point(e.center),
+        r,
         s + 180,
         {
           units: "meters"
@@ -325,10 +332,10 @@ class me {
   async setMapCamera(e) {
     if (!this.view)
       return { status: -1, message: "未初始化" };
-    const { name: i, duration: s = 0 } = e, { camera: a } = this.mapConfig;
-    if (!a)
+    const { name: i, duration: s = 0 } = e, { camera: r } = this.mapConfig;
+    if (!r)
       return { status: -1, message: "未配置camera" };
-    const o = a[i];
+    const o = r[i];
     return o ? (await this.view.goTo(o, { duration: s * 1e3 }), { status: 0, message: "成功" }) : { status: -1, message: "未配置camera" };
   }
   /**
@@ -350,8 +357,8 @@ class me {
       const s = new T({
         x: i[0],
         y: i[1]
-      }), a = this.view.toScreen(s);
-      return [a.x, a.y];
+      }), r = this.view.toScreen(s);
+      return [r.x, r.y];
     });
   }
   /**
@@ -368,8 +375,8 @@ class me {
     const { min: i, max: s } = e;
     !i && !s || (this.zoomWatchHandle && this.zoomWatchHandle.remove(), this.zoomWatchHandle = M.watch(
       () => this.view.zoom,
-      (a) => {
-        i && a <= i && (this.view.zoom = i), s && a >= s && (this.view.zoom = s);
+      (r) => {
+        i && r <= i && (this.view.zoom = i), s && r >= s && (this.view.zoom = s);
       }
     ));
   }
@@ -392,16 +399,16 @@ class me {
     );
     if (i)
       try {
-        const a = await (await fetch(
+        const r = await (await fetch(
           "/GisViewerAssets/ShangHai/Layers/district.json"
         )).json(), o = [], { renderer: l, labelingInfo: m } = i.options;
-        a.features.forEach((p) => {
+        r.features.forEach((p) => {
           const u = p.attributes.ZD_NAME;
           if (u !== "高架支队") {
             let g = new k({
               rings: p.geometry.rings
             });
-            g = I(g);
+            g = G(g);
             const f = new C({
               geometry: g,
               attributes: p.attributes
@@ -410,10 +417,10 @@ class me {
               if (l.type === "simple")
                 f.symbol = l.symbol;
               else if (l.type === "unique-value") {
-                const t = f.getAttribute("OBJECTID"), r = l.uniqueValueInfos.find(
-                  (c) => c.value == t
+                const t = f.getAttribute("OBJECTID"), a = l.uniqueValueInfos.find(
+                  (n) => n.value == t
                 );
-                f.symbol = r ? r.symbol : l.defaultSymbol;
+                f.symbol = a ? a.symbol : l.defaultSymbol;
               }
             } else
               f.symbol = {

package/es/src/gis-map/utils/police-jurisdiction.d.ts

@@ -5,5 +5,11 @@ export default class PoliceJurisdiction {
     private maskLayer;
     constructor(view: __esri.MapView | __esri.SceneView);
     showJurisdiction(params: IShowJurisdictionParams): Promise<IResult>;
+    /**
+     * 显示支队辖区
+     * @param zdCode
+     */
+    private showZD;
+    private showDD;
     clearJurisdiction(): void;
 }

package/es/src/gis-map/utils/police-jurisdiction.mjs

@@ -1,94 +1,66 @@
-import { Polygon as L } from "@arcgis/core/geometry";
-import * as l from "@arcgis/core/geometry/geometryEngine";
-import i from "@arcgis/core/Graphic";
-import S from "@arcgis/core/layers/GraphicsLayer";
-import _ from "axios";
-import { toRaw as b } from "vue";
-import k from "../stores/index.mjs";
-class M {
-  constructor(e) {
-    this.view = e, this.maskLayer = new S({
+import { Polygon as h } from "@arcgis/core/geometry";
+import * as n from "@arcgis/core/geometry/geometryEngine.js";
+import m from "@arcgis/core/Graphic";
+import k from "@arcgis/core/layers/GraphicsLayer";
+import g from "axios";
+import { toRaw as L } from "vue";
+import E from "../stores/index.mjs";
+import f from "./common-utils.mjs";
+class R {
+  constructor(o) {
+    this.view = o, this.maskLayer = new k({
       id: "police-jurisdiction"
     }), this.view.map.add(this.maskLayer);
-    const a = k.useAppDataStore, n = b(a.mapConfig);
-    this.geoServer = n.geoServer;
+    const t = E.useAppDataStore, r = L(t.mapConfig);
+    this.geoServer = r.geoServer;
   }
-  async showJurisdiction(e) {
-    if (!this.geoServer)
-      return { status: -1, message: "未配置GeoServer" };
-    const a = e.type.toLowerCase() === "zd" ? "VIEW_SH_ZD" : "VW_DWD_GEO_SH_DD", n = e.type.toLowerCase() === "zd" ? "ZD_CODE" : "DD_CODE", y = e.type.toLowerCase() === "zd" ? "ZD_NAME" : "DD_NAME", h = e.ids.join(","), s = await _.get(`${this.geoServer}/zd_edpass/wms`, {
+  async showJurisdiction(o) {
+    return this.geoServer ? o.type.toLowerCase() === "zd" ? await this.showZD(o.id) : o.type.toLowerCase() === "dd" ? await this.showDD(o.id) : { status: 0, message: "ok" } : { status: -1, message: "未配置GeoServer" };
+  }
+  /**
+   * 显示支队辖区
+   * @param zdCode
+   */
+  async showZD(o) {
+    let t = await g.get(`${this.geoServer}/zd_edpass/wms`, {
       params: {
         service: "WFS",
         version: "1.1.0",
         request: "GetFeature",
-        typename: `zd_edpass:${a}`,
+        typename: "zd_edpass:VIEW_SH_ZD",
         outputFormat: "application/json",
-        CQL_FILTER: `${n} IN (${h})`
+        CQL_FILTER: `ZD_CODE = ${o}`
       }
     });
-    if (s.status !== 200)
-      return { status: -1, message: s.status + " " + s.statusText };
-    const { features: c } = s.data;
-    if (!c || c.length === 0)
+    if (t.status !== 200)
+      return { status: -1, message: t.status + " " + t.statusText };
+    const { features: r } = t.data;
+    if (!r || r.length === 0)
       return { status: -1, message: "未查询到数据" };
     this.maskLayer.removeAll();
-    const t = [], p = [], d = [];
-    c.forEach((o) => {
-      const w = o.geometry.coordinates, r = new L({
-        rings: w[0]
-      });
-      t.push(r);
-      const v = new i({
-        geometry: r,
-        symbol: {
-          type: "simple-line",
-          style: "dash",
-          color: [111, 100, 255],
-          width: 4
-        }
-      }), D = new i({
-        geometry: r,
-        symbol: {
-          type: "simple-line",
-          style: "solid",
-          color: [111, 100, 255, 0.6],
-          width: 4
-        }
-      });
-      p.push(v, D);
-      const G = new i({
-        geometry: r.centroid,
-        symbol: {
-          type: "text",
-          color: [0, 0, 0],
-          haloColor: [255, 255, 255],
-          haloSize: "1px",
-          text: o.properties[y],
-          font: {
-            size: "14px",
-            weight: "bold",
-            family: "msyh"
-          }
-        }
+    const l = r[0].geometry.coordinates, s = [];
+    l.forEach((e) => {
+      const i = new h({
+        rings: e
       });
-      d.push(G);
+      s.push(i);
     });
-    const u = t[0].centroid, f = l.geodesicBuffer(
-      u,
+    const p = s[0].centroid, u = n.geodesicBuffer(
+      p,
       100,
       "kilometers"
     );
-    let m = l.difference(
-      f,
-      t[0]
+    let a = n.difference(
+      u,
+      s[0]
     );
-    for (let o = 1; o < t.length; o++)
-      m = l.difference(
-        m,
-        t[o]
+    for (let e = 1; e < s.length; e++)
+      a = n.difference(
+        a,
+        s[e]
       );
-    const g = new i({
-      geometry: m,
+    const y = new m({
+      geometry: a,
       symbol: {
         type: "simple-fill",
         color: [100, 100, 100, 0.8],
@@ -98,12 +70,133 @@ class M {
       },
       attributes: { type: "mask" }
     });
-    return this.maskLayer.add(g), this.maskLayer.addMany(p), this.maskLayer.addMany(d), await this.view.goTo(t), { status: 0, message: "ok" };
+    this.maskLayer.add(y);
+    const d = s.map((e) => new m({
+      geometry: e,
+      symbol: {
+        type: "simple-line",
+        style: "solid",
+        color: [240, 156, 69],
+        width: 2
+      }
+    }));
+    if (this.maskLayer.addMany(d), await f.viewGoto(this.view, d), t = await g.get(`${this.geoServer}/zd_edpass/wms`, {
+      params: {
+        service: "WFS",
+        version: "1.1.0",
+        request: "GetFeature",
+        typename: "zd_edpass:VW_DWD_GEO_SH_DD",
+        outputFormat: "application/json",
+        CQL_FILTER: `ZD_CODE = ${o}`
+      }
+    }), t.status === 200) {
+      const { features: e } = t.data;
+      if (e && e.length > 0) {
+        const i = [];
+        e.forEach((c) => {
+          c.geometry.coordinates.forEach((_) => {
+            const v = new h({
+              rings: _
+            }), G = new m({
+              geometry: v,
+              symbol: {
+                type: "simple-line",
+                style: "dash",
+                color: [240, 156, 69],
+                width: 1
+              }
+            });
+            i.push(G);
+          });
+          const w = c.properties.DD_NAME, D = new m({
+            geometry: {
+              type: "point",
+              longitude: c.properties.CENTER_X,
+              latitude: c.properties.CENTER_Y
+            },
+            symbol: {
+              type: "text",
+              color: [240, 156, 69],
+              haloColor: [255, 255, 255],
+              haloSize: "2px",
+              text: w,
+              font: {
+                size: "14px",
+                weight: "bold",
+                family: "msyh"
+              }
+            }
+          });
+          i.push(D);
+        }), this.maskLayer.addMany(i);
+      }
+    }
+    return { status: 0, message: "ok" };
+  }
+  async showDD(o) {
+    this.maskLayer.removeAll();
+    const t = await g.get(`${this.geoServer}/zd_edpass/wms`, {
+      params: {
+        service: "WFS",
+        version: "1.1.0",
+        request: "GetFeature",
+        typename: "zd_edpass:VW_DWD_GEO_SH_DD",
+        outputFormat: "application/json",
+        CQL_FILTER: `DD_CODE = ${o}`
+      }
+    });
+    if (console.log(t), t.status !== 200)
+      return { status: -1, message: t.status + " " + t.statusText };
+    const { features: r } = t.data;
+    if (!r || r.length === 0)
+      return { status: -1, message: "未查询到数据" };
+    const l = r[0].geometry.coordinates, s = [];
+    l.forEach((e) => {
+      const i = new h({
+        rings: e
+      });
+      s.push(i);
+    });
+    const p = s[0].centroid, u = n.geodesicBuffer(
+      p,
+      100,
+      "kilometers"
+    );
+    let a = n.difference(
+      u,
+      s[0]
+    );
+    for (let e = 1; e < s.length; e++)
+      a = n.difference(
+        a,
+        s[e]
+      );
+    const y = new m({
+      geometry: a,
+      symbol: {
+        type: "simple-fill",
+        color: [100, 100, 100, 0.8],
+        outline: {
+          width: 0
+        }
+      }
+    });
+    this.maskLayer.add(y);
+    const d = s.map((e) => new m({
+      geometry: e,
+      symbol: {
+        type: "simple-line",
+        style: "dash",
+        color: [240, 156, 69],
+        width: 1
+      }
+    }));
+    return this.maskLayer.addMany(d), await f.viewGoto(this.view, d), { status: 0, message: "ok" };
   }
   clearJurisdiction() {
     this.maskLayer.removeAll();
   }
 }
 export {
-  M as default
+  R as default
 };