bruce-cesium 3.1.3 → 3.1.4

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { Cartes, ProjectViewTile, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, DelayQueue, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, EntityRelationType, BruceEvent, EntityCoords, Api, EntitySource, MenuItem, EntityRelation, ENVIRONMENT, AbstractApi, ProjectViewBookmark, EntityAttachment, EntityAttachmentType, EntityAttribute, ProjectView, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, Primitive, Cesium3DTileFeature, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Model, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, Ion, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, PolygonPipeline, ColorMaterialProperty, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, CesiumInspector, Intersect } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, Primitive, Cesium3DTileFeature, SceneMode, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Model, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, createOsmBuildings, KmlDataSource, OrthographicFrustum, EasingFunction, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, Ion, CesiumInspector, defined, SceneTransforms, EllipsoidGeodesic, sampleTerrainMostDetailed, ColorMaterialProperty, BoundingSphere, GeometryInstance, PolygonPipeline, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5000,7 +5000,7 @@ var EntityLabel;
         Label.prototype.createLabel = function (starterPos3d) {
             var _a, _b, _c, _d, _e, _f, _g;
             return __awaiter(this, void 0, void 0, function () {
-                var pos3d, counter, sizeInM, heightRef, pixelOffset, visual, hierarchy, posses, centerIndex, pos1, pos2, pos3, posses, isClamped, centerIndex, size, height, scale, posses, centerIndex, text, type, e_1, ele, _lastDistance, _lastCameraPos, getDistance, MAX_DISTANCE, updateLabel, terrTimeout;
+                var pos3d, counter, sizeInM, heightRef, pixelOffset, visual, hierarchy, posses, centerIndex, pos1, pos2, pos3, posses, isClamped, centerIndex, model, size, height, scale, posses, centerIndex, text, type, e_1, ele, _lastDistance, _lastCameraPos, getDistance, MAX_DISTANCE, updateLabel, terrTimeout;
                 var _this = this;
                 return __generator(this, function (_h) {
                     switch (_h.label) {
@@ -5028,7 +5028,7 @@ var EntityLabel;
                                         posses = [].concat(hierarchy.positions);
                                         try {
                                             sizeInM = (_c = MeasureUtils.MeasurePolygon({
-                                                posses: posses,
+                                                posses: posses
                                             })) === null || _c === void 0 ? void 0 : _c.area;
                                             if (isNaN(sizeInM)) {
                                                 sizeInM = 0;
@@ -5069,7 +5069,7 @@ var EntityLabel;
                                         }
                                         try {
                                             sizeInM = (_d = MeasureUtils.MeasurePolyline({
-                                                posses: posses,
+                                                posses: posses
                                             })) === null || _d === void 0 ? void 0 : _d.totalLength;
                                             if (isNaN(sizeInM)) {
                                                 sizeInM = 0;
@@ -5084,6 +5084,10 @@ var EntityLabel;
                                     if (isNaN(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
                                         heightRef = getValue$2(this.viewer, visual.model.heightReference);
                                     }
+                                    model = visual.model;
+                                    if (model._radiusLoaded && model._radius > 0) {
+                                        sizeInM = model._radius;
+                                    }
                                 }
                                 else if (visual.point) {
                                     heightRef = getValue$2(this.viewer, visual.point.heightReference);
@@ -5112,7 +5116,7 @@ var EntityLabel;
                                         }
                                         try {
                                             sizeInM = (_e = MeasureUtils.MeasurePolyline({
-                                                posses: posses,
+                                                posses: posses
                                             })) === null || _e === void 0 ? void 0 : _e.totalLength;
                                             if (isNaN(sizeInM)) {
                                                 sizeInM = 0;
@@ -5234,40 +5238,17 @@ var EntityLabel;
                                         return _lastDistance;
                                     }
                                 }
-                                // Check if there is a raycast collision between camera and pos3d.
-                                // We'll let the labels draw through a ground collision.
-                                // Commented out while it is WIP.
-                                // const direction = Cesium.Cartesian3.subtract(pos3d, cameraPos, new Cesium.Cartesian3());
-                                // const ray = new Cesium.Ray(pos3d.clone(), direction);
-                                // const objects = (this.viewer.scene as any).drillPickFromRay(ray, 1, [visuals]);
-                                // if (objects && objects.length > 0) {
-                                //     for (let i = 0; i < objects.length; ++i) {
-                                //         const obj = objects[i];
-                                //         if (!visuals.find(x => x == obj?.id)) {
-                                //             let isGround = true;
-                                //             if (obj.object) {
-                                //                 const url = obj.object?.primitive?._basePath;
-                                //                 if (url && typeof url == "string") {
-                                //                     isGround = url.includes("tile.googleapis.com");
-                                //                 }
-                                //                 else {
-                                //                     isGround = false;
-                                //                 }
-                                //             }
-                                //             if (!isGround) {
-                                //                 return null;
-                                //             }
-                                //         }
-                                //     }
-                                // }
                                 var distance = Cartesian3.distance(cameraPos, _this._pos3d);
                                 _lastDistance = distance;
                                 _lastCameraPos = cameraPos.clone();
                                 return distance;
                             };
-                            MAX_DISTANCE = 5000;
-                            if (sizeInM > 30) {
-                                MAX_DISTANCE = Math.max(MAX_DISTANCE, sizeInM / 2);
+                            MAX_DISTANCE = Math.max(5000, sizeInM * 10);
+                            if (visual && visual instanceof Entity) {
+                                // Consistent sized things.
+                                if (visual.polyline || visual.billboard || visual.point) {
+                                    MAX_DISTANCE = Infinity;
+                                }
                             }
                             updateLabel = function () {
                                 var _a;
@@ -5297,7 +5278,7 @@ var EntityLabel;
                                 ele.style.display = "block";
                                 // Check scale to apply based on distance between camera and pos3d.
                                 // We'll make the label smaller and less transparent when further away.
-                                var scale = _this.prePositioned ? 1 : 1 - (distance / MAX_DISTANCE);
+                                var scale = _this.prePositioned || MAX_DISTANCE == Infinity ? 1 : 1 - (distance / MAX_DISTANCE);
                                 if (scale && scale > 0.15) {
                                     ele.style.transform = "scale(".concat(scale, ")");
                                     ele.style.opacity = "".concat(scale);
@@ -18754,7 +18735,7 @@ var CesiumViewMonitor;
     CesiumViewMonitor$$1.Monitor = Monitor;
 })(CesiumViewMonitor || (CesiumViewMonitor = {}));
 
-var VERSION$1 = "3.1.3";
+var VERSION$1 = "3.1.4";
 
 export { VERSION$1 as 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, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map