bruce-cesium 2.3.0 → 2.3.2

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, DelayQueue, BatchedDataGetter, EntityRelationType, 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, Entity, Primitive, Cesium3DTileFeature, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, SceneMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, Cesium3DTileColorBlendMode, KmlDataSource, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, OrthographicFrustum, JulianDate, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, Cesium3DTileset, Model, PolygonPipeline, ScreenSpaceEventHandler, ScreenSpaceEventType, Matrix4, Matrix3, IonResource, ColorMaterialProperty, EasingFunction, GeometryInstance, CesiumInspector, Ion, BoundingSphere } from 'cesium';
+import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, SceneMode, Entity, Primitive, Cesium3DTileFeature, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumInspector, defined, PolygonPipeline, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, ScreenSpaceEventHandler, ScreenSpaceEventType, ColorMaterialProperty, EasingFunction, GeometryInstance, Ion, BoundingSphere } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -3082,8 +3082,10 @@ function getClusterImage(params) {
 var FORCE_UPDATE_BATCH_SIZE = 1000;
 var FORCE_UPDATE_BATCH_DELAY = 100;
 var PointClustering = /** @class */ (function () {
-    function PointClustering(register, menuItemId) {
+    function PointClustering(register, menuItemId, settings) {
         var _this = this;
+        this.minDistance = 5000;
+        this.minTotalCount = 0;
         this.disposed = false;
         this.registeredEntityIds = new Set();
         // Queue to force update entities.
@@ -3100,6 +3102,14 @@ var PointClustering = /** @class */ (function () {
             _this.doUpdate();
         }, 1000);
         this.listenCamera();
+        if (settings) {
+            if (!isNaN(+settings.minDistance)) {
+                this.minDistance = +settings.minDistance;
+            }
+            if (!isNaN(+settings.minTotalCount)) {
+                this.minTotalCount = +settings.minTotalCount;
+            }
+        }
     }
     PointClustering.prototype.queueForceUpdate = function (entityIds) {
         for (var i = 0; i < entityIds.length; i++) {
@@ -3381,51 +3391,55 @@ var PointClustering = /** @class */ (function () {
         var clusters = [];
         var processedPoints = new Set();
         var cameraPosition = this.viewer.camera.position;
-        var MIN_CAMERA_DISTANCE = 5000;
-        var processQuad = function (quad) {
-            // Distance to quad.
-            // TODO: Needs improvement.
-            var distanceToQuad = quad.GetDistanceToQuad(cameraPosition);
-            // Skip quads that are too close.
-            if (distanceToQuad >= MIN_CAMERA_DISTANCE) {
-                for (var _i = 0, _a = quad.points; _i < _a.length; _i++) {
-                    var point = _a[_i];
-                    // Skip points already processed in previous clusters.
-                    if (processedPoints.has(point.id)) {
-                        continue;
-                    }
-                    // Skip points closer than MIN_CAMERA_DISTANCE meters to the camera.
-                    var cartesian3 = Cartesian3.fromDegrees(point.lon, point.lat);
-                    var distanceFromCluster = Cartesian3.distance(cartesian3, cameraPosition);
-                    if (distanceFromCluster <= MIN_CAMERA_DISTANCE) {
-                        continue;
-                    }
-                    var found = [];
-                    var nearbyPoints = quad.Query(new Circle(point.lon, point.lat, _this.getClusterSpacing(distanceFromCluster)), found);
-                    if (nearbyPoints.length > 1) {
-                        var cluster = { center: point, points: [] };
-                        for (var _b = 0, nearbyPoints_1 = nearbyPoints; _b < nearbyPoints_1.length; _b++) {
-                            var nearby = nearbyPoints_1[_b];
-                            if (!processedPoints.has(nearby.id) && !cluster.points.includes(nearby)) {
-                                cluster.points.push(nearby);
-                                processedPoints.add(nearby.id);
-                                _this.currClusteredEntities.add(nearby.id);
+        // Only cluster if total registered points exceeds minTotalCount.
+        var validClusters = [];
+        if (this.registeredEntityIds.size < this.minTotalCount) {
+            var MIN_CAMERA_DISTANCE_1 = this.minDistance;
+            var processQuad_1 = function (quad) {
+                // Distance to quad.
+                // TODO: Needs improvement.
+                var distanceToQuad = quad.GetDistanceToQuad(cameraPosition);
+                // Skip quads that are too close.
+                if (distanceToQuad >= MIN_CAMERA_DISTANCE_1) {
+                    for (var _i = 0, _a = quad.points; _i < _a.length; _i++) {
+                        var point = _a[_i];
+                        // Skip points already processed in previous clusters.
+                        if (processedPoints.has(point.id)) {
+                            continue;
+                        }
+                        // Skip points closer than MIN_CAMERA_DISTANCE meters to the camera.
+                        var cartesian3 = Cartesian3.fromDegrees(point.lon, point.lat);
+                        var distanceFromCluster = Cartesian3.distance(cartesian3, cameraPosition);
+                        if (distanceFromCluster <= MIN_CAMERA_DISTANCE_1) {
+                            continue;
+                        }
+                        var found = [];
+                        var nearbyPoints = quad.Query(new Circle(point.lon, point.lat, _this.getClusterSpacing(distanceFromCluster)), found);
+                        if (nearbyPoints.length > 1) {
+                            var cluster = { center: point, points: [] };
+                            for (var _b = 0, nearbyPoints_1 = nearbyPoints; _b < nearbyPoints_1.length; _b++) {
+                                var nearby = nearbyPoints_1[_b];
+                                if (!processedPoints.has(nearby.id) && !cluster.points.includes(nearby)) {
+                                    cluster.points.push(nearby);
+                                    processedPoints.add(nearby.id);
+                                    _this.currClusteredEntities.add(nearby.id);
+                                }
                             }
+                            clusters.push(cluster);
                         }
-                        clusters.push(cluster);
                     }
                 }
-            }
-            if (quad.divided) {
-                processQuad(quad.northwest);
-                processQuad(quad.northeast);
-                processQuad(quad.southwest);
-                processQuad(quad.southeast);
-            }
-        };
-        processQuad(this.quadTree);
-        // Filter out clusters with only one point.
-        var validClusters = clusters.filter(function (cluster) { return cluster.points.length > 1; });
+                if (quad.divided) {
+                    processQuad_1(quad.northwest);
+                    processQuad_1(quad.northeast);
+                    processQuad_1(quad.southwest);
+                    processQuad_1(quad.southeast);
+                }
+            };
+            processQuad_1(this.quadTree);
+            // Filter out clusters with only one point.
+            validClusters = clusters.filter(function (cluster) { return cluster.points.length > 1; });
+        }
         // Get the entity IDs that are no longer clustered
         var noLongerClustered = new Set(Array.from(this.prevClusteredEntities).filter(function (id) { return !_this.currClusteredEntities.has(id); }));
         // Update the previous clustered entities ref.
@@ -3581,7 +3595,7 @@ var EntitiesRenderManager;
         });
         Manager.prototype.Init = function (params) {
             var _this = this;
-            var _a, _b, _c, _d, _e, _f, _g, _h;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             if (this.disposed) {
                 throw (new Error("This item is disposed."));
             }
@@ -3635,12 +3649,12 @@ var EntitiesRenderManager;
                 return;
             }
             if (this.item.enableClustering) {
-                this.clustering = new PointClustering(this.visualsManager, this.item.id);
+                this.clustering = new PointClustering(this.visualsManager, this.item.id, (_h = this.item) === null || _h === void 0 ? void 0 : _h.clustering);
             }
             var api = this.apiGetter.getApi();
             this.getter = this.sharedGetters.GetOrCreateFilterGetter({
                 api: api,
-                attrFilter: (_h = this.item.BruceEntity.Filter) !== null && _h !== void 0 ? _h : {},
+                attrFilter: (_j = this.item.BruceEntity.Filter) !== null && _j !== void 0 ? _j : {},
                 batchSize: BATCH_SIZE,
                 typeId: this.item.BruceEntity["EntityType.ID"],
                 monitor: this.monitor,
@@ -5535,6 +5549,7 @@ var EntitiesIdsRenderManager;
 (function (EntitiesIdsRenderManager) {
     var Manager = /** @class */ (function () {
         function Manager(params) {
+            var _a;
             this.getter = null;
             this.getterSub = null;
             this.disposed = false;
@@ -5546,7 +5561,7 @@ var EntitiesIdsRenderManager;
             this.item = item;
             this.visualsManager = visualsManager;
             if (this.item.enableClustering) {
-                this.clustering = new PointClustering(visualsManager, this.item.id);
+                this.clustering = new PointClustering(visualsManager, this.item.id, (_a = this.item) === null || _a === void 0 ? void 0 : _a.clustering);
             }
         }
         Object.defineProperty(Manager.prototype, "Disposed", {
@@ -14241,7 +14256,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.2.9";
+var VERSION$1 = "2.3.2";
 
 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