bruce-cesium 5.3.3 → 5.3.5

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, DataLab, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, ProjectViewLegacyTile, Camera, EntityAttachment, EntityAttachmentType, EntityAttribute, AbstractApi, Session } 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, DataLab, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, EntityAttachment, EntityAttachmentType, EntityAttribute, AbstractApi, Session } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, ClassificationType, ArcType, CornerType, ShadowMode, ConstantProperty, ConstantPositionProperty, HorizontalOrigin, VerticalOrigin, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, Primitive, Cesium3DTileFeature, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, KmlDataSource, SceneTransforms, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, OrthographicFrustum, EasingFunction, NearFarScalar, CesiumInspector, defined, ClockRange, PolygonPipeline, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Quaternion, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, ConstantProperty, ClassificationType, ConstantPositionProperty, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, SceneMode, Primitive, Cesium3DTileFeature, GeoJsonDataSource, Cesium3DTileStyle, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidTerrainProvider, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, Quaternion, ScreenSpaceEventHandler, ScreenSpaceEventType, BoundingSphere, GeometryInstance, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
 
 const TIME_LAG = 300;
 const POSITION_CHECK_TIMER = 950;
@@ -1539,12 +1539,12 @@ function getColor$1(viewer, key, graphic) {
                 storeColor(key, color, graphic);
             }
         }
-        else if (key == "select") {
-            color = _selectColor;
-        }
         else if (key == "highlight") {
             color = _highlightColor;
         }
+        else if (key == "select") {
+            color = _selectColor;
+        }
     }
     return color;
 }
@@ -1570,19 +1570,19 @@ function refreshColor(viewer, graphic, opacity) {
     var _a, _b;
     // Calculate what color key we should apply.
     let key = "default";
-    if (getKeyState(graphic, "select")) {
-        key = "select";
-    }
-    else if (getKeyState(graphic, "highlight")) {
+    if (getKeyState(graphic, "highlight")) {
         key = "highlight";
     }
+    else if (getKeyState(graphic, "select")) {
+        key = "select";
+    }
     // This ensures that the default color is always stored prior to applying a new color.
     if (key != "default") {
         getColor$1(viewer, "default", graphic);
     }
     let color = (_a = getColor$1(viewer, key, graphic)) !== null && _a !== void 0 ? _a : Color.WHITE;
-    // If we're highlighting and it's selected, don't change the color.
-    if (key != "highlight" || getKeyState(graphic, "select") == false) {
+    // If we're selecting and it's highlighted, don't change the color.
+    if (key != "select" || getKeyState(graphic, "highlight") == false) {
         let animateMs = key == "highlight" ? ANIMATE_COLOR_HIGHLIGHT_MS : ANIMATE_COLOR_MS;
         color = color.clone();
         // Multiply opacity if one is set.
@@ -1738,12 +1738,12 @@ function getKeyState(graphic, key) {
 var CesiumEntityStyler;
 (function (CesiumEntityStyler) {
     function UpdateColorSetting(key, color) {
-        if (key == "select") {
-            _selectColor = color.clone();
-        }
-        else if (key == "highlight") {
+        if (key == "highlight") {
             _highlightColor = color.clone();
         }
+        else if (key == "select") {
+            _selectColor = color.clone();
+        }
     }
     CesiumEntityStyler.UpdateColorSetting = UpdateColorSetting;
     function Refresh(params) {
@@ -22885,37 +22885,52 @@ var TileRenderEngine;
                     let maxLevel = settings === null || settings === void 0 ? void 0 : settings.levelMax;
                     const hasLevels = !isNaN(minLevel) && !isNaN(maxLevel);
                     if (tileset.type === Tileset.EType.GeoMap) {
-                        if (TileMapServiceImageryProvider.hasOwnProperty("fromUrl")) {
-                            const url = Tileset.GetPublicFileUrl({
+                        let url = null;
+                        if (tileset.loadUrl) {
+                            url = tileset.loadUrl;
+                        }
+                        // To be removed.
+                        else {
+                            url = Tileset.GetPublicFileUrl({
                                 api,
                                 tilesetId: meta.tilesetId,
                                 file: "",
                                 viaCdn: true,
                                 viaCdnCacheToken: tileset.generateVersion
                             });
-                            provider = await CESIUM.TileMapServiceImageryProvider.fromUrl(url, {
-                                fileExtension: "png",
-                                // Tested to not cause increased lag.
-                                rectangle: boundaries,
+                        }
+                        // Nextspace imagery with a custom suffix.
+                        // This usually means it was generated through another service.
+                        if ((settings === null || settings === void 0 ? void 0 : settings.loadUrlSuffix) || url.endsWith(".png")) {
+                            provider = new UrlTemplateImageryProvider({
+                                url: url,
+                                tileHeight: 256,
+                                tileWidth: 256,
                                 maximumLevel: hasLevels ? maxLevel : undefined,
                                 minimumLevel: hasLevels ? minLevel : undefined,
                             });
                         }
+                        // Typical Nextspace imagery.
                         else {
-                            provider = new CESIUM.TileMapServiceImageryProvider({
-                                url: Tileset.GetPublicFileUrl({
-                                    api,
-                                    tilesetId: meta.tilesetId,
-                                    file: "",
-                                    viaCdn: true,
-                                    viaCdnCacheToken: tileset.generateVersion
-                                }),
-                                fileExtension: "png",
-                                // Tested to not cause increased lag.
-                                rectangle: boundaries,
-                                maximumLevel: hasLevels ? maxLevel : undefined,
-                                minimumLevel: hasLevels ? minLevel : undefined,
-                            });
+                            if (TileMapServiceImageryProvider.hasOwnProperty("fromUrl")) {
+                                provider = await CESIUM.TileMapServiceImageryProvider.fromUrl(url, {
+                                    fileExtension: "png",
+                                    // Tested to not cause increased lag.
+                                    rectangle: boundaries,
+                                    maximumLevel: hasLevels ? maxLevel : undefined,
+                                    minimumLevel: hasLevels ? minLevel : undefined,
+                                });
+                            }
+                            else {
+                                provider = new CESIUM.TileMapServiceImageryProvider({
+                                    url: url,
+                                    fileExtension: "png",
+                                    // Tested to not cause increased lag.
+                                    rectangle: boundaries,
+                                    maximumLevel: hasLevels ? maxLevel : undefined,
+                                    minimumLevel: hasLevels ? minLevel : undefined,
+                                });
+                            }
                         }
                     }
                     else if (tileset.type === Tileset.EType.ExternalGeoMap) {
@@ -30090,7 +30105,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "5.3.3";
+const VERSION = "5.3.5";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, ViewerEventTracker, MenuItemManager, isHistoricMetadataChanged, EntityRenderEngine, EntityRenderEnginePoint, EntityRenderEnginePolyline, EntityRenderEnginePolygon, EntityRenderEngineModel3d, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, DataLabRenderManager, 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, Walkthrough, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar, WidgetControlViewBar, WidgetControlViewBarSearch, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks };
 //# sourceMappingURL=bruce-cesium.es5.js.map