bruce-cesium 6.1.6 → 6.1.8

package/dist/bruce-cesium.es5.js

@@ -16305,6 +16305,7 @@ class TilesetStyler {
         // Once the style is loaded, we can queue the set for styling.
         this.stylePendingEntityIds = new Map();
         this.fallbackStyle = null;
+        this.styleFallbackLoaded = false;
         this.loadingCounter = 0;
         // Entity IDs -> boolean to indicate if we should override the feature colour.
         this.overrideFeatureColor = new Map();
@@ -16542,6 +16543,7 @@ class TilesetStyler {
         var _a, _b;
         const counter = ++this.loadingCounter;
         this.styleMappingLoaded = false;
+        this.styleFallbackLoaded = false;
         this.styleMappingsLoaded.clear();
         // Apply state changes.
         this.entityGatherer.Empty();
@@ -16553,7 +16555,11 @@ class TilesetStyler {
                     api: this.api,
                     styleId: fallbackStyleId
                 });
+                if (this.loadingCounter != counter) {
+                    return;
+                }
                 this.fallbackStyle = data;
+                this.styleFallbackLoaded = true;
             }
             catch (e) {
                 console.error(e);
@@ -16661,7 +16667,17 @@ class TilesetStyler {
                 // then we can pass them to the gatherer now.
                 const relatedIds = this.stylePendingEntityIds.get(styleMap.EntityTypeID);
                 if (relatedIds) {
-                    this.entityGatherer.Queue(Array.from(relatedIds));
+                    if (this.getTilesetFeatureNeedsFullData(styleMap.EntityTypeID)) {
+                        this.entityGatherer.Queue(Array.from(relatedIds));
+                    }
+                    else {
+                        relatedIds.forEach(id => {
+                            const rego = this.getEntityRego(id);
+                            if (rego) {
+                                this.styleTilesetFeature(rego);
+                            }
+                        });
+                    }
                     this.stylePendingEntityIds.delete(styleMap.EntityTypeID);
                 }
             }
@@ -16677,9 +16693,19 @@ class TilesetStyler {
             // Queue all Entities that are pending styling.
             const pendingKeys = this.stylePendingEntityIds.keys();
             for (const key of pendingKeys) {
-                const relatedIds = this.stylePendingEntityIds[key];
+                const relatedIds = this.stylePendingEntityIds.get(key);
                 if (relatedIds) {
-                    this.entityGatherer.Queue(Array.from(relatedIds));
+                    if (this.getTilesetFeatureNeedsFullData(key)) {
+                        this.entityGatherer.Queue(Array.from(relatedIds));
+                    }
+                    else {
+                        relatedIds.forEach(id => {
+                            const rego = this.getEntityRego(id);
+                            if (rego) {
+                                this.styleTilesetFeature(rego);
+                            }
+                        });
+                    }
                 }
             }
             this.stylePendingEntityIds.clear();
@@ -16725,6 +16751,14 @@ class TilesetStyler {
                     this.styleTilesetFeature(rego);
                 }
             }
+            else if (!this.styleMappingsLoaded.has(typeId) && this.styleFallbackLoaded) {
+                if (this.getTilesetFeatureNeedsFullData(typeId)) {
+                    needsDataIds.push(rego.entityId);
+                }
+                else {
+                    this.styleTilesetFeature(rego);
+                }
+            }
             else {
                 if (!this.stylePendingEntityIds.has(typeId)) {
                     this.stylePendingEntityIds.set(typeId, new Set());
@@ -16889,11 +16923,12 @@ var TilesetRenderEngine;
     }
     TilesetRenderEngine.OnTilesetReady = OnTilesetReady;
     function ApplyPosition(params) {
-        var _a;
+        var _a, _b;
         const cTileset = params.cTileset;
         const root = cTileset.root;
         const position = params.position;
-        let location = ((_a = position.ucs) === null || _a === void 0 ? void 0 : _a.location) ? position.ucs.location : position.location;
+        const ucsTransform = ((_a = position.ucs) === null || _a === void 0 ? void 0 : _a.transform) || {};
+        let location = ((_b = position.ucs) === null || _b === void 0 ? void 0 : _b.location) ? position.ucs.location : position.location;
         let transform = position.transform;
         transform = {
             heading: 0,
@@ -16906,24 +16941,33 @@ var TilesetRenderEngine;
             ...transform
         };
         transform.scale = EnsureNumber(transform.scale);
-        if (transform.scale <= 0) {
-            transform.scale = 0.000001;
-        }
-        // If we're in model-space we'll just go at 0,0 lat/lon and no h/p/r from the coords.
+        // In model-space we focus on the UCS.
+        // There's no location as we center the view around it.
+        // TODO: although we should render the model relative to the UCS.
         if (params.modelSpace) {
             location = null;
             transform = {
-                heading: 0,
-                pitch: 0,
-                roll: 0,
-                scale: EnsureNumber(transform.scale, 1),
-                x: 0,
-                y: 0,
-                z: 0
+                heading: EnsureNumber(ucsTransform.heading, 0),
+                pitch: EnsureNumber(ucsTransform.pitch, 0),
+                roll: EnsureNumber(ucsTransform.roll, 0),
+                scale: EnsureNumber(ucsTransform.scale, 1),
+                x: EnsureNumber(ucsTransform.x, 0),
+                y: EnsureNumber(ucsTransform.y, 0),
+                z: EnsureNumber(ucsTransform.z, 0)
             };
-            if (transform.scale <= 0) {
-                transform.scale = 0.000001;
-            }
+        }
+        // If not in model-space then scale/add UCS transform to the entity transform.
+        else {
+            transform.scale *= EnsureNumber(ucsTransform.scale, 1);
+            transform.heading += EnsureNumber(ucsTransform.heading, 0);
+            transform.pitch += EnsureNumber(ucsTransform.pitch, 0);
+            transform.roll += EnsureNumber(ucsTransform.roll, 0);
+            transform.x += EnsureNumber(ucsTransform.x, 0);
+            transform.y += EnsureNumber(ucsTransform.y, 0);
+            transform.z += EnsureNumber(ucsTransform.z, 0);
+        }
+        if (transform.scale <= 0) {
+            transform.scale = 0.000001;
         }
         /**
          * Very cursed.
@@ -33757,7 +33801,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "6.1.6";
+const VERSION = "6.1.8";
 
 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, LiveCursor, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, CESIUM_TIMELINE_LIVE_KEY, CESIUM_TIMELINE_LIVE_PADDING_KEY, CESIUM_TIMELINE_INTERVAL_KEY, CESIUM_MODEL_SPACE_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