bruce-cesium 3.0.2 → 3.0.4

package/dist/bruce-cesium.umd.js

@@ -2585,6 +2585,8 @@
     }
     var _fileValidationCache = {};
     var _fileHeightCache = {};
+    // Key = url + scale.
+    var _fileRadiusCache = new bruceModels.LRUCache(1000);
     /**
      * @param min
      * @param max
@@ -2864,7 +2866,9 @@
                                         case 4:
                                             rendered = rendered.filter(function (x) { return x != null; });
                                             if (rendered.length) {
-                                                rootEntity_1 = new Cesium.Entity({});
+                                                rootEntity_1 = new Cesium.Entity({
+                                                    id: bruceModels.ObjectUtils.UId(10)
+                                                });
                                                 rootEntity_1._siblingGraphics = [];
                                                 rootEntity_1._renderGroup = getRenderGroupId(zoomItem, (_h = params.viewer) === null || _h === void 0 ? void 0 : _h.terrainProvider);
                                                 rootEntity_1._siblingGraphics = rootEntity_1._siblingGraphics.concat(rendered);
@@ -3078,6 +3082,7 @@
                                     if (iconScale > 0) {
                                         heightRef = getHeightRef(style);
                                         cEntity = new Cesium.Entity({
+                                            id: bruceModels.ObjectUtils.UId(10),
                                             billboard: {
                                                 horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
                                                 verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
@@ -3126,6 +3131,7 @@
                                     });
                                     extrusion = getCylinderExtrusion(entity, params.tags, heightRef, style.CylinderFillExtrusion);
                                     cEntity = new Cesium.Entity({
+                                        id: bruceModels.ObjectUtils.UId(10),
                                         ellipse: {
                                             semiMajorAxis: radius,
                                             semiMinorAxis: radius,
@@ -3149,6 +3155,7 @@
                                             outlineExtrusion.exHeightRef = extrusion.exHeightRef;
                                         }
                                         siblings.push(new Cesium.Entity({
+                                            id: bruceModels.ObjectUtils.UId(10),
                                             ellipse: {
                                                 semiMajorAxis: radius + outlineWidth,
                                                 semiMinorAxis: radius + outlineWidth,
@@ -3179,6 +3186,7 @@
                                     heightRef = getHeightRef(style);
                                     circleBillboard = createCircleBillboard(size, cColor.toCssColorString());
                                     cEntity = new Cesium.Entity({
+                                        id: bruceModels.ObjectUtils.UId(10),
                                         // point: {
                                         //     pixelSize: size,
                                         //     color: cColor,
@@ -3357,6 +3365,7 @@
                     classification = Cesium.ClassificationType.BOTH;
                 }
                 var cEntity = new Cesium.Entity({
+                    id: bruceModels.ObjectUtils.UId(10),
                     polyline: units == "px" ? {
                         positions: posses,
                         material: cColor,
@@ -3514,6 +3523,7 @@
                     classification = Cesium.ClassificationType.BOTH;
                 }
                 var cEntity = new Cesium.Entity({
+                    id: bruceModels.ObjectUtils.UId(10),
                     polygon: {
                         hierarchy: new Cesium.PolygonHierarchy(posses, holePosses.map(function (x) { return new Cesium.PolygonHierarchy(x); })),
                         material: cFillColor,
@@ -3560,6 +3570,7 @@
                         borderPosses = posses.map(function (x) { return x.clone ? x.clone() : __assign({}, x); });
                     }
                     var cEntityBorder = new Cesium.Entity({
+                        id: bruceModels.ObjectUtils.UId(10),
                         polyline: units == "px" ? new Cesium.PolylineGraphics({
                             positions: borderPosses,
                             material: cLineColor,
@@ -3591,6 +3602,7 @@
                         var posses_1 = holePosses[i];
                         bruceModels.Cartes.CloseRing3(posses_1);
                         var cEntityHole = new Cesium.Entity({
+                            id: bruceModels.ObjectUtils.UId(10),
                             polyline: units == "px" ? new Cesium.PolylineGraphics({
                                 positions: posses_1,
                                 material: cLineColor,
@@ -3739,6 +3751,7 @@
                     }
                 }
                 var cEntity = new Cesium.Entity({
+                    id: bruceModels.ObjectUtils.UId(10),
                     model: {
                         uri: params.lodUrl,
                         heightReference: heightRef,
@@ -3753,6 +3766,61 @@
                     position: pos,
                     show: true
                 });
+                var fileRadiusKey = "model3d_".concat(params.lodUrl, "_").concat(scale * styleScale, "_radius");
+                var heightProm = _fileRadiusCache.Get(fileRadiusKey);
+                if (!heightProm) {
+                    heightProm = new Promise(function (res) {
+                        try {
+                            // We'll have an async secondary model created for calculating boundaries.
+                            // Once calculated we remove it.
+                            var modelPrim_1 = Cesium.Model.fromGltf({
+                                url: params.lodUrl,
+                                asynchronous: true,
+                                scale: scale * styleScale
+                            });
+                            modelPrim_1.readyPromise.then(function (loaded) {
+                                var kill = function () {
+                                    if (params.viewer && !params.viewer.isDestroyed() && params.viewer.scene.primitives.contains(modelPrim_1)) {
+                                        params.viewer.scene.primitives.remove(modelPrim_1);
+                                    }
+                                    if (!modelPrim_1.isDestroyed()) {
+                                        modelPrim_1.destroy();
+                                    }
+                                };
+                                if (!cEntity || !(loaded === null || loaded === void 0 ? void 0 : loaded.boundingSphere)) {
+                                    kill();
+                                    res(null);
+                                    return;
+                                }
+                                var radius = loaded.boundingSphere.radius;
+                                var centerOffset = loaded.boundingSphere.center;
+                                if (centerOffset) {
+                                    // Add the center offset to the radius because I am not good at math.
+                                    var magnitude = Cesium.Cartesian3.magnitude(centerOffset);
+                                    radius += magnitude;
+                                    // Extra padding if the model is super not centered.
+                                    // I saw some strange boundaries for some bad models.
+                                    if (magnitude > 100) {
+                                        radius += 100;
+                                    }
+                                }
+                                kill();
+                                res(radius);
+                            });
+                            params.viewer.scene.primitives.add(modelPrim_1);
+                        }
+                        catch (e) {
+                            console.error(e);
+                            res(null);
+                        }
+                    });
+                    _fileRadiusCache.Set(fileRadiusKey, heightProm);
+                }
+                heightProm.then(function (radius) {
+                    if (model) {
+                        model._radius = radius;
+                    }
+                });
                 var model = cEntity.model;
                 model._clientFileId = params.lodClientFileId;
                 model._entityScale = {
@@ -5014,8 +5082,84 @@
         EntityLabel.GetLabel = GetLabel;
     })(exports.EntityLabel || (exports.EntityLabel = {}));
 
-    // Area in m^2 for 3D model visibility check.
-    var MODEL_SIZE_TOLERANCE = 1000;
+    var MODEL_MIN_RADIUS = 1;
+    var POINT_MIN_RADIUS = 15;
+    // If a shape has more than this amount of points, we'll avoid checking it because it will take too long.
+    // We will put responsibility on the bookmark creator to view shapes they can see.
+    var DO_NOT_CULL_AT_LEN_POINTS = 5000;
+    // Returns terrain height at a given position.
+    // This will cache the results based on the terrain provider and position.
+    var _terrainCache = new bruceModels.LRUCache(1000);
+    // Positions within this tolerance from each-other will be re-used.
+    var TERRAIN_HEIGHT_TOLERANCE = 500;
+    var getTerrainOffset = function (viewer, pos3d) {
+        var terrain = exports.ViewUtils.GatherTerrainTile({
+            viewer: viewer
+        }).terrain;
+        if (!terrain || terrain.tilesetId == bruceModels.ProjectViewTile.EDefaultTerrain.FlatTerrain) {
+            return 0;
+        }
+        var terrainId = terrain.tilesetId;
+        // Check for existing values within TOLERANCE distance.
+        var keys = Array.from(_terrainCache.Entries());
+        for (var i = 0; i < keys.length; i++) {
+            var _a = keys[i], key_1 = _a[0], offset_1 = _a[1];
+            var _b = key_1.split("_"), terrainId2 = _b[0], x = _b[1], y = _b[2], z = _b[3];
+            if (terrainId2 != terrainId) {
+                continue;
+            }
+            var pos3d2 = new Cesium.Cartesian3(parseFloat(x), parseFloat(y), parseFloat(z));
+            var distance = Cesium.Cartesian3.distance(pos3d, pos3d2);
+            if (distance < TERRAIN_HEIGHT_TOLERANCE) {
+                return offset_1;
+            }
+        }
+        var key = terrainId + "_" + pos3d.x + "_" + pos3d.y + "_" + pos3d.z;
+        var offset = _terrainCache.Get(key);
+        if (offset == null) {
+            var carto = Cesium.Cartographic.fromCartesian(pos3d);
+            var height = 0;
+            try {
+                height = viewer.scene.globe.getHeight(carto);
+            }
+            catch (e) {
+                // Likely out of rendered area.
+                // This means it's not our problem since the user isn't looking there :)
+            }
+            offset = height;
+            _terrainCache.Set(key, offset);
+        }
+        return offset;
+    };
+    /**
+     * Converts given pos3d into a an absolute position.
+     * This means either setting it to terrain height or adding the height offset.
+     * @param viewer
+     * @param heightRef
+     * @param pos3d
+     * @returns
+     */
+    var adjustPos3d = function (viewer, heightRef, pos3d) {
+        if (heightRef == Cesium.HeightReference.NONE) {
+            return pos3d;
+        }
+        var offset = getTerrainOffset(viewer, pos3d);
+        if (!offset) {
+            return pos3d;
+        }
+        var carto = Cesium.Cartographic.fromCartesian(pos3d);
+        if (heightRef == Cesium.HeightReference.CLAMP_TO_GROUND) {
+            carto.height = offset;
+        }
+        else {
+            carto.height += offset;
+        }
+        var newPos3d = Cesium.Cartographic.toCartesian(carto);
+        if (!(newPos3d === null || newPos3d === void 0 ? void 0 : newPos3d.x)) {
+            return pos3d;
+        }
+        return newPos3d;
+    };
     function getValue$2(viewer, obj) {
         if (obj === null || obj === void 0 ? void 0 : obj.getValue) {
             return obj.getValue(viewer.scene.lastRenderTime);
@@ -5031,7 +5175,7 @@
             viewer: viewer
         }).terrain) === null || _a === void 0 ? void 0 : _a.tilesetId) == bruceModels.ProjectViewTile.EDefaultTerrain.FlatTerrain;
     }
