bruce-cesium 4.3.9 → 4.4.1

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
-import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, MathUtils, LRUCache, ProjectViewTile, DelayQueue, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, Api, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, EntitySource, MenuItem, EntityRelation, ProgramKey, Camera, ProjectView, ProjectViewBookmark, ProjectViewLegacyTile, EntityAttribute, EntityAttachment, EntityAttachmentType, AbstractApi, Session } from 'bruce-models';
+import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, MathUtils, LRUCache, ProjectViewTile, DelayQueue, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, Api, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, EntityAttribute, EntityAttachment, EntityAttachmentType, AbstractApi, Session } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, JulianDate, Color, HeightReference, Cartesian3, DistanceDisplayCondition, NearFarScalar, Model, ColorMaterialProperty, Entity, CallbackProperty, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorBlendMode, HeadingPitchRoll, Math as Math$1, Transforms, Primitive, Cesium3DTileFeature, Cartesian2, SceneMode, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, Rectangle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, CzmlDataSource, Quaternion } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, Primitive, Cesium3DTileFeature, SceneMode, DistanceDisplayCondition, NearFarScalar, Model, ColorMaterialProperty, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorBlendMode, HeadingPitchRoll, Transforms, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Quaternion, Intersect } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -16919,8 +16919,9 @@ var TilesetArbRenderManager;
                 }
             }
             if (!rego.entityId) {
+                // 'Building' ones are for legacy CC3D data.
                 var ACCEPTABLE_PROPS = [
-                    "Building_ID", "BuildingID", "BruceId"
+                    "Building_ID", "BuildingID", "BruceId", "entityId", "bruceId"
                 ];
                 for (var _i = 0, ACCEPTABLE_PROPS_1 = ACCEPTABLE_PROPS; _i < ACCEPTABLE_PROPS_1.length; _i++) {
                     var acceptableId = ACCEPTABLE_PROPS_1[_i];
@@ -17432,7 +17433,7 @@ var TilesetGooglePhotosRenderManager;
         Manager.prototype.Init = function () {
             var _this = this;
             (function () { return __awaiter(_this, void 0, void 0, function () {
-                var CESIUM, programKey, e_1, _a, colorCss;
+                var CESIUM, programKeys, _i, programKeys_1, programKey, e_1, _a, colorCss;
                 var _b;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
@@ -17446,14 +17447,20 @@ var TilesetGooglePhotosRenderManager;
                             _c.label = 1;
                         case 1:
                             _c.trys.push([1, 3, , 4]);
-                            return [4 /*yield*/, ProgramKey.Get({
-                                    programId: ProgramKey.EProgramId.Google,
+                            return [4 /*yield*/, ProgramKey.GetList({
                                     api: this.getters.GetBruceApi()
                                 })];
                         case 2:
-                            programKey = (_c.sent()).programKey;
-                            if (programKey === null || programKey === void 0 ? void 0 : programKey.Key) {
-                                CESIUM.GoogleMaps.defaultApiKey = programKey.Key;
+                            programKeys = (_c.sent()).programKeys;
+                            for (_i = 0, programKeys_1 = programKeys; _i < programKeys_1.length; _i++) {
+                                programKey = programKeys_1[_i];
+                                if (!programKey.Key) {
+                                    continue;
+                                }
+                                if (programKey.ProgramId === ProgramKey.EProgramId.Google || programKey.ProgramId === ProgramKey.EProgramId.GooglePhotogrammetry) {
+                                    CESIUM.GoogleMaps.defaultApiKey = programKey.Key;
+                                    break;
+                                }
                             }
                             return [3 /*break*/, 4];
                         case 3:
@@ -18573,64 +18580,43 @@ var GoogleSearchRenderManager;
         Manager.prototype.Init = function () {
             var _this = this;
             (function () { return __awaiter(_this, void 0, void 0, function () {
-                var key, valid, programKey, valid, e_1;
+                var programKey, valid, e_1;
                 var _this = this;
-                var _a, _b, _c, _d;
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
+                var _a;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
-                            _e.trys.push([0, 7, , 8]);
-                            if (!!((_c = (_b = (_a = getGoogle()) === null || _a === void 0 ? void 0 : _a.maps) === null || _b === void 0 ? void 0 : _b.places) === null || _c === void 0 ? void 0 : _c.PlacesService)) return [3 /*break*/, 6];
-                            key = this.item.accessToken;
-                            if (!key) return [3 /*break*/, 2];
-                            return [4 /*yield*/, validateKey(key)];
-                        case 1:
-                            valid = _e.sent();
-                            if (!valid) {
-                                console.warn("Menu Item key not valid for Google Places API. Will try use the account default.");
-                                key = null;
-                            }
-                            _e.label = 2;
-                        case 2:
-                            if (!!key) return [3 /*break*/, 5];
+                            _b.trys.push([0, 5, , 6]);
                             return [4 /*yield*/, ProgramKey.Get({
-                                    programId: ProgramKey.EProgramId.Google,
+                                    programId: ProgramKey.EProgramId.GoogleApi,
                                     api: this.getters.GetBruceApi()
                                 })];
-                        case 3:
-                            programKey = (_e.sent()).programKey;
-                            if (programKey === null || programKey === void 0 ? void 0 : programKey.Key) {
-                                key = programKey.Key;
-                            }
-                            if (!key) return [3 /*break*/, 5];
-                            return [4 /*yield*/, validateKey(key)];
-                        case 4:
-                            valid = _e.sent();
+                        case 1:
+                            programKey = (_b.sent()).programKey;
+                            if (!(programKey === null || programKey === void 0 ? void 0 : programKey.Key)) return [3 /*break*/, 3];
+                            return [4 /*yield*/, validateKey(programKey === null || programKey === void 0 ? void 0 : programKey.Key)];
+                        case 2:
+                            valid = _b.sent();
                             if (!valid) {
                                 throw new Error("Account default key not valid for Google Places API.");
                             }
-                            _e.label = 5;
-                        case 5:
-                            if (!key) {
-                                throw new Error("No valid key found for Google Places API.");
-                            }
-                            this.accessToken = key;
-                            _e.label = 6;
-                        case 6:
+                            return [3 /*break*/, 4];
+                        case 3: throw new Error("No valid key found for Google Places API.");
+                        case 4:
                             if (this.Disposed) {
                                 return [2 /*return*/];
                             }
-                            (_d = this.monitorRemoval) === null || _d === void 0 ? void 0 : _d.call(this);
+                            (_a = this.monitorRemoval) === null || _a === void 0 ? void 0 : _a.call(this);
                             this.monitorRemoval = this.monitor.Updated().Subscribe(function () {
                                 _this.startGetterLoop();
                             });
                             this.startGetterLoop();
-                            return [3 /*break*/, 8];
-                        case 7:
-                            e_1 = _e.sent();
+                            return [3 /*break*/, 6];
+                        case 5:
+                            e_1 = _b.sent();
                             console.error(e_1);
-                            return [3 /*break*/, 8];
-                        case 8: return [2 /*return*/];
+                            return [3 /*break*/, 6];
+                        case 6: return [2 /*return*/];
                     }
                 });
             }); })();
@@ -18730,8 +18716,7 @@ var GoogleSearchRenderManager;
                             return [4 /*yield*/, getPlaces({
                                     location: location_1,
                                     bounds: bounds_1,
-                                    keyword: this.item.keyword,
-                                    accessToken: this.accessToken
+                                    keyword: this.item.keyword
                                 })];
                         case 8:
                             result = _a.sent();
@@ -18885,72 +18870,6 @@ function delay$1(milliseconds) {
  * @param params
  */
 function getPlaces(params) {
-    var _a, _b, _c;
-    return __awaiter(this, void 0, void 0, function () {
-        return __generator(this, function (_d) {
-            // Works better with CORS.
-            // Does not allow a token to be passed in.
-            if ((_c = (_b = (_a = getGoogle()) === null || _a === void 0 ? void 0 : _a.maps) === null || _b === void 0 ? void 0 : _b.places) === null || _c === void 0 ? void 0 : _c.PlacesService) {
-                return [2 /*return*/, getPlacesThroughLib(params)];
-            }
-            // Dies in localhost with CORS errors.
-            return [2 /*return*/, getPlacesThroughHTTP(params)];
-        });
-    });
-}
-function getPlacesThroughHTTP(params) {
-    return __awaiter(this, void 0, void 0, function () {
-        var location, bounds, keyword, accessToken, isKeyValid, url, baseUrl, boundsStr, locationStr, baseUrl, locationStr, response, data;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    location = params.location, bounds = params.bounds, keyword = params.keyword, accessToken = params.accessToken;
-                    if (!accessToken) {
-                        throw new Error("No access token provided");
-                    }
-                    return [4 /*yield*/, validateKeyForSearches(accessToken)];
-                case 1:
-                    isKeyValid = _a.sent();
-                    if (!isKeyValid) {
-                        throw new Error("Invalid Google API Key");
-                    }
-                    if (bounds) {
-                        baseUrl = "https://maps.googleapis.com/maps/api/place/textsearch/json";
-                        url = new URL(baseUrl);
-                        url.searchParams.append("key", accessToken);
-                        url.searchParams.append("query", keyword);
-                        boundsStr = "".concat(MathUtils.Round(bounds.south, 4), ",").concat(MathUtils.Round(bounds.west, 4), "|").concat(MathUtils.Round(bounds.north, 4), ",").concat(MathUtils.Round(bounds.east, 4));
-                        url.searchParams.append("bounds", boundsStr);
-                        locationStr = "".concat(MathUtils.Round(location.latitude, 4), ",").concat(MathUtils.Round(location.longitude, 4));
-                        url.searchParams.append("location", locationStr);
-                    }
-                    else {
-                        baseUrl = "https://maps.googleapis.com/maps/api/place/nearbysearch/json";
-                        url = new URL(baseUrl);
-                        url.searchParams.append("key", accessToken);
-                        url.searchParams.append("keyword", keyword);
-                        locationStr = "".concat(MathUtils.Round(location.latitude, 4), ",").concat(MathUtils.Round(location.longitude, 4));
-                        url.searchParams.append("location", locationStr);
-                        url.searchParams.append("radius", "1000");
-                    }
-                    return [4 /*yield*/, fetch(url.toString())];
-                case 2:
-                    response = _a.sent();
-                    if (!response.ok) {
-                        throw new Error("HTTP error! status: ".concat(response.status));
-                    }
-                    return [4 /*yield*/, response.json()];
-                case 3:
-                    data = _a.sent();
-                    if (data.status !== "OK") {
-                        throw new Error("API error! status: ".concat(data.status));
-                    }
-                    return [2 /*return*/, data.results];
-            }
-        });
-    });
-}
-function getPlacesThroughLib(params) {
     var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function () {
         var location, bounds, keyword;
@@ -26337,7 +26256,7 @@ var ViewerUtils;
     ViewerUtils.AssertIonToken = AssertIonToken;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION = "4.3.9";
+var VERSION = "4.4.1";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, 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