bruce-cesium 2.6.0 → 2.6.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, 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, JulianDate, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, Primitive, Cesium3DTileFeature, KmlDataSource, OrthographicFrustum, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, PolygonPipeline, CesiumInspector, defined, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, ColorMaterialProperty, EasingFunction, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Ion, BoundingSphere } from 'cesium';
+import { Cartographic, Cartesian3, SceneMode, Math as Math$1, Cartesian2, CallbackProperty, Color, Rectangle, JulianDate, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, OrthographicFrustum, ColorMaterialProperty, Matrix3, Matrix4, EasingFunction, GeometryInstance, Cesium3DTileset, IonResource, ScreenSpaceEventHandler, ScreenSpaceEventType, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, Model, CesiumInspector, Ion, BoundingSphere } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -1863,6 +1863,7 @@ var EntityRenderEngine;
             return __generator(this, function (_j) {
                 switch (_j.label) {
                     case 0:
+                        console.log("Rendering entities", params);
                         groupRenderParams = {
                             apiGetter: params.apiGetter,
                             viewer: params.viewer,
@@ -2114,7 +2115,7 @@ var EntityRenderEngine;
     (function (Point) {
         function Render(params) {
             return __awaiter(this, void 0, void 0, function () {
-                var entity, style, type, cEntity, siblings, iconUrlRows, icon, iconUrl, res, e_4, iconScale, disableDepthTest, heightRef, radius, bFill, cFill, outline, cOutline, outlineWidth, outlineHeight, bOutline, fillHeight, exHeightRef, pos, bColor, cColor, size, heightRef;
+                var entity, style, type, cEntity, siblings, iconUrlRows, icon, iconUrl, res, e_4, iconScale, disableDepthTest, heightRef, radius, bFill, cFill, outline, bOutline, cOutline, outlineWidth, outlineHeight, fillHeight, pos, cartographicPosition, bColor, cColor, size, heightRef;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -2211,62 +2212,35 @@ var EntityRenderEngine;
                                 bFill = style.CylinderFillColor ? Calculator.GetColor(style.CylinderFillColor, entity, params.tags) : null;
                                 cFill = bFill ? colorToCColor(bFill) : Color.RED;
                                 outline = Boolean(style.CylinderBorderEnabled);
-                                cOutline = null;
-                                outlineWidth = 1;
-                                outlineHeight = 0;
-                                if (outline) {
-                                    bOutline = style.CylinderBorderColor ? Calculator.GetColor(style.CylinderBorderColor, entity, params.tags) : null;
-                                    cOutline = bOutline ? colorToCColor(bOutline) : Color.BLACK;
-                                    outlineWidth = EnsureNumber(Calculator.GetNumber(style.CylinderBorderWidth, entity, params.tags), 1);
-                                    outlineHeight = EnsureNumber(Calculator.GetNumber(style.CylinderBorderExtrusion, entity, params.tags), 0);
-                                }
+                                bOutline = style.CylinderBorderColor ? Calculator.GetColor(style.CylinderBorderColor, entity, params.tags) : null;
+                                cOutline = bOutline ? colorToCColor(bOutline) : Color.BLACK;
+                                outlineWidth = EnsureNumber(Calculator.GetNumber(style.CylinderBorderWidth, entity, params.tags), 1);
+                                outlineHeight = EnsureNumber(Calculator.GetNumber(style.CylinderBorderExtrusion, entity, params.tags), 0);
                                 fillHeight = EnsureNumber(Calculator.GetNumber(style.CylinderFillExtrusion, entity, params.tags));
-                                exHeightRef = undefined;
-                                if (fillHeight > 0) {
-                                    exHeightRef = HeightReference.RELATIVE_TO_GROUND;
-                                }
                                 pos = EntityUtils.GetPos({
                                     viewer: params.viewer,
                                     entity: entity,
-                                    recordHeightRef: HeightReference.CLAMP_TO_GROUND,
-                                    returnHeightRef: HeightReference.CLAMP_TO_GROUND
+                                    recordHeightRef: HeightReference.RELATIVE_TO_GROUND,
+                                    returnHeightRef: HeightReference.RELATIVE_TO_GROUND
                                 });
+                                // Adjust the position to consider half the height of the cylinder
+                                if (pos) {
+                                    cartographicPosition = Cartographic.fromCartesian(pos);
+                                    cartographicPosition.height += fillHeight / 2;
+                                    pos = Cartographic.toCartesian(cartographicPosition);
+                                }
                                 cEntity = new Entity({
-                                    ellipse: {
-                                        semiMajorAxis: radius,
-                                        semiMinorAxis: radius,
+                                    position: pos,
+                                    cylinder: {
+                                        length: fillHeight,
+                                        topRadius: radius,
+                                        bottomRadius: radius,
                                         material: cFill,
-                                        outlineWidth: null,
-                                        extrudedHeight: fillHeight,
-                                        heightReference: HeightReference.CLAMP_TO_GROUND,
-                                        extrudedHeightReference: exHeightRef,
-                                        zIndex: 1,
-                                        distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
-                                    },
-                                    position: pos === null || pos === void 0 ? void 0 : pos.clone(),
-                                    show: true
-                                });
-                                if (outline && outlineWidth > 0) {
-                                    if (!exHeightRef && outlineHeight > 0) {
-                                        exHeightRef = HeightReference.RELATIVE_TO_GROUND;
-                                        // We need height reference to match between rings.
-                                        cEntity.ellipse.extrudedHeightReference = exHeightRef;
+                                        outline: outline,
+                                        outlineColor: cOutline,
+                                        outlineWidth: outlineWidth
                                     }
-                                    siblings.push(new Entity({
-                                        ellipse: {
-                                            semiMajorAxis: radius + outlineWidth,
-                                            semiMinorAxis: radius + outlineWidth,
-                                            material: cOutline,
-                                            outlineWidth: undefined,
-                                            extrudedHeight: outlineHeight,
-                                            heightReference: HeightReference.CLAMP_TO_GROUND,
-                                            extrudedHeightReference: exHeightRef,
-                                            zIndex: 2,
-                                            distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
-                                        },
-                                        position: pos === null || pos === void 0 ? void 0 : pos.clone()
-                                    }));
-                                }
+                                });
                             }
                             if (!cEntity) {
                                 bColor = style.color ? Calculator.GetColor(style.color, entity, params.tags) : null;
@@ -2295,6 +2269,8 @@ var EntityRenderEngine;
                                     }),
                                     show: true
                                 });
+                                console.log("Created point", cEntity);
+                                debugger;
                             }
                             if (cEntity) {
                                 cEntity._siblingGraphics = siblings;
@@ -7206,7 +7182,7 @@ var TilesetRenderEngine;
      * The maximum memory in MB that can be used by all tilesets.
      * This is distributed evenly between all loaded tilesets.
      */
-    TilesetRenderEngine.MAX_TILESET_MEMORY = 1024 * 4;
+    TilesetRenderEngine.MAX_TILESET_MEMORY = 1024;
     /**
      * Watches tilesets in the viewer.
      * This will regulate their max memory param.
@@ -7223,7 +7199,7 @@ var TilesetRenderEngine;
             // We'll need to allow user to change this somehow.
             var maxMemory = TilesetRenderEngine.MAX_TILESET_MEMORY;
             // Minimum memory in MB per tileset.
-            var minMemory = 200;
+            var minMemory = 80;
             var totalPerTileset = Math.max(this.watched.length ? maxMemory / this.watched.length : maxMemory, minMemory);
             this.watched.forEach(function (x) {
                 x.maximumMemoryUsage = totalPerTileset;
@@ -15020,7 +14996,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.6.0";
+var VERSION$1 = "2.5.9";
 
 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