bruce-cesium 4.4.6 → 4.4.7

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
-import { BruceEvent, Cartes, Entity as Entity$1, Carto, Geometry, MathUtils, LRUCache, Api, Calculator, ClientFile, EntityTag, EntityType, ObjectUtils, Style, ProjectViewTile, DelayQueue, EntityLod, Bounds, ZoomControl, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, Session, EntityAttribute, EntityAttachment, EntityAttachmentType, AbstractApi } from 'bruce-models';
+import { BruceEvent, Cartes, Entity as Entity$1, Carto, Geometry, MathUtils, LRUCache, Api, Calculator, ClientFile, EntityTag, EntityType, ObjectUtils, Style, ProjectViewTile, DelayQueue, EntityLod, Bounds, ZoomControl, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, AbstractApi, Session, EntityAttribute, EntityAttachment, EntityAttachmentType } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, CesiumInspector, defined, ClockRange, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, Quaternion, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, Entity, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, JulianDate, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, SceneMode, Primitive, Cesium3DTileFeature, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, OrthographicFrustum, EasingFunction, NearFarScalar, SceneTransforms, EllipsoidTerrainProvider, CesiumInspector, defined, ClockRange, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, PolygonPipeline, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, BoundingSphere, GeometryInstance, Quaternion, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6876,6 +6876,18 @@ var EntityRenderEnginePolyline;
         if (totalLength < MIN_LEN || totalLength > MAX_LEN) {
             return null;
         }
+        // Smoothening the line.
+        // Warning: we don't have a way to indicate that this is not the original set of points yet.
+        // This means editing tools in our apps will bake these in on save.
+        if (style.smoothen && style.smoothen > 2) {
+            var smoothed = smoothenPoints(posses, style.smoothen, false);
+            if (smoothed.find(function (x) { return !Cartes.ValidateCartes3(x); })) {
+                console.error("Polyline.Render: Smoothening failed. Invalid Cartesian3 found. Defaulting to original points.");
+            }
+            else {
+                posses = smoothed;
+            }
+        }
         var bColor = style.lineColor ? Calculator.GetColor(style.lineColor, entity, params.tags) : null;
         var cColor = bColor ? ColorToCColor(bColor) : Color.fromCssColorString("rgba(255, 193, 7, 0.8)");
         if (cColor.alpha <= 0) {
@@ -7233,6 +7245,52 @@ function getHeightRef$2(style, defaultStyle) {
     }
     return heightRef;
 }
