bruce-cesium 3.2.2 → 3.2.4

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { Cartes, ProjectViewTile, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, DelayQueue, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, EntityRelationType, BruceEvent, EntityCoords, Api, EntitySource, MenuItem, EntityRelation, ProgramKey, ENVIRONMENT, AbstractApi, ProjectViewBookmark, EntityAttachment, EntityAttachmentType, EntityAttribute, ProjectView, ProjectViewLegacyTile, Camera } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, DistanceDisplayCondition, NearFarScalar, Model, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, HeadingPitchRange, Cesium3DTileColorBlendMode, KmlDataSource, Ion, Cesium3DTileStyle, SceneTransforms, OrthographicFrustum, EasingFunction, EllipsoidGeodesic, EllipsoidTerrainProvider, sampleTerrainMostDetailed, defined, Cesium3DTileset, Matrix4, Matrix3, IonResource, PolygonPipeline, CesiumInspector, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, ColorMaterialProperty, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, SceneMode, JulianDate, Entity, Primitive, Cesium3DTileFeature, DistanceDisplayCondition, NearFarScalar, Model, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, CesiumInspector, defined, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, Matrix4, Matrix3, IonResource, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, ScreenSpaceEventHandler, ScreenSpaceEventType, ColorMaterialProperty, BoundingSphere, GeometryInstance, PolygonPipeline, Intersect } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -973,43 +973,20 @@ var EntityUtils;
                             });
                         }); };
                         getEntityPositions = function (sample) { return __awaiter(_this, void 0, void 0, function () {
-                            var entityId, entity, tileset, tilesetId, e_1, evaluateRendered, evaluateRecord, renderedPosses, recordPosses, e_2, tSettings, pos3d, alt, alt, heading, pitch, roll, matrix4, offset, m1, hpr, transform, transformedOffset;
+                            var entityId, entity, tileset, tilesetId, evaluateRendered, evaluateRecord, renderedPosses, e_1, recordPosses, e_2, tSettings, pos3d, alt, alt, heading, pitch, roll, matrix4, offset, m1, hpr, transform, transformedOffset;
                             var _this = this;
                             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
                             return __generator(this, function (_l) {
                                 switch (_l.label) {
                                     case 0:
                                         entityId = sample.entityId, entity = sample.entity, tileset = sample.tileset, tilesetId = sample.tilesetId;
-                                        if (!!entity) return [3 /*break*/, 4];
-                                        if (!(apiCalls < MAX_API_CALLS)) return [3 /*break*/, 4];
-                                        apiCalls += 1;
-                                        _l.label = 1;
-                                    case 1:
-                                        _l.trys.push([1, 3, , 4]);
-                                        return [4 /*yield*/, Entity$1.Get({
-                                                api: api,
-                                                entityId: entityId,
-                                                // Not expanding relative positions at first to see if the entity has valid location just by itself.
-                                                expandLocation: false
-                                            })];
-                                    case 2:
-                                        entity = (_l.sent()).entity;
-                                        return [3 /*break*/, 4];
-                                    case 3:
-                                        e_1 = _l.sent();
-                                        console.error(e_1);
-                                        return [3 /*break*/, 4];
-                                    case 4:
-                                        if (!entity) {
-                                            return [2 /*return*/, []];
-                                        }
                                         evaluateRendered = function () { return __awaiter(_this, void 0, void 0, function () {
-                                            var rego, posses, visual, visualHeightRef, hierarchy, hPosses, hPossesSample, step, i, pPosses, pPossesSample, step, i, pPosses, pPossesSample, step, i, pos3d_1, modelExt, sphere;
+                                            var rego, posses, visual, visualHeightRef, hierarchy, hPosses, hPossesSample, step, i, pPosses, pPossesSample, step, i, pPosses, pPossesSample, step, i, pos3d_1, toAdjust, modelExt, sphere;
                                             return __generator(this, function (_a) {
                                                 switch (_a.label) {
                                                     case 0:
                                                         rego = visualRegister ? visualRegister.GetRego({
-                                                            entityId: entity.Bruce.ID,
+                                                            entityId: sample.entityId,
                                                         }) : null;
                                                         posses = [];
                                                         if (!((rego === null || rego === void 0 ? void 0 : rego.visual) instanceof Entity)) return [3 /*break*/, 14];
@@ -1087,15 +1064,11 @@ var EntityUtils;
                                                     case 12:
                                                         pos3d_1 = GetValue(viewer, visual.position);
                                                         if (!(pos3d_1 === null || pos3d_1 === void 0 ? void 0 : pos3d_1.x)) return [3 /*break*/, 14];
-                                                        pos3d_1 = DrawingUtils.EnsurePosHeight({
-                                                            desiredHeightRef: sample.returnHeightRef,
-                                                            heightRef: visualHeightRef,
-                                                            pos3d: pos3d_1,
-                                                            viewer: viewer
-                                                        });
-                                                        return [4 /*yield*/, processPosHeight(pos3d_1, sample.returnHeightRef)];
+                                                        toAdjust = [pos3d_1];
+                                                        return [4 /*yield*/, ensureHeightRefs(toAdjust, __assign(__assign({}, sample), { heightRef: visualHeightRef }))];
                                                     case 13:
-                                                        pos3d_1 = _a.sent();
+                                                        _a.sent();
+                                                        pos3d_1 = toAdjust[0];
                                                         posses.push(pos3d_1);
                                                         if (visual.model) {
                                                             modelExt = visual.model;
@@ -1180,11 +1153,34 @@ var EntityUtils;
                                             });
                                         }); };
                                         return [4 /*yield*/, evaluateRendered()];
-                                    case 5:
+                                    case 1:
                                         renderedPosses = _l.sent();
                                         if (renderedPosses === null || renderedPosses === void 0 ? void 0 : renderedPosses.length) {
                                             return [2 /*return*/, renderedPosses];
                                         }
+                                        if (!!entity) return [3 /*break*/, 5];
+                                        if (!(apiCalls < MAX_API_CALLS)) return [3 /*break*/, 5];
+                                        apiCalls += 1;
+                                        _l.label = 2;
+                                    case 2:
+                                        _l.trys.push([2, 4, , 5]);
+                                        return [4 /*yield*/, Entity$1.Get({
+                                                api: api,
+                                                entityId: entityId,
+                                                // Not expanding relative positions at first to see if the entity has valid location just by itself.
+                                                expandLocation: false
+                                            })];
+                                    case 3:
+                                        entity = (_l.sent()).entity;
+                                        return [3 /*break*/, 5];
+                                    case 4:
+                                        e_1 = _l.sent();
+                                        console.error(e_1);
+                                        return [3 /*break*/, 5];
+                                    case 5:
+                                        if (!entity) {
+                                            return [2 /*return*/, []];
+                                        }
                                         return [4 /*yield*/, evaluateRecord()];
                                     case 6:
                                         recordPosses = _l.sent();
@@ -3006,24 +3002,27 @@ function getModelEntity(url, scale) {
     return __awaiter(this, void 0, void 0, function () {
         var CESIUM;
         return __generator(this, function (_a) {
-            CESIUM = Cesium;
-            // Newer versions of Cesium have a fromGltfAsync method.
-            if (CESIUM.Model.hasOwnProperty("fromGltfAsync")) {
-                return [2 /*return*/, CESIUM.Model.fromGltfAsync({
-                        url: url,
-                        asynchronous: true,
-                        scale: scale
-                    })];
-            }
-            // Older versions of Cesium have a fromGltf method.
-            else if (Model.hasOwnProperty("fromGltf")) {
-                return [2 /*return*/, CESIUM.Model.fromGltf({
-                        url: url,
-                        asynchronous: true,
-                        scale: scale
-                    })];
-            }
-            return [2 /*return*/, null];
+            switch (_a.label) {
+                case 0:
+                    CESIUM = Cesium;
+                    if (!CESIUM.Model.hasOwnProperty("fromGltfAsync")) return [3 /*break*/, 2];
+                    return [4 /*yield*/, CESIUM.Model.fromGltfAsync({
+                            url: url,
+                            asynchronous: true,
+                            scale: scale
+                        })];
+                case 1: return [2 /*return*/, _a.sent()];
+                case 2:
+                    if (Model.hasOwnProperty("fromGltf")) {
+                        return [2 /*return*/, CESIUM.Model.fromGltf({
+                                url: url,
+                                asynchronous: true,
+                                scale: scale
+                            })];
+                    }
+                    _a.label = 3;
+                case 3: return [2 /*return*/, null];
+            }
         });
     });
 }
@@ -4082,7 +4081,7 @@ var EntityRenderEngine;
             var heightProm = _fileRadiusCache.Get(fileRadiusKey);
             if (!heightProm) {
                 heightProm = new Promise(function (res) { return __awaiter(_this, void 0, void 0, function () {
-                    var modelPrim_1, e_6;
+                    var modelPrim_1, onReady_1, readyEventRemoval_1, e_6;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
@@ -4090,7 +4089,9 @@ var EntityRenderEngine;
                                 return [4 /*yield*/, getModelEntity(params.lodUrl, scale * styleScale)];
                             case 1:
                                 modelPrim_1 = _a.sent();
-                                modelPrim_1.readyPromise.then(function (loaded) {
+                                onReady_1 = function () {
+                                    readyEventRemoval_1 === null || readyEventRemoval_1 === void 0 ? void 0 : readyEventRemoval_1();
+                                    readyEventRemoval_1 = null;
                                     var kill = function () {
                                         if (params.viewer && !params.viewer.isDestroyed() && params.viewer.scene.primitives.contains(modelPrim_1)) {
                                             params.viewer.scene.primitives.remove(modelPrim_1);
@@ -4099,13 +4100,13 @@ var EntityRenderEngine;
                                             modelPrim_1.destroy();
                                         }
                                     };
-                                    if (!cEntity || !(loaded === null || loaded === void 0 ? void 0 : loaded.boundingSphere)) {
+                                    if (!cEntity || !(modelPrim_1 === null || modelPrim_1 === void 0 ? void 0 : modelPrim_1.boundingSphere)) {
                                         kill();
                                         res(null);
                                         return;
                                     }
-                                    var radius = loaded.boundingSphere.radius;
-                                    var centerOffset = loaded.boundingSphere.center;
+                                    var radius = modelPrim_1.boundingSphere.radius;
+                                    var centerOffset = modelPrim_1.boundingSphere.center;
                                     if (centerOffset) {
                                         // Add the center offset to the radius because I am not good at math.
                                         var magnitude = Cartesian3.magnitude(centerOffset);
@@ -4118,10 +4119,21 @@ var EntityRenderEngine;
                                     }
                                     kill();
                                     res(radius);
-                                }).catch(function (e) {
-                                    console.error(e);
-                                    res(null);
-                                });
+                                };
+                                readyEventRemoval_1 = null;
+                                // Newer Cesium versions have readyEvent. They don't use readyPromise.
+                                if (modelPrim_1["readyEvent"]) {
+                                    modelPrim_1["readyEvent"].addEventListener(onReady_1);
+                                }
+                                // Older Cesium versions don't have readyEvent, they use readyPromise.
+                                else if (modelPrim_1["readyPromise"]) {
+                                    modelPrim_1["readyPromise"].then(function () {
+                                        onReady_1();
+                                    }).catch(function (e) {
+                                        console.error(e);
+                                        res(null);
+                                    });
+                                }
                                 params.viewer.scene.primitives.add(modelPrim_1);
                                 return [3 /*break*/, 3];
                             case 2:
@@ -19399,7 +19411,7 @@ var CesiumViewMonitor;
     CesiumViewMonitor$$1.Monitor = Monitor;
 })(CesiumViewMonitor || (CesiumViewMonitor = {}));
 
-var VERSION$1 = "3.2.2";
+var VERSION$1 = "3.2.4";
 
 export { VERSION$1 as VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map