bruce-cesium 1.2.9 → 1.3.1

package/dist/bruce-cesium.es5.js

@@ -1,5 +1,5 @@
 import { BruceEvent, Cartes, Carto, Geometry, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, DelayQueue, Entity as Entity$1, BatchedDataGetter, EntityRelationType, Tileset, EntityCoords, EntityFilterGetter, EntitySource, EntityRelation, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
-import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, Rectangle, KmlDataSource, OrthographicFrustum, JulianDate, CallbackProperty, Matrix4, Cesium3DTileset, IonResource, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance } from 'cesium';
+import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, Rectangle, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Matrix4, Cesium3DTileset, IonResource, KmlDataSource, OrthographicFrustum, JulianDate, CallbackProperty, PolygonPipeline, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance, EllipsoidGeodesic, sampleTerrainMostDetailed } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -1032,7 +1032,7 @@ function getPolygonStyleExtrusion(pStyle, entity, tags, heightRef) {
         return null;
     }
     try {
-        var extrusion = +Calculator.GetValue(attrPath, entity, tags);
+        var extrusion = +Calculator.GetNumber(attrPath, entity, tags);
         if (!extrusion && extrusion != 0) {
             return null;
         }
@@ -1072,6 +1072,7 @@ function getPolygonExtrusion(entity, tags, ring, posses, heightRef, pStyle) {
             });
             posses = points.map(function (x) { return Cartesian3.fromRadians(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(x.height)); });
         }
+        data.value = extrusion;
     }
     // Step 2. Try get using geometry data.
     else {
@@ -1114,7 +1115,7 @@ function getHeightRef(style) {
     return heightRef;
 }
 function getZIndex(style, entity, tags) {
-    var zIndex = (style === null || style === void 0 ? void 0 : style.zIndex) ? +Calculator.GetValue(style === null || style === void 0 ? void 0 : style.zIndex, entity, tags) : 0;
+    var zIndex = (style === null || style === void 0 ? void 0 : style.zIndex) ? +Calculator.GetNumber(style === null || style === void 0 ? void 0 : style.zIndex, entity, tags) : 0;
     if (zIndex == null) {
         zIndex = 0;
     }
@@ -1440,7 +1441,7 @@ var EntityRenderEngine;
                         row.type = Calculator.EValueType.Input;
                     }
                 });
-                var icon = Calculator.GetValue(iconUrlRows, entity, params.tags);
+                var icon = Calculator.GetString(iconUrlRows, entity, params.tags);
                 var iconUrl = null;
                 if (typeof icon == "string") {
                     iconUrl = icon;
@@ -1452,7 +1453,7 @@ var EntityRenderEngine;
                     });
                 }
                 if (iconUrl) {
-                    var iconScale = EnsureNumber(Calculator.GetValue(style.iconScale, entity, params.tags));
+                    var iconScale = EnsureNumber(Calculator.GetNumber(style.iconScale, entity, params.tags));
                     if (!iconScale && iconScale != 0) {
                         iconScale = 1;
                     }
@@ -1478,7 +1479,7 @@ var EntityRenderEngine;
             if (!cEntity) {
                 var bColor = style.color ? Calculator.GetColor(style.color, entity, params.tags) : null;
                 var cColor = bColor ? colorToCColor(bColor) : Color.RED;
-                var size = style.size ? Calculator.GetValue(style.size, entity, params.tags) : null;
+                var size = style.size ? Calculator.GetNumber(style.size, entity, params.tags) : null;
                 if (size == null) {
                     size = 30;
                 }
@@ -1594,7 +1595,7 @@ var EntityRenderEngine;
             var style = params.style;
             var bColor = style.lineColor ? Calculator.GetColor(style.lineColor, entity, params.tags) : null;
             var cColor = bColor ? colorToCColor(bColor) : Color.RED;
-            var width = style.lineWidth ? Calculator.GetValue(style.lineWidth, entity, params.tags) : null;
+            var width = style.lineWidth ? Calculator.GetNumber(style.lineWidth, entity, params.tags) : null;
             if (width == null) {
                 width = 4;
             }
@@ -1688,7 +1689,7 @@ var EntityRenderEngine;
             var cFillColor = bFillColor ? colorToCColor(bFillColor) : Color.RED;
             var bLineColor = Calculator.GetColor(style.lineColor, entity, params.tags);
             var cLineColor = bLineColor ? colorToCColor(bLineColor) : Color.RED;
-            var width = style.lineWidth ? Calculator.GetValue(style.lineWidth, entity, params.tags) : null;
+            var width = style.lineWidth ? Calculator.GetNumber(style.lineWidth, entity, params.tags) : null;
             if (width == null) {
                 width = 4;
             }
@@ -1700,6 +1701,7 @@ var EntityRenderEngine;
             var outerRing = pRings.find(function (x) { return x.Facing == Geometry.EPolygonRingType.Boundaries; });
             var points = Geometry.ParsePoints(outerRing === null || outerRing === void 0 ? void 0 : outerRing.LinearRing);
             var posses = points.map(function (x) { return Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(x.altitude)); });
+            Cartes.CloseRing3(posses);
             var extrusion = getPolygonExtrusion(entity, params.tags, outerRing, posses, heightRef, style);
             posses = extrusion.posses;
             var holeRings = pRings.filter(function (x) { return x.Facing == Geometry.EPolygonRingType.Hole; });
@@ -1727,8 +1729,24 @@ var EntityRenderEngine;
                 show: false
             });
             cEntity._siblingGraphics = [];
