bruce-cesium 2.5.8 → 2.6.0

package/dist/bruce-cesium.umd.js

@@ -2111,7 +2111,7 @@
         (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, 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, cOutline, outlineWidth, outlineHeight, bOutline, fillHeight, exHeightRef, pos, bColor, cColor, size, heightRef;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
@@ -2173,6 +2173,7 @@
                                     if (!iconScale && iconScale != 0) {
                                         iconScale = 1;
                                     }
+                                    disableDepthTest = Boolean(style.renderOnTop);
                                     if (iconScale > 0) {
                                         heightRef = getHeightRef(style);
                                         cEntity = new Cesium.Entity({
@@ -2182,6 +2183,7 @@
                                                 image: iconUrl,
                                                 heightReference: getHeightRef(style),
                                                 scale: iconScale,
+                                                disableDepthTestDistance: disableDepthTest ? Number.POSITIVE_INFINITY : undefined,
                                                 distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance),
                                                 // Would be great once we have a setting for this.
                                                 // translucencyByDistance: getTranslucencyByDistance(params.minDistance, params.maxDistance),
@@ -2437,12 +2439,16 @@
                 if (units != "px" && units != "m") {
                     units = "px";
                 }
+                var classification = Cesium.ClassificationType.TERRAIN;
+                if (style.drapeOver == "ALL") {
+                    classification = Cesium.ClassificationType.BOTH;
+                }
                 var cEntity = new Cesium.Entity({
                     polyline: units == "px" ? {
                         positions: posses,
                         material: cColor,
                         width: width,
-                        classificationType: Cesium.ClassificationType.TERRAIN,
+                        classificationType: classification,
                         arcType: Cesium.ArcType.GEODESIC,
                         zIndex: getZIndex(style, entity, params.tags),
                         clampToGround: heightRef == Cesium.HeightReference.CLAMP_TO_GROUND,
@@ -2452,7 +2458,7 @@
                         positions: posses,
                         material: cColor,
                         width: width,
-                        classificationType: Cesium.ClassificationType.TERRAIN,
+                        classificationType: classification,
                         heightReference: heightRef,
                         zIndex: getZIndex(style, entity, params.tags),
                         distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance, width),
@@ -2580,6 +2586,10 @@
                 });
                 var zIndex = getZIndex(style, entity, params.tags);
                 var size = getSizeOfPolygonEntity(entity);
+                var classification = Cesium.ClassificationType.TERRAIN;
+                if (style.drapeOver == "ALL") {
+                    classification = Cesium.ClassificationType.BOTH;
+                }
                 var cEntity = new Cesium.Entity({
                     polygon: {
                         hierarchy: new Cesium.PolygonHierarchy(posses, holePosses.map(function (x) { return new Cesium.PolygonHierarchy(x); })),
@@ -2588,7 +2598,7 @@
                         extrudedHeightReference: extrusion.exHeightRef,
                         shadows: Cesium.ShadowMode.ENABLED,
                         heightReference: heightRef,
-                        classificationType: Cesium.ClassificationType.BOTH,
+                        classificationType: classification,
                         perPositionHeight: heightRef == Cesium.HeightReference.CLAMP_TO_GROUND ? false : true,
                         zIndex: zIndex,
                         distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance, size, true)
@@ -2646,7 +2656,7 @@
                             fill: true,
                             zIndex: zIndex + 1,
                             cornerType: Cesium.CornerType.MITERED,
-                            classificationType: Cesium.ClassificationType.BOTH,
+                            classificationType: classification,
                             distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance, width),
                             shadows: Cesium.ShadowMode.ENABLED
                         },
@@ -2677,7 +2687,7 @@
                                 fill: true,
                                 zIndex: zIndex + 1,
                                 cornerType: Cesium.CornerType.MITERED,
-                                classificationType: Cesium.ClassificationType.BOTH,
+                                classificationType: classification,
                                 distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance, width),
                                 shadows: Cesium.ShadowMode.ENABLED,
                             },
@@ -7167,7 +7177,7 @@
          * 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;
+        TilesetRenderEngine.MAX_TILESET_MEMORY = 1024 * 4;
         /**
          * Watches tilesets in the viewer.
          * This will regulate their max memory param.
@@ -7184,7 +7194,7 @@
                 // We'll need to allow user to change this somehow.
                 var maxMemory = TilesetRenderEngine.MAX_TILESET_MEMORY;
                 // Minimum memory in MB per tileset.
-                var minMemory = 80;
+                var minMemory = 200;
                 var totalPerTileset = Math.max(this.watched.length ? maxMemory / this.watched.length : maxMemory, minMemory);
                 this.watched.forEach(function (x) {
                     x.maximumMemoryUsage = totalPerTileset;
@@ -14956,7 +14966,7 @@
         ViewerUtils.CreateWidgets = CreateWidgets;
     })(exports.ViewerUtils || (exports.ViewerUtils = {}));
 
-    var VERSION$1 = "2.5.8";
+    var VERSION$1 = "2.6.0";
 
     exports.VERSION = VERSION$1;
     exports.CesiumViewMonitor = CesiumViewMonitor;