bruce-cesium 5.6.3 → 5.6.5

package/dist/bruce-cesium.es5.js

@@ -3032,7 +3032,7 @@ var EntityUtils;
              * Returns an array of positions from the entity's currently rendered graphics.
              */
             const evaluateRendered = async () => {
-                var _a, _b;
+                var _a;
                 const rego = visualRegister ? visualRegister.GetRego({
                     entityId: sample.entityId,
                     menuItemId: sample.menuItemId
@@ -3042,12 +3042,12 @@ var EntityUtils;
                 }
                 // If this is a historic Entity but associated with a Tileset, we'll hack the movement in.
                 // Our API doesn't account for this at the moment.
-                if (rego.visual instanceof Cesium3DTileFeature && ((_a = rego.historicLayers) === null || _a === void 0 ? void 0 : _a.length)) {
+                if (rego.visual instanceof Cesium3DTileFeature && rego.outline && rego.outline.some(x => !!x.DateTime)) {
                     // Get the Tileset.
                     const tileset = rego.visual.tileset;
                     if (tileset === null || tileset === void 0 ? void 0 : tileset._bruceCoords) {
                         // The render logic currently swaps out the UCS location when the assembly is moving.
-                        const location = (_b = tileset._bruceCoords.ucs) === null || _b === void 0 ? void 0 : _b.location;
+                        const location = (_a = tileset._bruceCoords.ucs) === null || _a === void 0 ? void 0 : _a.location;
                         if (location) {
                             const latitude = EnsureNumber(location.latitude);
                             const longitude = EnsureNumber(location.longitude);
@@ -6290,7 +6290,6 @@ function shouldRecheck(viewer) {
  * @returns
  */
 function isCullingIgnored(viewer, rego) {
-    var _a;
     if (
     // No rego or visual.
     // This is a safety check to avoid crashes.
@@ -6306,7 +6305,7 @@ function isCullingIgnored(viewer, rego) {
         // Won't touch in case there is special logic.
         rego.collection ||
         // We won't cull historic records as they may be interpolating their locations.
-        Boolean((_a = rego.historicLayers) === null || _a === void 0 ? void 0 : _a.length)) {
+        Boolean(rego.outline && rego.outline.some(x => !!x.DateTime))) {
         return true;
     }
     const visual = rego.visual;
@@ -8306,26 +8305,37 @@ function getHeightRef$3(style, defaultStyle) {
  * @param rego
  * @param entity
  */
-function isHistoricMetadataChanged(rego, entity) {
-    var _a, _b, _c, _d, _e, _f, _g;
-    // Different overlay amount.
-    if (((_a = rego.historicLayers) === null || _a === void 0 ? void 0 : _a.length) != ((_c = (_b = entity.Bruce) === null || _b === void 0 ? void 0 : _b.HistoricLayers) === null || _c === void 0 ? void 0 : _c.length)) {
+function isOutlineChanged(rego, entity) {
+    var _a, _b, _c, _d, _e, _f;
+    if (((_a = rego.outline) === null || _a === void 0 ? void 0 : _a.length) != ((_c = (_b = entity.Bruce) === null || _b === void 0 ? void 0 : _b.Outline) === null || _c === void 0 ? void 0 : _c.length)) {
         return true;
     }
-    // Both missing. Nothing to compare.
-    else if (!rego.historicLayers && !((_d = entity.Bruce) === null || _d === void 0 ? void 0 : _d.HistoricLayers)) {
+    else if (!rego.outline && !((_d = entity.Bruce) === null || _d === void 0 ? void 0 : _d.Outline)) {
         return false;
     }
-    // One missing. Definitely different.
-    else if (!rego.historicLayers || !((_e = entity.Bruce) === null || _e === void 0 ? void 0 : _e.HistoricLayers)) {
+    else if (!rego.outline || !((_e = entity.Bruce) === null || _e === void 0 ? void 0 : _e.Outline)) {
         return true;
     }
-    // Compare each layer.
-    for (let i = 0; i < rego.historicLayers.length; i++) {
-        if (rego.historicLayers[i].attrKey != ((_f = entity.Bruce) === null || _f === void 0 ? void 0 : _f.HistoricLayers[i].attrKey)) {
+    // Compare each item.
+    for (let i = 0; i < rego.outline.length; i++) {
+        const rOutline = rego.outline[i];
+        const eOutline = (_f = entity.Bruce) === null || _f === void 0 ? void 0 : _f.Outline[i];
+        if (rOutline.Kind !== eOutline.Kind) {
+            return true;
+        }
+        else if (rOutline.DateTime !== eOutline.DateTime) {
+            return true;
+        }
+        else if (rOutline.Scenario !== eOutline.Scenario) {
             return true;
         }
-        if (rego.historicLayers[i].dateTime != ((_g = entity.Bruce) === null || _g === void 0 ? void 0 : _g.HistoricLayers[i].dateTime)) {
+        else if (rOutline.Baseline !== eOutline.Baseline) {
+            return true;
+        }
+        else if (rOutline["Source.ID"] !== eOutline["Source.ID"]) {
+            return true;
+        }
+        else if (rOutline["EntityType.Source.ID"] !== eOutline["EntityType.Source.ID"]) {
             return true;
         }
     }
@@ -8424,7 +8434,7 @@ var EntityRenderEngine;
                 if (!params.force &&
                     newRenderId == oldRenderId &&
                     !(existingRego === null || existingRego === void 0 ? void 0 : existingRego.stale) &&
-                    !isHistoricMetadataChanged(existingRego, entity) &&
+                    !isOutlineChanged(existingRego, entity) &&
                     ((existingRego === null || existingRego === void 0 ? void 0 : existingRego.scenario) == ((_b = entity.Bruce) === null || _b === void 0 ? void 0 : _b.Scenario))) {
                     // No sorting category needed. Already rendered the way we want.
                     cEntities.set(id, existingRego.visual);
@@ -8436,7 +8446,7 @@ var EntityRenderEngine;
                         // Flag as no longer stale as we're unlikely to recreate the rego if we're reusing the graphic.
                         existingRego.stale = false;
                         // Update metadata for the same reason.
-                        existingRego.historicLayers = (_c = entity.Bruce) === null || _c === void 0 ? void 0 : _c.HistoricLayers;
+                        existingRego.outline = (_c = entity.Bruce) === null || _c === void 0 ? void 0 : _c.Outline;
                         existingRego.entityTypeId = entity.Bruce["EntityType.ID"];
                         existingRego.scenario = (_d = entity.Bruce) === null || _d === void 0 ? void 0 : _d.Scenario;
                         updated.set(id, true);
@@ -9663,7 +9673,7 @@ var EntityLabel;
                                                 entityId: this.rego.entityId,
                                                 entityTypeId: this.rego.entityTypeId,
                                                 scenario: this.rego.scenario,
-                                                schemaId: this.rego.schemaId,
+                                                schemaId: this.rego.schema,
                                                 migrated: true
                                             });
                                             for (let i = 0; i < attributes.length; i++) {
@@ -13402,7 +13412,7 @@ var EntitiesRenderManager;
              * @returns
              */
             const register = (thing) => {
-                var _a, _b, _c, _d, _e, _f;
+                var _a, _b, _c, _d, _e, _f, _g, _h;
                 // See if the cesium entity already exists in a group.
                 let group = groups.find((x) => { var _a; return ((_a = x.visual) === null || _a === void 0 ? void 0 : _a.id) == thing.id || x.siblings.find(x => (x === null || x === void 0 ? void 0 : x.id) == thing.id); });
                 if (group) {
@@ -13445,7 +13455,8 @@ var EntitiesRenderManager;
                         })) !== null && _d !== void 0 ? _d : "Unnamed Entity" : "Unnamed Entity",
                         cdn: this.item.cdnEnabled,
                         collection: source.entities,
-                        scenario: (_f = (_e = group.data) === null || _e === void 0 ? void 0 : _e.Bruce) === null || _f === void 0 ? void 0 : _f.Scenario
+                        scenario: (_f = (_e = group.data) === null || _e === void 0 ? void 0 : _e.Bruce) === null || _f === void 0 ? void 0 : _f.Scenario,
+                        outline: (_h = (_g = group.data) === null || _g === void 0 ? void 0 : _g.Bruce) === null || _h === void 0 ? void 0 : _h.Outline,
                     };
                     group.rego = rego;
                     this.visualsManager.AddRego({
@@ -13514,7 +13525,7 @@ var EntitiesRenderManager;
                     });
                     entitiesHistoric = historicData.recordsByIds;
                     // Remove ones with no historicAttrKey and no historic data.
-                    const toRemoveIds = entities.filter(x => { var _a, _b; return !((_b = (_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.HistoricLayers) === null || _b === void 0 ? void 0 : _b.length) && !entitiesHistoric[x.Bruce.ID]; }).map(x => x.Bruce.ID);
+                    const toRemoveIds = entities.filter(x => { var _a, _b; return !((_b = (_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.Outline) === null || _b === void 0 ? void 0 : _b.length) && !entitiesHistoric[x.Bruce.ID]; }).map(x => x.Bruce.ID);
                     for (let i = 0; i < toRemoveIds.length; i++) {
                         const removeId = toRemoveIds[i];
                         this.visualsManager.RemoveRegos({
@@ -13529,7 +13540,7 @@ var EntitiesRenderManager;
                 // Not interpolating.
                 // So we'll see if the Entities have a historic key or not.
                 else {
-                    const toRemoveIds = entities.filter(x => { var _a; return !((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.HistoricLayers); }).map(x => x.Bruce.ID);
+                    const toRemoveIds = entities.filter(x => { var _a; return !((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.Outline); }).map(x => x.Bruce.ID);
                     for (let i = 0; i < toRemoveIds.length; i++) {
                         const removeId = toRemoveIds[i];
                         this.visualsManager.RemoveRegos({
@@ -13581,7 +13592,7 @@ var EntitiesRenderManager;
                         const rego = {
                             canEdit: true,
                             entityId: id,
-                            schemaId: (_f = entity.Bruce) === null || _f === void 0 ? void 0 : _f.SchemaID,
+                            schema: (_f = entity.Bruce) === null || _f === void 0 ? void 0 : _f.Schema,
                             menuItemId: this.item.id,
                             menuItemType: this.item.Type,
                             visual: cEntity,
@@ -13592,7 +13603,7 @@ var EntitiesRenderManager;
                             overrideShow: wasClustered ? false : null,
                             name: cEntity.name,
                             cdn: this.item.cdnEnabled,
-                            historicLayers: (_g = entity.Bruce) === null || _g === void 0 ? void 0 : _g.HistoricLayers,
+                            outline: (_g = entity.Bruce) === null || _g === void 0 ? void 0 : _g.Outline,
                             scenario: (_h = entity.Bruce) === null || _h === void 0 ? void 0 : _h.Scenario
                         };
                         this.visualsManager.AddRego({
@@ -13605,9 +13616,9 @@ var EntitiesRenderManager;
                         rego.visual = cEntity;
                         rego.entityTypeId = entity.Bruce["EntityType.ID"];
                         rego.tagIds = ((_j = entity.Bruce) === null || _j === void 0 ? void 0 : _j["Layer.ID"]) ? [].concat(entity.Bruce["Layer.ID"]) : [];
-                        rego.historicLayers = (_k = entity.Bruce) === null || _k === void 0 ? void 0 : _k.HistoricLayers;
+                        rego.outline = (_k = entity.Bruce) === null || _k === void 0 ? void 0 : _k.Outline;
                         rego.cdn = this.item.cdnEnabled;
-                        rego.schemaId = (_l = entity.Bruce) === null || _l === void 0 ? void 0 : _l.SchemaID;
+                        rego.schema = (_l = entity.Bruce) === null || _l === void 0 ? void 0 : _l.Schema;
                         rego.scenario = (_m = entity.Bruce) === null || _m === void 0 ? void 0 : _m.Scenario;
                         // Marked as stale meaning some change was performed that requires a refresh.
                         // This usually means a new sibling was added that we need to update.
@@ -15876,16 +15887,16 @@ class TilesetStyler {
             this.entityGatherer.Queue(needsDataIds, highPriority);
         }
     }
-    styleTilesetFeature(entity) {
-        this.styleTilesetFeatureFullData(entity, null, []);
+    styleTilesetFeature(rego) {
+        this.styleTilesetFeatureFullData(rego, null, []);
     }
-    styleTilesetFeatureFullData(entity, data, tags) {
+    styleTilesetFeatureFullData(rego, data, tags) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
-        const visual = entity.visual;
+        const visual = rego.visual;
         if (!visual || !(visual instanceof Cesium3DTileFeature)) {
             return;
         }
-        const style = this.getTilesetFeatureStyle(entity.entityTypeId);
+        const style = this.getTilesetFeatureStyle(rego.entityTypeId);
         const bColor = style && ((_a = style.modelStyle) === null || _a === void 0 ? void 0 : _a.fillColor) ? Calculator.GetColor(style.modelStyle.fillColor, data, tags) : null;
         let cColor = null;
         if (bColor == null) {
@@ -15894,15 +15905,15 @@ class TilesetStyler {
         else {
             cColor = colorToCColor$3(bColor);
         }
-        const override = this.overrideFeatureColor.get(entity.entityId) == true;
+        const override = this.overrideFeatureColor.get(rego.entityId) == true;
         CesiumEntityStyler.SetDefaultColor({
             color: cColor,
             entity: visual,
             viewer: this.viewer,
             override: override
         });
-        this.overrideFeatureColor.set(entity.entityId, true);
-        this.styledEntityIds.set(entity.entityId, true);
+        this.overrideFeatureColor.set(rego.entityId, true);
+        this.styledEntityIds.set(rego.entityId, true);
         this._styleProgressQueue.Call();
         // Since we only need to update it for scenarios right now.
         // We'll avoid doing it if not needed, eg: first render and no scenario (same state as default).
@@ -15910,13 +15921,13 @@ class TilesetStyler {
             // Update the Entity's rego state.
             let changed = false;
             // Changed scenario.
-            if (entity.scenario != ((_c = data === null || data === void 0 ? void 0 : data.Bruce) === null || _c === void 0 ? void 0 : _c.Scenario)) {
-                entity.scenario = (_d = data === null || data === void 0 ? void 0 : data.Bruce) === null || _d === void 0 ? void 0 : _d.Scenario;
+            if (rego.scenario != ((_c = data === null || data === void 0 ? void 0 : data.Bruce) === null || _c === void 0 ? void 0 : _c.Scenario)) {
+                rego.scenario = (_d = data === null || data === void 0 ? void 0 : data.Bruce) === null || _d === void 0 ? void 0 : _d.Scenario;
                 changed = true;
             }
             // Changed historic.
-            if ((data && isHistoricMetadataChanged(entity, data)) || (!data && ((_e = entity.historicLayers) === null || _e === void 0 ? void 0 : _e.length) && !((_g = (_f = data.Bruce) === null || _f === void 0 ? void 0 : _f.HistoricLayers) === null || _g === void 0 ? void 0 : _g.length))) {
-                entity.historicLayers = (_h = data === null || data === void 0 ? void 0 : data.Bruce) === null || _h === void 0 ? void 0 : _h.HistoricLayers;
+            if ((data && isOutlineChanged(rego, data)) || (!data && ((_e = rego.outline) === null || _e === void 0 ? void 0 : _e.length) && !((_g = (_f = data.Bruce) === null || _f === void 0 ? void 0 : _f.Outline) === null || _g === void 0 ? void 0 : _g.length))) {
+                rego.outline = (_h = data === null || data === void 0 ? void 0 : data.Bruce) === null || _h === void 0 ? void 0 : _h.Outline;
                 changed = true;
             }
             // Something changed, trigger a rego update.
@@ -15924,8 +15935,8 @@ class TilesetStyler {
             if (changed) {
                 this.register.OnUpdate.Trigger({
                     type: VisualsRegister.EVisualUpdateType.Update,
-                    entityId: entity.entityId,
-                    rego: entity
+                    entityId: rego.entityId,
+                    rego: rego
                 });
             }
         }
@@ -31710,7 +31721,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "5.6.3";
+const VERSION = "5.6.5";
 
-export { VERSION, CesiumViewMonitor, ViewerUtils, ViewerEventTracker, MenuItemManager, isHistoricMetadataChanged, EntityRenderEngine, EntityRenderEnginePoint, EntityRenderEnginePolyline, EntityRenderEnginePolygon, EntityRenderEngineModel3d, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, DataLabRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, GoogleSearchRenderManager, AssemblyRenderManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, CESIUM_TIMELINE_LIVE_KEY, CESIUM_TIMELINE_LIVE_PADDING_KEY, CESIUM_TIMELINE_INTERVAL_KEY, DEFAULT_LIVE_PADDING_SECONDS, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Walkthrough, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar, WidgetControlViewBar, WidgetControlViewBarSearch, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks };
+export { VERSION, CesiumViewMonitor, ViewerUtils, ViewerEventTracker, MenuItemManager, isOutlineChanged, EntityRenderEngine, EntityRenderEnginePoint, EntityRenderEnginePolyline, EntityRenderEnginePolygon, EntityRenderEngineModel3d, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, DataLabRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, GoogleSearchRenderManager, AssemblyRenderManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, CESIUM_TIMELINE_LIVE_KEY, CESIUM_TIMELINE_LIVE_PADDING_KEY, CESIUM_TIMELINE_INTERVAL_KEY, DEFAULT_LIVE_PADDING_SECONDS, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Walkthrough, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar, WidgetControlViewBar, WidgetControlViewBarSearch, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks };
 //# sourceMappingURL=bruce-cesium.es5.js.map