bruce-cesium 2.7.4 → 2.7.6

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, EntityRelationType, DelayQueue, BatchedDataGetter, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, EntityRelation, ENVIRONMENT, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera, AbstractApi, EntityAttachment, EntityAttachmentType, EntityAttribute } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Entity, Primitive, Cesium3DTileFeature, Color, Cartesian2, JulianDate, Cartesian3, SceneMode, Math as Math$1, CallbackProperty, Rectangle, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, EllipsoidTerrainProvider, CesiumInspector, OrthographicFrustum, defined, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, Model, PolygonPipeline, Matrix4, Matrix3, IonResource, ScreenSpaceEventHandler, ScreenSpaceEventType, ColorMaterialProperty, EasingFunction, GeometryInstance, Ion, BoundingSphere } from 'cesium';
+import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, JulianDate, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, EasingFunction, Cesium3DTileset, Matrix4, Matrix3, IonResource, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, Model, PolygonPipeline, CesiumInspector, ColorMaterialProperty, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Ion, BoundingSphere } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -1766,7 +1766,7 @@ function getName(api, entity) {
 }
 function getStyle(api, entity, styleId) {
     return __awaiter(this, void 0, void 0, function () {
-        var style, e_2, typeId, type, e_3;
+        var style, e_2, typeId, type, e_3, hideError, error, code;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -1809,7 +1809,18 @@ function getStyle(api, entity, styleId) {
                     return [3 /*break*/, 9];
                 case 8:
                     e_3 = _a.sent();
-                    console.error(e_3);
+                    hideError = false;
+                    // TODO: we need a util for extracting code + message rather than writing all this every time.
+                    if (e_3 && typeof e_3 == "object" && e_3.ERROR) {
+                        error = e_3.ERROR;
+                        code = error && typeof error == "object" ? error.Code : "";
+                        // Avoiding logging a common error.
+                        // This happens when rendering entities that don't have records.
+                        hideError = String(code).toLowerCase() == "notfound";
+                    }
+                    if (!hideError) {
+                        console.error(e_3);
+                    }
                     return [3 /*break*/, 9];
                 case 9: return [2 /*return*/, style];
             }
@@ -5519,16 +5530,14 @@ var EntitiesRenderManager;
                 viewer: this.viewer,
                 // Unfortunately this searches as an "AND" rather than "OR" which does not meet our needs here.
                 // So for multiple tags we'll manually sort on UI end...
-                tagIds: tagsToRender.length == 1 ? tagsToRender : [],
+                tagIds: (tagsToRender === null || tagsToRender === void 0 ? void 0 : tagsToRender.length) ? tagsToRender : [],
                 debugShowBounds: Boolean(window === null || window === void 0 ? void 0 : window.ENTITIES_RENDER_MANAGER_SHOW_BOUNDS),
                 cdn: this.item.cdnEnabled
             });
             var minMax = RenderManager.GetZoomMinMax({
                 zoomControl: this.item.CameraZoomSettings
             });
-            // Unfortunately this searches as an "AND" rather than "OR" which does not meet our needs here.
-            // So for multiple tags we'll manually sort on UI end...
-            this.getter.IncludeMenuItem(this.item.id, tagsToRender.length == 1 ? tagsToRender : [], minMax[0], minMax[1]);
+            this.getter.IncludeMenuItem(this.item.id, (tagsToRender === null || tagsToRender === void 0 ? void 0 : tagsToRender.length) ? tagsToRender : [], minMax[0], minMax[1]);
             this.getterSub = this.getter.OnUpdate.Subscribe(function (entities) {
                 if (isTagItem) {
                     _this.distributeForRender(entities.filter(function (entity) {
@@ -8247,6 +8256,7 @@ var TilesetEntitiesRenderManager;
 (function (TilesetEntitiesRenderManager) {
     var Manager = /** @class */ (function () {
         function Manager(params) {
+            this.initCounter = 0;
             this.disposed = false;
             this.cTileset = null;
             var viewer = params.viewer, visualsManager = params.register, apiGetter = params.getters, item = params.item;
@@ -8269,23 +8279,32 @@ var TilesetEntitiesRenderManager;
             enumerable: false,
             configurable: true
         });
-        Manager.prototype.Init = function () {
+        Manager.prototype.Init = function (params) {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var tilesetId;
+                var counter, tilesetId;
                 var _this = this;
                 return __generator(this, function (_b) {
+                    this.initCounter += 1;
+                    counter = this.initCounter;
+                    if (this.disposed) {
+                        return [2 /*return*/];
+                    }
+                    if (params === null || params === void 0 ? void 0 : params.item) {
+                        this.item = params.item;
+                    }
                     tilesetId = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.TilesetID;
                     if (!tilesetId) {
                         return [2 /*return*/];
                     }
                     (function () { return __awaiter(_this, void 0, void 0, function () {
-                        var canAccess, e_1, accountId, api, tileset, cTileset, _a;
+                        var canAccess, e_1, accountId, api, tileset, cTileset, _a, attenuation, attenuationMax;
                         var _this = this;
                         var _b, _c, _d;
                         return __generator(this, function (_e) {
                             switch (_e.label) {
                                 case 0:
+                                    if (!!this.cTileset) return [3 /*break*/, 9];
                                     if (!tilesetId) return [3 /*break*/, 5];
                                     canAccess = false;
                                     _e.label = 1;
@@ -8314,6 +8333,9 @@ var TilesetEntitiesRenderManager;
                                     console.warn("No tileset id found. Skipping access check.");
                                     _e.label = 6;
                                 case 6:
+                                    if (this.disposed || counter !== this.initCounter) {
+                                        return [2 /*return*/];
+                                    }
                                     accountId = (_d = this.item.tileset) === null || _d === void 0 ? void 0 : _d.ClientAccountID;
                                     if (!accountId) {
                                         accountId = this.getters.GetAccountId();
@@ -8327,7 +8349,7 @@ var TilesetEntitiesRenderManager;
                                         })];
                                 case 7:
                                     tileset = (_e.sent()).tileset;
-                                    if (!tileset || this.disposed) {
+                                    if (!tileset || this.disposed || counter !== this.initCounter) {
                                         return [2 /*return*/];
                                     }
                                     this.typeId = tileset.settings.entityTypeId;
@@ -8361,6 +8383,25 @@ var TilesetEntitiesRenderManager;
                                     cTileset.tileLoad.addEventListener(function (tile) {
                                         _this.mapCTile(tile);
                                     });
+                                    _e.label = 9;
+                                case 9:
+                                    attenuation = this.item.attenuation;
+                                    if (!attenuation && attenuation != false) {
+                                        attenuation = true;
+                                    }
+                                    attenuationMax = this.item.attenuationMax;
+                                    if (isNaN(attenuationMax)) {
+                                        attenuationMax = 20;
+                                    }
+                                    this.cTileset.readyPromise.then(function () {
+                                        TilesetRenderEngine.ApplySettings({
+                                            cTileset: _this.cTileset,
+                                            settings: {
+                                                attenuation: attenuation,
+                                                maximumAttenuation: attenuationMax
+                                            }
+                                        });
+                                    });
                                     return [2 /*return*/];
                             }
                         });
@@ -9387,6 +9428,14 @@ var MenuItemManager;
                         rItem.item = params.item;
                     }
                 }
+                // This means we're updating a entities tileset menu item.
+                // These have different point scaling settings based on bookmark settings.
+                else if (rItem.type == MenuItem.EType.EntityTileset && params.item.Type == MenuItem.EType.EntityTileset) {
+                    rItem.renderManager.Init({
+                        item: params.item,
+                    });
+                    rItem.item = params.item;
+                }
             }
             else {
                 rItem = {
@@ -10058,7 +10107,7 @@ var MenuItemCreator;
                         renderedItemIds = [];
                         if (!((menuItems === null || menuItems === void 0 ? void 0 : menuItems.length) && (enabledIds === null || enabledIds === void 0 ? void 0 : enabledIds.length))) return [3 /*break*/, 10];
                         traverseItems_1 = function (item) { return __awaiter(_this, void 0, void 0, function () {
-                            var eItem, eItemAlt, itemId, i;
+                            var eItem, eItemAlt, tItem, tItemAlt, itemId, i;
                             var _a;
                             return __generator(this, function (_b) {
                                 switch (_b.label) {
@@ -10073,6 +10122,12 @@ var MenuItemCreator;
                                                     eItem.BruceEntity = __assign(__assign({}, eItem.BruceEntity), { SelectedExpandLayers: (_a = eItemAlt.BruceEntity) === null || _a === void 0 ? void 0 : _a.SelectedExpandLayers });
                                                 }
                                             }
+                                            else if (item.Type == MenuItem.EType.EntityTileset) {
+                                                tItem = item;
+                                                tItemAlt = alternations[item.id];
+                                                tItem.attenuation = tItemAlt.attenuation;
+                                                tItem.attenuationMax = tItemAlt.attenuationMax;
+                                            }
                                         }
                                         if (!enabledIds.includes(item.id)) return [3 /*break*/, 2];
                                         return [4 /*yield*/, manager.RenderItem({
@@ -12436,71 +12491,43 @@ var ViewRenderEngine;
 })(ViewRenderEngine || (ViewRenderEngine = {}));
 
 var DEFAULT_SMOOTH_MULTIPLIER = 0;
-function avgDistanceFromPointPair(refPoint, pos1, pos2) {
-    var carto1 = Cartographic.fromCartesian(refPoint);
-    var carto2 = Cartographic.fromCartesian(pos1);
-    var carto3 = Cartographic.fromCartesian(pos2);
-    var x1 = carto1.longitude;
-    var y1 = carto1.latitude;
-    var x2 = carto2.longitude;
-    var y2 = carto2.latitude;
-    var x3 = carto3.longitude;
-    var y3 = carto3.latitude;
-    var A = x1 - x2;
-    var B = y1 - y2;
-    var C = x3 - x2;
-    var D = y3 - y2;
-    var dot = A * C + B * D;
-    var lenSq = C * C + D * D;
-    var param = dot / lenSq;
-    var xx;
-    var yy;
-    if (param < 0 || x2 == x3 && y2 == y3) {
-        xx = x2;
-        yy = y2;
-    }
-    else if (param > 1) {
-        xx = x3;
-        yy = y3;
+function distanceToSegment$1(p, v, w) {
+    var l2 = Cartesian3.distanceSquared(v, w);
+    if (l2 === 0) {
+        return Cartesian3.distance(p, v);
     }
-    else {
-        xx = x2 + param * C;
-        yy = y2 + param * D;
+    var t = Cartesian3.dot(Cartesian3.subtract(p, v, new Cartesian3()), Cartesian3.subtract(w, v, new Cartesian3())) / l2;
+    if (t < 0) {
+        return Cartesian3.distance(p, v);
+    }
+    if (t > 1) {
+        return Cartesian3.distance(p, w);
     }
-    var dx = x1 - xx;
-    var dy = y1 - yy;
-    return Math.sqrt(dx * dx + dy * dy);
+    var projection = Cartesian3.add(v, Cartesian3.multiplyByScalar(Cartesian3.subtract(w, v, new Cartesian3()), t, new Cartesian3()), new Cartesian3());
+    return Cartesian3.distance(p, projection);
 }
+/**
+ * Returns splice index into a list of positions to insert a new position.
+ * @param positions List of positions to insert into.
+ * @param pos3d New position to insert.
+ * @returns Index to insert at.
+ */
 function getInsertIndex(positions, pos3d) {
     if (positions.length < 2) {
         return 0;
     }
+    var minDistance = Infinity;
     var index = -1;
-    if (positions) {
-        var distance = void 0;
-        for (var j = 0; j < positions.length; j++) {
-            var pos1 = positions[j];
-            var pos2 = void 0;
-            var pos2Index = -1;
-            if (j >= positions.length - 1) {
-                pos2 = positions[0];
-                pos2Index = 0;
-            }
-            else {
-                pos2 = positions[j + 1];
-                pos2Index = j + 1;
-            }
-            if (Cartes.ValidateCartes3(pos1), Cartes.ValidateCartes3(pos2)) {
-                var length_1 = avgDistanceFromPointPair(pos3d, pos1, pos2);
-                if (index == -1 || length_1 < distance) {
-                    var insertIndex = pos2Index == 0 ? 0 : j > pos2Index ? j : pos2Index;
-                    index = insertIndex;
-                    distance = length_1;
-                }
-            }
+    for (var i = 0; i < positions.length; i++) {
+        var pos1 = positions[i];
+        var pos2 = i < positions.length - 1 ? positions[i + 1] : positions[0];
+        var dist = distanceToSegment$1(pos3d, pos1, pos2);
+        if (dist < minDistance) {
+            minDistance = dist;
+            index = i + 1;
         }
     }
-    return index == -1 ? 0 : index;
+    return index;
 }
 var OUTLINE_COLOR = "rgba(51, 177, 255, 0.2)";
 var FILL_COLOR = "#33B1FF";
@@ -12903,71 +12930,61 @@ var Draw3dPolygon = /** @class */ (function () {
 }());
 
 var DEFAULT_SMOOTH_MULTIPLIER$1 = 0;
-function avgDistanceFromPointPair$1(refPoint, pos1, pos2) {
-    var carto1 = Cartographic.fromCartesian(refPoint);
-    var carto2 = Cartographic.fromCartesian(pos1);
-    var carto3 = Cartographic.fromCartesian(pos2);
-    var x1 = carto1.longitude;
-    var y1 = carto1.latitude;
-    var x2 = carto2.longitude;
-    var y2 = carto2.latitude;
-    var x3 = carto3.longitude;
-    var y3 = carto3.latitude;
-    var A = x1 - x2;
-    var B = y1 - y2;
-    var C = x3 - x2;
-    var D = y3 - y2;
-    var dot = A * C + B * D;
-    var lenSq = C * C + D * D;
-    var param = dot / lenSq;
-    var xx;
-    var yy;
-    if (param < 0 || x2 == x3 && y2 == y3) {
-        xx = x2;
-        yy = y2;
-    }
-    else if (param > 1) {
-        xx = x3;
-        yy = y3;
+function distanceToSegment$2(p, v, w) {
+    var l2 = Cartesian3.distanceSquared(v, w);
+    if (l2 === 0) {
+        return Cartesian3.distance(p, v);
     }
-    else {
-        xx = x2 + param * C;
-        yy = y2 + param * D;
+    var t = Cartesian3.dot(Cartesian3.subtract(p, v, new Cartesian3()), Cartesian3.subtract(w, v, new Cartesian3())) / l2;
+    if (t < 0) {
+        return Cartesian3.distance(p, v);
     }
-    var dx = x1 - xx;
-    var dy = y1 - yy;
-    return Math.sqrt(dx * dx + dy * dy);
+    if (t > 1) {
+        return Cartesian3.distance(p, w);
+    }
+    var projection = Cartesian3.add(v, Cartesian3.multiplyByScalar(Cartesian3.subtract(w, v, new Cartesian3()), t, new Cartesian3()), new Cartesian3());
+    return Cartesian3.distance(p, projection);
 }
+/**
+ * Returns splice index into a list of positions to insert a new position.
+ * @param positions List of positions to insert into.
+ * @param pos3d New position to insert.
+ * @returns Index to insert at.
+ */
 function getInsertIndex$1(positions, pos3d) {
     if (positions.length < 2) {
         return 0;
     }
-    var index = 0;
-    if (positions) {
-        var marginalShift = function (pos) {
-            var SHIFT = 0.001;
-            pos = pos.clone();
-            return new Cartesian3(pos.x + SHIFT, pos.y + SHIFT, pos.z + SHIFT);
-        };
-        var distance = avgDistanceFromPointPair$1(pos3d, positions[0], marginalShift(positions[0]));
-        var endDistance = avgDistanceFromPointPair$1(pos3d, positions[positions.length - 1], marginalShift(positions[positions.length - 1]));
-        if (endDistance < distance) {
-            index = positions.length;
-            distance = endDistance;
-        }
-        for (var j = 0; j < positions.length; j++) {
-            var pos1 = positions[j];
-            var pos2 = positions[j + 1];
-            var pos2Index = j + 1;
-            if (Cartes.ValidateCartes3(pos1), Cartes.ValidateCartes3(pos2)) {
-                var length_1 = avgDistanceFromPointPair$1(pos3d, pos1, pos2);
-                if (length_1 < distance) {
-                    var insertIndex = pos2Index == 0 ? 0 : j > pos2Index ? j : pos2Index;
-                    index = insertIndex;
-                    distance = length_1;
-                }
-            }
-        }
+    var minDistance = Infinity;
+    var index = -1;
+    // Check against segments
+    for (var i = 0; i < positions.length - 1; i++) {
+        var pos1 = positions[i];
+        var pos2 = positions[i + 1];
+        var dist = distanceToSegment$2(pos3d, pos1, pos2);
+        if (dist < minDistance) {
+            minDistance = dist;
+            index = i + 1;
+        }
+    }
+    // Check against start point
+    var startDist = Cartesian3.distance(pos3d, positions[0]);
+    if (startDist <= minDistance) {
+        index = 0;
+        minDistance = startDist;
+        console.log("Insert at start");
+    }
+    else {
+        console.log("Start distance was longer than cur distance. ".concat(startDist, " > ").concat(minDistance));
+    }
+    // Check against end point
+    var endDist = Cartesian3.distance(pos3d, positions[positions.length - 1]);
+    if (endDist <= minDistance) {
+        index = positions.length;
+        console.log("Insert at end");
+    }
+    else {
+        console.log("End distance was longer than cur distance. ".concat(endDist, " > ").concat(minDistance));
     }
     return index;
 }
@@ -15272,7 +15289,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.7.4";
+var VERSION$1 = "2.7.6";
 
 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, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map