bruce-cesium 7.2.5 → 7.2.7

package/dist/bruce-cesium.umd.js

@@ -14090,6 +14090,8 @@
             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;
@@ -14199,6 +14201,7 @@
                 return;
             }
             this.eIdQueue = [];
+            this.eIdQueued.clear();
             this.priorityCount = 0;
             this.lastOrderFocus = null;
             this.allEIds.clear();
@@ -14210,6 +14213,7 @@
                 return;
             }
             this.eIdQueue = Array.from(this.allEIds);
+            this.eIdQueued = new Set(this.eIdQueue);
             this.priorityCount = 0;
             this.lastOrderFocus = null;
         }
@@ -14299,27 +14303,58 @@
                 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;
@@ -14453,7 +14488,7 @@
                         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;
@@ -14465,6 +14500,9 @@
                             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 BModels.Entity.GetListByIds({
                                 entityIds: batch,
                                 historicPoint: this.historic ? rTime : null,
@@ -14473,7 +14511,9 @@
                                 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;
@@ -14493,8 +14533,8 @@
                     // 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
@@ -14513,7 +14553,9 @@
                                 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.
@@ -42483,7 +42525,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.
@@ -45773,7 +45819,7 @@ void main() {
         StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
     })(exports.StyleUtils || (exports.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.