bruce-cesium 0.5.4 → 0.5.6

package/dist/bruce-cesium.es5.js

@@ -1,5 +1,5 @@
 import { BruceEvent, Cartes, Carto, Geometry, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, DelayQueue, Entity as Entity$1, BatchedDataGetter, ObjectUtils, Tileset, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, TilesetExtMapTiles, ProgramKey, Camera, MathUtils } from 'bruce-models';
-import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, HeadingPitchRange, OrthographicFrustum, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Matrix4, Cesium3DTileset, EllipsoidGeodesic, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, JulianDate, createOsmBuildings, Cesium3DTileStyle } from 'cesium';
+import { Color, HeightReference, Cartographic, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cartesian2, HeadingPitchRange, OrthographicFrustum, Math as Math$1, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Matrix4, Cesium3DTileset, EllipsoidGeodesic, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, JulianDate, createOsmBuildings, Cesium3DTileStyle } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -436,17 +436,27 @@ function traverseEntity(cEntity, arr) {
     arr.push(cEntity);
 }
 var ORG_OPACITY_KEY = "_org_opacity_";
+var NEW_OPACITY_KEY = "_new_opacity_";
 function getColor(viewer, material) {
-    var _a;
-    var color;
-    if (material instanceof Color) {
-        color = material;
-    }
-    else if ((_a = material) === null || _a === void 0 ? void 0 : _a.color) {
-        var anyCol = material.color;
-        color = anyCol.getValue ? anyCol.getValue(viewer.scene.lastRenderTime) : anyCol;
+    var _a, _b;
+    function findColor() {
+        var _a;
+        if (!material) {
+            return Color.WHITE;
+        }
+        if (material.getValue) {
+            material = material.getValue(viewer.scene.lastRenderTime);
+        }
+        if (material instanceof Color) {
+            return material;
+        }
+        var tmp = (_a = material) === null || _a === void 0 ? void 0 : _a.color;
+        if (tmp === null || tmp === void 0 ? void 0 : tmp.getValue) {
+            tmp = tmp.getValue(viewer.scene.lastRenderTime);
+        }
+        return tmp ? tmp : Color.WHITE;
     }
-    return color;
+    return (_b = (_a = findColor()) === null || _a === void 0 ? void 0 : _a.clone) === null || _b === void 0 ? void 0 : _b.call(_a);
 }
 function applyOpacityToColor(viewer, opacity, material) {
     var color = getColor(viewer, material);
@@ -455,44 +465,82 @@ function applyOpacityToColor(viewer, opacity, material) {
     }
     return color;
 }
-function applyOpacityToGraphic(viewer, entity, graphicKey, opacity) {
-    var color = applyOpacityToColor(viewer, opacity, entity[graphicKey].material);
+function applyOpacityToGraphic(viewer, entity, graphicKey, materialKey, opacity) {
+    var color = applyOpacityToColor(viewer, opacity, entity[graphicKey][materialKey]);
     if (color) {
-        entity[graphicKey].material = new ColorMaterialProperty(color);
+        entity[graphicKey][materialKey] = materialKey == "material" ? new ColorMaterialProperty(color) : color;
     }
 }
 function revertAppliedEntityOpacity(viewer, entity) {
-    function processKey(graphicKey) {
-        if (entity[graphicKey]) {
-            var orgOpacity = entity[graphicKey][ORG_OPACITY_KEY];
-            if (orgOpacity != null) {
-                applyOpacityToGraphic(viewer, entity, graphicKey, orgOpacity);
+    entity[NEW_OPACITY_KEY] = null;
+    if (entity instanceof Entity) {
+        var processKey = function (graphicKey, materialKey) {
+            if (materialKey === void 0) { materialKey = "material"; }
+            if (entity[graphicKey]) {
+                var orgOpacity = entity[graphicKey][ORG_OPACITY_KEY];
+                if (orgOpacity != null) {
+                    applyOpacityToGraphic(viewer, entity, graphicKey, materialKey, orgOpacity);
+                }
                 entity[graphicKey][ORG_OPACITY_KEY] = null;
             }
+        };
+        processKey("polygon");
+        processKey("polyline");
+        processKey("point", "color");
+        processKey("ellipse");
+        processKey("model", "color");
+    }
+    else if (entity instanceof Cesium3DTileFeature) {
+        var orgOpacity = entity[ORG_OPACITY_KEY];
+        if (orgOpacity != null) {
+            var color = entity.color ? entity.color.clone() : new Color();
+            color.alpha = orgOpacity;
+            entity.color = color;
         }
+        entity[ORG_OPACITY_KEY] = null;
     }
-    processKey("polygon");
-    processKey("polyline");
-    processKey("point");
-    processKey("ellipse");
-    processKey("model");
 }
 function applyOpacityToEntity(viewer, opacity, entity) {
-    function processKey(graphicKey) {
-        var _a;
-        if (entity[graphicKey]) {
-            var orgOpacity = entity[graphicKey][ORG_OPACITY_KEY];
-            if (orgOpacity == null) {
-                entity[graphicKey][ORG_OPACITY_KEY] = (_a = getColor(viewer, entity[graphicKey].material)) === null || _a === void 0 ? void 0 : _a.alpha;
+    entity[NEW_OPACITY_KEY] = opacity;
+    if (entity instanceof Entity) {
+        var processKey = function (graphicKey, materialKey) {
+            var _a;
+            if (materialKey === void 0) { materialKey = "material"; }
+            if (entity[graphicKey]) {
+                var orgOpacity = entity[graphicKey][ORG_OPACITY_KEY];
+                if (orgOpacity == null) {
+                    entity[graphicKey][ORG_OPACITY_KEY] = (_a = getColor(viewer, entity[graphicKey][materialKey])) === null || _a === void 0 ? void 0 : _a.alpha;
+                }
+                if (orgOpacity == null) {
+                    orgOpacity = 1;
+                }
+                applyOpacityToGraphic(viewer, entity, graphicKey, materialKey, opacity * orgOpacity);
             }
-            applyOpacityToGraphic(viewer, entity, graphicKey, opacity);
+        };
+        processKey("polygon");
+        processKey("polyline");
+        processKey("point", "color");
+        processKey("ellipse");
+        processKey("model", "color");
+    }
+    else if (entity instanceof Cesium3DTileFeature) {
+        var orgOpacity = entity[ORG_OPACITY_KEY];
+        if (orgOpacity == null) {
+            entity[ORG_OPACITY_KEY] = entity.color ? entity.color.alpha : 1;
+        }
+        if (!orgOpacity) {
+            orgOpacity = 1;
         }
+        var color = entity.color ? entity.color.clone() : new Color();
+        color.alpha = opacity * orgOpacity;
+        if (color.equals(Color.WHITE)) {
+            color.blue = 0.0001;
+        }
+        entity.color = color;
     }
-    processKey("polygon");
-    processKey("polyline");
-    processKey("point");
-    processKey("ellipse");
-    processKey("model");
+}
+function findOpacity(entity) {
+    return entity[NEW_OPACITY_KEY];
 }
 var EntityUtils;
 (function (EntityUtils) {
@@ -685,6 +733,17 @@ var EntityUtils;
         revertAppliedEntityOpacity(viewer, entity);
     }
     EntityUtils.RevertOpacity = RevertOpacity;
+    /**
+     * Gets opacity of the entity.
+     * This does not count opacity that it was rendered with.
+     * This is the opacity that was set post-rendering.
+     * @param viewer
+     * @param entity
+     */
+    function GetOpacity(entity) {
+        return findOpacity(entity);
+    }
+    EntityUtils.GetOpacity = GetOpacity;
 })(EntityUtils || (EntityUtils = {}));
 
 var RenderManager;
@@ -1932,67 +1991,89 @@ function unmarkEntity(visual) {
         }
     }
 }
-function select(visual) {
+var ORG_COLOR_KEY = "_org_color_";
+function select(viewer, visual) {
+    var _a;
     var color = Color.fromAlpha(Color.YELLOW, 0.5);
     if (visual instanceof Entity) {
         var entities = EntityUtils.GatherEntity(visual);
-        for (var i = 0; i < entities.length; i++) {
-            var cEntity = entities[i];
-            if (cEntity.point) {
-                cEntity.point._orgColor = cEntity.point.color;
-                cEntity.point.color = color.clone();
-            }
-            if (cEntity.polyline) {
-                cEntity.polyline._orgColor = cEntity.polyline.material;
-                cEntity.polyline.material = color.clone();
-            }
-            if (cEntity.polygon) {
-                cEntity.polygon._orgColor = cEntity.polygon.material;
-                cEntity.polygon.material = color.clone();
-            }
-            if (cEntity.model) {
-                cEntity.model._orgColor = cEntity.model.color;
-                cEntity.model.color = color.clone();
-            }
-            if (cEntity.billboard) {
-                cEntity.billboard._orgColor = cEntity.billboard.color;
-                cEntity.billboard.color = color.clone();
+        var keyMapping = {
+            "point": "color",
+            "polygon": "material",
+            "polyline": "material",
+            "model": "color",
+            "billboard": "color"
+        };
+        var _loop_1 = function (i) {
+            var entity = entities[i];
+            var processGraphic = function (graphicKey, materialKey) {
+                if (entity[graphicKey]) {
+                    if (entity[graphicKey][ORG_COLOR_KEY] == null) {
+                        entity[graphicKey][ORG_COLOR_KEY] = entity[graphicKey][materialKey];
+                    }
+                    entity[graphicKey][materialKey] = color.clone();
+                }
+            };
+            for (var key in keyMapping) {
+                var map = keyMapping[key];
+                processGraphic(key, map);
             }
+        };
+        for (var i = 0; i < entities.length; i++) {
+            _loop_1(i);
         }
     }
     else if (visual instanceof Primitive) ;
     else if (visual instanceof Cesium3DTileFeature) {
-        var cPrim = visual;
-        cPrim._orgColor = cPrim.color;
-        cPrim.color = color.clone();
+        var orgColor = visual[ORG_COLOR_KEY];
+        if (orgColor == null) {
+            orgColor = visual.color;
+            visual[ORG_COLOR_KEY] = (_a = orgColor === null || orgColor === void 0 ? void 0 : orgColor.clone) === null || _a === void 0 ? void 0 : _a.call(orgColor);
+        }
+        visual.color = color.clone();
+    }
+    var opacity = EntityUtils.GetOpacity(visual);
+    if (opacity != null) {
+        EntityUtils.SetOpacity(viewer, visual, opacity);
     }
 }
-function deselect(visual) {
+function deselect(viewer, visual) {
     if (visual instanceof Entity) {
         var entities = EntityUtils.GatherEntity(visual);
-        for (var i = 0; i < entities.length; i++) {
-            var cEntity = entities[i];
-            if (cEntity.point) {
-                cEntity.point.color = cEntity.point._orgColor;
-            }
-            if (cEntity.polyline) {
-                cEntity.polyline.material = cEntity.polyline._orgColor;
-            }
-            if (cEntity.polygon) {
-                cEntity.polygon.material = cEntity.polygon._orgColor;
-            }
-            if (cEntity.model) {
-                cEntity.model.color = cEntity.model._orgColor;
-            }
-            if (cEntity.billboard) {
-                cEntity.billboard.color = cEntity.billboard._orgColor;
+        var keyMapping = {
+            "point": "color",
+            "polygon": "material",
+            "polyline": "material",
+            "model": "color",
+            "billboard": "color"
+        };
+        var _loop_2 = function (i) {
+            var entity = entities[i];
+            var processGraphic = function (graphicKey, materialKey) {
+                var _a;
+                if ((_a = entity[graphicKey]) === null || _a === void 0 ? void 0 : _a[ORG_COLOR_KEY]) {
+                    entity[graphicKey][materialKey] = entity[graphicKey][ORG_COLOR_KEY];
+                }
+            };
+            for (var key in keyMapping) {
+                var map = keyMapping[key];
+                processGraphic(key, map);
             }
+        };
+        for (var i = 0; i < entities.length; i++) {
+            _loop_2(i);
         }
     }
     else if (visual instanceof Primitive) ;
     else if (visual instanceof Cesium3DTileFeature) {
-        var cPrim = visual;
-        cPrim.color = cPrim._orgColor;
+        var orgColor = visual[ORG_COLOR_KEY];
+        if (orgColor != null) {
+            visual.color = orgColor;
+        }
+    }
+    var opacity = EntityUtils.GetOpacity(visual);
+    if (opacity != null) {
+        EntityUtils.SetOpacity(viewer, visual, opacity);
     }
 }
 /**
@@ -2073,7 +2154,7 @@ var VisualsRegister;
                 if (regos) {
                     for (var i = 0; i < regos.length; i++) {
                         var rego = regos[i];
-                        select(rego.visual);
+                        select(this.viewer, rego.visual);
                     }
                 }
             }
@@ -2086,7 +2167,7 @@ var VisualsRegister;
                 if (regos) {
                     for (var i = 0; i < regos.length; i++) {
                         var rego = regos[i];
-                        deselect(rego.visual);
+                        deselect(this.viewer, rego.visual);
                     }
                 }
             }
@@ -2101,7 +2182,7 @@ var VisualsRegister;
                 if (regos) {
                     for (var i_1 = 0; i_1 < regos.length; i_1++) {
                         var rego = regos[i_1];
-                        deselect(rego.visual);
+                        deselect(this.viewer, rego.visual);
                     }
                 }
             }
@@ -2117,16 +2198,26 @@ var VisualsRegister;
             markEntity(this, rego, rego.visual);
             updateEntity(this.viewer, this.rego[entityId], this.GetAddons(entityId));
             if (this.selectedIds.includes(entityId)) {
-                select(rego.visual);
+                select(this.viewer, rego.visual);
             }
             (_b = this.onUpdate) === null || _b === void 0 ? void 0 : _b.Trigger({ rego: rego, isAdding: true });
         };
+        /**
+         * Locates a visual corresponding to a given entity id.
+         * If no menu item id is provided, then it will pick the "best" one.
+         * @param entityId
+         * @param menuItemId
+         * @returns
+         */
         Register.prototype.GetRego = function (entityId, menuItemId) {
             var entityRegos = this.rego[entityId];
             if (!entityRegos) {
                 return [];
             }
-            return entityRegos.find(function (r) { return r.menuItemId === menuItemId; });
+            if (menuItemId) {
+                return entityRegos.find(function (r) { return r.menuItemId === menuItemId; });
+            }
+            return entityRegos.find(function (x) { return x.best; });
         };
         Register.prototype.GetRegos = function (entityId) {
             var entityRegos = this.rego[entityId];