Merge branch 'master' of https://github.com/MapGIS/WebClient-JavaScript

Author: 潘卓然ParnDeedlit

src/cesiumjs/manager/PopupController.js

@@ -86,10 +86,10 @@ export default class PopupController extends BaseLayer {
         const randID = CommonFuncManager.generateRandom();
         const rootContentDiv = document.createElement('div');
         rootContentDiv.setAttribute('id', `popup_${randID}`);
-        rootContentDiv.setAttribute('class', 'cesium-popup');
+        rootContentDiv.setAttribute('class', 'mapgis-popup');
         rootContentDiv.setAttribute('style', 'top:5px;left:0;');
         const closeDiv = document.createElement('a');
-        closeDiv.setAttribute('class', 'cesium-popup-close-button');
+        closeDiv.setAttribute('class', 'mapgis-popup-close-button');
         // closeDiv.setAttribute('href', '#');
         closeDiv.innerHTML = '×';
         const webControl = this;
@@ -101,18 +101,18 @@ export default class PopupController extends BaseLayer {
         rootContentDiv.appendChild(closeDiv);
 
         const contentDiv = document.createElement('div');
-        contentDiv.setAttribute('class', 'cesium-popup-content-wrapper');
+        contentDiv.setAttribute('class', 'mapgis-popup-content-wrapper');
         const contentLinkDiv = document.createElement('div');
-        contentLinkDiv.setAttribute('class', 'cesium-popup-content');
+        contentLinkDiv.setAttribute('class', 'mapgis-popup-content');
         contentLinkDiv.setAttribute('style', 'max-width: 300px;');
         contentLinkDiv.innerHTML = content;
         contentDiv.appendChild(contentLinkDiv);
         rootContentDiv.appendChild(contentDiv);
 
         const tipContainDiv = document.createElement('div');
-        tipContainDiv.setAttribute('class', 'cesium-popup-tip-container');
+        tipContainDiv.setAttribute('class', 'mapgis-popup-tip-container');
         const tipDiv = document.createElement('div');
-        tipDiv.setAttribute('class', 'cesium-popup-tip');
+        tipDiv.setAttribute('class', 'mapgis-popup-tip');
         tipContainDiv.appendChild(tipDiv);
         rootContentDiv.appendChild(tipContainDiv);
 
@@ -274,15 +274,15 @@ export default class PopupController extends BaseLayer {
         if (removeDiv && popDiv.parentNode !== null) {
             popDiv.parentNode.removeChild(popDiv);
         }
-        if (owner.popupContain !== null && owner.popupContain.length > 0) {
+        if (Cesium.defined(owner.popupContain) && owner.popupContain.length > 0) {
             for (let i = 0, n = 0; i < owner.popupContain.length; i += 1) {
                 if (owner.popupContain[i].id !== popID) {
                     owner.popupContain[(n += 1)] = owner.popupContain[i];
                 }
             }
             owner.popupContain.length -= 1;
         }
-        if (owner.popupContain.length <= 0) {
+        if (Cesium.defined(owner.popupContain) && owner.popupContain.length <= 0) {
             owner.viewer.camera.percentageChanged = 0.5;
             owner.viewer.camera.changed.removeEventListener(this.updatePopups, this);
         }

src/cesiumjs/manager/SceneManager.js

@@ -137,7 +137,8 @@ export default class SceneManager {
                 longitudeString = Cesium.Math.toDegrees(cartographic.longitude);
                 latitudeString = Cesium.Math.toDegrees(cartographic.latitude);
                 cameraHeight = Math.ceil(that.viewer.camera.positionCartographic.height);
-                height = Math.max(that.viewer.scene.globe.getHeight(cartographic), cartographic.height);
+                // height = Math.max(that.viewer.scene.globe.getHeight(cartographic), cartographic.height);
+                height = cartographic.height;
                 longlatHeight = `经度:${longitudeString.toFixed(4)}°，纬度:${latitudeString.toFixed(4)}°，海拔高度:${height.toFixed(0)}米，相机视角高度:${cameraHeight.toFixed(0)}米`;
             }
             let strHpr = '';