gisviewer-vue3-arcgis 1.0.230 → 1.0.232

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

@@ -25,5 +25,6 @@ export default class DistrictController {
      */
     getAllSignalCoordinates(): number[][];
     private getDarkNonGrayColor;
+    private cyrb53;
 }
 export {};

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

@@ -1,12 +1,12 @@
-import d from "../common-utils.mjs";
-class r {
-  constructor(s, n) {
-    this.parentName = "", this.signals = [], this.subDistricts = [], this.areaColor = this.getDarkNonGrayColor(), this.signalCount = 0, this.subDistrictCount = 0, this.id = s.name, this.name = s.areaDesc, this.parentId = s.parentId, n === "alarm" && (this.areaColor = [255, 0, 0]);
+import u from "../common-utils.mjs";
+class h {
+  constructor(s, a) {
+    this.parentName = "", this.signals = [], this.subDistricts = [], this.areaColor = this.getDarkNonGrayColor(), this.signalCount = 0, this.subDistrictCount = 0, this.id = s.name, this.name = s.areaDesc, this.parentId = s.parentId, a === "alarm" && (this.areaColor = [255, 0, 0]);
     for (const t of s.children)
       if (t.children) {
-        const i = new r(t, n);
-        i.id = t.id, i.name = `SS ${t.name}`, i.parentId = this.id, i.parentName = this.name, this.subDistricts.push(i), this.subDistrictCount++, this.signalCount += i.signalCount;
-      } else if (d.isCoordinateValid(t)) {
+        const i = new h(t, a);
+        i.id = t.id, i.name = `SS ${t.name}`, i.parentId = this.id, i.parentName = this.name, i.areaColor = this.getDarkNonGrayColor(t.id), this.subDistricts.push(i), this.subDistrictCount++, this.signalCount += i.signalCount;
+      } else if (u.isCoordinateValid(t)) {
         const i = {
           id: t.id,
           name: t.name,
@@ -26,20 +26,32 @@ class r {
    */
   getAllSignalCoordinates() {
     const s = [];
-    for (const n of this.signals)
-      s.push([n.longitude, n.latitude]);
-    for (const n of this.subDistricts)
-      s.push(...n.getAllSignalCoordinates());
+    for (const a of this.signals)
+      s.push([a.longitude, a.latitude]);
+    for (const a of this.subDistricts)
+      s.push(...a.getAllSignalCoordinates());
     return s;
   }
-  getDarkNonGrayColor() {
-    const s = Math.floor(Math.random() * 360), n = 80 + Math.random() * 20, t = 15 + Math.random() * 15, i = n / 100 * Math.min(t / 100, 1 - t / 100), o = (e) => {
-      const a = (e + s / 30) % 12, l = t / 100 - i * Math.max(Math.min(a - 3, 9 - a, 1), -1);
+  getDarkNonGrayColor(s) {
+    let a, t, i;
+    if (s) {
+      const r = this.cyrb53(s);
+      a = Math.abs(r) % 360, t = 80 + Math.abs(r >> 3) % 21, i = 10 + Math.abs(r >> 7) % 41;
+    } else
+      a = Math.floor(Math.random() * 360), t = 80 + Math.random() * 20, i = 15 + Math.random() * 35;
+    const o = t / 100 * Math.min(i / 100, 1 - i / 100), n = (r) => {
+      const e = (r + a / 30) % 12, l = i / 100 - o * Math.max(Math.min(e - 3, 9 - e, 1), -1);
       return Math.round(255 * l);
     };
-    return [o(0), o(8), o(4)];
+    return [n(0), n(8), n(4)];
+  }
+  cyrb53(s, a = 0) {
+    let t = 3735928559 ^ a, i = 1103547991 ^ a;
+    for (let o = 0, n; o < s.length; o++)
+      n = s.charCodeAt(o), t = Math.imul(t ^ n, 2654435761), i = Math.imul(i ^ n, 1597334677);
+    return t = Math.imul(t ^ t >>> 16, 2246822507), t ^= Math.imul(i ^ i >>> 13, 3266489909), i = Math.imul(i ^ i >>> 16, 2246822507), i ^= Math.imul(t ^ t >>> 13, 3266489909), 4294967296 * (2097151 & i) + (t >>> 0);
   }
 }
 export {
-  r as default
+  h as default
 };

package/es/src/gis-map/utils/signal-control-area/layer-symbol.d.ts

@@ -5,10 +5,11 @@ declare const districtSolidLineLayerOptions: any;
 /** 子区图层 */
 declare const subDistrictLayerOptions: any;
 declare const subDistrictPointLayerOptions: any;
+declare const subDistrictLineLayerOptions: any;
 /** 信号机圆点图层 */
 declare const signalMarkerLayerOptions: any;
 /** 信号机图标图层 */
 declare const signalPictureLayerOptions: any;
 /** 信号机聚合图层 */
 declare const signalClusterLayerOptions: any;
-export { districtDashLineLayerOptions, districtSolidLineLayerOptions, signalClusterLayerOptions, signalMarkerLayerOptions, signalPictureLayerOptions, subDistrictLayerOptions, subDistrictPointLayerOptions };
+export { districtDashLineLayerOptions, districtSolidLineLayerOptions, signalClusterLayerOptions, signalMarkerLayerOptions, signalPictureLayerOptions, subDistrictLayerOptions, subDistrictLineLayerOptions, subDistrictPointLayerOptions };

package/es/src/gis-map/utils/signal-control-area/layer-symbol.mjs

@@ -131,7 +131,7 @@ const e = {
     ]
   }
 }, i = {
-  id: "subDistrictController",
+  id: "subDistrictPointController",
   source: [],
   objectIdField: "ObjectID",
   outFields: ["*"],
@@ -205,6 +205,42 @@ const e = {
     ]
   }
 }, r = {
+  id: "subDistrictLineController",
+  source: [],
+  objectIdField: "ObjectID",
+  outFields: ["*"],
+  geometryType: "polyline",
+  fields: [
+    {
+      name: "ObjectID",
+      type: "oid"
+    },
+    {
+      name: "id",
+      type: "string"
+    },
+    {
+      name: "districtId",
+      type: "string"
+    },
+    {
+      name: "subDistrictId",
+      type: "string"
+    },
+    {
+      name: "fromNode",
+      type: "string"
+    },
+    {
+      name: "toNode",
+      type: "string"
+    },
+    {
+      name: "color",
+      type: "string"
+    }
+  ]
+}, l = {
   id: "signalLayer",
   source: [],
   objectIdField: "ObjectID",
@@ -380,7 +416,7 @@ const e = {
       }
     ]
   }
-}, l = {
+}, s = {
   id: "signalLayer",
   source: [],
   objectIdField: "ObjectID",
@@ -692,7 +728,7 @@ const e = {
       }
     ]
   }
-}, s = {
+}, a = {
   id: "signalLayer",
   source: [],
   objectIdField: "ObjectID",
@@ -910,8 +946,9 @@ const e = {
 export {
   e as districtDashLineLayerOptions,
   t as districtSolidLineLayerOptions,
-  s as signalClusterLayerOptions,
-  r as signalMarkerLayerOptions,
-  l as signalPictureLayerOptions,
+  a as signalClusterLayerOptions,
+  l as signalMarkerLayerOptions,
+  s as signalPictureLayerOptions,
+  r as subDistrictLineLayerOptions,
   i as subDistrictPointLayerOptions
 };

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

@@ -8,19 +8,9 @@ export default class SignalControlAreaController1 {
     private districtRenderer;
     private subDistrictRenderer;
     private signalRenderer;
-    private clickHandler;
-    private districtControllerOid;
-    private subDistrictControllerOid;
-    private signalOid;
-    private popupEnabled;
     private mapConfig;
+    private roadLines;
     constructor(view: __esri.MapView | __esri.SceneView);
-    /** 暂存等待绘制的区控graphic */
-    private districtGraphics;
-    /** 暂存等待绘制的子区graphic */
-    private subDistrictGraphics;
-    /** 暂存等待绘制的信号机graphic */
-    private signalGraphics;
     /**
      * 显示所有区控、子区、信号机
      * @param params
@@ -62,15 +52,10 @@ export default class SignalControlAreaController1 {
         message: string;
     }>;
     /**
-     * 生成区控、子区和信号机graphic
-     * @param districtController
-     * @param isDistrict 是否是区控
+     * 获取道路线
      * @returns
      */
-    private generateGraphic;
-    /**
-     * 重置所有graphic的置灰状态
-     */
+    private loadRoadLine;
     /**
      * 加载支队图层
      * 现场环境用url创建FeatureLayer有各种问题，