-    var boundingSphereCache = {};
+    var boundingSphereCache = new bruceModels.LRUCache(100000);
     function getPositionsFromEntity(viewer, entity) {
         var positions = [];
         var heightRef;
@@ -5040,59 +5184,94 @@
             if (!(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
                 return null;
             }
-            positions.push(pos3d);
             heightRef = getValue$2(viewer, entity.billboard.heightReference);
+            pos3d = adjustPos3d(viewer, heightRef, pos3d);
+            positions.push(pos3d);
         }
         else if (entity.polyline) {
-            positions = getValue$2(viewer, entity.polyline.positions);
+            var posses = getValue$2(viewer, entity.polyline.positions);
+            if (!(posses === null || posses === void 0 ? void 0 : posses.length) || posses.length >= DO_NOT_CULL_AT_LEN_POINTS) {
+                return null;
+            }
+            // Get the first, last, and every forth point.
+            // This is to reduce the amount of points we need to check.
+            if (posses.length > 10) {
+                var first = posses[0];
+                var last = posses[posses.length - 1];
+                var everyForth = posses.filter(function (_, index) { return index % 4 == 0; });
+                posses = [first, last].concat(everyForth);
+            }
             heightRef = getValue$2(viewer, entity.polyline.clampToGround) == false ? Cesium.HeightReference.NONE : Cesium.HeightReference.CLAMP_TO_GROUND;
+            for (var i = 0; i < posses.length; i++) {
+                var pos3d = adjustPos3d(viewer, heightRef, posses[i]);
+                positions.push(pos3d);
+            }
         }
         else if (entity.polygon) {
             var hierarchy = getValue$2(viewer, entity.polygon.hierarchy);
-            positions = hierarchy.positions;
+            var posses = hierarchy.positions;
+            if (!(posses === null || posses === void 0 ? void 0 : posses.length) || posses.length >= DO_NOT_CULL_AT_LEN_POINTS) {
+                return null;
+            }
+            // Get the first, last, and every forth point.
+            // This is to reduce the amount of points we need to check.
+            if (posses.length > 10) {
+                var first = posses[0];
+                var last = posses[posses.length - 1];
+                var everyForth = posses.filter(function (_, index) { return index % 4 == 0; });
+                posses = [first, last].concat(everyForth);
+            }
             heightRef = getValue$2(viewer, entity.polygon.heightReference);
+            for (var i = 0; i < posses.length; i++) {
+                var pos3d = adjustPos3d(viewer, heightRef, posses[i]);
+                positions.push(pos3d);
+            }
         }
         else if (entity.corridor) {
-            positions = getValue$2(viewer, entity.corridor.positions);
+            var posses = getValue$2(viewer, entity.corridor.positions);
+            if (!(posses === null || posses === void 0 ? void 0 : posses.length) || posses.length >= DO_NOT_CULL_AT_LEN_POINTS) {
+                return null;
+            }
+            // Get the first, last, and every forth point.
+            // This is to reduce the amount of points we need to check.
+            if (posses.length > 10) {
+                var first = posses[0];
+                var last = posses[posses.length - 1];
+                var everyForth = posses.filter(function (_, index) { return index % 4 == 0; });
+                posses = [first, last].concat(everyForth);
+            }
+            heightRef = getValue$2(viewer, entity.corridor.heightReference);
+            for (var i = 0; i < posses.length; i++) {
+                var pos3d = adjustPos3d(viewer, heightRef, posses[i]);
+                positions.push(pos3d);
+            }
         }
         else if (entity.ellipse) {
-            var position = getValue$2(viewer, entity.position);
-            if (!(position === null || position === void 0 ? void 0 : position.x)) {
+            var pos3d = getValue$2(viewer, entity.position);
+            if (!(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
                 return null;
             }
             heightRef = getValue$2(viewer, entity.ellipse.heightReference);
-            var semiMajorAxis = getValue$2(viewer, entity.ellipse.semiMajorAxis);
-            var semiMinorAxis = getValue$2(viewer, entity.ellipse.semiMinorAxis);
-            var rotation = getValue$2(viewer, entity.ellipse.rotation);
-            // More subdivisions means a more accurate ellipse but worse performance.
-            var numberOfSubdivisions = 5;
-            for (var i = 0; i < numberOfSubdivisions; i++) {
-                var theta = i * (2 * Math.PI / numberOfSubdivisions);
-                var x = semiMajorAxis * Math.cos(theta);
-                var y = semiMinorAxis * Math.sin(theta);
-                // Apply rotation.
-                var rotatedX = x * Math.cos(rotation) - y * Math.sin(rotation);
-                var rotatedY = x * Math.sin(rotation) + y * Math.cos(rotation);
-                // Translate by the ellipse's position.
-                var point = new Cesium.Cartesian3(position.x + rotatedX, position.y + rotatedY, position.z);
-                positions.push(point);
-            }
+            pos3d = adjustPos3d(viewer, heightRef, pos3d);
+            positions.push(pos3d);
         }
         else if (entity.model) {
             var pos3d = getValue$2(viewer, entity.position);
             if (!(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
                 return null;
             }
-            positions.push(pos3d);
             heightRef = getValue$2(viewer, entity.model.heightReference);
+            pos3d = adjustPos3d(viewer, heightRef, pos3d);
+            positions.push(pos3d);
         }
         else if (entity.point) {
             var pos3d = getValue$2(viewer, entity.position);
             if (!(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
                 return null;
             }
-            positions.push(pos3d);
             heightRef = getValue$2(viewer, entity.point.heightReference);
+            pos3d = adjustPos3d(viewer, heightRef, pos3d);
+            positions.push(pos3d);
         }
         if (!(positions === null || positions === void 0 ? void 0 : positions.length)) {
             return;
@@ -5112,27 +5291,81 @@
         return Cesium.BoundingSphere.fromPoints(positions);
     }
     function shouldCullEntity(viewer, cEntity) {
+        var _a, _b;
         var camera = viewer.scene.camera;
         var boundingSphere;
-        if (boundingSphereCache[cEntity.id]) {
-            boundingSphere = boundingSphereCache[cEntity.id];
+        var terrainId = (_b = (_a = exports.ViewUtils.GatherTerrainTile({
+            viewer: viewer
+        }).terrain) === null || _a === void 0 ? void 0 : _a.tilesetId) !== null && _b !== void 0 ? _b : bruceModels.ProjectViewTile.EDefaultTerrain.FlatTerrain;
+        var cullSphere;
+        var cacheKey = terrainId + cEntity.id;
+        var cacheData = boundingSphereCache.Get(cacheKey);
+        if (cacheData) {
+            boundingSphere = cacheData;
         }
         else {
             var positions = getPositionsFromEntity(viewer, cEntity);
             if (positions) {
                 boundingSphere = computeBoundingSphereFromPositions(positions);
                 if (cEntity.model) {
-                    // We don't know how large models are so we'll just add a tolerance.
-                    boundingSphere.radius += Math.sqrt(MODEL_SIZE_TOLERANCE);
+                    var model = cEntity.model;
+                    if (model._radius && !isNaN(model._radius)) {
+                        boundingSphere.radius = Math.max(model._radius, MODEL_MIN_RADIUS);
+                    }
+                    else {
+                        // Unknown size. Ignoring.
+                        boundingSphere = -1;
+                    }
+                }
+                // Check for radius and extrusion.
+                else if (cEntity.ellipse) {
+                    var radius = getValue$2(viewer, cEntity.ellipse.semiMajorAxis);
+                    var extrusion = getValue$2(viewer, cEntity.ellipse.extrudedHeight);
+                    if (extrusion && !isNaN(extrusion)) {
+                        if (!radius) {
+                            radius = extrusion;
+                        }
+                        else if (extrusion > radius / 2) {
+                            radius = extrusion;
+                        }
+                    }
+                    if (radius && !isNaN(radius)) {
+                        boundingSphere.radius = radius;
+                    }
+                }
+                // Check for extrusion.
+                else if (cEntity.polygon) {
+                    var extrusion = getValue$2(viewer, cEntity.polygon.extrudedHeight);
+                    if (extrusion && !isNaN(extrusion)) {
+                        if (!boundingSphere.radius) {
+                            boundingSphere.radius = extrusion;
+                        }
+                        else if (extrusion > boundingSphere.radius / 2) {
+                            boundingSphere.radius = extrusion;
+                        }
+                    }
                 }
-                boundingSphereCache[cEntity.id] = boundingSphere;
+                else if (cEntity.point || cEntity.billboard) {
+                    boundingSphere.radius = Math.max(boundingSphere.radius, POINT_MIN_RADIUS);
+                }
+                boundingSphereCache.Set(cacheKey, boundingSphere);
+            }
+            else {
+                boundingSphereCache.Set(cacheKey, -1);
             }
         }
-        if (!boundingSphere) {
+        if (!boundingSphere || boundingSphere == -1) {
             return false;
         }
         var cullingVolume = camera.frustum.computeCullingVolume(camera.position, camera.direction, camera.up);
         var visibility = cullingVolume.computeVisibility(boundingSphere);
+        if (cullSphere) {
+            cullSphere.ellipsoid.material =
+                (visibility == Cesium.Intersect.INSIDE ||
+                    visibility == Cesium.Intersect.INTERSECTING) ? Cesium.Color.GREEN.withAlpha(0.1) :
+                    Cesium.Color.RED.withAlpha(0.1);
+            viewer.scene.requestRender();
+        }
         return visibility !== Cesium.Intersect.INSIDE && visibility !== Cesium.Intersect.INTERSECTING;
     }
     // Amount of entities to check per interval.
@@ -5197,7 +5430,7 @@
                 var rego = register.GetRego({
                     entityId: entityId
                 });
-                if (!rego || !rego.visual || !(rego.visual instanceof Cesium.Entity)) {
+                if (!rego || !rego.visual || !(rego.visual instanceof Cesium.Entity) || rego.relation != null) {
                     continue;
                 }
                 var parts = exports.EntityUtils.GatherEntity({
@@ -11990,8 +12223,8 @@
      * Deprecated relations render manager.
      * This follows original navigator logic that renders both up/downstream relationships and ALL relationship types.
      */
-    var OldRelationsRenderManager;
-    (function (OldRelationsRenderManager) {
+    var LegacyRelationsRenderManager;
+    (function (LegacyRelationsRenderManager) {
         var Manager = /** @class */ (function () {
             function Manager(params) {
                 // If true, this menu item is disposed and should not be used.
@@ -12292,8 +12525,8 @@
             };
             return Manager;
         }());
-        OldRelationsRenderManager.Manager = Manager;
-    })(OldRelationsRenderManager || (OldRelationsRenderManager = {}));
+        LegacyRelationsRenderManager.Manager = Manager;
+    })(LegacyRelationsRenderManager || (LegacyRelationsRenderManager = {}));
 
     (function (MenuItemManager) {
         var Manager = /** @class */ (function () {
@@ -12541,7 +12774,7 @@
                         // Deprecated to support a few demos until new one is phased in.
                         // Use Relationships instead.
                         case bruceModels.MenuItem.EType.Relations:
-                            rItem.renderManager = new OldRelationsRenderManager.Manager({
+                            rItem.renderManager = new LegacyRelationsRenderManager.Manager({
                                 apiGetter: params.apiGetter,
                                 item: params.item,
                                 register: this.visualsRegister,
@@ -18152,7 +18385,7 @@
         ViewerUtils.CreateWidgets = CreateWidgets;
     })(exports.ViewerUtils || (exports.ViewerUtils = {}));
 
-    var VERSION$1 = "3.0.2";
+    var VERSION$1 = "3.0.4";
 
     exports.VERSION = VERSION$1;
     exports.CesiumParabola = CesiumParabola;