bruce-cesium 7.2.5 → 7.2.7

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import * as Cesium from 'cesium';
-import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, Math as Math$1, Cartesian3, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, ShaderSource, Ellipsoid, Geometry, GeometryAttribute, ComponentDatatype, PrimitiveType, BoundingSphere, GeometryPipeline, sampleTerrain, Texture, PixelFormat, Sampler, TextureWrap, TextureMinificationFilter, TextureMagnificationFilter, VertexArray, BufferUsage, ShaderProgram, RenderState, BlendingState, DrawCommand, Pass, Cartesian2, DistanceDisplayCondition, HeightReference, HorizontalOrigin, VerticalOrigin, ClassificationType, ConstantPositionProperty, ArcType, CornerType, ShadowMode, ColorBlendMode, Model, SceneTransforms, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, Rectangle, NearFarScalar, Matrix3, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Ion, IonResource, Cesium3DTileset, Cesium3DTileColorBlendMode, OrthographicFrustum, EasingFunction, Intersect, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, PolygonPipeline, CesiumInspector, ClockRange, DynamicEnvironmentMapManager, GeometryInstance, CustomDataSource, ScreenSpaceEventHandler, ScreenSpaceEventType, Fullscreen, CzmlDataSource } from 'cesium';
-import { Cartes, Entity as Entity$1, ProjectViewTile, ENVIRONMENT, Api, Calculator, ClientFile, EntityTag, EntityType, LRUCache, ObjectUtils, Style, Carto, Geometry as Geometry$1, EntityLod, Color as Color$1, Bounds, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, BruceEvent, EntityCoords, DelayQueue, DataLab, BruceApi, EntityRelation, AccountConcept, RecordChangeFeed, EntitySource, Camera, ProgramKey, ProjectViewLegacyTile, Account, AccountLimits, Session, UrlUtils, ProjectViewBookmarkGroup, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, EntityRelationType, EntityHistoricData } from 'bruce-models';
+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, DistanceDisplayCondition, ClassificationType, ArcType, HeightReference, CornerType, ShadowMode, ConstantPositionProperty, JulianDate, Quaternion, HeadingPitchRoll, ColorBlendMode, Model, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, Rectangle, SceneTransforms, HorizontalOrigin, VerticalOrigin, NearFarScalar, Matrix3, KmlDataSource, SceneMode, GeoJsonDataSource, Cesium3DTileStyle, HeadingPitchRange, Ion, Cesium3DTileColorBlendMode, IonResource, 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, ScreenSpaceEventHandler, ScreenSpaceEventType, GeometryInstance, Fullscreen, CzmlDataSource } from 'cesium';
+import { Cartes, Entity as Entity$1, ProjectViewTile, ENVIRONMENT, Calculator, Carto, EntityTag, EntityType, Geometry as Geometry$1, ObjectUtils, Style, ClientFile, EntityLod, LRUCache, Bounds, 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, ProjectViewBookmarkGroup, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, EntityRelationType, EntityHistoricData } from 'bruce-models';
 
 /**
  * Ensures a number is returned from a given value.
@@ -14131,6 +14131,8 @@ class EntityGatherer {
         this.lastFoundDateTimes = new Map();
         // ID of Entity IDs that need to be requested.
         this.eIdQueue = [];
+        // Membership mirror of eIdQueue for quick checks.
+        this.eIdQueued = new Set();
         // Resolves where an Entity sits without reading its record, when the caller can say.
         // Unset leaves the queue in insertion order, which is what sources that bake no coordinates get.
         this.positionOf = null;
@@ -14240,6 +14242,7 @@ class EntityGatherer {
             return;
         }
         this.eIdQueue = [];
+        this.eIdQueued.clear();
         this.priorityCount = 0;
         this.lastOrderFocus = null;
         this.allEIds.clear();
@@ -14251,6 +14254,7 @@ class EntityGatherer {
             return;
         }
         this.eIdQueue = Array.from(this.allEIds);
+        this.eIdQueued = new Set(this.eIdQueue);
         this.priorityCount = 0;
         this.lastOrderFocus = null;
     }
@@ -14340,27 +14344,58 @@ class EntityGatherer {
             return;
         }
         let changes = 0;
-        for (let i = 0; i < entityIds.length; i++) {
-            const eId = entityIds[i];
-            const index = this.eIdQueue.indexOf(eId);
-            if (topOfQueue) {
-                // If we want it to be at the top of the queue, remove it from the queue first.
-                if (index !== -1) {
-                    this.eIdQueue.splice(index, 1);
-                    if (index < this.priorityCount) {
-                        this.priorityCount -= 1;
-                    }
-                }
-                this.eIdQueue.unshift(eId);
-                this.priorityCount += 1;
-                changes += 1;
+        if (topOfQueue) {
+            // Walked back to front so a repeated ID keeps the position of its last occurrence, then
+            // laid down in that order, which is where inserting one at a time leaves them.
+            const toFront = [];
+            const promoting = new Set();
+            let anyAlreadyQueued = false;
+            for (let i = entityIds.length - 1; i >= 0; i--) {
+                const eId = entityIds[i];
+                this.allEIds.add(eId);
+                if (promoting.has(eId)) {
+                    continue;
+                }
+                promoting.add(eId);
+                toFront.push(eId);
+                if (this.eIdQueued.has(eId)) {
+                    anyAlreadyQueued = true;
+                }
+            }
+            if (anyAlreadyQueued && this.eIdQueue.length) {
+                const kept = [];
+                let removedFromPriority = 0;
+                for (let i = 0; i < this.eIdQueue.length; i++) {
+                    const eId = this.eIdQueue[i];
+                    if (promoting.has(eId)) {
+                        if (i < this.priorityCount) {
+                            removedFromPriority += 1;
+                        }
+                        continue;
+                    }
+                    kept.push(eId);
+                }
+                this.eIdQueue = kept;
+                this.priorityCount = Math.max(0, this.priorityCount - removedFromPriority);
             }
-            else if (index === -1) {
+            this.eIdQueue = toFront.concat(this.eIdQueue);
+            this.priorityCount += toFront.length;
+            for (let i = 0; i < toFront.length; i++) {
+                this.eIdQueued.add(toFront[i]);
+            }
+            changes = toFront.length;
+        }
+        else {
+            for (let i = 0; i < entityIds.length; i++) {
+                const eId = entityIds[i];
+                this.allEIds.add(eId);
+                if (this.eIdQueued.has(eId)) {
+                    continue;
+                }
+                this.eIdQueued.add(eId);
                 this.eIdQueue.push(eId);
                 changes += 1;
             }
-            // Flag that we've seen this ID.
-            this.allEIds.add(entityIds[i]);
         }
         if (!changes) {
             return;
@@ -14494,7 +14529,7 @@ class EntityGatherer {
                     this.emitEntities(toEmit, tags);
                 };
                 const QUEUE_BATCH_SIZE = 500;
-                const requestedIds = [];
+                const requestedIds = new Set();
                 // If we have a queue, we need to request those first.
                 if (this.eIdQueue.length) {
                     const total = this.eIdQueue.length;
@@ -14506,6 +14541,9 @@ class EntityGatherer {
                         this.orderQueueByCamera();
                         const batch = this.eIdQueue.splice(0, QUEUE_BATCH_SIZE);
                         this.priorityCount = Math.max(0, this.priorityCount - batch.length);
+                        for (let i = 0; i < batch.length; i++) {
+                            this.eIdQueued.delete(batch[i]);
+                        }
                         const { entities } = await Entity$1.GetListByIds({
                             entityIds: batch,
                             historicPoint: this.historic ? rTime : null,
@@ -14514,7 +14552,9 @@ class EntityGatherer {
                             maxSearchTimeSec: 60 * 2
                         });
                         handleResponse(batch, entities);
-                        requestedIds.push(...batch);
+                        for (let i = 0; i < batch.length; i++) {
+                            requestedIds.add(batch[i]);
+                        }
                         done += batch.length;
                         if (this._onQueueProgress) {
                             let progress = (done / total) * 100;
@@ -14534,8 +14574,8 @@ class EntityGatherer {
                 // Now run through all IDs that we've seen and request them.
                 // We'll skip those that we just requested.
                 let allEIds = Array.from(this.allEIds);
-                if (requestedIds.length) {
-                    allEIds = allEIds.filter((eId) => requestedIds.indexOf(eId) === -1);
+                if (requestedIds.size) {
+                    allEIds = allEIds.filter((eId) => !requestedIds.has(eId));
                 }
                 if (allEIds.length) {
                     // A historic tick re-reads the whole set, so the near ones are worth resolving
@@ -14554,7 +14594,9 @@ class EntityGatherer {
                             maxSearchTimeSec: 60 * 2
                         });
                         handleResponse(batch, entities);
-                        requestedIds.push(...batch);
+                        for (let i = 0; i < batch.length; i++) {
+                            requestedIds.add(batch[i]);
+                        }
                     }
                 }
                 // If we had leftovers because we stopped early, we need to re-run the tick.
@@ -42605,7 +42647,11 @@ void main() {
     // Value zero sits at the polygon's own altitude, plus the terrain underneath when the polygon
     // is following the ground rather than absolutely positioned.
     float ground = sampleGround(st) * u_groundWeight;
-    float displacement = u_baseHeight + ground + metres * texel.a - skirt * u_skirtDepth;
+
+    // Coverage scales the displacement only where it is measured from the terrain, because there a
+    // zero means the surface sits on the ground.
+    float coverageScale = mix(1.0, texel.a, u_groundWeight);
+    float displacement = u_baseHeight + ground + metres * coverageScale - skirt * u_skirtDepth;
 
     // Added to the LOW half of the encoded position: a metre-scale offset added to the high half
     // would be lost to float32 rounding at an earth radius.
@@ -45911,7 +45957,7 @@ var StyleUtils;
     StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
 })(StyleUtils || (StyleUtils = {}));
 
-const VERSION = "7.2.5";
+const VERSION = "7.2.7";
 /**
  * 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.