bruce-cesium 2.6.6 → 2.6.7

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, EntityRelationType, DelayQueue, BatchedDataGetter, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, EntityRelation, ENVIRONMENT, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera, AbstractApi, EntityAttachment, EntityAttachmentType, EntityAttribute } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, SceneMode, JulianDate, Primitive, Cesium3DTileFeature, HeadingPitchRange, Cesium3DTileColorBlendMode, Cesium3DTileStyle, KmlDataSource, createOsmBuildings, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidTerrainProvider, CesiumInspector, OrthographicFrustum, defined, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, ColorMaterialProperty, EasingFunction, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Ion, BoundingSphere } from 'cesium';
+import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, JulianDate, Entity, Primitive, Cesium3DTileFeature, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, SceneMode, HeadingPitchRange, Cesium3DTileColorBlendMode, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumInspector, defined, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, Model, Matrix4, Matrix3, IonResource, PolygonPipeline, ScreenSpaceEventHandler, ScreenSpaceEventType, ColorMaterialProperty, EasingFunction, GeometryInstance, Ion, BoundingSphere } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -5455,6 +5455,12 @@ var EntitiesRenderManager;
             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 : {},
@@ -5462,19 +5468,18 @@ var EntitiesRenderManager;
                 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 = 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) {
@@ -7768,6 +7773,7 @@ function createFilterGetterCacheKey(params) {
     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;
@@ -15170,7 +15176,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.6.6";
+var VERSION$1 = "2.6.7";
 
 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, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map