+function smoothenPoints(points, multiplier, closed) {
+    if (points.length < 4 || multiplier < 2) {
+        return points;
+    }
+    if (!closed) {
+        points.unshift(Cartesian3.subtract(points[0], points[1], new Cartesian3()));
+        points.push(Cartesian3.subtract(points[points.length - 1], points[points.length - 2], new Cartesian3()));
+    }
+    else {
+        points.unshift(points[points.length - 1]);
+        points.unshift(points[points.length - 2]);
+        points.push(points[2]);
+    }
+    var splinePoints = [];
+    var _loop_1 = function (i) {
+        var _a = [0, 1, 2, 3].map(function (n) { return points[i + n]; }), P0 = _a[0], P1 = _a[1], P2 = _a[2], P3 = _a[3];
+        for (var j = 0; j <= multiplier; j++) {
+            splinePoints.push(catmullRom$1(P0, P1, P2, P3, j / multiplier));
+        }
+    };
+    for (var i = 0; i < points.length - 3; i++) {
+        _loop_1(i);
+    }
+    return splinePoints;
+}
+function catmullRom$1(p0, p1, p2, p3, t) {
+    var t0 = 0;
+    var t1 = getT$1(t0, 0.5, p0, p1);
+    var t2 = getT$1(t1, 0.5, p1, p2);
+    var t3 = getT$1(t2, 0.5, p2, p3);
+    t = Math$1.lerp(t1, t2, t);
+    var _a = [function (l, r) { return Cartesian3.add(l, r, new Cartesian3()); }, function (l, r) { return Cartesian3.multiplyByScalar(l, r, new Cartesian3()); }], add = _a[0], mul = _a[1];
+    var A1 = add(mul(p0, (t1 - t) / (t1 - t0)), mul(p1, (t - t0) / (t1 - t0)));
+    var A2 = add(mul(p1, (t2 - t) / (t2 - t1)), mul(p2, (t - t1) / (t2 - t1)));
+    var A3 = add(mul(p2, (t3 - t) / (t3 - t2)), mul(p3, (t - t2) / (t3 - t2)));
+    var B1 = add(mul(A1, (t2 - t) / (t2 - t0)), mul(A2, (t - t0) / (t2 - t0)));
+    var B2 = add(mul(A2, (t3 - t) / (t3 - t1)), mul(A3, (t - t1) / (t3 - t1)));
+    var C = add(mul(B1, (t2 - t) / (t2 - t1)), mul(B2, (t - t1) / (t2 - t1)));
+    return C;
+}
+function getT$1(t, alpha, p0, p1) {
+    var d = Cartesian3.subtract(p1, p0, new Cartesian3());
+    var a = Cartesian3.dot(d, d);
+    var b = Math.pow(a, alpha * 0.5);
+    return b + t;
+}
 
 var EntityRenderEnginePolygon;
 (function (EntityRenderEnginePolygon) {
@@ -17712,6 +17770,24 @@ var TilesetArbRenderManager;
                             }
                             this.viewer.scene.requestRender();
                             TilesetRenderEngine.OnTilesetReady(this.cTileset).then(function () {
+                                // Colour mask to apply to the Tileset as a whole.
+                                // Individual Entities can override this.
+                                // This is typically used for Tilesets without Entities to allow some sort of basic styling per-bookmark.
+                                try {
+                                    var colorCss = _this.item.colorMask;
+                                    if (colorCss) {
+                                        _this.cTileset.style = new Cesium3DTileStyle({
+                                            color: {
+                                                conditions: [
+                                                    ["true", "color(\"".concat(colorCss, "\")")]
+                                                ]
+                                            }
+                                        });
+                                    }
+                                }
+                                catch (e) {
+                                    console.error(e);
+                                }
                                 try {
                                     if (_this.item.ApplyStyles ||
                                         _this.item.Type == MenuItem.EType.IonTileset) {
@@ -24462,19 +24538,11 @@ function getInsertIndex(positions, pos3d) {
     if (startDist <= minDistance) {
         index = 0;
         minDistance = startDist;
-        console.log("Insert at start");
-    }
-    else {
-        console.log("Start distance was longer than cur distance. ".concat(startDist, " > ").concat(minDistance));
     }
     // Check against end point
     var endDist = Cartesian3.distance(pos3d, positions[positions.length - 1]);
     if (endDist <= minDistance) {
         index = positions.length;
-        console.log("Insert at end");
-    }
-    else {
-        console.log("End distance was longer than cur distance. ".concat(endDist, " > ").concat(minDistance));
     }
     return index;
 }
@@ -27204,7 +27272,7 @@ var ViewerUtils;
     ViewerUtils.AssertIonToken = AssertIonToken;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION = "4.4.6";
+var VERSION = "4.4.7";
 
-export { VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, EntityRenderEnginePoint, EntityRenderEnginePolyline, EntityRenderEnginePolygon, EntityRenderEngineModel3d, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, GoogleSearchRenderManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, WidgetNavCompass$$1 as WidgetNavCompass, WidgetSearchBar, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks };
+export { VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, EntityRenderEnginePoint, EntityRenderEnginePolyline, smoothenPoints, EntityRenderEnginePolygon, EntityRenderEngineModel3d, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, GoogleSearchRenderManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, WidgetNavCompass$$1 as WidgetNavCompass, WidgetSearchBar, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks };
 //# sourceMappingURL=bruce-cesium.es5.js.map