bruce-cesium 1.7.6 → 1.7.8

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, DelayQueue, BatchedDataGetter, EntityRelationType, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, EntityRelation, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartesian2, Cartographic, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, HeightReference, EllipsoidTerrainProvider, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, JulianDate, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Cesium3DTileset, Matrix4, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance, PolygonPipeline, Cesium3DTileColorBlendMode } from 'cesium';
+import { Cartesian2, Cartographic, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, HeightReference, EllipsoidTerrainProvider, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, HeadingPitchRange, Cesium3DTileColorBlendMode, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, JulianDate, NearFarScalar, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Cesium3DTileset, Matrix4, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -5509,7 +5509,7 @@ var TilesetCadRenderManager;
             }
         };
         Manager.prototype.mapTilesetFeature = function (feature) {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             var rego = {
                 entityId: null,
                 entityTypeId: null,
@@ -5520,33 +5520,38 @@ var TilesetCadRenderManager;
                 tilesetId: (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID
             };
             var featureAny = feature;
-            var propertyNames = featureAny.getPropertyNames ? featureAny.getPropertyNames() : featureAny.getPropertyIds();
-            for (var i = 0; i < propertyNames.length; i++) {
-                var prop = propertyNames[i];
-                var name_1 = String(prop).toLocaleLowerCase();
-                if (name_1 == "bruceid") {
-                    rego.entityId = feature.getProperty(prop);
-                    break;
+            var propertyNames = featureAny.getPropertyNames ? featureAny.getPropertyNames() : (_d = featureAny.getPropertyIds) === null || _d === void 0 ? void 0 : _d.call(featureAny);
+            if (!propertyNames) {
+                return null;
+            }
+            // GeomId is higher priority than using entityId directly as we need entityTypeId as well.
+            var geomIdProp = propertyNames.find(function (x) { return String(x).toLowerCase() == "geomid"; });
+            if (geomIdProp) {
+                var geomId = +feature.getProperty(geomIdProp);
+                if (geomId != null && (!!geomId || geomId == 0)) {
+                    var meta = this.getMetaByGeomId(geomId, feature.tileset);
+                    if (meta) {
+                        rego.entityId = meta.id;
+                        rego.entityTypeId = meta.typeId;
+                    }
+                }
+            }
+            if (!rego.entityId) {
+                var bruceIdProp = propertyNames.find(function (x) { return String(x).toLowerCase() == "bruceid"; });
+                if (bruceIdProp) {
+                    rego.entityId = feature.getProperty(bruceIdProp);
                 }
-                else if (name_1 == "brucepath") {
-                    var pathStr = feature.getProperty(prop);
-                    if (pathStr != undefined) {
+            }
+            // Legacy.
+            if (!rego.entityId) {
+                var brucePathProp = propertyNames.find(function (x) { return String(x).toLowerCase() == "brucepath"; });
+                if (brucePathProp) {
+                    var pathStr = feature.getProperty(brucePathProp);
+                    if (pathStr) {
                         var path = pathStr.split("|");
                         var entityTypeId = this.getEntityTypeByPath(path);
                         rego.entityTypeId = entityTypeId;
                         rego.entityId = path[path.length - 1];
-                        break;
-                    }
-                }
-                else if (name_1 == "geomid") {
-                    var geomId = +feature.getProperty(prop);
-                    if (geomId != null && (!!geomId || geomId == 0)) {
-                        var meta = this.getMetaByGeomId(geomId, feature.tileset);
-                        if (meta) {
-                            rego.entityId = meta.id;
-                            rego.entityTypeId = meta.typeId;
-                            break;
-                        }
                     }
                 }
             }
@@ -5555,7 +5560,7 @@ var TilesetCadRenderManager;
             }
             // Optional menu item restriction.
             // Allows only showing certain entities from a tileset.
-            var onlyIds = (_d = this.item.BruceEntity) === null || _d === void 0 ? void 0 : _d.EntityIds;
+            var onlyIds = (_e = this.item.BruceEntity) === null || _e === void 0 ? void 0 : _e.EntityIds;
             if ((onlyIds === null || onlyIds === void 0 ? void 0 : onlyIds.length) && !onlyIds.includes(rego.entityId)) {
                 if (this.item.BruceEntity.Ghosts) {
                     feature.color = Color.WHITE.clone().withAlpha(0.5);
@@ -5573,9 +5578,13 @@ var TilesetCadRenderManager;
         Manager.prototype.getMetaByGeomId = function (geomId, tileset) {
             var _a;
             var modelTree = (_a = tileset === null || tileset === void 0 ? void 0 : tileset.extensions) === null || _a === void 0 ? void 0 : _a.modelTree;
-            return this.digMetaByGeomId(geomId, modelTree, []);
+            return this.digMetaByGeomId(geomId, modelTree, [], 0);
         };
-        Manager.prototype.digMetaByGeomId = function (geomId, branch, path) {
+        Manager.prototype.digMetaByGeomId = function (geomId, branch, path, depth) {
+            if (depth > 8) {
+                console.error("digMetaByGeomId: depth > 8");
+                return null;
+            }
             path = [].concat(path);
             path.push(branch.id);
             if (branch.geomId == geomId) {
@@ -5583,7 +5592,7 @@ var TilesetCadRenderManager;
             }
             else if (branch.children) {
                 for (var i = 0; i < branch.children.length; i++) {
-                    var meta = this.digMetaByGeomId(geomId, branch.children[i], path);
+                    var meta = this.digMetaByGeomId(geomId, branch.children[i], path, depth + 1);
                     if (meta) {
                         return meta;
                     }
@@ -8850,11 +8859,11 @@ function renderLegacyNavigator(params, bookmark, view) {
  * @param view
  */
 function renderNavigator(params, bookmark, view) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4;
     return __awaiter(this, void 0, void 0, function () {
-        var viewer, scene, vSettings, bSettings, defaults, camera, newLens, curLens, transition, pos, terrain, gOcclusion, hillShades, baseColor, globeHidden, shadows, size, ambientOcclusion, AO, lighting, light, quality, fxaa, dateTime, clock, selectedIds, hiddenIds, isolatedIds, entityOpacityMap, entityId, opacity, imagery, renderedRelationEntityIds, curEnabled, newItemIds, _i, curEnabled_1, id, menuItem;
-        return __generator(this, function (_4) {
-            switch (_4.label) {
+        var viewer, scene, vSettings, bSettings, defaults, camera, newLens, curLens, transition, pos, terrain, gOcclusion, hillShades, baseColor, globeHidden, globeAlpha, shadows, size, ambientOcclusion, AO, lighting, light, quality, fxaa, dateTime, clock, selectedIds, hiddenIds, isolatedIds, entityOpacityMap, entityId, opacity, imagery, renderedRelationEntityIds, curEnabled, newItemIds, _i, curEnabled_1, id, menuItem;
+        return __generator(this, function (_5) {
+            switch (_5.label) {
                 case 0:
                     viewer = params.manager.Viewer;
                     scene = viewer.scene;
@@ -8916,8 +8925,8 @@ function renderNavigator(params, bookmark, view) {
                             viewer: params.manager.Viewer,
                         })];
                 case 1:
-                    _4.sent();
-                    _4.label = 2;
+                    _5.sent();
+                    _5.label = 2;
                 case 2:
                     gOcclusion = bSettings === null || bSettings === void 0 ? void 0 : bSettings.groundOcclusion;
                     if (gOcclusion == null) {
@@ -8953,9 +8962,19 @@ function renderNavigator(params, bookmark, view) {
                         globeHidden = false;
                     }
                     scene.globe.show = !globeHidden;
+                    globeAlpha = +(bSettings === null || bSettings === void 0 ? void 0 : bSettings.globeAlpha);
+                    if (isNaN(globeAlpha)) {
+                        globeAlpha = +((_t = defaults.settings) === null || _t === void 0 ? void 0 : _t.globeAlpha);
+                    }
+                    if (!scene.globe.translucency.enabled) {
+                        scene.globe.translucency.enabled = true;
+                        scene.globe.translucency.frontFaceAlphaByDistance = new NearFarScalar(400.0, 0.0, 800.0, 1.0);
+                        scene.globe.translucency.frontFaceAlphaByDistance.farValue = 1;
+                    }
+                    scene.globe.translucency.frontFaceAlphaByDistance.nearValue = EnsureNumber(globeAlpha, 1);
                     shadows = bSettings === null || bSettings === void 0 ? void 0 : bSettings.shadows;
                     if (shadows == null) {
-                        shadows = (_t = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _t === void 0 ? void 0 : _t.shadows;
+                        shadows = (_u = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _u === void 0 ? void 0 : _u.shadows;
                     }
                     if (shadows == null) {
                         shadows = {
@@ -8982,7 +9001,7 @@ function renderNavigator(params, bookmark, view) {
                     }
                     ambientOcclusion = bSettings === null || bSettings === void 0 ? void 0 : bSettings.ambientOcclusion;
                     if (ambientOcclusion == null) {
-                        ambientOcclusion = (_u = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _u === void 0 ? void 0 : _u.ambientOcclusion;
+                        ambientOcclusion = (_v = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _v === void 0 ? void 0 : _v.ambientOcclusion;
                     }
                     if (ambientOcclusion == null) {
                         ambientOcclusion = {
@@ -9005,7 +9024,7 @@ function renderNavigator(params, bookmark, view) {
                     }
                     lighting = bSettings === null || bSettings === void 0 ? void 0 : bSettings.lighting;
                     if (lighting == null) {
-                        lighting = (_v = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _v === void 0 ? void 0 : _v.lighting;
+                        lighting = (_w = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _w === void 0 ? void 0 : _w.lighting;
                     }
                     if (lighting == null) {
                         lighting = {
@@ -9020,7 +9039,7 @@ function renderNavigator(params, bookmark, view) {
                     }
                     quality = bSettings === null || bSettings === void 0 ? void 0 : bSettings.quality;
                     if (quality == null) {
-                        quality = (_w = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _w === void 0 ? void 0 : _w.quality;
+                        quality = (_x = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _x === void 0 ? void 0 : _x.quality;
                     }
                     if (quality == null) {
                         quality = {
@@ -9031,7 +9050,7 @@ function renderNavigator(params, bookmark, view) {
                     fxaa.enabled = Boolean(quality.fxaa);
                     dateTime = bSettings === null || bSettings === void 0 ? void 0 : bSettings.dateTime;
                     if (dateTime == null) {
-                        dateTime = (_x = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _x === void 0 ? void 0 : _x.dateTime;
+                        dateTime = (_y = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _y === void 0 ? void 0 : _y.dateTime;
                     }
                     if (dateTime != null) {
                         clock = viewer.clock;
@@ -9039,7 +9058,7 @@ function renderNavigator(params, bookmark, view) {
                     }
                     selectedIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.selectedEntityIds;
                     if (selectedIds == null) {
-                        selectedIds = (_y = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _y === void 0 ? void 0 : _y.selectedEntityIds;
+                        selectedIds = (_z = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _z === void 0 ? void 0 : _z.selectedEntityIds;
                     }
                     if (selectedIds != null) {
                         params.manager.VisualsRegister.ClearSelected();
@@ -9052,7 +9071,7 @@ function renderNavigator(params, bookmark, view) {
                     params.manager.VisualsRegister.ClearHidden();
                     hiddenIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.hiddenEntityIds;
                     if (hiddenIds == null) {
-                        hiddenIds = (_z = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _z === void 0 ? void 0 : _z.hiddenEntityIds;
+                        hiddenIds = (_0 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _0 === void 0 ? void 0 : _0.hiddenEntityIds;
                     }
                     if (hiddenIds != null) {
                         params.manager.VisualsRegister.SetHidden({
@@ -9063,7 +9082,7 @@ function renderNavigator(params, bookmark, view) {
                     params.manager.VisualsRegister.ClearIsolated();
                     isolatedIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.isolatedEntityIds;
                     if (isolatedIds == null) {
-                        isolatedIds = (_0 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _0 === void 0 ? void 0 : _0.isolatedEntityIds;
+                        isolatedIds = (_1 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _1 === void 0 ? void 0 : _1.isolatedEntityIds;
                     }
                     if (isolatedIds != null) {
                         params.manager.VisualsRegister.SetIsolated({
@@ -9074,7 +9093,7 @@ function renderNavigator(params, bookmark, view) {
                     params.manager.VisualsRegister.ClearOpacity();
                     entityOpacityMap = bSettings === null || bSettings === void 0 ? void 0 : bSettings.entityOpacityMap;
                     if (entityOpacityMap == null) {
-                        entityOpacityMap = (_1 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _1 === void 0 ? void 0 : _1.entityOpacityMap;
+                        entityOpacityMap = (_2 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _2 === void 0 ? void 0 : _2.entityOpacityMap;
                     }
                     if (entityOpacityMap != null) {
                         for (entityId in entityOpacityMap) {
@@ -9087,7 +9106,7 @@ function renderNavigator(params, bookmark, view) {
                             }
                         }
                     }
-                    imagery = (bSettings === null || bSettings === void 0 ? void 0 : bSettings.imagery) != null ? bSettings.imagery : (_2 = defaults.settings) === null || _2 === void 0 ? void 0 : _2.imagery;
+                    imagery = (bSettings === null || bSettings === void 0 ? void 0 : bSettings.imagery) != null ? bSettings.imagery : (_3 = defaults.settings) === null || _3 === void 0 ? void 0 : _3.imagery;
                     if (imagery == null) {
                         // TODO: Need global default.
                         imagery = [
@@ -9109,15 +9128,15 @@ function renderNavigator(params, bookmark, view) {
                             viewer: params.manager.Viewer,
                         })];
                 case 3:
-                    _4.sent();
+                    _5.sent();
                     renderedRelationEntityIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.renderedEntityRelations;
                     if (!renderedRelationEntityIds) {
                         renderedRelationEntityIds = [];
                     }
                     curEnabled = params.manager.GetEnabledItemIds();
-                    newItemIds = (_3 = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemIds) !== null && _3 !== void 0 ? _3 : [];
+                    newItemIds = (_4 = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemIds) !== null && _4 !== void 0 ? _4 : [];
                     _i = 0, curEnabled_1 = curEnabled;
-                    _4.label = 4;
+                    _5.label = 4;
                 case 4:
                     if (!(_i < curEnabled_1.length)) return [3 /*break*/, 7];
                     id = curEnabled_1[_i];
@@ -9127,8 +9146,8 @@ function renderNavigator(params, bookmark, view) {
                             menuItemId: id
                         })];
                 case 5:
-                    _4.sent();
-                    _4.label = 6;
+                    _5.sent();
+                    _5.label = 6;
                 case 6:
                     _i++;
                     return [3 /*break*/, 4];
@@ -9141,8 +9160,8 @@ function renderNavigator(params, bookmark, view) {
                             bookmark: bookmark
                         })];
                 case 8:
-                    _4.sent();
-                    _4.label = 9;
+                    _5.sent();
+                    _5.label = 9;
                 case 9:
                     if (!(renderedRelationEntityIds.length > 0)) return [3 /*break*/, 11];
                     menuItem = {
@@ -9158,8 +9177,8 @@ function renderNavigator(params, bookmark, view) {
                             item: menuItem
                         })];
                 case 10:
-                    _4.sent();
-                    _4.label = 11;
+                    _5.sent();
+                    _5.label = 11;
                 case 11: return [2 /*return*/];
             }
         });