zywlgis 0.5.38 → 0.5.39

package/dist/ZYWLGIS.es.js

@@ -10946,21 +10946,42 @@ class Gi {
           isHighlight: this.isHighlight,
           customHTML: this.data_?.customHTML
         });
-      this.calculatePosition(t.scene, this.HTMLInstance_, this.presentationMode_, this.destination_, this.data_?.customHTML, this.isHighlight);
+      this.calculatePosition(
+        t.scene,
+        this.HTMLInstance_,
+        this.presentationMode_,
+        this.destination_,
+        this.data_?.customHTML,
+        this.isHighlight
+      ), this.addShowHTML({
+        HTMLInstance: this.HTMLInstance_,
+        destination: this.destination_,
+        presentationMode: this.presentationMode_,
+        isHighlight: this.isHighlight,
+        customHTML: this.data_?.customHTML
+      });
     }
-    window.CustomHTMLRender || (window.CustomHTMLRender = t.scene.camera.changed.addEventListener(this.postRenderCustomHTML));
+    window.CustomHTMLRender || (window.CustomHTMLRender = t.scene.camera.changed.addEventListener(
+      this.postRenderCustomHTML
+    ));
   };
   // 渲染回调方法（帧更新）
   postRenderCustomHTML = () => {
-    if (window.CustomHTMLInstances_) {
-      let A = k.getMapEngineInstance(this.containerID_);
-      for (const e of [...window.CustomHTMLInstances_]) {
-        let t = e[1].HTMLInstance;
-        const i = e[1].presentationMode;
-        if (i === 0 || !t || t && t.style.display !== "block")
+    if (window.ShowHTMLInstances_) {
+      const e = k.getMapEngineInstance(this.containerID_).scene;
+      for (const t of [...window.ShowHTMLInstances_]) {
+        const i = t[1].HTMLInstance, r = t[1].presentationMode;
+        if (r === 0 || !i || i && i.style.display !== "block")
           continue;
-        const r = e[1].destination, s = e[1].isHighlight, o = e[1].customHTML, a = A.scene;
-        this.calculatePosition(a, t, i, r, o, s);
+        const s = t[1].destination, o = t[1].isHighlight, a = t[1].customHTML;
+        this.calculatePosition(
+          e,
+          i,
+          r,
+          s,
+          a,
+          o
+        );
       }
     }
   };
@@ -10988,7 +11009,14 @@ class Gi {
     let A = k.getMapEngineInstance(this.containerID_), e = this.data_.ID + "-ZYWLCustomHTML";
     if (window.CustomHTMLInstances_ && window.CustomHTMLInstances_.has(e)) {
       let t = window.CustomHTMLInstances_.get(e);
-      t.presentationMode === 2 && (t.HTMLInstance.style.display = "block"), t.isHighlight = !0, this.calculatePosition(A.scene, t.HTMLInstance, t.presentationMode, t.destination, t.customHTML, t.isHighlight);
+      t.presentationMode === 2 && (t.HTMLInstance.style.display = "block"), t.isHighlight = !0, this.calculatePosition(
+        A.scene,
+        t.HTMLInstance,
+        t.presentationMode,
+        t.destination,
+        t.customHTML,
+        t.isHighlight
+      ), this.addShowHTML(t);
     }
   };
   // 隐藏方法
@@ -10996,9 +11024,22 @@ class Gi {
     let A = k.getMapEngineInstance(this.containerID_), e = this.data_.ID + "-ZYWLCustomHTML";
     if (window.CustomHTMLInstances_ && window.CustomHTMLInstances_.has(e)) {
       let t = window.CustomHTMLInstances_.get(e);
-      t.presentationMode === 2 && (t.HTMLInstance.style.display = "none"), t.isHighlight = !1, this.calculatePosition(A.scene, t.HTMLInstance, t.presentationMode, t.destination, t.customHTML, t.isHighlight);
+      t.presentationMode === 2 && (t.HTMLInstance.style.display = "none"), t.isHighlight = !1, this.calculatePosition(
+        A.scene,
+        t.HTMLInstance,
+        t.presentationMode,
+        t.destination,
+        t.customHTML,
+        t.isHighlight
+      ), this.removeShowHTML(t);
     }
   };
+  addShowHTML = (A) => {
+    window.ShowHTMLInstances_ || (window.ShowHTMLInstances_ = /* @__PURE__ */ new Map()), window.ShowHTMLInstances_.has(A.HTMLInstance.id) && window.ShowHTMLInstances_.delete(A.HTMLInstance.id), (A.presentationMode === 1 || A.presentationMode === 2 && A.isHighlight) && window.ShowHTMLInstances_.set(A.HTMLInstance.id, A);
+  };
+  removeShowHTML = (A) => {
+    window.ShowHTMLInstances_ || (window.ShowHTMLInstances_ = /* @__PURE__ */ new Map()), window.ShowHTMLInstances_ && window.ShowHTMLInstances_.has(A.HTMLInstance.id) && window.ShowHTMLInstances_.delete(A.HTMLInstance.id);
+  };
   // 销毁方法
   clear = () => {
     let e = k.getMapEngineInstance(this.containerID_)?.cesiumWidget?.container;
@@ -133365,24 +133406,27 @@ class k {
     let i = this.getMapEngineID(A), r = this.getMapEngineInstance(i.openlayersID), s = this.getMapEngineInstance(i.cesiumID);
     if (r && s) {
       let o, a = r.getView().getResolutionForZoom(e);
+      const l = this.degreesToRadians(t?.latitude);
       return o = this.calcDistanceForResolution(
         A,
         a,
-        this.degreesToRadians(t?.latitude)
+        l
       ), o;
     }
   };
   static calcDistanceForResolution = (A, e, t) => {
     let i = this.getMapEngineID(A), r = this.getMapEngineInstance(i.openlayersID);
     const o = this.getMapEngineInstance(i.cesiumID).scene, a = o.camera.frustum, l = o.canvas.clientHeight, D = r.getView().getProjection().getMetersPerUnit(), P = Math.cos(Math.abs(t));
-    let c, h = 0.7302107096371538;
-    return a instanceof Cesium.PerspectiveFrustum && (h = a.fovy), c = e * D * P * l / 2 / Math.tan(h / 2), c;
+    let c;
+    const h = e * D * P * l;
+    let g = 0.7302107096371538;
+    return a instanceof Cesium.PerspectiveFrustum && (g = a.fovy), c = h / 2 / Math.tan(g / 2), c;
   };
   static calcResolutionForDistance = (A, e, t) => {
     let i = this.getMapEngineID(A), r = this.getMapEngineInstance(i.openlayersID);
-    const o = this.getMapEngineInstance(i.cesiumID).scene, a = o.camera.frustum, l = r.getView().getProjection().getMetersPerUnit(), D = Math.cos(Math.abs(t));
-    let P = 0.7302107096371538;
-    return a instanceof Cesium.PerspectiveFrustum && (P = a.fovy), 2 * e * Math.tan(P / 2) / l / D / o.canvas.clientHeight;
+    const o = this.getMapEngineInstance(i.cesiumID).scene, a = o.camera.frustum, l = o.canvas.clientHeight, D = r.getView().getProjection().getMetersPerUnit(), P = Math.cos(Math.abs(t));
+    let c, h = 0.7302107096371538;
+    return a instanceof Cesium.PerspectiveFrustum && (h = a.fovy), c = 2 * e * Math.tan(h / 2), c / D / P / l;
   };
   static calculateZoom = (A, e) => {
     let t = e.getView().getZoomForResolution(A);
@@ -133397,15 +133441,14 @@ class k {
         a.clientHeight / 2
       ), D;
       if (D = k.getCartesian(s, l), D) {
-        let P = Cesium.Cartesian3.distance(D, o.position), c = s.globe.ellipsoid.cartesianToCartographic(D), h = this.calculateZoom(
-          this.calcResolutionForDistance(
-            A,
-            P,
-            c ? c.latitude : 0
-          ),
-          i
-        );
-        return h < 0 && (h = 0), parseInt(h);
+        let P = Cesium.Cartesian3.distance(D, o.position), c = s.globe.ellipsoid.cartesianToCartographic(D);
+        const h = c ? c.latitude : 0;
+        let g = this.calcResolutionForDistance(
+          A,
+          P,
+          h
+        ), u = this.calculateZoom(g, i);
+        return u < 0 && (u = 0), parseInt(u);
       }
     } else {
       if (i)
@@ -133455,11 +133498,7 @@ class k {
       let a = Cesium.Cartesian3.distance(
         t.scene.camera.position,
         i
-      ), l = new Cesium.HeadingPitchRange(
-        0,
-        s,
-        a
-      );
+      ), l = new Cesium.HeadingPitchRange(0, s, a);
       t.scene.camera.lookAt(i, l), t.scene.camera.lookAtTransform(Cesium.Matrix4.IDENTITY);
     } else
       t.scene.camera.setView({
@@ -135449,14 +135488,18 @@ class k {
     else if (A.includes("-openlayers"))
       t && (e ? e === "TakeOffCursor.png" ? t.getTargetElement().style.cursor = `url(${ra.getIconBase64(e)}) 16 21, auto` : t.getTargetElement().style.cursor = e : t.getTargetElement().style.cursor = "");
     else if (A.includes("-maptalks"))
-      t && (e ? e === "TakeOffCursor.png" ? t.setCursor(`url(${ra.getIconBase64(e)}) 16 21, auto`) : t.setCursor(e) : t.setCursor(""));
+      t && (e ? e === "TakeOffCursor.png" ? t.setCursor(
+        `url(${ra.getIconBase64(e)}) 16 21, auto`
+      ) : t.setCursor(e) : t.setCursor(""));
     else {
       let i = this.getMapEngineID(A), r = this.getMapEngineInstance(i.cesiumID);
       r && (e ? e === "TakeOffCursor.png" ? r.container.style.cursor = `url(${ra.getIconBase64(e)}) 16 21, auto` : r.container.style.cursor = e : r.container.style.cursor = "", console.log(r.container));
       let s = this.getMapEngineInstance(i.openlayersID);
       s && (e ? e === "TakeOffCursor.png" ? s.getTargetElement().style.cursor = `url(${ra.getIconBase64(e)}) 16 21, auto` : s.getTargetElement().style.cursor = e : s.getTargetElement().style.cursor = "");
       let o = this.getMapEngineInstance(i.maptalksID);
-      o && (e ? e === "TakeOffCursor.png" ? o.setCursor(`url(${ra.getIconBase64(e)}) 16 21, auto`) : o.setCursor(e) : o.setCursor(""));
+      o && (e ? e === "TakeOffCursor.png" ? o.setCursor(
+        `url(${ra.getIconBase64(e)}) 16 21, auto`
+      ) : o.setCursor(e) : o.setCursor(""));
     }
   };
   /**恢复鼠标样式*/
@@ -166846,7 +166889,7 @@ class fWA {
     this.data_?.symbol?.pointColor && this.data_?.symbol?.pointColor.length && (i = this.data_?.symbol?.pointColor), i = Cesium.Color.fromCssColorString(i);
     const r = this.data_?.symbol?.pixelSize ?? 10;
     new Promise((s) => {
-      const o = this.containerID_.split("-cesium")[0], a = k.transformCoordinate(e), l = k.getMapHeightByZoom(o, 21, a), D = k.getMapHeightByZoom(o, 4, a);
+      const o = this.containerID_.split("-cesium")[0], a = k.transformCoordinate(e), l = k.getMapHeightByZoom(o, 20, a), D = k.getMapHeightByZoom(o, 4, a);
       s({
         nearHeight: l,
         farHeight: D
@@ -193998,7 +194041,7 @@ const zte = (n, A) => {
         { type: "css", url: "/libs/Cesium/Widgets/widgets.css" },
         // JavaScript资源 - 按依赖顺序加载
         { type: "js", url: "/libs/Cesium/Cesium.js" },
-        { type: "js", url: "/libs/Cesium/Cesium-Version.js" },
+        { type: "js", url: "/libs/Cesium/Cesium-Extend.js" },
         { type: "js", url: "/libs/SuperMap3D/SuperMap3D.js" },
         { type: "js", url: "/libs/cpRPA.js" },
         { type: "js", url: "/libs/egm96_mhl.js" }
@@ -194248,7 +194291,7 @@ const zte = (n, A) => {
     createCesium(n) {
       let A = this.MapConfiguration_Temp?.isAR ?? !1, e = document.getElementById(this.cesiumID);
       e || (e = document.createElement("div"), e.id = this.cesiumID, e.tabIndex = "0", e.style.position = "absolute", e.style.height = "100%", e.style.width = "100%", e.style.zIndex = 2, e.style.backgroundColor = "#232323", n && n.appendChild(e));
-      let t = this.MapEngine_Temp?.zoom?.max ?? 21, i = this.MapEngine_Temp?.zoom?.min ?? 1, r = this.MapEngine_Temp?.camera?.pitch ?? -90, s = k.isSupportWebGL2(), o = k.getMapEngineInstance(this.cesiumID);
+      let t = this.MapEngine_Temp?.zoom?.max ?? 20, i = this.MapEngine_Temp?.zoom?.min ?? 1, r = this.MapEngine_Temp?.camera?.pitch ?? -90, s = k.isSupportWebGL2(), o = k.getMapEngineInstance(this.cesiumID);
       return o || (o = new Cesium.Viewer(this.cesiumID, {
         geocoder: !1,
         animation: !1,
@@ -194341,7 +194384,7 @@ const zte = (n, A) => {
       if (A.scene.sun.show = !1, A.scene.moon.show = !1, A.scene.skyBox.show = !1, A.scene.logarithmicDepthBuffer = !1, e)
         A.scene.skyAtmosphere.show = !1, A.scene.backgroundColor = Cesium.Color.TRANSPARENT, A.scene.globe.translucency.enabled = !0, A.scene.globe.translucency.backFaceAlpha = 0, A.scene.globe.translucency.frontFaceAlpha = 0;
       else {
-        this.addMapSlider(A, n), A.imageryLayers.removeAll(), A.scene.postProcessStages.fxaa.enabled = !0, window.devicePixelRatio = 1, A.resolutionScale = window.devicePixelRatio, A.targetFrameRate = 120, A.trackedEntity = void 0, A.scene.globe.maximumScreenSpaceError = 1, A.scene.globe.preloadAncestors = !0, A.scene.globe.preloadSiblings = !0, t > 21 && (t = 21);
+        this.addMapSlider(A, n), A.imageryLayers.removeAll(), A.scene.postProcessStages.fxaa.enabled = !0, window.devicePixelRatio = 1, A.resolutionScale = window.devicePixelRatio, A.targetFrameRate = 120, A.trackedEntity = void 0, A.scene.globe.maximumScreenSpaceError = 1, A.scene.globe.preloadAncestors = !1, A.scene.globe.preloadSiblings = !1, t > 20 && (t = 20);
         let r = k.getMapHeightByZoom(
           this.containerID,
           t,
@@ -194704,8 +194747,8 @@ const zte = (n, A) => {
         if (Q) {
           w || (w = document.createElement("img"), w.id = `${this.containerID}-MapEngineZoomIn`, n.appendChild(w), w.addEventListener("click", () => {
             this.setMapEngineRangingTool(!1);
-            let m = this.loadZoom(), T = this.MapEngine_Temp?.zoom?.max ?? 21;
-            T > 21 && (T = 21), m < T && (m++, this.syncZoom(m), window.isStartMapModeChange = !0, k.setMapEnginePosition(
+            let m = this.loadZoom(), T = this.MapEngine_Temp?.zoom?.max ?? 20;
+            T > 20 && (T = 20), m < T && (m++, this.syncZoom(m), window.isStartMapModeChange = !0, k.setMapEnginePosition(
               this.MapEngine_Temp,
               this.loadZoom(),
               !0,
@@ -195728,11 +195771,7 @@ const zte = (n, A) => {
                 if (L && (m = new Cesium.ImageryLayer(L, {
                   show: u,
                   splitDirection: E
-                }), m.readyEvent.addEventListener((b) => {
-                  console.log("readyEvent", b);
-                }), m.errorEvent.addEventListener((b) => {
-                  console.log("errorEvent", b);
-                }), i.imageryLayers.add(m), console.log(m), c)) {
+                }), i.imageryLayers.add(m), c)) {
                   let b = Cesium.Color.fromCssColorString(
                     k.setMapColor(c)
                   );