bruce-cesium 7.2.8 → 7.2.9

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import * as Cesium from 'cesium';
-import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, ShaderSource, Cartesian3, Math as Math$1, Ellipsoid, Transforms, Matrix4, Geometry, GeometryAttribute, ComponentDatatype, PrimitiveType, BoundingSphere, GeometryPipeline, sampleTerrain, Texture, PixelFormat, Sampler, TextureWrap, TextureMinificationFilter, TextureMagnificationFilter, VertexArray, BufferUsage, ShaderProgram, RenderState, BlendingState, DrawCommand, Pass, Cartesian2, JulianDate, Quaternion, HeadingPitchRoll, DistanceDisplayCondition, HeightReference, HorizontalOrigin, VerticalOrigin, ClassificationType, ConstantPositionProperty, ColorBlendMode, ShadowMode, Model, ArcType, CornerType, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, Rectangle, SceneTransforms, NearFarScalar, Matrix3, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Ion, IonResource, Cesium3DTileColorBlendMode, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, Cesium3DTileset, OrthographicFrustum, EasingFunction, Intersect, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, PolygonPipeline, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, CesiumInspector, ClockRange, DynamicEnvironmentMapManager, CustomDataSource, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Fullscreen, CzmlDataSource } from 'cesium';
-import { Cartes, Entity as Entity$1, ProjectViewTile, ENVIRONMENT, Api, Calculator, ClientFile, EntityTag, EntityType, LRUCache, ObjectUtils, Style, EntityLod, Carto, Geometry as Geometry$1, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, Bounds, ClientFileValueMap, Color as Color$1, BruceEvent, EntityCoords, DataLab, DelayQueue, BruceApi, EntityRelation, EntitySource, AccountConcept, RecordChangeFeed, ProgramKey, ProjectViewLegacyTile, Camera, Account, AccountLimits, Session, UrlUtils, ProjectViewBookmarkGroup, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, EntityRelationType, EntityHistoricData } from 'bruce-models';
+import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, DistanceDisplayCondition, ShaderSource, Cartesian3, Math as Math$1, Ellipsoid, Transforms, Matrix4, Geometry, GeometryAttribute, ComponentDatatype, PrimitiveType, BoundingSphere, GeometryPipeline, sampleTerrain, Texture, PixelFormat, Sampler, TextureWrap, TextureMinificationFilter, TextureMagnificationFilter, VertexArray, BufferUsage, ShaderProgram, RenderState, BlendingState, DrawCommand, Pass, Cartesian2, JulianDate, Quaternion, HeadingPitchRoll, HeightReference, ColorBlendMode, ShadowMode, ClassificationType, Model, ArcType, CornerType, ConstantPositionProperty, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, Rectangle, HorizontalOrigin, VerticalOrigin, SceneTransforms, NearFarScalar, Matrix3, KmlDataSource, GeoJsonDataSource, SceneMode, Ion, IonResource, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Intersect, OrthographicFrustum, EasingFunction, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, PolygonPipeline, CustomDataSource, GeometryInstance, CesiumInspector, ClockRange, DynamicEnvironmentMapManager, ScreenSpaceEventHandler, ScreenSpaceEventType, Fullscreen, CzmlDataSource } from 'cesium';
+import { Cartes, Entity as Entity$1, ProjectViewTile, ENVIRONMENT, Calculator, ClientFile, EntityLod, EntityTag, EntityType, LRUCache, ObjectUtils, Style, Carto, Geometry as Geometry$1, Bounds, ClientFileValueMap, Color as Color$1, Api, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, BruceEvent, EntityCoords, DelayQueue, DataLab, EntityRelation, BruceApi, AccountConcept, RecordChangeFeed, EntitySource, ProgramKey, ProjectViewLegacyTile, Camera, Account, AccountLimits, Session, UrlUtils, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, ProjectViewBookmarkGroup, EntityRelationType, EntityHistoricData } from 'bruce-models';
 
 /**
  * Ensures a number is returned from a given value.
@@ -42468,7 +42468,7 @@ var TextureValueLabels;
 var DisplacedSurfacePrimitive;
 (function (DisplacedSurfacePrimitive) {
     // Grid densities a tile can draw at, coarsest first.
-    const TIERS = [32, 64, 128, 192];
+    const TIERS = [32, 64, 128, 192, 256, 384];
     // Tiles per side the extent is cut into.
     const TILES_PER_SIDE = 6;
     // Screen pixels one grid cell should cover. Lower means finer meshes sooner.
@@ -43116,6 +43116,7 @@ void main() {
             const camera = frameState.camera;
             const fovy = camera.frustum && camera.frustum.fovy ? camera.frustum.fovy : Math$1.PI_OVER_THREE;
             const pixelsPerRadian = frameState.context.drawingBufferHeight / fovy;
+            const ceiling = this.tierCeiling();
             for (const tile of this.tiles) {
                 if (!tile.centre) {
                     tile.tier = TIERS[0];
@@ -43126,13 +43127,33 @@ void main() {
                 const wanted = screenPixels / TARGET_CELL_PIXELS;
                 let tier = TIERS[0];
                 for (const candidate of TIERS) {
-                    if (candidate <= wanted) {
+                    if (candidate <= wanted && candidate <= ceiling) {
                         tier = candidate;
                     }
                 }
                 tile.tier = tier;
             }
         }
+        /*
+         * The finest tier worth drawing for this surface, from the texture behind it.
+         *
+         * Subdividing past one vertex per texel spends vertices resolving detail the source does not
+         * carry, so the ladder is capped one step above the texel count rather than run to its top.
+         */
+        tierCeiling() {
+            const source = this.source;
+            if (!source || !source.width || !source.height) {
+                return TIERS[TIERS.length - 1];
+            }
+            const perSide = Math.sqrt(this.tiles.length) || TILES_PER_SIDE;
+            const texelsPerTile = Math.max(source.width, source.height) / perSide;
+            for (const candidate of TIERS) {
+                if (candidate >= texelsPerTile) {
+                    return candidate;
+                }
+            }
+            return TIERS[TIERS.length - 1];
+        }
         shouldReselect(frameState, nowMs) {
             if (this.selectionDirty) {
                 return true;
@@ -43145,9 +43166,23 @@ void main() {
                 return true;
             }
             const moved = Cartesian3.distance(eye, this.lastEyePosition);
-            const anchor = this.tiles[0].centre;
-            const reference = anchor ? Math.max(1, Cartesian3.distance(eye, anchor)) : 1;
-            return moved / reference > MOVEMENT_THRESHOLD;
+            return moved / this.nearestTileDistance(eye) > MOVEMENT_THRESHOLD;
+        }
+        /*
+         * Distance to the closest tile, measured the way selectTiers measures each one.
+         */
+        nearestTileDistance(eye) {
+            let nearest = Number.POSITIVE_INFINITY;
+            for (const tile of this.tiles) {
+                if (!tile.centre) {
+                    continue;
+                }
+                const distance = Cartesian3.distance(eye, tile.centre) - tile.radius;
+                if (distance < nearest) {
+                    nearest = distance;
+                }
+            }
+            return isFinite(nearest) ? Math.max(1, nearest) : 1;
         }
         commandFor(context, tile, mesh) {
             if (!this.shaderProgram) {
@@ -45879,7 +45914,7 @@ var StyleUtils;
     StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
 })(StyleUtils || (StyleUtils = {}));
 
-const VERSION = "7.2.8";
+const VERSION = "7.2.9";
 /**
  * Updates the environment instance used by bruce-cesium to one specified.
  * This can be used to ensure that the instance a parent is referencing is shared between bruce-cesium, bruce-models, and the parent app.