bruce-cesium 5.0.7 → 5.0.9

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Entity as Entity$1, Carto, Geometry, MathUtils, LRUCache, Api, Calculator, ClientFile, EntityTag, EntityType, ObjectUtils, Style, ProjectViewTile, DelayQueue, EntityLod, Bounds, ZoomControl, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, DataLab, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, EntityAttachment, EntityAttachmentType, EntityAttribute, AbstractApi, Session } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, ConstantProperty, ClassificationType, ConstantPositionProperty, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, Quaternion, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, ConstantProperty, ClassificationType, ConstantPositionProperty, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, SceneMode, Primitive, Cesium3DTileFeature, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, Quaternion, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
 
 const TIME_LAG = 300;
 const POSITION_CHECK_TIMER = 950;
@@ -8714,6 +8714,8 @@ var EntityLabel;
             this.loadTimeout = null;
             this.loadedName = false;
             this.line = null;
+            // Null = not attempted to load.
+            this.additionalTexts = null;
             this.rego = params.rego;
             this.viewer = params.viewer;
             this.api = params.api;
@@ -8933,6 +8935,7 @@ var EntityLabel;
             }
             this._pos3d = pos3d;
             let text = "Unknown Entity";
+            const additionalTexts = this.additionalTexts ? this.additionalTexts : [];
             if (this.rego) {
                 if (this.rego.relation) {
                     let type = this.rego.relation.RelationType;
@@ -8960,14 +8963,77 @@ var EntityLabel;
                 else {
                     text = "Unnamed Entity";
                 }
-                if (text == "Unnamed Entity" && !this.loadedName) {
-                    text = "Loading...";
+                // Load any missing information and re-render the label afterwards.
+                if (this.additionalTexts == null || (text == "Unnamed Entity" && !this.loadedName)) {
+                    let loadName = false;
+                    if ((text == "Unnamed Entity" && !this.loadedName)) {
+                        text = "Loading...";
+                        loadName = true;
+                    }
                     clearTimeout(this.loadTimeout);
                     this.loadTimeout = setTimeout(async () => {
+                        var _a, _b;
                         if (this.disposed || this.counter != counter) {
                             return;
                         }
-                        await this.loadName();
+                        // Load additional texts to display alongside the name.
+                        if (this.additionalTexts == null) {
+                            const additionalTexts = [];
+                            // Rego might not have a known or default Entity Type. Eg: OSM building.
+                            if (this.rego.entityTypeId) {
+                                let entityType = null;
+                                try {
+                                    const data = await EntityType.Get({
+                                        api: this.api,
+                                        entityTypeId: this.rego.entityTypeId
+                                    });
+                                    if (data === null || data === void 0 ? void 0 : data.entityType) {
+                                        entityType = data.entityType;
+                                    }
+                                }
+                                // Type could be deleted, however we'll just catch that to show a label instead of nothing.
+                                // This is not unusual for Tilesets where the Type that is baked might be outdated.
+                                catch (e) {
+                                    console.error(e);
+                                }
+                                // Type could be deleted, however we'll just catch that to show a label instead of nothing.
+                                // This is not unusual for Tilesets where the Type that is baked might be outdated.
+                                if (entityType) {
+                                    const attributes = (_b = (_a = entityType.VisualSettings) === null || _a === void 0 ? void 0 : _a.label) === null || _b === void 0 ? void 0 : _b.attributes;
+                                    if (attributes) {
+                                        try {
+                                            const { entity } = await Entity$1.Get({
+                                                api: this.api,
+                                                entityId: this.rego.entityId,
+                                                entityTypeId: this.rego.entityTypeId,
+                                                scenario: this.rego.scenario,
+                                                schemaId: this.rego.schemaId,
+                                                migrated: true
+                                            });
+                                            for (let i = 0; i < attributes.length; i++) {
+                                                const value = Entity$1.GetValue({
+                                                    entity: entity,
+                                                    path: attributes[i]
+                                                });
+                                                if (value) {
+                                                    additionalTexts.push(value);
+                                                }
+                                            }
+                                        }
+                                        // Entity doesn't exist.
+                                        // Likely a graphic with an ID that points to no record.
+                                        catch (e) {
+                                            console.error(e);
+                                        }
+                                    }
+                                }
+                            }
+                            this.additionalTexts = additionalTexts;
+                        }
+                        // Load name and apply to rego.
+                        if (loadName) {
+                            await this.loadName();
+                        }
                         if (this.disposed || this.counter != counter) {
                             return;
                         }
@@ -8978,6 +9044,12 @@ var EntityLabel;
             if (this.disposed || this.counter != counter) {
                 return;
             }
+            const labelContent = `
+                <div>
+                    <div style="margin-bottom:4px">${text}</div>
+                    ${additionalTexts.map(attr => `<div>${attr}</div>`).join('')}
+                </div>
+            `;
             let ele = null;
             let lineEle = null;
             if (this.label) {
@@ -8985,7 +9057,7 @@ var EntityLabel;
             }
             else {
                 ele = document.createElement("div");
-                ele.innerHTML = text;
+                ele.innerHTML = labelContent;
                 ele.setAttribute("style", `
                     position: absolute;
                     z-index: 0;
@@ -9119,6 +9191,13 @@ var EntityLabel;
                             addHeight = Math.min(distance, this.viewer.camera.positionCartographic.height) / 7;
                         }
                     }
+                    // The ratio is roughly 1m = 11px on the screen.
+                    // So if we want to add additional labels then we'll need to adjust the height.
+                    if (additionalTexts === null || additionalTexts === void 0 ? void 0 : additionalTexts.length) {
+                        // Each additional text is about 16px tall.
+                        // So we get the total px height and divide by 11 to get the meters.
+                        addHeight += ((additionalTexts.length * 16) / 11);
+                    }
                     // Safety check.
                     if (!addHeight || addHeight <= 0) {
                         addHeight = 0.001;
@@ -26167,19 +26246,28 @@ var Walkthrough;
         });
         let lastCheck;
         let currentTime = new Date();
-        data.tickRemoval = viewer.clock.onTick.addEventListener(async () => {
+        const interval = setInterval(() => {
             lastCheck = new Date();
-            if (lastCheck.getTime() - currentTime.getTime() > (1000 / 60)) {
+            if (lastCheck.getTime() - currentTime.getTime() >= (1000 / 60)) {
                 doMovementTick(viewer);
                 currentTime = new Date();
             }
-        });
-        document.addEventListener("keydown", data.handlerKeyDown = (e) => {
+        }, 1000 / 60);
+        data.tickRemoval = () => {
+            clearInterval(interval);
+        };
+        let keyDown = (e) => {
             checkKeybind(viewer, e.key, true);
-        }, false);
-        document.addEventListener("keyup", data.handlerKeyUp = (e) => {
+        };
+        document.addEventListener("keydown", keyDown, false);
+        let keyUp = (e) => {
             checkKeybind(viewer, e.key, false);
-        }, false);
+        };
+        document.addEventListener("keyup", keyUp, false);
+        data.handlerKeysRemoval = () => {
+            document.removeEventListener("keydown", keyDown);
+            document.removeEventListener("keyup", keyUp);
+        };
         data.handlerScreenSpace.setInputAction((e) => {
             data.actions.set(EAction.Looking, true);
             data.mousePosCurrent = data.mousePosStart = Cartesian2.clone(e.position);
@@ -26201,17 +26289,13 @@ var Walkthrough;
             status: false
         });
         if (data) {
-            (_a = data.screenSpaceHandler) === null || _a === void 0 ? void 0 : _a.destroy();
-            data.screenSpaceHandler = null;
+            (_a = data.handlerScreenSpace) === null || _a === void 0 ? void 0 : _a.destroy();
+            data.handlerScreenSpace = null;
             (_b = data.tickRemoval) === null || _b === void 0 ? void 0 : _b.call(data);
             data.tickRemoval = null;
-            if (data.keyDownHandler) {
-                document.removeEventListener("keydown", data.keyDownHandler);
-                data.keyDownHandler = null;
-            }
-            if (data.keyUpHandler) {
-                document.removeEventListener("keyup", data.keyUpHandler);
-                data.keyUpHandler = null;
+            if (data.handlerKeysRemoval) {
+                data.handlerKeysRemoval();
+                data.handlerKeysRemoval = null;
             }
         }
     }
@@ -29360,7 +29444,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "5.0.7";
+const VERSION = "5.0.9";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, ViewerEventTracker, MenuItemManager, EntityRenderEngine, EntityRenderEnginePoint, EntityRenderEnginePolyline, EntityRenderEnginePolygon, EntityRenderEngineModel3d, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, DataLabRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, GoogleSearchRenderManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, 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