bruce-cesium 4.5.0 → 4.5.2
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.
- package/dist/bruce-cesium.es5.js +276 -77
- package/dist/bruce-cesium.es5.js.map +1 -1
- package/dist/bruce-cesium.umd.js +268 -74
- package/dist/bruce-cesium.umd.js.map +1 -1
- package/dist/lib/bruce-cesium.js +2 -1
- package/dist/lib/bruce-cesium.js.map +1 -1
- package/dist/lib/rendering/entity-render-engine-model3d.js +32 -13
- package/dist/lib/rendering/entity-render-engine-model3d.js.map +1 -1
- package/dist/lib/rendering/entity-render-engine-point.js +32 -13
- package/dist/lib/rendering/entity-render-engine-point.js.map +1 -1
- package/dist/lib/rendering/entity-render-engine-polygon.js +32 -13
- package/dist/lib/rendering/entity-render-engine-polygon.js.map +1 -1
- package/dist/lib/rendering/entity-render-engine-polyline.js +32 -13
- package/dist/lib/rendering/entity-render-engine-polyline.js.map +1 -1
- package/dist/lib/rendering/tile-render-engine.js +49 -17
- package/dist/lib/rendering/tile-render-engine.js.map +1 -1
- package/dist/lib/rendering/view-render-engine.js +13 -4
- package/dist/lib/rendering/view-render-engine.js.map +1 -1
- package/dist/lib/viewer/viewer-event-tracker.js +72 -0
- package/dist/lib/viewer/viewer-event-tracker.js.map +1 -0
- package/dist/lib/viewer/viewer-utils.js +17 -0
- package/dist/lib/viewer/viewer-utils.js.map +1 -1
- package/dist/types/bruce-cesium.d.ts +2 -1
- package/dist/types/viewer/viewer-event-tracker.d.ts +47 -0
- package/dist/types/viewer/viewer-utils.d.ts +8 -0
- package/package.json +1 -1
package/dist/bruce-cesium.es5.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
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,
|
|
1
|
+
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';
|
|
2
2
|
import * as Cesium from 'cesium';
|
|
3
|
-
import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle,
|
|
3
|
+
import { Cartographic, JulianDate, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, Entity, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidTerrainProvider, CesiumInspector, defined, ClockRange, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, Quaternion, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect } from 'cesium';
|
|
4
4
|
|
|
5
5
|
/*! *****************************************************************************
|
|
6
6
|
Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -5089,7 +5089,7 @@ function getName(api, entity) {
|
|
|
5089
5089
|
}
|
|
5090
5090
|
function getStyle(api, entity, styleId) {
|
|
5091
5091
|
return __awaiter(this, void 0, void 0, function () {
|
|
5092
|
-
var style, e_4, typeId, type, e_5, hideError, error, code;
|
|
5092
|
+
var style, e_4, typeId, type, e_5, hideError, error, code, e_6, hideError, error, code;
|
|
5093
5093
|
return __generator(this, function (_a) {
|
|
5094
5094
|
switch (_a.label) {
|
|
5095
5095
|
case 0:
|
|
@@ -5110,27 +5110,30 @@ function getStyle(api, entity, styleId) {
|
|
|
5110
5110
|
console.error(e_4);
|
|
5111
5111
|
return [3 /*break*/, 4];
|
|
5112
5112
|
case 4:
|
|
5113
|
-
if (!!style) return [3 /*break*/,
|
|
5113
|
+
if (!!style) return [3 /*break*/, 12];
|
|
5114
5114
|
typeId = entity.Bruce["EntityType.ID"];
|
|
5115
|
-
if (!typeId) return [3 /*break*/,
|
|
5115
|
+
if (!typeId) return [3 /*break*/, 12];
|
|
5116
|
+
_a.label = 5;
|
|
5117
|
+
case 5:
|
|
5118
|
+
_a.trys.push([5, 11, , 12]);
|
|
5116
5119
|
return [4 /*yield*/, EntityType.Get({
|
|
5117
5120
|
api: api,
|
|
5118
5121
|
entityTypeId: typeId
|
|
5119
5122
|
})];
|
|
5120
|
-
case 5:
|
|
5121
|
-
type = (_a.sent()).entityType;
|
|
5122
|
-
if (!type["DisplaySetting.ID"]) return [3 /*break*/, 9];
|
|
5123
|
-
_a.label = 6;
|
|
5124
5123
|
case 6:
|
|
5125
|
-
_a.
|
|
5124
|
+
type = (_a.sent()).entityType;
|
|
5125
|
+
if (!type["DisplaySetting.ID"]) return [3 /*break*/, 10];
|
|
5126
|
+
_a.label = 7;
|
|
5127
|
+
case 7:
|
|
5128
|
+
_a.trys.push([7, 9, , 10]);
|
|
5126
5129
|
return [4 /*yield*/, Style.Get({
|
|
5127
5130
|
api: api,
|
|
5128
5131
|
styleId: type["DisplaySetting.ID"]
|
|
5129
5132
|
})];
|
|
5130
|
-
case 7:
|
|
5131
|
-
style = (_a.sent()).style;
|
|
5132
|
-
return [3 /*break*/, 9];
|
|
5133
5133
|
case 8:
|
|
5134
|
+
style = (_a.sent()).style;
|
|
5135
|
+
return [3 /*break*/, 10];
|
|
5136
|
+
case 9:
|
|
5134
5137
|
e_5 = _a.sent();
|
|
5135
5138
|
hideError = false;
|
|
5136
5139
|
// TODO: we need a util for extracting code + message rather than writing all this every time.
|
|
@@ -5144,8 +5147,24 @@ function getStyle(api, entity, styleId) {
|
|
|
5144
5147
|
if (!hideError) {
|
|
5145
5148
|
console.error(e_5);
|
|
5146
5149
|
}
|
|
5147
|
-
return [3 /*break*/,
|
|
5148
|
-
case
|
|
5150
|
+
return [3 /*break*/, 10];
|
|
5151
|
+
case 10: return [3 /*break*/, 12];
|
|
5152
|
+
case 11:
|
|
5153
|
+
e_6 = _a.sent();
|
|
5154
|
+
hideError = false;
|
|
5155
|
+
// TODO: we need a util for extracting code + message rather than writing all this every time.
|
|
5156
|
+
if (e_6 && typeof e_6 == "object" && e_6.ERROR) {
|
|
5157
|
+
error = e_6.ERROR;
|
|
5158
|
+
code = error && typeof error == "object" ? error.Code : "";
|
|
5159
|
+
// Avoiding logging a common error.
|
|
5160
|
+
// This happens when rendering entities that don't have records.
|
|
5161
|
+
hideError = String(code).toLowerCase() == "notfound";
|
|
5162
|
+
}
|
|
5163
|
+
if (!hideError) {
|
|
5164
|
+
console.error(e_6);
|
|
5165
|
+
}
|
|
5166
|
+
return [3 /*break*/, 12];
|
|
5167
|
+
case 12: return [2 /*return*/, style];
|
|
5149
5168
|
}
|
|
5150
5169
|
});
|
|
5151
5170
|
});
|
|
@@ -6727,7 +6746,7 @@ function getName$1(api, entity) {
|
|
|
6727
6746
|
}
|
|
6728
6747
|
function getStyle$1(api, entity, styleId) {
|
|
6729
6748
|
return __awaiter(this, void 0, void 0, function () {
|
|
6730
|
-
var style, e_3, typeId, type, e_4, hideError, error, code;
|
|
6749
|
+
var style, e_3, typeId, type, e_4, hideError, error, code, e_5, hideError, error, code;
|
|
6731
6750
|
return __generator(this, function (_a) {
|
|
6732
6751
|
switch (_a.label) {
|
|
6733
6752
|
case 0:
|
|
@@ -6748,27 +6767,30 @@ function getStyle$1(api, entity, styleId) {
|
|
|
6748
6767
|
console.error(e_3);
|
|
6749
6768
|
return [3 /*break*/, 4];
|
|
6750
6769
|
case 4:
|
|
6751
|
-
if (!!style) return [3 /*break*/,
|
|
6770
|
+
if (!!style) return [3 /*break*/, 12];
|
|
6752
6771
|
typeId = entity.Bruce["EntityType.ID"];
|
|
6753
|
-
if (!typeId) return [3 /*break*/,
|
|
6772
|
+
if (!typeId) return [3 /*break*/, 12];
|
|
6773
|
+
_a.label = 5;
|
|
6774
|
+
case 5:
|
|
6775
|
+
_a.trys.push([5, 11, , 12]);
|
|
6754
6776
|
return [4 /*yield*/, EntityType.Get({
|
|
6755
6777
|
api: api,
|
|
6756
6778
|
entityTypeId: typeId
|
|
6757
6779
|
})];
|
|
6758
|
-
case 5:
|
|
6759
|
-
type = (_a.sent()).entityType;
|
|
6760
|
-
if (!type["DisplaySetting.ID"]) return [3 /*break*/, 9];
|
|
6761
|
-
_a.label = 6;
|
|
6762
6780
|
case 6:
|
|
6763
|
-
_a.
|
|
6781
|
+
type = (_a.sent()).entityType;
|
|
6782
|
+
if (!type["DisplaySetting.ID"]) return [3 /*break*/, 10];
|
|
6783
|
+
_a.label = 7;
|
|
6784
|
+
case 7:
|
|
6785
|
+
_a.trys.push([7, 9, , 10]);
|
|
6764
6786
|
return [4 /*yield*/, Style.Get({
|
|
6765
6787
|
api: api,
|
|
6766
6788
|
styleId: type["DisplaySetting.ID"]
|
|
6767
6789
|
})];
|
|
6768
|
-
case 7:
|
|
6769
|
-
style = (_a.sent()).style;
|
|
6770
|
-
return [3 /*break*/, 9];
|
|
6771
6790
|
case 8:
|
|
6791
|
+
style = (_a.sent()).style;
|
|
6792
|
+
return [3 /*break*/, 10];
|
|
6793
|
+
case 9:
|
|
6772
6794
|
e_4 = _a.sent();
|
|
6773
6795
|
hideError = false;
|
|
6774
6796
|
// TODO: we need a util for extracting code + message rather than writing all this every time.
|
|
@@ -6782,8 +6804,24 @@ function getStyle$1(api, entity, styleId) {
|
|
|
6782
6804
|
if (!hideError) {
|
|
6783
6805
|
console.error(e_4);
|
|
6784
6806
|
}
|
|
6785
|
-
return [3 /*break*/,
|
|
6786
|
-
case
|
|
6807
|
+
return [3 /*break*/, 10];
|
|
6808
|
+
case 10: return [3 /*break*/, 12];
|
|
6809
|
+
case 11:
|
|
6810
|
+
e_5 = _a.sent();
|
|
6811
|
+
hideError = false;
|
|
6812
|
+
// TODO: we need a util for extracting code + message rather than writing all this every time.
|
|
6813
|
+
if (e_5 && typeof e_5 == "object" && e_5.ERROR) {
|
|
6814
|
+
error = e_5.ERROR;
|
|
6815
|
+
code = error && typeof error == "object" ? error.Code : "";
|
|
6816
|
+
// Avoiding logging a common error.
|
|
6817
|
+
// This happens when rendering entities that don't have records.
|
|
6818
|
+
hideError = String(code).toLowerCase() == "notfound";
|
|
6819
|
+
}
|
|
6820
|
+
if (!hideError) {
|
|
6821
|
+
console.error(e_5);
|
|
6822
|
+
}
|
|
6823
|
+
return [3 /*break*/, 12];
|
|
6824
|
+
case 12: return [2 /*return*/, style];
|
|
6787
6825
|
}
|
|
6788
6826
|
});
|
|
6789
6827
|
});
|
|
@@ -7176,7 +7214,7 @@ function getName$2(api, entity) {
|
|
|
7176
7214
|
}
|
|
7177
7215
|
function getStyle$2(api, entity, styleId) {
|
|
7178
7216
|
return __awaiter(this, void 0, void 0, function () {
|
|
7179
|
-
var style, e_2, typeId, type, e_3, hideError, error, code;
|
|
7217
|
+
var style, e_2, typeId, type, e_3, hideError, error, code, e_4, hideError, error, code;
|
|
7180
7218
|
return __generator(this, function (_a) {
|
|
7181
7219
|
switch (_a.label) {
|
|
7182
7220
|
case 0:
|
|
@@ -7197,27 +7235,30 @@ function getStyle$2(api, entity, styleId) {
|
|
|
7197
7235
|
console.error(e_2);
|
|
7198
7236
|
return [3 /*break*/, 4];
|
|
7199
7237
|
case 4:
|
|
7200
|
-
if (!!style) return [3 /*break*/,
|
|
7238
|
+
if (!!style) return [3 /*break*/, 12];
|
|
7201
7239
|
typeId = entity.Bruce["EntityType.ID"];
|
|
7202
|
-
if (!typeId) return [3 /*break*/,
|
|
7240
|
+
if (!typeId) return [3 /*break*/, 12];
|
|
7241
|
+
_a.label = 5;
|
|
7242
|
+
case 5:
|
|
7243
|
+
_a.trys.push([5, 11, , 12]);
|
|
7203
7244
|
return [4 /*yield*/, EntityType.Get({
|
|
7204
7245
|
api: api,
|
|
7205
7246
|
entityTypeId: typeId
|
|
7206
7247
|
})];
|
|
7207
|
-
case 5:
|
|
7208
|
-
type = (_a.sent()).entityType;
|
|
7209
|
-
if (!type["DisplaySetting.ID"]) return [3 /*break*/, 9];
|
|
7210
|
-
_a.label = 6;
|
|
7211
7248
|
case 6:
|
|
7212
|
-
_a.
|
|
7249
|
+
type = (_a.sent()).entityType;
|
|
7250
|
+
if (!type["DisplaySetting.ID"]) return [3 /*break*/, 10];
|
|
7251
|
+
_a.label = 7;
|
|
7252
|
+
case 7:
|
|
7253
|
+
_a.trys.push([7, 9, , 10]);
|
|
7213
7254
|
return [4 /*yield*/, Style.Get({
|
|
7214
7255
|
api: api,
|
|
7215
7256
|
styleId: type["DisplaySetting.ID"]
|
|
7216
7257
|
})];
|
|
7217
|
-
case 7:
|
|
7218
|
-
style = (_a.sent()).style;
|
|
7219
|
-
return [3 /*break*/, 9];
|
|
7220
7258
|
case 8:
|
|
7259
|
+
style = (_a.sent()).style;
|
|
7260
|
+
return [3 /*break*/, 10];
|
|
7261
|
+
case 9:
|
|
7221
7262
|
e_3 = _a.sent();
|
|
7222
7263
|
hideError = false;
|
|
7223
7264
|
// TODO: we need a util for extracting code + message rather than writing all this every time.
|
|
@@ -7231,8 +7272,24 @@ function getStyle$2(api, entity, styleId) {
|
|
|
7231
7272
|
if (!hideError) {
|
|
7232
7273
|
console.error(e_3);
|
|
7233
7274
|
}
|
|
7234
|
-
return [3 /*break*/,
|
|
7235
|
-
case
|
|
7275
|
+
return [3 /*break*/, 10];
|
|
7276
|
+
case 10: return [3 /*break*/, 12];
|
|
7277
|
+
case 11:
|
|
7278
|
+
e_4 = _a.sent();
|
|
7279
|
+
hideError = false;
|
|
7280
|
+
// TODO: we need a util for extracting code + message rather than writing all this every time.
|
|
7281
|
+
if (e_4 && typeof e_4 == "object" && e_4.ERROR) {
|
|
7282
|
+
error = e_4.ERROR;
|
|
7283
|
+
code = error && typeof error == "object" ? error.Code : "";
|
|
7284
|
+
// Avoiding logging a common error.
|
|
7285
|
+
// This happens when rendering entities that don't have records.
|
|
7286
|
+
hideError = String(code).toLowerCase() == "notfound";
|
|
7287
|
+
}
|
|
7288
|
+
if (!hideError) {
|
|
7289
|
+
console.error(e_4);
|
|
7290
|
+
}
|
|
7291
|
+
return [3 /*break*/, 12];
|
|
7292
|
+
case 12: return [2 /*return*/, style];
|
|
7236
7293
|
}
|
|
7237
7294
|
});
|
|
7238
7295
|
});
|
|
@@ -7685,7 +7742,7 @@ function getName$3(api, entity) {
|
|
|
7685
7742
|
}
|
|
7686
7743
|
function getStyle$3(api, entity, styleId) {
|
|
7687
7744
|
return __awaiter(this, void 0, void 0, function () {
|
|
7688
|
-
var style, e_2, typeId, type, e_3, hideError, error, code;
|
|
7745
|
+
var style, e_2, typeId, type, e_3, hideError, error, code, e_4, hideError, error, code;
|
|
7689
7746
|
return __generator(this, function (_a) {
|
|
7690
7747
|
switch (_a.label) {
|
|
7691
7748
|
case 0:
|
|
@@ -7706,27 +7763,30 @@ function getStyle$3(api, entity, styleId) {
|
|
|
7706
7763
|
console.error(e_2);
|
|
7707
7764
|
return [3 /*break*/, 4];
|
|
7708
7765
|
case 4:
|
|
7709
|
-
if (!!style) return [3 /*break*/,
|
|
7766
|
+
if (!!style) return [3 /*break*/, 12];
|
|
7710
7767
|
typeId = entity.Bruce["EntityType.ID"];
|
|
7711
|
-
if (!typeId) return [3 /*break*/,
|
|
7768
|
+
if (!typeId) return [3 /*break*/, 12];
|
|
7769
|
+
_a.label = 5;
|
|
7770
|
+
case 5:
|
|
7771
|
+
_a.trys.push([5, 11, , 12]);
|
|
7712
7772
|
return [4 /*yield*/, EntityType.Get({
|
|
7713
7773
|
api: api,
|
|
7714
7774
|
entityTypeId: typeId
|
|
7715
7775
|
})];
|
|
7716
|
-
case 5:
|
|
7717
|
-
type = (_a.sent()).entityType;
|
|
7718
|
-
if (!type["DisplaySetting.ID"]) return [3 /*break*/, 9];
|
|
7719
|
-
_a.label = 6;
|
|
7720
7776
|
case 6:
|
|
7721
|
-
_a.
|
|
7777
|
+
type = (_a.sent()).entityType;
|
|
7778
|
+
if (!type["DisplaySetting.ID"]) return [3 /*break*/, 10];
|
|
7779
|
+
_a.label = 7;
|
|
7780
|
+
case 7:
|
|
7781
|
+
_a.trys.push([7, 9, , 10]);
|
|
7722
7782
|
return [4 /*yield*/, Style.Get({
|
|
7723
7783
|
api: api,
|
|
7724
7784
|
styleId: type["DisplaySetting.ID"]
|
|
7725
7785
|
})];
|
|
7726
|
-
case 7:
|
|
7727
|
-
style = (_a.sent()).style;
|
|
7728
|
-
return [3 /*break*/, 9];
|
|
7729
7786
|
case 8:
|
|
7787
|
+
style = (_a.sent()).style;
|
|
7788
|
+
return [3 /*break*/, 10];
|
|
7789
|
+
case 9:
|
|
7730
7790
|
e_3 = _a.sent();
|
|
7731
7791
|
hideError = false;
|
|
7732
7792
|
// TODO: we need a util for extracting code + message rather than writing all this every time.
|
|
@@ -7740,8 +7800,24 @@ function getStyle$3(api, entity, styleId) {
|
|
|
7740
7800
|
if (!hideError) {
|
|
7741
7801
|
console.error(e_3);
|
|
7742
7802
|
}
|
|
7743
|
-
return [3 /*break*/,
|
|
7744
|
-
case
|
|
7803
|
+
return [3 /*break*/, 10];
|
|
7804
|
+
case 10: return [3 /*break*/, 12];
|
|
7805
|
+
case 11:
|
|
7806
|
+
e_4 = _a.sent();
|
|
7807
|
+
hideError = false;
|
|
7808
|
+
// TODO: we need a util for extracting code + message rather than writing all this every time.
|
|
7809
|
+
if (e_4 && typeof e_4 == "object" && e_4.ERROR) {
|
|
7810
|
+
error = e_4.ERROR;
|
|
7811
|
+
code = error && typeof error == "object" ? error.Code : "";
|
|
7812
|
+
// Avoiding logging a common error.
|
|
7813
|
+
// This happens when rendering entities that don't have records.
|
|
7814
|
+
hideError = String(code).toLowerCase() == "notfound";
|
|
7815
|
+
}
|
|
7816
|
+
if (!hideError) {
|
|
7817
|
+
console.error(e_4);
|
|
7818
|
+
}
|
|
7819
|
+
return [3 /*break*/, 12];
|
|
7820
|
+
case 12: return [2 /*return*/, style];
|
|
7745
7821
|
}
|
|
7746
7822
|
});
|
|
7747
7823
|
});
|
|
@@ -21365,6 +21441,74 @@ var MenuItemCreator;
|
|
|
21365
21441
|
MenuItemCreator.RenderBookmarkItems = RenderBookmarkItems;
|
|
21366
21442
|
})(MenuItemCreator || (MenuItemCreator = {}));
|
|
21367
21443
|
|
|
21444
|
+
/**
|
|
21445
|
+
* We had the need to emit info about viewer events while we load entities/tilesets/etc.
|
|
21446
|
+
* This is to communicate to Navigator on anything the user needs to review.
|
|
21447
|
+
*/
|
|
21448
|
+
var ViewerEventTracker;
|
|
21449
|
+
(function (ViewerEventTracker) {
|
|
21450
|
+
var EDomain;
|
|
21451
|
+
(function (EDomain) {
|
|
21452
|
+
// Terrain/Imagery.
|
|
21453
|
+
EDomain["TileTerrain"] = "TileTerrain";
|
|
21454
|
+
EDomain["TileImagery"] = "TileImagery";
|
|
21455
|
+
})(EDomain = ViewerEventTracker.EDomain || (ViewerEventTracker.EDomain = {}));
|
|
21456
|
+
// Type event.
|
|
21457
|
+
var EType;
|
|
21458
|
+
(function (EType) {
|
|
21459
|
+
EType["Info"] = "info";
|
|
21460
|
+
EType["Error"] = "error";
|
|
21461
|
+
EType["Warn"] = "warn";
|
|
21462
|
+
})(EType = ViewerEventTracker.EType || (ViewerEventTracker.EType = {}));
|
|
21463
|
+
var Tracker = /** @class */ (function () {
|
|
21464
|
+
function Tracker(logEnabled) {
|
|
21465
|
+
if (logEnabled === void 0) { logEnabled = false; }
|
|
21466
|
+
this.MAX_CACHE_ITEMS = 30;
|
|
21467
|
+
this.cache = [];
|
|
21468
|
+
this.OnEvent = new BruceEvent();
|
|
21469
|
+
this.logEnabled = logEnabled;
|
|
21470
|
+
}
|
|
21471
|
+
Tracker.prototype.SetLogEnabled = function (enabled) {
|
|
21472
|
+
this.logEnabled = enabled;
|
|
21473
|
+
};
|
|
21474
|
+
Tracker.prototype.Info = function (domain, message, data) {
|
|
21475
|
+
if (this.logEnabled == true || (typeof this.logEnabled === "string" && this.logEnabled.includes("info"))) {
|
|
21476
|
+
console.info("[ViewerEventTracker] ".concat(domain, ": ").concat(message), data);
|
|
21477
|
+
}
|
|
21478
|
+
var event = { type: EType.Info, domain: domain, message: message, data: data };
|
|
21479
|
+
this.addToCache(event);
|
|
21480
|
+
this.OnEvent.Trigger(event);
|
|
21481
|
+
};
|
|
21482
|
+
Tracker.prototype.Error = function (domain, message, data) {
|
|
21483
|
+
if (this.logEnabled == true || (typeof this.logEnabled === "string" && this.logEnabled.includes("error"))) {
|
|
21484
|
+
console.error("[ViewerEventTracker] ".concat(domain, ": ").concat(message), data);
|
|
21485
|
+
}
|
|
21486
|
+
var event = { type: EType.Error, domain: domain, message: message, data: data };
|
|
21487
|
+
this.addToCache(event);
|
|
21488
|
+
this.OnEvent.Trigger(event);
|
|
21489
|
+
};
|
|
21490
|
+
Tracker.prototype.Warn = function (domain, message, data) {
|
|
21491
|
+
if (this.logEnabled == true || (typeof this.logEnabled === "string" && this.logEnabled.includes("warn"))) {
|
|
21492
|
+
console.warn("[ViewerEventTracker] ".concat(domain, ": ").concat(message), data);
|
|
21493
|
+
}
|
|
21494
|
+
var event = { type: EType.Warn, domain: domain, message: message, data: data };
|
|
21495
|
+
this.addToCache(event);
|
|
21496
|
+
this.OnEvent.Trigger(event);
|
|
21497
|
+
};
|
|
21498
|
+
Tracker.prototype.addToCache = function (event) {
|
|
21499
|
+
if (this.cache.length >= this.MAX_CACHE_ITEMS) {
|
|
21500
|
+
this.cache.shift();
|
|
21501
|
+
}
|
|
21502
|
+
this.cache.push(event);
|
|
21503
|
+
};
|
|
21504
|
+
Tracker.prototype.GetCache = function () {
|
|
21505
|
+
return this.cache;
|
|
21506
|
+
};
|
|
21507
|
+
return Tracker;
|
|
21508
|
+
}());
|
|
21509
|
+
ViewerEventTracker.Tracker = Tracker;
|
|
21510
|
+
})(ViewerEventTracker || (ViewerEventTracker = {}));
|
|
21511
|
+
|
|
21368
21512
|
// Used to track if a current in-progress render is the latest.
|
|
21369
21513
|
// If we're midway through an async function that is rendering 10 imageries and this changes, then we stop the function.
|
|
21370
21514
|
var ITERATION_KEY = "nextspace-tile-render-engine-iteration";
|
|
@@ -22269,21 +22413,30 @@ var TileRenderEngine;
|
|
|
22269
22413
|
return [4 /*yield*/, renderDefaultMapTile(apiGetter, ProjectViewTile.EDefaultImagery.MapboxSatellite)];
|
|
22270
22414
|
case 6:
|
|
22271
22415
|
provider = _d.sent();
|
|
22272
|
-
|
|
22416
|
+
ViewerUtils.GetEventTracker(params.viewer).Warn(ViewerEventTracker.EDomain.TileImagery, "Bing Maps Aerial failed to load. Falling back to Mapbox Satellite.", {
|
|
22417
|
+
tilesetId: ProjectViewTile.EDefaultImagery.BingMapsAerial,
|
|
22418
|
+
exception: e_2
|
|
22419
|
+
});
|
|
22273
22420
|
return [3 /*break*/, 12];
|
|
22274
22421
|
case 7:
|
|
22275
22422
|
if (!(defaultImg.id === ProjectViewTile.EDefaultImagery.BingMapsAerialWithLabels)) return [3 /*break*/, 9];
|
|
22276
22423
|
return [4 /*yield*/, renderDefaultMapTile(apiGetter, ProjectViewTile.EDefaultImagery.MapBoxStreets)];
|
|
22277
22424
|
case 8:
|
|
22278
22425
|
provider = _d.sent();
|
|
22279
|
-
|
|
22426
|
+
ViewerUtils.GetEventTracker(params.viewer).Warn(ViewerEventTracker.EDomain.TileImagery, "Bing Maps Aerial with Labels failed to load. Falling back to Mapbox Streets.", {
|
|
22427
|
+
tilesetId: ProjectViewTile.EDefaultImagery.BingMapsAerialWithLabels,
|
|
22428
|
+
exception: e_2
|
|
22429
|
+
});
|
|
22280
22430
|
return [3 /*break*/, 12];
|
|
22281
22431
|
case 9:
|
|
22282
22432
|
if (!(defaultImg.id === ProjectViewTile.EDefaultImagery.BingMapsRoads)) return [3 /*break*/, 11];
|
|
22283
22433
|
return [4 /*yield*/, renderDefaultMapTile(apiGetter, ProjectViewTile.EDefaultImagery.OpenStreetMap)];
|
|
22284
22434
|
case 10:
|
|
22285
22435
|
provider = _d.sent();
|
|
22286
|
-
|
|
22436
|
+
ViewerUtils.GetEventTracker(params.viewer).Warn(ViewerEventTracker.EDomain.TileImagery, "Bing Maps Roads failed to load. Falling back to OpenStreetMap.", {
|
|
22437
|
+
tilesetId: ProjectViewTile.EDefaultImagery.BingMapsRoads,
|
|
22438
|
+
exception: e_2
|
|
22439
|
+
});
|
|
22287
22440
|
return [3 /*break*/, 12];
|
|
22288
22441
|
case 11: throw e_2;
|
|
22289
22442
|
case 12: return [3 /*break*/, 13];
|
|
@@ -22729,7 +22882,7 @@ var TileRenderEngine;
|
|
|
22729
22882
|
function Render(params) {
|
|
22730
22883
|
var _a;
|
|
22731
22884
|
return __awaiter(this, void 0, void 0, function () {
|
|
22732
|
-
var iteration, CESIUM, enabledMeta, provider_1, leave, defaultTerr, provider, shouldCreate, api, tileset, url, vertexes, settings;
|
|
22885
|
+
var iteration, CESIUM, enabledMeta, provider_1, leave, defaultTerr, provider, shouldCreate, api, tileset, e_4, url, vertexes, settings;
|
|
22733
22886
|
return __generator(this, function (_b) {
|
|
22734
22887
|
switch (_b.label) {
|
|
22735
22888
|
case 0:
|
|
@@ -22763,7 +22916,7 @@ var TileRenderEngine;
|
|
|
22763
22916
|
}
|
|
22764
22917
|
defaultTerr = params.tile.accountId ? null : ProjectViewTile.DefaultTerrains.find(function (x) { return x.id === params.tile.tilesetId; });
|
|
22765
22918
|
provider = null;
|
|
22766
|
-
if (!defaultTerr) return [3 /*break*/,
|
|
22919
|
+
if (!defaultTerr) return [3 /*break*/, 6];
|
|
22767
22920
|
shouldCreate = true;
|
|
22768
22921
|
if (!(defaultTerr.id == ProjectViewTile.EDefaultTerrain.CesiumWorldTerrain)) return [3 /*break*/, 2];
|
|
22769
22922
|
return [4 /*yield*/, ViewerUtils.AssertIonToken(Ion.defaultAccessToken)];
|
|
@@ -22775,15 +22928,20 @@ var TileRenderEngine;
|
|
|
22775
22928
|
return [4 /*yield*/, renderDefaultTerrTile(defaultTerr.id)];
|
|
22776
22929
|
case 3:
|
|
22777
22930
|
provider = (_b.sent());
|
|
22778
|
-
|
|
22779
|
-
case 4:
|
|
22780
|
-
|
|
22931
|
+
return [3 /*break*/, 5];
|
|
22932
|
+
case 4:
|
|
22933
|
+
ViewerUtils.GetEventTracker(params.viewer).Warn(ViewerEventTracker.EDomain.TileTerrain, "Cesium Ion token not set, Cesium World Terrain will not be enabled.", {
|
|
22934
|
+
tilesetId: ProjectViewTile.EDefaultTerrain.CesiumWorldTerrain
|
|
22935
|
+
});
|
|
22936
|
+
_b.label = 5;
|
|
22937
|
+
case 5: return [3 /*break*/, 14];
|
|
22938
|
+
case 6:
|
|
22781
22939
|
api = params.apiGetter.getApi(params.tile.accountId);
|
|
22782
22940
|
// Ensure regional url is loaded.
|
|
22783
22941
|
// When loading stuff in the same account as the default it's likely already loaded,
|
|
22784
22942
|
// but if we just made an API instance for some external account then it won't be loaded yet.
|
|
22785
22943
|
return [4 /*yield*/, api.Loading];
|
|
22786
|
-
case
|
|
22944
|
+
case 7:
|
|
22787
22945
|
// Ensure regional url is loaded.
|
|
22788
22946
|
// When loading stuff in the same account as the default it's likely already loaded,
|
|
22789
22947
|
// but if we just made an API instance for some external account then it won't be loaded yet.
|
|
@@ -22791,15 +22949,32 @@ var TileRenderEngine;
|
|
|
22791
22949
|
if (!assertIteration(params.viewer, iteration)) {
|
|
22792
22950
|
return [2 /*return*/];
|
|
22793
22951
|
}
|
|
22952
|
+
tileset = void 0;
|
|
22953
|
+
_b.label = 8;
|
|
22954
|
+
case 8:
|
|
22955
|
+
_b.trys.push([8, 10, , 11]);
|
|
22794
22956
|
return [4 /*yield*/, Tileset.Get({
|
|
22795
22957
|
api: api,
|
|
22796
22958
|
tilesetId: params.tile.tilesetId
|
|
22797
22959
|
})];
|
|
22798
|
-
case
|
|
22960
|
+
case 9:
|
|
22799
22961
|
tileset = (_b.sent()).tileset;
|
|
22800
22962
|
if (!assertIteration(params.viewer, iteration)) {
|
|
22801
22963
|
return [2 /*return*/];
|
|
22802
22964
|
}
|
|
22965
|
+
if (tileset == null) {
|
|
22966
|
+
throw new Error("Tileset not found.");
|
|
22967
|
+
}
|
|
22968
|
+
return [3 /*break*/, 11];
|
|
22969
|
+
case 10:
|
|
22970
|
+
e_4 = _b.sent();
|
|
22971
|
+
ViewerUtils.GetEventTracker(params.viewer).Error(ViewerEventTracker.EDomain.TileTerrain, "Failed to retreieve terrain Tileset record.", {
|
|
22972
|
+
tilesetId: params.tile.tilesetId,
|
|
22973
|
+
accountId: params.tile.accountId,
|
|
22974
|
+
exception: e_4
|
|
22975
|
+
});
|
|
22976
|
+
return [3 /*break*/, 11];
|
|
22977
|
+
case 11:
|
|
22803
22978
|
url = void 0;
|
|
22804
22979
|
vertexes = true;
|
|
22805
22980
|
if (tileset.type === Tileset.EType.Terrain) {
|
|
@@ -22819,21 +22994,21 @@ var TileRenderEngine;
|
|
|
22819
22994
|
else {
|
|
22820
22995
|
console.error("Invalid tileset type.", tileset);
|
|
22821
22996
|
}
|
|
22822
|
-
if (!url) return [3 /*break*/,
|
|
22823
|
-
if (!CESIUM.CesiumTerrainProvider.hasOwnProperty("fromUrl")) return [3 /*break*/,
|
|
22997
|
+
if (!url) return [3 /*break*/, 14];
|
|
22998
|
+
if (!CESIUM.CesiumTerrainProvider.hasOwnProperty("fromUrl")) return [3 /*break*/, 13];
|
|
22824
22999
|
return [4 /*yield*/, CESIUM.CesiumTerrainProvider.fromUrl(url, {
|
|
22825
23000
|
requestVertexNormals: vertexes
|
|
22826
23001
|
})];
|
|
22827
|
-
case
|
|
23002
|
+
case 12:
|
|
22828
23003
|
provider = (_b.sent());
|
|
22829
|
-
return [3 /*break*/,
|
|
22830
|
-
case
|
|
23004
|
+
return [3 /*break*/, 14];
|
|
23005
|
+
case 13:
|
|
22831
23006
|
provider = new CESIUM.CesiumTerrainProvider({
|
|
22832
23007
|
url: url,
|
|
22833
23008
|
requestVertexNormals: vertexes
|
|
22834
23009
|
});
|
|
22835
|
-
_b.label =
|
|
22836
|
-
case
|
|
23010
|
+
_b.label = 14;
|
|
23011
|
+
case 14:
|
|
22837
23012
|
if (provider) {
|
|
22838
23013
|
provider._bMeta = {
|
|
22839
23014
|
accountId: params.tile.accountId,
|
|
@@ -23460,7 +23635,9 @@ function renderNavigator(iteration, params, bookmark, view, getters) {
|
|
|
23460
23635
|
terrain = {
|
|
23461
23636
|
tilesetId: ProjectViewTile.EDefaultTerrain.FlatTerrain
|
|
23462
23637
|
};
|
|
23463
|
-
|
|
23638
|
+
ViewerUtils.GetEventTracker(params.viewer).Warn(ViewerEventTracker.EDomain.TileTerrain, "Cesium Ion token not set, using flat terrain instead of Cesium World Terrain.", {
|
|
23639
|
+
tilesetId: ProjectViewTile.EDefaultTerrain.CesiumWorldTerrain
|
|
23640
|
+
});
|
|
23464
23641
|
}
|
|
23465
23642
|
return [4 /*yield*/, TileRenderEngine.Terrain.Navigator.Render({
|
|
23466
23643
|
apiGetter: params.apiGetter,
|
|
@@ -23717,15 +23894,21 @@ function renderNavigator(iteration, params, bookmark, view, getters) {
|
|
|
23717
23894
|
layer = imagery[i];
|
|
23718
23895
|
if (layer.tilesetId == ProjectViewTile.EDefaultImagery.BingMapsAerial) {
|
|
23719
23896
|
layer.tilesetId = ProjectViewTile.EDefaultImagery.MapboxSatellite;
|
|
23720
|
-
|
|
23897
|
+
ViewerUtils.GetEventTracker(params.viewer).Warn(ViewerEventTracker.EDomain.TileImagery, "Cesium Ion token not set, using Mapbox Satellite instead of Bing Maps Aerial.", {
|
|
23898
|
+
tilesetId: ProjectViewTile.EDefaultImagery.BingMapsAerial
|
|
23899
|
+
});
|
|
23721
23900
|
}
|
|
23722
23901
|
else if (layer.tilesetId == ProjectViewTile.EDefaultImagery.BingMapsAerialWithLabels) {
|
|
23723
23902
|
layer.tilesetId = ProjectViewTile.EDefaultImagery.MapboxSatellite;
|
|
23724
|
-
|
|
23903
|
+
ViewerUtils.GetEventTracker(params.viewer).Warn(ViewerEventTracker.EDomain.TileImagery, "Cesium Ion token not set, using Mapbox Satellite instead of Bing Maps Aerial with labels.", {
|
|
23904
|
+
tilesetId: ProjectViewTile.EDefaultImagery.BingMapsAerialWithLabels
|
|
23905
|
+
});
|
|
23725
23906
|
}
|
|
23726
23907
|
else if (layer.tilesetId == ProjectViewTile.EDefaultImagery.BingMapsRoads) {
|
|
23727
23908
|
layer.tilesetId = ProjectViewTile.EDefaultImagery.MapBoxStreets;
|
|
23728
|
-
|
|
23909
|
+
ViewerUtils.GetEventTracker(params.viewer).Warn(ViewerEventTracker.EDomain.TileImagery, "Cesium Ion token not set, using Mapbox Satellite instead of Bing Maps Roads.", {
|
|
23910
|
+
tilesetId: ProjectViewTile.EDefaultImagery.BingMapsRoads
|
|
23911
|
+
});
|
|
23729
23912
|
}
|
|
23730
23913
|
}
|
|
23731
23914
|
}
|
|
@@ -26967,6 +27150,7 @@ var WidgetEmbeddedInfoView = /** @class */ (function (_super) {
|
|
|
26967
27150
|
}(Widget.AWidget));
|
|
26968
27151
|
|
|
26969
27152
|
var CESIUM_VIEWER_MANAGER_KEY = "_cesiumViewerManager";
|
|
27153
|
+
var CESIUM_VIEWER_EVENT_TRACKER_KEY = "_cesiumViewerEventTracker";
|
|
26970
27154
|
/**
|
|
26971
27155
|
* Bug related to entities not being visible after they were added then a render was requested.
|
|
26972
27156
|
* It was 4 point entities in York. They would not appear until a request render was recalled.
|
|
@@ -27238,9 +27422,24 @@ var ViewerUtils;
|
|
|
27238
27422
|
});
|
|
27239
27423
|
}
|
|
27240
27424
|
ViewerUtils.AssertIonToken = AssertIonToken;
|
|
27425
|
+
/**
|
|
27426
|
+
* Gets or creates a viewer event tracker.
|
|
27427
|
+
* This will log and emit events that are tracked.
|
|
27428
|
+
* @param viewer
|
|
27429
|
+
* @returns
|
|
27430
|
+
*/
|
|
27431
|
+
function GetEventTracker(viewer) {
|
|
27432
|
+
var tracker = viewer[CESIUM_VIEWER_EVENT_TRACKER_KEY];
|
|
27433
|
+
if (!tracker) {
|
|
27434
|
+
tracker = new ViewerEventTracker.Tracker("warn,error");
|
|
27435
|
+
}
|
|
27436
|
+
viewer[CESIUM_VIEWER_EVENT_TRACKER_KEY] = tracker;
|
|
27437
|
+
return tracker;
|
|
27438
|
+
}
|
|
27439
|
+
ViewerUtils.GetEventTracker = GetEventTracker;
|
|
27241
27440
|
})(ViewerUtils || (ViewerUtils = {}));
|
|
27242
27441
|
|
|
27243
|
-
var VERSION = "4.5.
|
|
27442
|
+
var VERSION = "4.5.2";
|
|
27244
27443
|
|
|
27245
|
-
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 };
|
|
27444
|
+
export { VERSION, CesiumViewMonitor, ViewerUtils, ViewerEventTracker, 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 };
|
|
27246
27445
|
//# sourceMappingURL=bruce-cesium.es5.js.map
|