+            if (width > 0 && bLineColor) {
+                var cEntityBorder = new Entity({
+                    polyline: new PolylineGraphics({
+                        positions: posses,
+                        material: cLineColor,
+                        width: width,
+                        clampToGround: heightRef == HeightReference.CLAMP_TO_GROUND,
+                        classificationType: ClassificationType.TERRAIN,
+                        arcType: ArcType.GEODESIC,
+                        zIndex: zIndex
+                    }),
+                    show: false
+                });
+                cEntity._siblingGraphics.push(cEntityBorder);
+            }
             for (var i = 0; i < holePosses.length; i++) {
                 var posses_1 = holePosses[i];
+                Cartes.CloseRing3(posses_1);
                 var cEntityHole = new Entity({
                     polyline: new PolylineGraphics({
                         positions: posses_1,
@@ -1814,7 +1832,7 @@ var EntityRenderEngine;
                 scale = 1;
             }
             var style = params.style;
-            var styleScale = (style === null || style === void 0 ? void 0 : style.scale) ? Calculator.GetValue(style === null || style === void 0 ? void 0 : style.scale, entity, params.tags) : null;
+            var styleScale = (style === null || style === void 0 ? void 0 : style.scale) ? Calculator.GetNumber(style === null || style === void 0 ? void 0 : style.scale, entity, params.tags) : null;
             styleScale = EnsureNumber(styleScale ? styleScale : 1);
             if (styleScale <= 0) {
                 styleScale = 1;
@@ -1906,7 +1924,7 @@ var EntityRenderEngine;
                             _e.label = 4;
                         case 4:
                             mStyle = (_b = (_a = style === null || style === void 0 ? void 0 : style.Settings) === null || _a === void 0 ? void 0 : _a.polygonStyle) !== null && _b !== void 0 ? _b : {};
-                            group = mStyle.lodGroup ? Calculator.GetValue(mStyle.lodGroup, entity, tags) : null;
+                            group = mStyle.lodGroup ? Calculator.GetString(mStyle.lodGroup, entity, tags) : null;
                             if (!group) {
                                 group = "DEFAULT";
                             }
@@ -2908,12 +2926,12 @@ var RelationRenderEngine;
             var entity = params.dataEntity;
             var bColor = (style === null || style === void 0 ? void 0 : style.lineColor) ? Calculator.GetColor(style === null || style === void 0 ? void 0 : style.lineColor, entity, []) : null;
             var cColor = bColor ? colorToCColor$1(bColor) : Color.WHITE;
-            var width = EnsureNumber((style === null || style === void 0 ? void 0 : style.lineWidth) ? Calculator.GetValue(style === null || style === void 0 ? void 0 : style.lineWidth, entity, []) : 4, 4);
+            var width = EnsureNumber((style === null || style === void 0 ? void 0 : style.lineWidth) ? Calculator.GetNumber(style === null || style === void 0 ? void 0 : style.lineWidth, entity, []) : 4, 4);
             if (width < 1) {
                 width = 1;
             }
-            var duration = EnsureNumber((style === null || style === void 0 ? void 0 : style.duration) ? Calculator.GetValue(style === null || style === void 0 ? void 0 : style.duration, entity, []) : 2, 2);
-            var hDistanceRatio = EnsureNumber((style === null || style === void 0 ? void 0 : style.heightDistanceRatio) ? Calculator.GetValue(style === null || style === void 0 ? void 0 : style.heightDistanceRatio, entity, []) : 0.25, 0.25);
+            var duration = EnsureNumber((style === null || style === void 0 ? void 0 : style.duration) ? Calculator.GetNumber(style === null || style === void 0 ? void 0 : style.duration, entity, []) : 2, 2);
+            var hDistanceRatio = EnsureNumber((style === null || style === void 0 ? void 0 : style.heightDistanceRatio) ? Calculator.GetNumber(style === null || style === void 0 ? void 0 : style.heightDistanceRatio, entity, []) : 0.25, 0.25);
             var fromPos = null;
             var toPos = null;
             var updatingPosses = false;
@@ -4272,11 +4290,11 @@ var TilesetRenderEngine;
     TilesetRenderEngine.Render = Render;
     function RenderLegacy(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var apiGetter, viewer, tileset, ionId, loadUrl, settings, visual, etc, api, cTileset;
+            var apiGetter, viewer, tileset, ionId, loadUrl, viaCdn, settings, visual, etc, api, rootFile, api, rootFile, cTileset;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        apiGetter = params.apiGetter, viewer = params.viewer, tileset = params.tileset, ionId = params.ionId, loadUrl = params.loadUrl;
+                        apiGetter = params.apiGetter, viewer = params.viewer, tileset = params.tileset, ionId = params.ionId, loadUrl = params.loadUrl, viaCdn = params.viaCdn;
                         settings = tileset === null || tileset === void 0 ? void 0 : tileset.Settings;
                         settings = __assign({}, settings);
                         visual = settings.visual;
@@ -4297,7 +4315,15 @@ var TilesetRenderEngine;
                     case 3:
                         if (!loadUrl && tileset) {
                             api = apiGetter.getApi(apiGetter.accountId);
-                            loadUrl = api.GetBaseUrl() + ("ui.tileset/" + tileset.ID + "/file/tileset.json");
+                            rootFile = tileset.RootFileName ? tileset.RootFileName : "tileset.json";
+                            loadUrl = api.GetBaseUrl() + ("ui.tileset/" + tileset.ID + "/file/" + rootFile);
+                        }
+                        if (viaCdn && (tileset === null || tileset === void 0 ? void 0 : tileset.ID)) {
+                            api = apiGetter.getApi(apiGetter.accountId);
+                            if (api.LegacyTilesetCdnUrl) {
+                                rootFile = tileset.RootFileName ? tileset.RootFileName : "tileset.json";
+                                loadUrl = api.LegacyTilesetCdnUrl.replace("<TILESETID>", tileset.ID).replace("<FILEPATH>", rootFile);
+                            }
                         }
                         cTileset = new Cesium3DTileset({
                             url: loadUrl
@@ -5038,7 +5064,7 @@ var SharedGetters;
             var cacheKey = createFilterGetterCacheKey(params);
             var getter = this.data[cacheKey];
             if (!getter) {
-                getter = new EntityFilterGetter.Getter(params.api, params.monitor, params.typeId, params.batchSize, params.attrFilter);
+                getter = new EntityFilterGetter.Getter(params.api, params.monitor, params.typeId, params.batchSize, params.attrFilter, true);
                 this.data[cacheKey] = getter;
             }
             return getter;
@@ -5849,7 +5875,8 @@ var TilesetArbRenderManager;
                                     tileset: legacyTileset,
                                     viewer: this.viewer,
                                     ionId: (_d = this.item.IonResource) === null || _d === void 0 ? void 0 : _d.AssetID,
-                                    loadUrl: loadUrlOverride
+                                    loadUrl: loadUrlOverride,
+                                    viaCdn: true
                                 })];
                         case 7:
                             _h.cTileset = _j.sent();