- Fixed empty string names were ignored when updating mil std and bas…

…ic points. #343
missioncommand · Oct 5, 2017 · bf0a845 · bf0a845
1 parent 510d6d2
commit bf0a845
Show file tree

Hide file tree

Showing 40 changed files with 137,995 additions and 102,332 deletions.
diff --git a/src/mapengine/cesium/js/lib/cesium/Cesium.js b/src/mapengine/cesium/js/lib/cesium/Cesium.js
diff --git a/src/mapengine/cesium/js/lib/cesium/EmpCesium.js b/src/mapengine/cesium/js/lib/cesium/EmpCesium.js
@@ -9099,6 +9099,7 @@ function EmpCesium() {
             presentEntity.label.outlineColor = entity.label.outlineColor;
             presentEntity.label.scale = entity.label.scale;
             presentEntity.label.font = entity.label.font;
+            presentEntity.label.text = entity.label.text;
             presentEntity.label.horizontalOrigin = entity.label.horizontalOrigin;
           } else if (entity.label && !presentEntity.label) {
             presentEntity.label = entity.label;

diff --git a/src/mapengine/cesium/js/lib/cesium/Widgets/CesiumInspector/CesiumInspector.css b/src/mapengine/cesium/js/lib/cesium/Widgets/CesiumInspector/CesiumInspector.css
@@ -55,7 +55,7 @@
     width: 185px;
 }
 
-.cesium-cesiumInspector-frustumStats {
+.cesium-cesiumInspector-frustumStatistics {
     padding-left: 10px;
     padding: 5px;
     background-color: rgba(80, 80, 80, 0.75);

diff --git a/src/mapengine/cesium/js/lib/cesium/Widgets/Viewer/Viewer.css b/src/mapengine/cesium/js/lib/cesium/Widgets/Viewer/Viewer.css
@@ -95,3 +95,14 @@
     display: inline-block;
     margin: 0 3px;
 }
+
+.cesium-viewer-cesium3DTilesInspectorContainer {
+    display: block;
+    position: absolute;
+    top: 50px;
+    right: 10px;
+    max-height: 100%;
+    padding-bottom: 70px;
+    box-sizing: border-box;
+    overflow: auto;
+}
diff --git a/src/mapengine/cesium/js/lib/cesium/Widgets/widgets.css b/src/mapengine/cesium/js/lib/cesium/Widgets/widgets.css
@@ -3,6 +3,7 @@
 @import url(./BaseLayerPicker/BaseLayerPicker.css);
 @import url(./CesiumWidget/CesiumWidget.css);
 @import url(./CesiumInspector/CesiumInspector.css);
+@import url(./Cesium3DTilesInspector/Cesium3DTilesInspector.css);
 @import url(./FullscreenButton/FullscreenButton.css);
 @import url(./VRButton/VRButton.css);
 @import url(./Geocoder/Geocoder.css);