bruce-cesium 2.6.0 → 2.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -2111,7 +2111,7 @@
2111
2111
  (function (Point) {
2112
2112
  function Render(params) {
2113
2113
  return __awaiter(this, void 0, void 0, function () {
2114
- 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;
2114
+ 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, bColor, cColor, size, heightRef;
2115
2115
  return __generator(this, function (_a) {
2116
2116
  switch (_a.label) {
2117
2117
  case 0:
@@ -2208,62 +2208,30 @@
2208
2208
  bFill = style.CylinderFillColor ? bruceModels.Calculator.GetColor(style.CylinderFillColor, entity, params.tags) : null;
2209
2209
  cFill = bFill ? colorToCColor(bFill) : Cesium.Color.RED;
2210
2210
  outline = Boolean(style.CylinderBorderEnabled);
2211
- cOutline = null;
2212
- outlineWidth = 1;
2213
- outlineHeight = 0;
2214
- if (outline) {
2215
- bOutline = style.CylinderBorderColor ? bruceModels.Calculator.GetColor(style.CylinderBorderColor, entity, params.tags) : null;
2216
- cOutline = bOutline ? colorToCColor(bOutline) : Cesium.Color.BLACK;
2217
- outlineWidth = EnsureNumber(bruceModels.Calculator.GetNumber(style.CylinderBorderWidth, entity, params.tags), 1);
2218
- outlineHeight = EnsureNumber(bruceModels.Calculator.GetNumber(style.CylinderBorderExtrusion, entity, params.tags), 0);
2219
- }
2211
+ bOutline = style.CylinderBorderColor ? bruceModels.Calculator.GetColor(style.CylinderBorderColor, entity, params.tags) : null;
2212
+ cOutline = bOutline ? colorToCColor(bOutline) : Cesium.Color.BLACK;
2213
+ outlineWidth = EnsureNumber(bruceModels.Calculator.GetNumber(style.CylinderBorderWidth, entity, params.tags), 1);
2214
+ outlineHeight = EnsureNumber(bruceModels.Calculator.GetNumber(style.CylinderBorderExtrusion, entity, params.tags), 0);
2220
2215
  fillHeight = EnsureNumber(bruceModels.Calculator.GetNumber(style.CylinderFillExtrusion, entity, params.tags));
2221
- exHeightRef = undefined;
2222
- if (fillHeight > 0) {
2223
- exHeightRef = Cesium.HeightReference.RELATIVE_TO_GROUND;
2224
- }
2225
2216
  pos = exports.EntityUtils.GetPos({
2226
2217
  viewer: params.viewer,
2227
2218
  entity: entity,
2228
2219
  recordHeightRef: Cesium.HeightReference.CLAMP_TO_GROUND,
2229
- returnHeightRef: Cesium.HeightReference.CLAMP_TO_GROUND
2220
+ returnHeightRef: Cesium.HeightReference.RELATIVE_TO_GROUND
2230
2221
  });
2231
2222
  cEntity = new Cesium.Entity({
2232
- ellipse: {
2233
- semiMajorAxis: radius,
2234
- semiMinorAxis: radius,
2235
- material: cFill,
2236
- outlineWidth: null,
2237
- extrudedHeight: fillHeight,
2238
- heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
2239
- extrudedHeightReference: exHeightRef,
2240
- zIndex: 1,
2241
- distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
2242
- },
2243
2223
  position: pos === null || pos === void 0 ? void 0 : pos.clone(),
2244
- show: true
2245
- });
2246
- if (outline && outlineWidth > 0) {
2247
- if (!exHeightRef && outlineHeight > 0) {
2248
- exHeightRef = Cesium.HeightReference.RELATIVE_TO_GROUND;
2249
- // We need height reference to match between rings.
2250
- cEntity.ellipse.extrudedHeightReference = exHeightRef;
2224
+ cylinder: {
2225
+ length: fillHeight,
2226
+ topRadius: radius,
2227
+ bottomRadius: radius,
2228
+ material: cFill,
2229
+ outline: outline,
2230
+ outlineColor: cOutline,
2231
+ outlineWidth: outlineWidth
2251
2232
  }
2252
- siblings.push(new Cesium.Entity({
2253
- ellipse: {
2254
- semiMajorAxis: radius + outlineWidth,
2255
- semiMinorAxis: radius + outlineWidth,
2256
- material: cOutline,
2257
- outlineWidth: undefined,
2258
- extrudedHeight: outlineHeight,
2259
- heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
2260
- extrudedHeightReference: exHeightRef,
2261
- zIndex: 2,
2262
- distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
2263
- },
2264
- position: pos === null || pos === void 0 ? void 0 : pos.clone()
2265
- }));
2266
- }
2233
+ });
2234
+ // Here you can add additional logic if you need more customization for the cylinder
2267
2235
  }
2268
2236
  if (!cEntity) {
2269
2237
  bColor = style.color ? bruceModels.Calculator.GetColor(style.color, entity, params.tags) : null;
@@ -7177,7 +7145,7 @@
7177
7145
  * The maximum memory in MB that can be used by all tilesets.
7178
7146
  * This is distributed evenly between all loaded tilesets.
7179
7147
  */
7180
- TilesetRenderEngine.MAX_TILESET_MEMORY = 1024 * 4;
7148
+ TilesetRenderEngine.MAX_TILESET_MEMORY = 1024;
7181
7149
  /**
7182
7150
  * Watches tilesets in the viewer.
7183
7151
  * This will regulate their max memory param.
@@ -7194,7 +7162,7 @@
7194
7162
  // We'll need to allow user to change this somehow.
7195
7163
  var maxMemory = TilesetRenderEngine.MAX_TILESET_MEMORY;
7196
7164
  // Minimum memory in MB per tileset.
7197
- var minMemory = 200;
7165
+ var minMemory = 80;
7198
7166
  var totalPerTileset = Math.max(this.watched.length ? maxMemory / this.watched.length : maxMemory, minMemory);
7199
7167
  this.watched.forEach(function (x) {
7200
7168
  x.maximumMemoryUsage = totalPerTileset;
@@ -14966,7 +14934,7 @@
14966
14934
  ViewerUtils.CreateWidgets = CreateWidgets;
14967
14935
  })(exports.ViewerUtils || (exports.ViewerUtils = {}));
14968
14936
 
14969
- var VERSION$1 = "2.6.0";
14937
+ var VERSION$1 = "2.5.9";
14970
14938
 
14971
14939
  exports.VERSION = VERSION$1;
14972
14940
  exports.CesiumViewMonitor = CesiumViewMonitor;