bruce-cesium 3.8.9 → 3.9.1

package/dist/bruce-cesium.es5.js

@@ -8241,27 +8241,30 @@ var CesiumAnimatedInOut;
             }
         }
         else if (entity instanceof Cesium3DTileFeature) {
-            try {
-                CesiumAnimatedProperty.AnimateTFeatureColor({
-                    durationMs: 500,
-                    feature: entity,
-                    targetColor: Color.WHITE.withAlpha(0.0),
-                    startColor: entity.color ? entity.color : Color.WHITE.clone(),
-                    viewer: viewer,
-                    onDone: function () {
-                        var tileset = entity === null || entity === void 0 ? void 0 : entity.tileset;
-                        if (tileset && viewer.scene.primitives.contains(tileset)) {
-                            entity.show = false;
+            var tileset = entity === null || entity === void 0 ? void 0 : entity.tileset;
+            if (tileset && (viewer === null || viewer === void 0 ? void 0 : viewer.scene) && viewer.scene.primitives.contains(tileset)) {
+                try {
+                    CesiumAnimatedProperty.AnimateTFeatureColor({
+                        durationMs: 500,
+                        feature: entity,
+                        targetColor: Color.WHITE.withAlpha(0.0),
+                        startColor: entity.color ? entity.color : Color.WHITE.clone(),
+                        viewer: viewer,
+                        onDone: function () {
+                            var tileset = entity === null || entity === void 0 ? void 0 : entity.tileset;
+                            if (tileset && viewer.scene.primitives.contains(tileset)) {
+                                entity.show = false;
+                            }
                         }
+                    });
+                }
+                catch (e) {
+                    console.error(e);
+                    // If an error occurs, just hide the feature.
+                    var tileset_1 = entity === null || entity === void 0 ? void 0 : entity.tileset;
+                    if (tileset_1 && viewer.scene.primitives.contains(tileset_1)) {
+                        entity.show = false;
                     }
-                });
-            }
-            catch (e) {
-                console.error(e);
-                // If an error occurs, just hide the feature.
-                var tileset = entity === null || entity === void 0 ? void 0 : entity.tileset;
-                if (tileset && viewer.scene.primitives.contains(tileset)) {
-                    entity.show = false;
                 }
             }
         }
@@ -15211,18 +15214,18 @@ var TilesetEntitiesRenderManager;
                 return;
             }
             (function () { return __awaiter(_this, void 0, void 0, function () {
-                var canAccess, e_1, accountId, api, tileset, cTileset, _a, attenuation, attenuationMax;
+                var canAccess, e_1, accountId, api, tileset, fallbackTypeId, cTileset, _a, attenuation, attenuationMax;
                 var _this = this;
-                var _b, _c, _d;
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
+                var _b, _c, _d, _e, _f;
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
                         case 0:
                             if (!!this.cTileset) return [3 /*break*/, 9];
                             if (!tilesetId) return [3 /*break*/, 5];
                             canAccess = false;
-                            _e.label = 1;
+                            _g.label = 1;
                         case 1:
-                            _e.trys.push([1, 3, , 4]);
+                            _g.trys.push([1, 3, , 4]);
                             return [4 /*yield*/, Tileset.Publish.IsAccessAllowed({
                                     sourceAccountId: (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID,
                                     tilesetId: tilesetId,
@@ -15230,10 +15233,10 @@ var TilesetEntitiesRenderManager;
                                     api: this.getters.GetGlobalApi()
                                 })];
                         case 2:
-                            canAccess = _e.sent();
+                            canAccess = _g.sent();
                             return [3 /*break*/, 4];
                         case 3:
-                            e_1 = _e.sent();
+                            e_1 = _g.sent();
                             console.error(e_1);
                             return [3 /*break*/, 4];
                         case 4:
@@ -15244,7 +15247,7 @@ var TilesetEntitiesRenderManager;
                             return [3 /*break*/, 6];
                         case 5:
                             console.warn("No tileset id found. Skipping access check.");
-                            _e.label = 6;
+                            _g.label = 6;
                         case 6:
                             if (this.disposed || counter !== this.initCounter) {
                                 return [2 /*return*/];
@@ -15261,11 +15264,18 @@ var TilesetEntitiesRenderManager;
                                     tilesetId: tilesetId
                                 })];
                         case 7:
-                            tileset = (_e.sent()).tileset;
+                            tileset = (_g.sent()).tileset;
                             if (!tileset || this.disposed || counter !== this.initCounter) {
                                 return [2 /*return*/];
                             }
                             this.typeId = tileset.settings.entityTypeId;
+                            // Other account so we'll prefer the fallback entity-type ID if it's set.
+                            if (accountId != this.getters.GetAccountId()) {
+                                fallbackTypeId = (_f = (_e = this.item) === null || _e === void 0 ? void 0 : _e.BruceEntity) === null || _f === void 0 ? void 0 : _f["EntityType.ID"];
+                                if (fallbackTypeId) {
+                                    this.typeId = fallbackTypeId;
+                                }
+                            }
                             _a = this;
                             return [4 /*yield*/, TilesetRenderEngine.Render({
                                     apiGetter: this.getters.GetBruceGetter(),
@@ -15275,7 +15285,7 @@ var TilesetEntitiesRenderManager;
                                     viaCdn: this.item.cdnEnabled
                                 })];
                         case 8:
-                            cTileset = _a.cTileset = _e.sent();
+                            cTileset = _a.cTileset = _g.sent();
                             if (this.disposed) {
                                 this.doDispose();
                                 return [2 /*return*/];
@@ -15300,7 +15310,7 @@ var TilesetEntitiesRenderManager;
                             cTileset.tileLoad.addEventListener(function (tile) {
                                 _this.mapCTile(tile);
                             });
-                            _e.label = 9;
+                            _g.label = 9;
                         case 9:
                             attenuation = this.item.attenuation;
                             if (!attenuation && attenuation != false) {
@@ -15360,7 +15370,10 @@ var TilesetEntitiesRenderManager;
             }
             for (var i = 0; i < content.featuresLength; i++) {
                 var feature = content.getFeature(i);
-                this.mapTilesetFeature(feature);
+                var rego = this.mapTilesetFeature(feature);
+                if ((rego === null || rego === void 0 ? void 0 : rego.entityId) && this.styler) {
+                    this.styler.QueueEntities([rego]);
+                }
             }
             this.viewer.scene.requestRender();
         };
@@ -15393,7 +15406,9 @@ var TilesetEntitiesRenderManager;
                     rego: rego,
                     requestRender: false
                 });
+                return rego;
             }
+            return null;
         };
         Manager.prototype.ReRender = function (params) {
             return __awaiter(this, void 0, void 0, function () {
@@ -24143,7 +24158,7 @@ var ViewRenderEngine;
     ViewRenderEngine.Render = Render;
 })(ViewRenderEngine || (ViewRenderEngine = {}));
 
-var VERSION = "3.8.9";
+var VERSION = "3.9.1";
 
 export { 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, CESIUM_TIMELINE_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map