bruce-cesium 2.2.2 → 2.2.3
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 +31 -29
- package/dist/bruce-cesium.es5.js.map +1 -1
- package/dist/bruce-cesium.umd.js +30 -28
- package/dist/bruce-cesium.umd.js.map +1 -1
- package/dist/lib/rendering/view-render-engine.js +30 -28
- package/dist/lib/rendering/view-render-engine.js.map +1 -1
- package/package.json +1 -1
package/dist/bruce-cesium.es5.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, DelayQueue, BatchedDataGetter, EntityRelationType, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, EntityRelation, ENVIRONMENT, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
|
|
2
2
|
import * as Cesium from 'cesium';
|
|
3
|
-
import { Cartesian2, Cartographic, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, SceneMode, HeightReference, DistanceDisplayCondition, NearFarScalar,
|
|
3
|
+
import { Cartesian2, Cartographic, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, SceneMode, Entity, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, CesiumInspector, PolygonPipeline, ColorMaterialProperty, EasingFunction, GeometryInstance } from 'cesium';
|
|
4
4
|
|
|
5
5
|
var TIME_LAG = 300;
|
|
6
6
|
var POSITION_CHECK_TIMER = 950;
|
|
@@ -10468,7 +10468,7 @@ function renderLegacyNavigator(params, bookmark, view) {
|
|
|
10468
10468
|
function renderNavigator(params, bookmark, view) {
|
|
10469
10469
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6;
|
|
10470
10470
|
return __awaiter(this, void 0, void 0, function () {
|
|
10471
|
-
var viewer, scene, vSettings, bSettings, defaults, camera, newLens, modePicker, is2d, curLens, modePicker_1, transition, pos, terrain,
|
|
10471
|
+
var viewer, scene, vSettings, bSettings, defaults, camera, newLens, modePicker, is2d, curLens, modePicker_1, transition, pos, terrain, hillShades, baseColor, globeHidden, terrainWireframe, globeAlpha, shadows, size, ambientOcclusion, AO, lighting, light, quality, fxaa, dateTime, clock, selectedIds, hiddenIds, isolatedIds, entityOpacityMap, entityId, opacity, imagery, renderedRelationEntityIds, curEnabled, newItemIds, _i, curEnabled_1, id, menuItem, gOcclusion;
|
|
10472
10472
|
return __generator(this, function (_7) {
|
|
10473
10473
|
switch (_7.label) {
|
|
10474
10474
|
case 0:
|
|
@@ -10537,18 +10537,9 @@ function renderNavigator(params, bookmark, view) {
|
|
|
10537
10537
|
_7.sent();
|
|
10538
10538
|
_7.label = 2;
|
|
10539
10539
|
case 2:
|
|
10540
|
-
|
|
10541
|
-
if (gOcclusion == null) {
|
|
10542
|
-
gOcclusion = (_p = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _p === void 0 ? void 0 : _p.groundOcclusion;
|
|
10543
|
-
}
|
|
10544
|
-
if (gOcclusion == null) {
|
|
10545
|
-
// TODO: Need global default.
|
|
10546
|
-
gOcclusion = true;
|
|
10547
|
-
}
|
|
10548
|
-
scene.globe.depthTestAgainstTerrain = Boolean(gOcclusion);
|
|
10549
|
-
hillShades = (_q = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _q === void 0 ? void 0 : _q.hillShades;
|
|
10540
|
+
hillShades = (_p = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings) === null || _p === void 0 ? void 0 : _p.hillShades;
|
|
10550
10541
|
if (hillShades == null) {
|
|
10551
|
-
hillShades = (
|
|
10542
|
+
hillShades = (_q = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _q === void 0 ? void 0 : _q.hillShades;
|
|
10552
10543
|
}
|
|
10553
10544
|
if (hillShades == null) {
|
|
10554
10545
|
hillShades = true;
|
|
@@ -10556,7 +10547,7 @@ function renderNavigator(params, bookmark, view) {
|
|
|
10556
10547
|
scene.globe.enableLighting = Boolean(hillShades);
|
|
10557
10548
|
baseColor = bSettings === null || bSettings === void 0 ? void 0 : bSettings.globeColor;
|
|
10558
10549
|
if (baseColor == null) {
|
|
10559
|
-
baseColor = (
|
|
10550
|
+
baseColor = (_r = defaults.settings) === null || _r === void 0 ? void 0 : _r.globeColor;
|
|
10560
10551
|
}
|
|
10561
10552
|
if (baseColor == null) {
|
|
10562
10553
|
// TODO: Need global default.
|
|
@@ -10565,7 +10556,7 @@ function renderNavigator(params, bookmark, view) {
|
|
|
10565
10556
|
scene.globe.baseColor = Color.fromCssColorString(baseColor);
|
|
10566
10557
|
globeHidden = bSettings === null || bSettings === void 0 ? void 0 : bSettings.globeHidden;
|
|
10567
10558
|
if (globeHidden == null) {
|
|
10568
|
-
globeHidden = (
|
|
10559
|
+
globeHidden = (_s = defaults.settings) === null || _s === void 0 ? void 0 : _s.globeHidden;
|
|
10569
10560
|
}
|
|
10570
10561
|
if (globeHidden == null) {
|
|
10571
10562
|
globeHidden = false;
|
|
@@ -10573,7 +10564,7 @@ function renderNavigator(params, bookmark, view) {
|
|
|
10573
10564
|
scene.globe.show = !globeHidden;
|
|
10574
10565
|
terrainWireframe = bSettings === null || bSettings === void 0 ? void 0 : bSettings.terrainWireframe;
|
|
10575
10566
|
if (terrainWireframe == null) {
|
|
10576
|
-
terrainWireframe = (
|
|
10567
|
+
terrainWireframe = (_t = defaults.settings) === null || _t === void 0 ? void 0 : _t.terrainWireframe;
|
|
10577
10568
|
}
|
|
10578
10569
|
if (terrainWireframe == null) {
|
|
10579
10570
|
terrainWireframe = false;
|
|
@@ -10584,7 +10575,7 @@ function renderNavigator(params, bookmark, view) {
|
|
|
10584
10575
|
});
|
|
10585
10576
|
globeAlpha = +(bSettings === null || bSettings === void 0 ? void 0 : bSettings.globeAlpha);
|
|
10586
10577
|
if (isNaN(globeAlpha)) {
|
|
10587
|
-
globeAlpha = +((
|
|
10578
|
+
globeAlpha = +((_u = defaults.settings) === null || _u === void 0 ? void 0 : _u.globeAlpha);
|
|
10588
10579
|
}
|
|
10589
10580
|
if (!scene.globe.translucency.enabled) {
|
|
10590
10581
|
scene.globe.translucency.enabled = true;
|
|
@@ -10594,7 +10585,7 @@ function renderNavigator(params, bookmark, view) {
|
|
|
10594
10585
|
scene.globe.translucency.frontFaceAlphaByDistance.nearValue = EnsureNumber(globeAlpha, 1);
|
|
10595
10586
|
shadows = bSettings === null || bSettings === void 0 ? void 0 : bSettings.shadows;
|
|
10596
10587
|
if (shadows == null) {
|
|
10597
|
-
shadows = (
|
|
10588
|
+
shadows = (_v = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _v === void 0 ? void 0 : _v.shadows;
|
|
10598
10589
|
}
|
|
10599
10590
|
if (shadows == null) {
|
|
10600
10591
|
// Experimenting with default on.
|
|
@@ -10622,7 +10613,7 @@ function renderNavigator(params, bookmark, view) {
|
|
|
10622
10613
|
}
|
|
10623
10614
|
ambientOcclusion = bSettings === null || bSettings === void 0 ? void 0 : bSettings.ambientOcclusion;
|
|
10624
10615
|
if (ambientOcclusion == null) {
|
|
10625
|
-
ambientOcclusion = (
|
|
10616
|
+
ambientOcclusion = (_w = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _w === void 0 ? void 0 : _w.ambientOcclusion;
|
|
10626
10617
|
}
|
|
10627
10618
|
if (ambientOcclusion == null) {
|
|
10628
10619
|
ambientOcclusion = {
|
|
@@ -10645,7 +10636,7 @@ function renderNavigator(params, bookmark, view) {
|
|
|
10645
10636
|
}
|
|
10646
10637
|
lighting = bSettings === null || bSettings === void 0 ? void 0 : bSettings.lighting;
|
|
10647
10638
|
if (lighting == null) {
|
|
10648
|
-
lighting = (
|
|
10639
|
+
lighting = (_x = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _x === void 0 ? void 0 : _x.lighting;
|
|
10649
10640
|
}
|
|
10650
10641
|
if (lighting == null) {
|
|
10651
10642
|
lighting = {
|
|
@@ -10660,7 +10651,7 @@ function renderNavigator(params, bookmark, view) {
|
|
|
10660
10651
|
}
|
|
10661
10652
|
quality = bSettings === null || bSettings === void 0 ? void 0 : bSettings.quality;
|
|
10662
10653
|
if (quality == null) {
|
|
10663
|
-
quality = (
|
|
10654
|
+
quality = (_y = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _y === void 0 ? void 0 : _y.quality;
|
|
10664
10655
|
}
|
|
10665
10656
|
if (quality == null) {
|
|
10666
10657
|
quality = {
|
|
@@ -10671,7 +10662,7 @@ function renderNavigator(params, bookmark, view) {
|
|
|
10671
10662
|
fxaa.enabled = Boolean(quality.fxaa);
|
|
10672
10663
|
dateTime = bSettings === null || bSettings === void 0 ? void 0 : bSettings.dateTime;
|
|
10673
10664
|
if (dateTime == null) {
|
|
10674
|
-
dateTime = (
|
|
10665
|
+
dateTime = (_z = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _z === void 0 ? void 0 : _z.dateTime;
|
|
10675
10666
|
}
|
|
10676
10667
|
if (dateTime != null) {
|
|
10677
10668
|
clock = viewer.clock;
|
|
@@ -10679,7 +10670,7 @@ function renderNavigator(params, bookmark, view) {
|
|
|
10679
10670
|
}
|
|
10680
10671
|
selectedIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.selectedEntityIds;
|
|
10681
10672
|
if (selectedIds == null) {
|
|
10682
|
-
selectedIds = (
|
|
10673
|
+
selectedIds = (_0 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _0 === void 0 ? void 0 : _0.selectedEntityIds;
|
|
10683
10674
|
}
|
|
10684
10675
|
if (selectedIds != null) {
|
|
10685
10676
|
params.manager.VisualsRegister.ClearSelected();
|
|
@@ -10692,7 +10683,7 @@ function renderNavigator(params, bookmark, view) {
|
|
|
10692
10683
|
params.manager.VisualsRegister.ClearHidden();
|
|
10693
10684
|
hiddenIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.hiddenEntityIds;
|
|
10694
10685
|
if (hiddenIds == null) {
|
|
10695
|
-
hiddenIds = (
|
|
10686
|
+
hiddenIds = (_1 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _1 === void 0 ? void 0 : _1.hiddenEntityIds;
|
|
10696
10687
|
}
|
|
10697
10688
|
if (hiddenIds != null) {
|
|
10698
10689
|
params.manager.VisualsRegister.SetHidden({
|
|
@@ -10703,7 +10694,7 @@ function renderNavigator(params, bookmark, view) {
|
|
|
10703
10694
|
params.manager.VisualsRegister.ClearIsolated();
|
|
10704
10695
|
isolatedIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.isolatedEntityIds;
|
|
10705
10696
|
if (isolatedIds == null) {
|
|
10706
|
-
isolatedIds = (
|
|
10697
|
+
isolatedIds = (_2 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _2 === void 0 ? void 0 : _2.isolatedEntityIds;
|
|
10707
10698
|
}
|
|
10708
10699
|
if (isolatedIds != null) {
|
|
10709
10700
|
params.manager.VisualsRegister.SetIsolated({
|
|
@@ -10714,7 +10705,7 @@ function renderNavigator(params, bookmark, view) {
|
|
|
10714
10705
|
params.manager.VisualsRegister.ClearOpacity();
|
|
10715
10706
|
entityOpacityMap = bSettings === null || bSettings === void 0 ? void 0 : bSettings.entityOpacityMap;
|
|
10716
10707
|
if (entityOpacityMap == null) {
|
|
10717
|
-
entityOpacityMap = (
|
|
10708
|
+
entityOpacityMap = (_3 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _3 === void 0 ? void 0 : _3.entityOpacityMap;
|
|
10718
10709
|
}
|
|
10719
10710
|
if (entityOpacityMap != null) {
|
|
10720
10711
|
for (entityId in entityOpacityMap) {
|
|
@@ -10727,7 +10718,7 @@ function renderNavigator(params, bookmark, view) {
|
|
|
10727
10718
|
}
|
|
10728
10719
|
}
|
|
10729
10720
|
}
|
|
10730
|
-
imagery = (bSettings === null || bSettings === void 0 ? void 0 : bSettings.imagery) != null ? bSettings.imagery : (
|
|
10721
|
+
imagery = (bSettings === null || bSettings === void 0 ? void 0 : bSettings.imagery) != null ? bSettings.imagery : (_4 = defaults.settings) === null || _4 === void 0 ? void 0 : _4.imagery;
|
|
10731
10722
|
if (imagery == null) {
|
|
10732
10723
|
// TODO: Need global default.
|
|
10733
10724
|
imagery = [
|
|
@@ -10755,7 +10746,7 @@ function renderNavigator(params, bookmark, view) {
|
|
|
10755
10746
|
renderedRelationEntityIds = [];
|
|
10756
10747
|
}
|
|
10757
10748
|
curEnabled = params.manager.GetEnabledItemIds();
|
|
10758
|
-
newItemIds = (
|
|
10749
|
+
newItemIds = (_5 = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemIds) !== null && _5 !== void 0 ? _5 : [];
|
|
10759
10750
|
for (_i = 0, curEnabled_1 = curEnabled; _i < curEnabled_1.length; _i++) {
|
|
10760
10751
|
id = curEnabled_1[_i];
|
|
10761
10752
|
if (newItemIds.indexOf(id) === -1 ||
|
|
@@ -10792,7 +10783,18 @@ function renderNavigator(params, bookmark, view) {
|
|
|
10792
10783
|
case 6:
|
|
10793
10784
|
_7.sent();
|
|
10794
10785
|
_7.label = 7;
|
|
10795
|
-
case 7:
|
|
10786
|
+
case 7:
|
|
10787
|
+
gOcclusion = bSettings === null || bSettings === void 0 ? void 0 : bSettings.groundOcclusion;
|
|
10788
|
+
if (gOcclusion == null) {
|
|
10789
|
+
gOcclusion = (_6 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _6 === void 0 ? void 0 : _6.groundOcclusion;
|
|
10790
|
+
}
|
|
10791
|
+
if (gOcclusion == null) {
|
|
10792
|
+
// TODO: Need global default.
|
|
10793
|
+
gOcclusion = true;
|
|
10794
|
+
}
|
|
10795
|
+
console.log("Applying Ground Occlusion", Boolean(gOcclusion));
|
|
10796
|
+
scene.globe.depthTestAgainstTerrain = Boolean(gOcclusion);
|
|
10797
|
+
return [2 /*return*/];
|
|
10796
10798
|
}
|
|
10797
10799
|
});
|
|
10798
10800
|
});
|