bruce-cesium 2.6.6 → 2.6.8

package/dist/bruce-cesium.umd.js

@@ -5442,6 +5442,12 @@
                 var _this = this;
                 var _a;
                 this.unsetGetter();
+                var isTagItem = Boolean(this.item.BruceEntity.ExpandLayers);
+                var tagsToRender = isTagItem ? this.item.BruceEntity.SelectedExpandLayers : null;
+                if (!tagsToRender) {
+                    tagsToRender = [];
+                }
+                tagsToRender = [].concat(tagsToRender);
                 this.getter = this.sharedGetters.GetOrCreateFilterGetter({
                     api: this.apiGetter.getApi(),
                     attrFilter: (_a = this.item.BruceEntity.Filter) !== null && _a !== void 0 ? _a : {},
@@ -5449,19 +5455,18 @@
                     typeId: this.item.BruceEntity["EntityType.ID"],
                     monitor: this.monitor,
                     viewer: this.viewer,
+                    // Unfortunately this searches as an "AND" rather than "OR" which does not meet our needs here.
+                    // So for multiple tags we'll manually sort on UI end...
+                    tagIds: tagsToRender.length == 1 ? tagsToRender : [],
                     debugShowBounds: Boolean(window === null || window === void 0 ? void 0 : window.ENTITIES_RENDER_MANAGER_SHOW_BOUNDS),
                     cdn: this.item.cdnEnabled
                 });
                 var minMax = exports.RenderManager.GetZoomMinMax({
                     zoomControl: this.item.CameraZoomSettings
                 });
-                this.getter.IncludeMenuItem(this.item.id, [], minMax[0], minMax[1]);
-                var isTagItem = Boolean(this.item.BruceEntity.ExpandLayers);
-                var tagsToRender = isTagItem ? this.item.BruceEntity.SelectedExpandLayers : null;
-                if (!tagsToRender) {
-                    tagsToRender = [];
-                }
-                tagsToRender = [].concat(tagsToRender);
+                // Unfortunately this searches as an "AND" rather than "OR" which does not meet our needs here.
+                // So for multiple tags we'll manually sort on UI end...
+                this.getter.IncludeMenuItem(this.item.id, tagsToRender.length == 1 ? tagsToRender : [], minMax[0], minMax[1]);
                 this.getterSub = this.getter.OnUpdate.Subscribe(function (entities) {
                     if (isTagItem) {
                         _this.distributeForRender(entities.filter(function (entity) {
@@ -6963,10 +6968,11 @@
                 enumerable: false,
                 configurable: true
             });
-            Styler.prototype.QueueEntities = function (entities) {
+            Styler.prototype.QueueEntities = function (entities, highPriority) {
+                if (highPriority === void 0) { highPriority = false; }
                 for (var i = 0; i < entities.length; i++) {
                     var entity = entities[i];
-                    this.queueTilesetFeatureStyle(entity);
+                    this.queueTilesetFeatureStyle(entity, highPriority);
                 }
                 if (this.recordLoadQueue.length > 0) {
                     this.processQueue();
@@ -7245,7 +7251,7 @@
                                             var entityId = batch[i];
                                             var entity = _this.getEntityRego(entityId);
                                             if (entity) {
-                                                _this.queueTilesetFeatureStyle(entity);
+                                                _this.queueTilesetFeatureStyle(entity, false);
                                             }
                                         }
                                         _this.viewer.scene.requestRender();
@@ -7259,7 +7265,7 @@
                     });
                 });
             };
-            Styler.prototype.queueTilesetFeatureStyle = function (entity) {
+            Styler.prototype.queueTilesetFeatureStyle = function (entity, highPriority) {
                 if (this.styleMappingLoaded || this.styleMappingsLoaded[entity.entityTypeId] == true) {
                     var needsData = this.getTilesetFeatureNeedsFullData(entity.entityId, entity.entityTypeId);
                     if (needsData) {
@@ -7272,7 +7278,12 @@
                     }
                 }
                 else {
-                    this.recordCheckQueue.push(entity.entityId);
+                    if (highPriority) {
+                        this.recordCheckQueue.unshift(entity.entityId);
+                    }
+                    else {
+                        this.recordCheckQueue.push(entity.entityId);
+                    }
                 }
             };
             Styler.prototype.styleTilesetFeature = function (entity) {
@@ -7718,7 +7729,7 @@
                         if (entityIds != null) {
                             regos = regos.filter(function (r) { return entityIds.indexOf(r.entityId) >= 0; });
                         }
-                        this.styler.QueueEntities(regos);
+                        this.styler.QueueEntities(regos, true);
                         return [2 /*return*/];
                     });
                 });
@@ -7734,6 +7745,7 @@
         cacheKey += params.typeId;
         cacheKey += params.batchSize;
         cacheKey += String(params.cdn);
+        cacheKey += JSON.stringify(params.tagIds ? params.tagIds : []);
         // This could potentially crash, but if it crashes here then it would crash during API request anyways.
         cacheKey += JSON.stringify(params.attrFilter ? params.attrFilter : {});
         return cacheKey;
@@ -15116,7 +15128,7 @@
         ViewerUtils.CreateWidgets = CreateWidgets;
     })(exports.ViewerUtils || (exports.ViewerUtils = {}));
 
-    var VERSION$1 = "2.6.6";
+    var VERSION$1 = "2.6.8";
 
     exports.VERSION = VERSION$1;
     exports.CesiumViewMonitor = CesiumViewMonitor;