gisviewer-vue3-arcgis 1.0.205 → 1.0.207

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

@@ -16,6 +16,8 @@ export default class SignalControlAreaController1 {
     private subDistrictControllerOid;
     private signalOid;
     constructor(view: __esri.MapView | __esri.SceneView);
+    /** 暂存等待绘制的区控graphic */
+    private districtGraphics;
     /** 暂存等待绘制的子区graphic */
     private subDistrictGraphics;
     /**

package/es/src/gis-map/utils/signal-control-area-controller/show-area.mjs

@@ -1,17 +1,17 @@
 import y from "@arcgis/core/Graphic";
-import a from "@arcgis/core/layers/FeatureLayer";
+import o from "@arcgis/core/layers/FeatureLayer";
 import c from "@turf/buffer";
 import p from "@turf/convex";
 import * as n from "@turf/helpers";
-import m from "concaveman";
-import h from "../../stores/index.mjs";
+import h from "concaveman";
+import m from "../../stores/index.mjs";
 import g from "./district-controller.mjs";
 class S {
   constructor(e) {
-    var r;
-    this.districtControllerOid = 0, this.subDistrictControllerOid = 0, this.signalOid = 0, this.subDistrictGraphics = [], this.view = e, this.hasGpu = localStorage.getItem("gpu") !== "Unknown";
-    const s = h.useAppDataStore.mapConfig;
-    this.openDriveServer = (r = s.openDriveServer) == null ? void 0 : r.url, this.districtControllerDashLayer = new a({
+    var i;
+    this.districtControllerOid = 0, this.subDistrictControllerOid = 0, this.signalOid = 0, this.districtGraphics = [], this.subDistrictGraphics = [], this.view = e, this.hasGpu = localStorage.getItem("gpu") !== "Unknown";
+    const t = m.useAppDataStore.mapConfig;
+    this.openDriveServer = (i = t.openDriveServer) == null ? void 0 : i.url, this.districtControllerDashLayer = new o({
       id: "districtController",
       spatialReference: e.spatialReference,
       source: [],
@@ -49,7 +49,7 @@ class S {
           width: 3
         }
       }
-    }), this.districtControllerSolidLayer = new a({
+    }), this.districtControllerSolidLayer = new o({
       id: "districtController",
       spatialReference: e.spatialReference,
       source: [],
@@ -109,7 +109,7 @@ class S {
           width: 3
         }
       }
-    }), this.subDistrictControllerLayer = new a({
+    }), this.subDistrictControllerLayer = new o({
       id: "subDistrictController",
       spatialReference: e.spatialReference,
       source: [],
@@ -173,7 +173,7 @@ class S {
           width: 3
         }
       }
-    }), this.signalMarkerLayer = new a({
+    }), this.signalMarkerLayer = new o({
       id: "signalLayer",
       spatialReference: e.spatialReference,
       source: [],
@@ -291,7 +291,7 @@ class S {
           }
         ]
       }
-    }), this.signalPictureLayer = new a({
+    }), this.signalPictureLayer = new o({
       id: "signalLayer",
       spatialReference: e.spatialReference,
       source: [],
@@ -576,17 +576,20 @@ class S {
    */
   async showSignalControlArea(e) {
     await this.clearSignalControlArea(), this.districtControllerDashLayer.visible = !0, this.districtControllerSolidLayer.visible = !0, this.subDistrictControllerLayer.visible = !1, this.signalMarkerLayer.visible = !1, this.signalPictureLayer.visible = !1;
-    for (const s of e.areaList) {
-      const r = new g(
-        s,
+    for (const r of e.areaList) {
+      const t = new g(
+        r,
         e.style || ""
       );
-      await this.drawArea(r, !0), await this.subDistrictControllerLayer.applyEdits({
+      await this.drawArea(t, !0), await this.subDistrictControllerLayer.applyEdits({
         addFeatures: this.subDistrictGraphics
       }), this.subDistrictGraphics = [];
     }
-    const t = await this.districtControllerDashLayer.queryFeatures();
-    return this.view.goTo(t.features), { status: 0, message: "ok" };
+    return await this.districtControllerDashLayer.applyEdits({
+      addFeatures: this.districtGraphics
+    }), await this.districtControllerSolidLayer.applyEdits({
+      addFeatures: this.districtGraphics
+    }), this.view.goTo(this.districtGraphics), this.districtGraphics = [], { status: 0, message: "ok" };
   }
   /**
    * 清空区控、子区、信号机
@@ -634,30 +637,30 @@ class S {
   async locateSignalControlArea(e) {
     switch (e.type) {
       case "district": {
-        const r = this.districtControllerDashLayer.createQuery();
-        r.where = `id = '${e.id}'`, r.returnGeometry = !0, r.outFields = ["*"];
-        const i = await this.districtControllerDashLayer.queryFeatures(
-          r
+        const i = this.districtControllerDashLayer.createQuery();
+        i.where = `id = '${e.id}'`, i.returnGeometry = !0, i.outFields = ["*"];
+        const a = await this.districtControllerDashLayer.queryFeatures(
+          i
         );
-        return i.features.length > 0 ? (await this.view.goTo(i.features, {
+        return a.features.length > 0 ? (await this.view.goTo(a.features, {
           duration: this.hasGpu ? 1e3 : 0
         }), { status: 0, message: "ok" }) : { status: 1, message: "未找到区控" };
       }
       case "subDistrict":
-        const t = this.subDistrictControllerLayer.createQuery();
-        t.where = `id = '${e.id}'`, t.returnGeometry = !0, t.outFields = ["*"];
-        const s = await this.subDistrictControllerLayer.queryFeatures(
-          t
+        const r = this.subDistrictControllerLayer.createQuery();
+        r.where = `id = '${e.id}'`, r.returnGeometry = !0, r.outFields = ["*"];
+        const t = await this.subDistrictControllerLayer.queryFeatures(
+          r
         );
-        return s.features.length > 0 ? (await this.view.goTo(s.features, {
+        return t.features.length > 0 ? (await this.view.goTo(t.features, {
           duration: this.hasGpu ? 1e3 : 0
         }), { status: 0, message: "ok" }) : { status: 1, message: "未找到子区" };
       case "signal": {
-        const r = this.signalMarkerLayer.createQuery();
-        r.where = `id = '${e.id}'`, r.returnGeometry = !0, r.outFields = ["*"];
-        const i = await this.signalMarkerLayer.queryFeatures(r);
-        return i.features.length > 0 ? (await this.view.goTo(
-          { target: i.features[0], scale: 2500 },
+        const i = this.signalMarkerLayer.createQuery();
+        i.where = `id = '${e.id}'`, i.returnGeometry = !0, i.outFields = ["*"];
+        const a = await this.signalMarkerLayer.queryFeatures(i);
+        return a.features.length > 0 ? (await this.view.goTo(
+          { target: a.features[0], scale: 2500 },
           {
             duration: this.hasGpu ? 1e3 : 0
           }
@@ -675,38 +678,41 @@ class S {
   async highlightSignalControlArea(e) {
     switch (e.type) {
       case "district": {
+        const r = this.districtControllerDashLayer.definitionExpression;
         this.districtControllerDashLayer.definitionExpression = `id = '${e.id}'`;
         const t = await this.districtControllerDashLayer.queryFeatures();
         return t.features.length > 0 ? (this.districtControllerSolidLayer.definitionExpression = `id = '${e.id}'`, this.subDistrictControllerLayer.definitionExpression = `parentId = '${e.id}'`, this.signalMarkerLayer.definitionExpression = `districtId = '${e.id}'`, this.signalPictureLayer.definitionExpression = `districtId = '${e.id}'`, await this.view.goTo(t.features, {
           duration: this.hasGpu ? 1e3 : 0
-        }), { status: 0, message: "ok" }) : (this.districtControllerDashLayer.definitionExpression = "1=1", { status: 1, message: "未找到区控" });
+        }), { status: 0, message: "ok" }) : (this.districtControllerDashLayer.definitionExpression = r, { status: 1, message: "未找到区控" });
       }
       case "subDistrict": {
+        const r = this.subDistrictControllerLayer.definitionExpression;
         this.subDistrictControllerLayer.definitionExpression = `id = '${e.id}'`;
         const t = await this.subDistrictControllerLayer.queryFeatures();
         if (t.features.length > 0) {
           this.signalMarkerLayer.definitionExpression = `subDistrictId = '${e.id}'`, this.signalPictureLayer.definitionExpression = `subDistrictId = '${e.id}'`;
-          const r = t.features[0].attributes.parentId;
-          return this.districtControllerDashLayer.definitionExpression = `id = '${r}'`, this.districtControllerSolidLayer.definitionExpression = `id = '${r}'`, await this.view.goTo(t.features, {
+          const a = t.features[0].attributes.parentId;
+          return this.districtControllerDashLayer.definitionExpression = `id = '${a}'`, this.districtControllerSolidLayer.definitionExpression = `id = '${a}'`, await this.view.goTo(t.features, {
             duration: this.hasGpu ? 1e3 : 0
           }), { status: 0, message: "ok" };
         } else
-          return this.subDistrictControllerLayer.definitionExpression = "1=1", { status: 1, message: "未找到子区" };
+          return this.subDistrictControllerLayer.definitionExpression = r, { status: 1, message: "未找到子区" };
       }
       case "signal": {
+        const r = this.signalMarkerLayer.definitionExpression;
         this.signalMarkerLayer.definitionExpression = `id = '${e.id}'`;
         const t = await this.signalMarkerLayer.queryFeatures();
         if (t.features.length > 0) {
           this.signalPictureLayer.definitionExpression = `id = '${e.id}'`;
-          const s = t.features[0], { districtId: r, subDistrictId: i } = s.attributes;
-          return this.districtControllerDashLayer.definitionExpression = `id = '${r}'`, this.districtControllerSolidLayer.definitionExpression = `id = '${r}'`, this.subDistrictControllerLayer.definitionExpression = `id = '${i}'`, await this.view.goTo(
+          const i = t.features[0], { districtId: a, subDistrictId: l } = i.attributes;
+          return this.districtControllerDashLayer.definitionExpression = `id = '${a}'`, this.districtControllerSolidLayer.definitionExpression = `id = '${a}'`, this.subDistrictControllerLayer.definitionExpression = `id = '${l}'`, await this.view.goTo(
             { target: t.features, zoom: 2500 },
             {
               duration: this.hasGpu ? 1e3 : 0
             }
           ), { status: 0, message: "ok" };
         } else
-          return this.signalMarkerLayer.definitionExpression = "1=1", { status: 1, message: "未找到信号机" };
+          return this.signalMarkerLayer.definitionExpression = r, { status: 1, message: "未找到信号机" };
       }
       default:
         return { status: 1, message: "未知类型" };
@@ -729,77 +735,76 @@ class S {
    * @param isDistrict 是否是区控
    * @returns
    */
-  async drawArea(e, t) {
-    const s = e.getAllSignalCoordinates();
-    if (s.length >= 2) {
-      let i = null;
-      if (s.length === 2)
-        i = n.lineString(s);
+  async drawArea(e, r) {
+    const t = e.getAllSignalCoordinates();
+    let i;
+    if (t.length >= 2)
+      if (t.length === 2)
+        i = n.lineString(t);
       else {
-        if (t) {
-          const l = n.featureCollection(
-            s.map((d) => n.point(d))
+        if (r) {
+          const s = n.featureCollection(
+            t.map((u) => n.point(u))
           );
-          i = p(l);
+          i = p(s);
         } else {
-          const l = m(s, 0.5);
-          l.length >= 4 && (i = n.polygon([l]));
+          const s = h(t, 0.5);
+          s.length >= 4 && (i = n.polygon([s]));
         }
-        i || (i = n.lineString(s));
+        i || (i = n.lineString(t));
       }
-      const u = c(
-        i.geometry,
-        // 区控面积更大，需要更大的缓冲半径
-        t ? 200 : 30,
-        {
-          units: "meters"
-        }
-      ), o = new y({
-        geometry: {
-          type: "polyline",
-          paths: u.geometry.coordinates
-        },
-        attributes: {
-          ObjectID: t ? this.districtControllerOid++ : this.subDistrictControllerOid++,
-          id: e.id,
-          name: e.name,
-          subDistrictCount: e.subDistrictCount,
-          signalCount: e.signalCount,
-          parentId: e.parentId,
-          parentName: e.parentName
-        }
-      });
-      t ? (await this.districtControllerDashLayer.applyEdits({
-        addFeatures: [o]
-      }), await this.districtControllerSolidLayer.applyEdits({
-        addFeatures: [o]
-      })) : this.subDistrictGraphics.push(o);
-    }
-    for (const i of e.subDistricts)
-      await this.drawArea(i, !1);
-    const r = e.signals.map((i) => new y({
+    else if (t.length === 1)
+      i = n.point(t[0]);
+    else
+      return;
+    const a = c(
+      i.geometry,
+      // 区控面积更大，需要更大的缓冲半径
+      r ? 200 : 30,
+      {
+        units: "meters"
+      }
+    ), l = new y({
+      geometry: {
+        type: "polyline",
+        paths: a.geometry.coordinates
+      },
+      attributes: {
+        ObjectID: r ? this.districtControllerOid++ : this.subDistrictControllerOid++,
+        id: e.id,
+        name: e.name,
+        subDistrictCount: e.subDistrictCount,
+        signalCount: e.signalCount,
+        parentId: e.parentId,
+        parentName: e.parentName
+      }
+    });
+    r ? this.districtGraphics.push(l) : this.subDistrictGraphics.push(l);
+    for (const s of e.subDistricts)
+      await this.drawArea(s, !1);
+    const d = e.signals.map((s) => new y({
       geometry: {
         type: "point",
-        x: i.longitude,
-        y: i.latitude
+        x: s.longitude,
+        y: s.latitude
       },
       attributes: {
         ObjectID: this.signalOid++,
-        id: i.id,
-        name: i.name,
-        signalId: i.signalId,
-        nodeId: i.nodeId,
-        isKey: i.isKey,
-        districtId: t ? e.id : e.parentId,
-        districtName: t ? e.name : e.parentName,
-        subDistrictId: t ? "" : e.id,
-        subDistrictName: t ? "" : e.name
+        id: s.id,
+        name: s.name,
+        signalId: s.signalId,
+        nodeId: s.nodeId,
+        isKey: s.isKey,
+        districtId: r ? e.id : e.parentId,
+        districtName: r ? e.name : e.parentName,
+        subDistrictId: r ? "" : e.id,
+        subDistrictName: r ? "" : e.name
       }
     }));
     await this.signalMarkerLayer.applyEdits({
-      addFeatures: r
+      addFeatures: d
     }), await this.signalPictureLayer.applyEdits({
-      addFeatures: r
+      addFeatures: d
     });
   }
 }

package/lib/src/gis-map/utils/signal-control-area-controller/show-area.d.ts

@@ -16,6 +16,8 @@ export default class SignalControlAreaController1 {
     private subDistrictControllerOid;
     private signalOid;
     constructor(view: __esri.MapView | __esri.SceneView);
+    /** 暂存等待绘制的区控graphic */
+    private districtGraphics;
     /** 暂存等待绘制的子区graphic */
     private subDistrictGraphics;
     /**

package/lib/src/gis-map/utils/signal-control-area-controller/show-area.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const d=require("@arcgis/core/Graphic"),n=require("@arcgis/core/layers/FeatureLayer"),p=require("@turf/buffer"),h=require("@turf/convex"),m=require("@turf/helpers"),g=require("concaveman"),f=require("../../stores/index.js"),b=require("./district-controller.js");function C(a){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(a){for(const t in a)if(t!=="default"){const s=Object.getOwnPropertyDescriptor(a,t);Object.defineProperty(e,t,s.get?s:{enumerable:!0,get:()=>a[t]})}}return e.default=a,Object.freeze(e)}const l=C(m);class I{constructor(e){var r;this.districtControllerOid=0,this.subDistrictControllerOid=0,this.signalOid=0,this.subDistrictGraphics=[],this.view=e,this.hasGpu=localStorage.getItem("gpu")!=="Unknown";const s=f.default.useAppDataStore.mapConfig;this.openDriveServer=(r=s.openDriveServer)==null?void 0:r.url,this.districtControllerDashLayer=new n({id:"districtController",spatialReference:e.spatialReference,source:[],objectIdField:"ObjectID",geometryType:"polyline",outFields:["*"],fields:[{name:"ObjectID",type:"oid"},{name:"id",type:"string"},{name:"name",type:"string"},{name:"subDistrictCount",type:"integer"},{name:"signalCount",type:"integer"}],renderer:{type:"simple",symbol:{type:"simple-line",style:"long-dash",color:[111,100,255],width:3}}}),this.districtControllerSolidLayer=new n({id:"districtController",spatialReference:e.spatialReference,source:[],objectIdField:"ObjectID",outFields:["*"],geometryType:"polyline",fields:[{name:"ObjectID",type:"oid"},{name:"id",type:"string"},{name:"name",type:"string"},{name:"subDistrictCount",type:"integer"},{name:"signalCount",type:"integer"}],popupTemplate:{title:"{name}",content:[{type:"fields",fieldInfos:[{fieldName:"id",label:"区控编号"},{fieldName:"subDistrictCount",label:"子区数量"},{fieldName:"signalCount",label:"信号机数量"}]}]},renderer:{type:"simple",symbol:{type:"simple-line",style:"solid",color:[111,100,255,.4],width:3}}}),this.subDistrictControllerLayer=new n({id:"subDistrictController",spatialReference:e.spatialReference,source:[],objectIdField:"ObjectID",outFields:["*"],geometryType:"polyline",fields:[{name:"ObjectID",type:"oid"},{name:"id",type:"string"},{name:"name",type:"string"},{name:"parentId",type:"string"},{name:"parentName",type:"string"},{name:"signalCount",type:"integer"}],popupTemplate:{title:"{name} 子区",content:[{type:"fields",fieldInfos:[{fieldName:"id",label:"区控编号"},{fieldName:"parentName",label:"所属区控"},{fieldName:"signalCount",label:"信号机数量"}]}]},renderer:{type:"simple",symbol:{type:"simple-line",style:"solid",color:[5,196,104],width:3}}}),this.signalMarkerLayer=new n({id:"signalLayer",spatialReference:e.spatialReference,source:[],objectIdField:"ObjectID",outFields:["*"],geometryType:"point",maxScale:5e3,fields:[{name:"ObjectID",type:"oid"},{name:"id",type:"string"},{name:"name",type:"string"},{name:"signalId",type:"string"},{name:"nodeId",type:"string"},{name:"isKey",type:"string"},{name:"districtId",type:"string"},{name:"districtName",type:"string"},{name:"subDistrictId",type:"string"},{name:"subDistrictName",type:"string"}],popupTemplate:{title:"{name}信号机",content:[{type:"fields",fieldInfos:[{fieldName:"districtName",label:"区控名称"},{fieldName:"subDistrictName",label:"子区名称"},{fieldName:"signalId",label:"信号机编号"},{fieldName:"nodeId",label:"路口编号"}]}]},renderer:{type:"unique-value",field:"isKey",defaultSymbol:{type:"simple-marker",style:"circle",color:"gray",size:4,outline:{color:"white",width:1}},uniqueValueInfos:[{value:"true",symbol:{type:"simple-marker",style:"circle",color:[254,172,22],size:12,outline:{color:"white",width:1}}},{value:"false",symbol:{type:"simple-marker",style:"circle",color:[5,116,255],size:8,outline:{color:"white",width:1}}}]}}),this.signalPictureLayer=new n({id:"signalLayer",spatialReference:e.spatialReference,source:[],objectIdField:"ObjectID",outFields:["*"],geometryType:"point",minScale:5e3,fields:[{name:"ObjectID",type:"oid"},{name:"id",type:"string"},{name:"name",type:"string"},{name:"signalId",type:"string"},{name:"nodeId",type:"string"},{name:"isKey",type:"string"},{name:"districtId",type:"string"},{name:"districtName",type:"string"},{name:"subDistrictId",type:"string"},{name:"subDistrictName",type:"string"}],popupTemplate:{title:"{name}信号机",content:[{type:"fields",fieldInfos:[{fieldName:"districtName",label:"区控名称"},{fieldName:"subDistrictName",label:"子区名称"},{fieldName:"signalId",label:"信号机编号"},{fieldName:"nodeId",label:"路口编号"}]}]},renderer:{type:"unique-value",field:"isKey",defaultSymbol:{type:"simple-marker",style:"circle",color:"gray",size:4,outline:{color:"white",width:1}},uniqueValueInfos:[{value:"true",symbol:{type:"cim",data:{type:"CIMSymbolReference",primitiveOverrides:[{type:"CIMPrimitiveOverride",primitiveName:"textGraphic",propertyName:"TextString",valueExpressionInfo:{type:"CIMExpressionInfo",title:"Custom",expression:'Replace($feature.name, "与", "/") + "  " + $feature.signalId',returnType:"Default"}}],symbol:{type:"CIMPointSymbol",symbolLayers:[{type:"CIMVectorMarker",size:32,colorLocked:!0,anchorPointUnits:"Relative",frame:{xmin:-16,ymin:-16,xmax:16,ymax:16},markerGraphics:[{type:"CIMMarkerGraphic",primitiveName:"textGraphic",geometry:{x:0,y:0},symbol:{type:"CIMTextSymbol",height:12,horizontalAlignment:"Center",offsetX:0,offsetY:30,haloSize:1,haloSymbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[255,255,255,255]}]},symbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[0,0,0,255]}]},verticalAlignment:"Center"},textString:""}],scaleSymbolsProportionally:!0,respectFrame:!0},{type:"CIMPictureMarker",enable:!0,anchorPoint:{x:0,y:0},anchorPointUnits:"Relative",size:40,rotateClockwise:!0,textureFilter:"Picture",url:"/GisViewerAssets/Images/cross/gis_gjxklk_orange.png"}]}}}},{value:"false",symbol:{type:"cim",data:{type:"CIMSymbolReference",primitiveOverrides:[{type:"CIMPrimitiveOverride",primitiveName:"textGraphic",propertyName:"TextString",valueExpressionInfo:{type:"CIMExpressionInfo",title:"Custom",expression:'Replace($feature.name, "与", "/") + "  " + $feature.signalId',returnType:"Default"}}],symbol:{type:"CIMPointSymbol",symbolLayers:[{type:"CIMVectorMarker",size:32,colorLocked:!0,anchorPointUnits:"Relative",frame:{xmin:-16,ymin:-16,xmax:16,ymax:16},markerGraphics:[{type:"CIMMarkerGraphic",primitiveName:"textGraphic",geometry:{x:0,y:0},symbol:{type:"CIMTextSymbol",height:12,horizontalAlignment:"Center",offsetX:0,offsetY:15,haloSize:1,haloSymbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[255,255,255,255]}]},symbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[0,0,0,255]}]},verticalAlignment:"Center"},textString:""}],scaleSymbolsProportionally:!0,respectFrame:!0},{type:"CIMPictureMarker",enable:!0,anchorPoint:{x:0,y:0},anchorPointUnits:"Relative",size:20,rotateClockwise:!0,textureFilter:"Picture",url:"/GisViewerAssets/Images/cross/gis_xhj_blue.png"}]}}}}]}}),this.view.map.addMany([this.districtControllerSolidLayer,this.districtControllerDashLayer,this.subDistrictControllerLayer,this.signalMarkerLayer,this.signalPictureLayer])}async showSignalControlArea(e){await this.clearSignalControlArea(),this.districtControllerDashLayer.visible=!0,this.districtControllerSolidLayer.visible=!0,this.subDistrictControllerLayer.visible=!1,this.signalMarkerLayer.visible=!1,this.signalPictureLayer.visible=!1;for(const s of e.areaList){const r=new b.default(s,e.style||"");await this.drawArea(r,!0),await this.subDistrictControllerLayer.applyEdits({addFeatures:this.subDistrictGraphics}),this.subDistrictGraphics=[]}const t=await this.districtControllerDashLayer.queryFeatures();return this.view.goTo(t.features),{status:0,message:"ok"}}async clearSignalControlArea(){this.districtControllerOid=0,this.subDistrictControllerOid=0,this.signalOid=0;let e=await this.districtControllerDashLayer.queryFeatures();return await this.districtControllerDashLayer.applyEdits({deleteFeatures:e.features}),e=await this.districtControllerSolidLayer.queryFeatures(),await this.districtControllerSolidLayer.applyEdits({deleteFeatures:e.features}),e=await this.subDistrictControllerLayer.queryFeatures(),await this.subDistrictControllerLayer.applyEdits({deleteFeatures:e.features}),e=await this.signalMarkerLayer.queryFeatures(),await this.signalMarkerLayer.applyEdits({deleteFeatures:e.features}),e=await this.signalPictureLayer.queryFeatures(),await this.signalPictureLayer.applyEdits({deleteFeatures:e.features}),{status:0,message:"ok"}}setLayerVisibility(e){switch(e.visible===!1&&this.view.closePopup(),e.id){case"district":this.districtControllerDashLayer.visible=e.visible,this.districtControllerSolidLayer.visible=e.visible;break;case"subDistrict":this.subDistrictControllerLayer.visible=e.visible;break;case"signal":this.signalMarkerLayer.visible=e.visible,this.signalPictureLayer.visible=e.visible;break}return{status:0,message:"ok"}}async locateSignalControlArea(e){switch(e.type){case"district":{const r=this.districtControllerDashLayer.createQuery();r.where=`id = '${e.id}'`,r.returnGeometry=!0,r.outFields=["*"];const i=await this.districtControllerDashLayer.queryFeatures(r);return i.features.length>0?(await this.view.goTo(i.features,{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}):{status:1,message:"未找到区控"}}case"subDistrict":const t=this.subDistrictControllerLayer.createQuery();t.where=`id = '${e.id}'`,t.returnGeometry=!0,t.outFields=["*"];const s=await this.subDistrictControllerLayer.queryFeatures(t);return s.features.length>0?(await this.view.goTo(s.features,{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}):{status:1,message:"未找到子区"};case"signal":{const r=this.signalMarkerLayer.createQuery();r.where=`id = '${e.id}'`,r.returnGeometry=!0,r.outFields=["*"];const i=await this.signalMarkerLayer.queryFeatures(r);return i.features.length>0?(await this.view.goTo({target:i.features[0],scale:2500},{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}):{status:1,message:"未找到信号机"}}default:return{status:1,message:"未知类型"}}}async highlightSignalControlArea(e){switch(e.type){case"district":{this.districtControllerDashLayer.definitionExpression=`id = '${e.id}'`;const t=await this.districtControllerDashLayer.queryFeatures();return t.features.length>0?(this.districtControllerSolidLayer.definitionExpression=`id = '${e.id}'`,this.subDistrictControllerLayer.definitionExpression=`parentId = '${e.id}'`,this.signalMarkerLayer.definitionExpression=`districtId = '${e.id}'`,this.signalPictureLayer.definitionExpression=`districtId = '${e.id}'`,await this.view.goTo(t.features,{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}):(this.districtControllerDashLayer.definitionExpression="1=1",{status:1,message:"未找到区控"})}case"subDistrict":{this.subDistrictControllerLayer.definitionExpression=`id = '${e.id}'`;const t=await this.subDistrictControllerLayer.queryFeatures();if(t.features.length>0){this.signalMarkerLayer.definitionExpression=`subDistrictId = '${e.id}'`,this.signalPictureLayer.definitionExpression=`subDistrictId = '${e.id}'`;const r=t.features[0].attributes.parentId;return this.districtControllerDashLayer.definitionExpression=`id = '${r}'`,this.districtControllerSolidLayer.definitionExpression=`id = '${r}'`,await this.view.goTo(t.features,{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}}else return this.subDistrictControllerLayer.definitionExpression="1=1",{status:1,message:"未找到子区"}}case"signal":{this.signalMarkerLayer.definitionExpression=`id = '${e.id}'`;const t=await this.signalMarkerLayer.queryFeatures();if(t.features.length>0){this.signalPictureLayer.definitionExpression=`id = '${e.id}'`;const s=t.features[0],{districtId:r,subDistrictId:i}=s.attributes;return this.districtControllerDashLayer.definitionExpression=`id = '${r}'`,this.districtControllerSolidLayer.definitionExpression=`id = '${r}'`,this.subDistrictControllerLayer.definitionExpression=`id = '${i}'`,await this.view.goTo({target:t.features,zoom:2500},{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}}else return this.signalMarkerLayer.definitionExpression="1=1",{status:1,message:"未找到信号机"}}default:return{status:1,message:"未知类型"}}}async resetHighlight(){this.districtControllerDashLayer.definitionExpression="1=1",this.districtControllerSolidLayer.definitionExpression="1=1",this.subDistrictControllerLayer.definitionExpression="1=1",this.signalMarkerLayer.definitionExpression="1=1";const e=await this.districtControllerDashLayer.queryFeatures();return this.view.goTo(e.features,{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}}async drawArea(e,t){const s=e.getAllSignalCoordinates();if(s.length>=2){let i=null;if(s.length===2)i=l.lineString(s);else{if(t){const o=l.featureCollection(s.map(c=>l.point(c)));i=h(o)}else{const o=g(s,.5);o.length>=4&&(i=l.polygon([o]))}i||(i=l.lineString(s))}const y=p(i.geometry,t?200:30,{units:"meters"}),u=new d({geometry:{type:"polyline",paths:y.geometry.coordinates},attributes:{ObjectID:t?this.districtControllerOid++:this.subDistrictControllerOid++,id:e.id,name:e.name,subDistrictCount:e.subDistrictCount,signalCount:e.signalCount,parentId:e.parentId,parentName:e.parentName}});t?(await this.districtControllerDashLayer.applyEdits({addFeatures:[u]}),await this.districtControllerSolidLayer.applyEdits({addFeatures:[u]})):this.subDistrictGraphics.push(u)}for(const i of e.subDistricts)await this.drawArea(i,!1);const r=e.signals.map(i=>new d({geometry:{type:"point",x:i.longitude,y:i.latitude},attributes:{ObjectID:this.signalOid++,id:i.id,name:i.name,signalId:i.signalId,nodeId:i.nodeId,isKey:i.isKey,districtId:t?e.id:e.parentId,districtName:t?e.name:e.parentName,subDistrictId:t?"":e.id,subDistrictName:t?"":e.name}}));await this.signalMarkerLayer.applyEdits({addFeatures:r}),await this.signalPictureLayer.applyEdits({addFeatures:r})}}exports.default=I;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const c=require("@arcgis/core/Graphic"),o=require("@arcgis/core/layers/FeatureLayer"),p=require("@turf/buffer"),h=require("@turf/convex"),m=require("@turf/helpers"),g=require("concaveman"),f=require("../../stores/index.js"),b=require("./district-controller.js");function C(n){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(n){for(const i in n)if(i!=="default"){const t=Object.getOwnPropertyDescriptor(n,i);Object.defineProperty(e,i,t.get?t:{enumerable:!0,get:()=>n[i]})}}return e.default=n,Object.freeze(e)}const l=C(m);class I{constructor(e){var r;this.districtControllerOid=0,this.subDistrictControllerOid=0,this.signalOid=0,this.districtGraphics=[],this.subDistrictGraphics=[],this.view=e,this.hasGpu=localStorage.getItem("gpu")!=="Unknown";const t=f.default.useAppDataStore.mapConfig;this.openDriveServer=(r=t.openDriveServer)==null?void 0:r.url,this.districtControllerDashLayer=new o({id:"districtController",spatialReference:e.spatialReference,source:[],objectIdField:"ObjectID",geometryType:"polyline",outFields:["*"],fields:[{name:"ObjectID",type:"oid"},{name:"id",type:"string"},{name:"name",type:"string"},{name:"subDistrictCount",type:"integer"},{name:"signalCount",type:"integer"}],renderer:{type:"simple",symbol:{type:"simple-line",style:"long-dash",color:[111,100,255],width:3}}}),this.districtControllerSolidLayer=new o({id:"districtController",spatialReference:e.spatialReference,source:[],objectIdField:"ObjectID",outFields:["*"],geometryType:"polyline",fields:[{name:"ObjectID",type:"oid"},{name:"id",type:"string"},{name:"name",type:"string"},{name:"subDistrictCount",type:"integer"},{name:"signalCount",type:"integer"}],popupTemplate:{title:"{name}",content:[{type:"fields",fieldInfos:[{fieldName:"id",label:"区控编号"},{fieldName:"subDistrictCount",label:"子区数量"},{fieldName:"signalCount",label:"信号机数量"}]}]},renderer:{type:"simple",symbol:{type:"simple-line",style:"solid",color:[111,100,255,.4],width:3}}}),this.subDistrictControllerLayer=new o({id:"subDistrictController",spatialReference:e.spatialReference,source:[],objectIdField:"ObjectID",outFields:["*"],geometryType:"polyline",fields:[{name:"ObjectID",type:"oid"},{name:"id",type:"string"},{name:"name",type:"string"},{name:"parentId",type:"string"},{name:"parentName",type:"string"},{name:"signalCount",type:"integer"}],popupTemplate:{title:"{name} 子区",content:[{type:"fields",fieldInfos:[{fieldName:"id",label:"区控编号"},{fieldName:"parentName",label:"所属区控"},{fieldName:"signalCount",label:"信号机数量"}]}]},renderer:{type:"simple",symbol:{type:"simple-line",style:"solid",color:[5,196,104],width:3}}}),this.signalMarkerLayer=new o({id:"signalLayer",spatialReference:e.spatialReference,source:[],objectIdField:"ObjectID",outFields:["*"],geometryType:"point",maxScale:5e3,fields:[{name:"ObjectID",type:"oid"},{name:"id",type:"string"},{name:"name",type:"string"},{name:"signalId",type:"string"},{name:"nodeId",type:"string"},{name:"isKey",type:"string"},{name:"districtId",type:"string"},{name:"districtName",type:"string"},{name:"subDistrictId",type:"string"},{name:"subDistrictName",type:"string"}],popupTemplate:{title:"{name}信号机",content:[{type:"fields",fieldInfos:[{fieldName:"districtName",label:"区控名称"},{fieldName:"subDistrictName",label:"子区名称"},{fieldName:"signalId",label:"信号机编号"},{fieldName:"nodeId",label:"路口编号"}]}]},renderer:{type:"unique-value",field:"isKey",defaultSymbol:{type:"simple-marker",style:"circle",color:"gray",size:4,outline:{color:"white",width:1}},uniqueValueInfos:[{value:"true",symbol:{type:"simple-marker",style:"circle",color:[254,172,22],size:12,outline:{color:"white",width:1}}},{value:"false",symbol:{type:"simple-marker",style:"circle",color:[5,116,255],size:8,outline:{color:"white",width:1}}}]}}),this.signalPictureLayer=new o({id:"signalLayer",spatialReference:e.spatialReference,source:[],objectIdField:"ObjectID",outFields:["*"],geometryType:"point",minScale:5e3,fields:[{name:"ObjectID",type:"oid"},{name:"id",type:"string"},{name:"name",type:"string"},{name:"signalId",type:"string"},{name:"nodeId",type:"string"},{name:"isKey",type:"string"},{name:"districtId",type:"string"},{name:"districtName",type:"string"},{name:"subDistrictId",type:"string"},{name:"subDistrictName",type:"string"}],popupTemplate:{title:"{name}信号机",content:[{type:"fields",fieldInfos:[{fieldName:"districtName",label:"区控名称"},{fieldName:"subDistrictName",label:"子区名称"},{fieldName:"signalId",label:"信号机编号"},{fieldName:"nodeId",label:"路口编号"}]}]},renderer:{type:"unique-value",field:"isKey",defaultSymbol:{type:"simple-marker",style:"circle",color:"gray",size:4,outline:{color:"white",width:1}},uniqueValueInfos:[{value:"true",symbol:{type:"cim",data:{type:"CIMSymbolReference",primitiveOverrides:[{type:"CIMPrimitiveOverride",primitiveName:"textGraphic",propertyName:"TextString",valueExpressionInfo:{type:"CIMExpressionInfo",title:"Custom",expression:'Replace($feature.name, "与", "/") + "  " + $feature.signalId',returnType:"Default"}}],symbol:{type:"CIMPointSymbol",symbolLayers:[{type:"CIMVectorMarker",size:32,colorLocked:!0,anchorPointUnits:"Relative",frame:{xmin:-16,ymin:-16,xmax:16,ymax:16},markerGraphics:[{type:"CIMMarkerGraphic",primitiveName:"textGraphic",geometry:{x:0,y:0},symbol:{type:"CIMTextSymbol",height:12,horizontalAlignment:"Center",offsetX:0,offsetY:30,haloSize:1,haloSymbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[255,255,255,255]}]},symbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[0,0,0,255]}]},verticalAlignment:"Center"},textString:""}],scaleSymbolsProportionally:!0,respectFrame:!0},{type:"CIMPictureMarker",enable:!0,anchorPoint:{x:0,y:0},anchorPointUnits:"Relative",size:40,rotateClockwise:!0,textureFilter:"Picture",url:"/GisViewerAssets/Images/cross/gis_gjxklk_orange.png"}]}}}},{value:"false",symbol:{type:"cim",data:{type:"CIMSymbolReference",primitiveOverrides:[{type:"CIMPrimitiveOverride",primitiveName:"textGraphic",propertyName:"TextString",valueExpressionInfo:{type:"CIMExpressionInfo",title:"Custom",expression:'Replace($feature.name, "与", "/") + "  " + $feature.signalId',returnType:"Default"}}],symbol:{type:"CIMPointSymbol",symbolLayers:[{type:"CIMVectorMarker",size:32,colorLocked:!0,anchorPointUnits:"Relative",frame:{xmin:-16,ymin:-16,xmax:16,ymax:16},markerGraphics:[{type:"CIMMarkerGraphic",primitiveName:"textGraphic",geometry:{x:0,y:0},symbol:{type:"CIMTextSymbol",height:12,horizontalAlignment:"Center",offsetX:0,offsetY:15,haloSize:1,haloSymbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[255,255,255,255]}]},symbol:{type:"CIMPolygonSymbol",symbolLayers:[{type:"CIMSolidFill",enable:!0,color:[0,0,0,255]}]},verticalAlignment:"Center"},textString:""}],scaleSymbolsProportionally:!0,respectFrame:!0},{type:"CIMPictureMarker",enable:!0,anchorPoint:{x:0,y:0},anchorPointUnits:"Relative",size:20,rotateClockwise:!0,textureFilter:"Picture",url:"/GisViewerAssets/Images/cross/gis_xhj_blue.png"}]}}}}]}}),this.view.map.addMany([this.districtControllerSolidLayer,this.districtControllerDashLayer,this.subDistrictControllerLayer,this.signalMarkerLayer,this.signalPictureLayer])}async showSignalControlArea(e){await this.clearSignalControlArea(),this.districtControllerDashLayer.visible=!0,this.districtControllerSolidLayer.visible=!0,this.subDistrictControllerLayer.visible=!1,this.signalMarkerLayer.visible=!1,this.signalPictureLayer.visible=!1;for(const i of e.areaList){const t=new b.default(i,e.style||"");await this.drawArea(t,!0),await this.subDistrictControllerLayer.applyEdits({addFeatures:this.subDistrictGraphics}),this.subDistrictGraphics=[]}return await this.districtControllerDashLayer.applyEdits({addFeatures:this.districtGraphics}),await this.districtControllerSolidLayer.applyEdits({addFeatures:this.districtGraphics}),this.view.goTo(this.districtGraphics),this.districtGraphics=[],{status:0,message:"ok"}}async clearSignalControlArea(){this.districtControllerOid=0,this.subDistrictControllerOid=0,this.signalOid=0;let e=await this.districtControllerDashLayer.queryFeatures();return await this.districtControllerDashLayer.applyEdits({deleteFeatures:e.features}),e=await this.districtControllerSolidLayer.queryFeatures(),await this.districtControllerSolidLayer.applyEdits({deleteFeatures:e.features}),e=await this.subDistrictControllerLayer.queryFeatures(),await this.subDistrictControllerLayer.applyEdits({deleteFeatures:e.features}),e=await this.signalMarkerLayer.queryFeatures(),await this.signalMarkerLayer.applyEdits({deleteFeatures:e.features}),e=await this.signalPictureLayer.queryFeatures(),await this.signalPictureLayer.applyEdits({deleteFeatures:e.features}),{status:0,message:"ok"}}setLayerVisibility(e){switch(e.visible===!1&&this.view.closePopup(),e.id){case"district":this.districtControllerDashLayer.visible=e.visible,this.districtControllerSolidLayer.visible=e.visible;break;case"subDistrict":this.subDistrictControllerLayer.visible=e.visible;break;case"signal":this.signalMarkerLayer.visible=e.visible,this.signalPictureLayer.visible=e.visible;break}return{status:0,message:"ok"}}async locateSignalControlArea(e){switch(e.type){case"district":{const r=this.districtControllerDashLayer.createQuery();r.where=`id = '${e.id}'`,r.returnGeometry=!0,r.outFields=["*"];const a=await this.districtControllerDashLayer.queryFeatures(r);return a.features.length>0?(await this.view.goTo(a.features,{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}):{status:1,message:"未找到区控"}}case"subDistrict":const i=this.subDistrictControllerLayer.createQuery();i.where=`id = '${e.id}'`,i.returnGeometry=!0,i.outFields=["*"];const t=await this.subDistrictControllerLayer.queryFeatures(i);return t.features.length>0?(await this.view.goTo(t.features,{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}):{status:1,message:"未找到子区"};case"signal":{const r=this.signalMarkerLayer.createQuery();r.where=`id = '${e.id}'`,r.returnGeometry=!0,r.outFields=["*"];const a=await this.signalMarkerLayer.queryFeatures(r);return a.features.length>0?(await this.view.goTo({target:a.features[0],scale:2500},{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}):{status:1,message:"未找到信号机"}}default:return{status:1,message:"未知类型"}}}async highlightSignalControlArea(e){switch(e.type){case"district":{const i=this.districtControllerDashLayer.definitionExpression;this.districtControllerDashLayer.definitionExpression=`id = '${e.id}'`;const t=await this.districtControllerDashLayer.queryFeatures();return t.features.length>0?(this.districtControllerSolidLayer.definitionExpression=`id = '${e.id}'`,this.subDistrictControllerLayer.definitionExpression=`parentId = '${e.id}'`,this.signalMarkerLayer.definitionExpression=`districtId = '${e.id}'`,this.signalPictureLayer.definitionExpression=`districtId = '${e.id}'`,await this.view.goTo(t.features,{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}):(this.districtControllerDashLayer.definitionExpression=i,{status:1,message:"未找到区控"})}case"subDistrict":{const i=this.subDistrictControllerLayer.definitionExpression;this.subDistrictControllerLayer.definitionExpression=`id = '${e.id}'`;const t=await this.subDistrictControllerLayer.queryFeatures();if(t.features.length>0){this.signalMarkerLayer.definitionExpression=`subDistrictId = '${e.id}'`,this.signalPictureLayer.definitionExpression=`subDistrictId = '${e.id}'`;const a=t.features[0].attributes.parentId;return this.districtControllerDashLayer.definitionExpression=`id = '${a}'`,this.districtControllerSolidLayer.definitionExpression=`id = '${a}'`,await this.view.goTo(t.features,{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}}else return this.subDistrictControllerLayer.definitionExpression=i,{status:1,message:"未找到子区"}}case"signal":{const i=this.signalMarkerLayer.definitionExpression;this.signalMarkerLayer.definitionExpression=`id = '${e.id}'`;const t=await this.signalMarkerLayer.queryFeatures();if(t.features.length>0){this.signalPictureLayer.definitionExpression=`id = '${e.id}'`;const r=t.features[0],{districtId:a,subDistrictId:u}=r.attributes;return this.districtControllerDashLayer.definitionExpression=`id = '${a}'`,this.districtControllerSolidLayer.definitionExpression=`id = '${a}'`,this.subDistrictControllerLayer.definitionExpression=`id = '${u}'`,await this.view.goTo({target:t.features,zoom:2500},{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}}else return this.signalMarkerLayer.definitionExpression=i,{status:1,message:"未找到信号机"}}default:return{status:1,message:"未知类型"}}}async resetHighlight(){this.districtControllerDashLayer.definitionExpression="1=1",this.districtControllerSolidLayer.definitionExpression="1=1",this.subDistrictControllerLayer.definitionExpression="1=1",this.signalMarkerLayer.definitionExpression="1=1";const e=await this.districtControllerDashLayer.queryFeatures();return this.view.goTo(e.features,{duration:this.hasGpu?1e3:0}),{status:0,message:"ok"}}async drawArea(e,i){const t=e.getAllSignalCoordinates();let r;if(t.length>=2)if(t.length===2)r=l.lineString(t);else{if(i){const s=l.featureCollection(t.map(y=>l.point(y)));r=h(s)}else{const s=g(t,.5);s.length>=4&&(r=l.polygon([s]))}r||(r=l.lineString(t))}else if(t.length===1)r=l.point(t[0]);else return;const a=p(r.geometry,i?200:30,{units:"meters"}),u=new c({geometry:{type:"polyline",paths:a.geometry.coordinates},attributes:{ObjectID:i?this.districtControllerOid++:this.subDistrictControllerOid++,id:e.id,name:e.name,subDistrictCount:e.subDistrictCount,signalCount:e.signalCount,parentId:e.parentId,parentName:e.parentName}});i?this.districtGraphics.push(u):this.subDistrictGraphics.push(u);for(const s of e.subDistricts)await this.drawArea(s,!1);const d=e.signals.map(s=>new c({geometry:{type:"point",x:s.longitude,y:s.latitude},attributes:{ObjectID:this.signalOid++,id:s.id,name:s.name,signalId:s.signalId,nodeId:s.nodeId,isKey:s.isKey,districtId:i?e.id:e.parentId,districtName:i?e.name:e.parentName,subDistrictId:i?"":e.id,subDistrictName:i?"":e.name}}));await this.signalMarkerLayer.applyEdits({addFeatures:d}),await this.signalPictureLayer.applyEdits({addFeatures:d})}}exports.default=I;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gisviewer-vue3-arcgis",
-  "version": "1.0.205",
+  "version": "1.0.207",
   "main": "lib/index.js",
   "module": "es/index.mjs",
   "files": [