bruce-cesium 3.5.4 → 3.5.5
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 +60 -53
- package/dist/bruce-cesium.es5.js.map +1 -1
- package/dist/bruce-cesium.umd.js +59 -52
- package/dist/bruce-cesium.umd.js.map +1 -1
- package/dist/lib/bruce-cesium.js +1 -1
- package/dist/lib/rendering/relation-render-engine.js +21 -17
- package/dist/lib/rendering/relation-render-engine.js.map +1 -1
- package/dist/lib/utils/entity-utils.js +37 -34
- package/dist/lib/utils/entity-utils.js.map +1 -1
- package/dist/types/bruce-cesium.d.ts +1 -1
- package/dist/types/utils/entity-utils.d.ts +1 -0
- 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, ProjectViewTile, DelayQueue, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, Api, EntityRelationType, ENVIRONMENT, EntityCoords, EntitySource, MenuItem, EntityRelation, ProgramKey, AbstractApi, ProjectViewBookmark, EntityAttachment, EntityAttachmentType, EntityAttribute, ProjectView, ProjectViewLegacyTile, Camera } from 'bruce-models';
|
|
2
2
|
import * as Cesium from 'cesium';
|
|
3
|
-
import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, DistanceDisplayCondition, NearFarScalar, Model,
|
|
3
|
+
import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, Primitive, Cesium3DTileFeature, SceneMode, DistanceDisplayCondition, NearFarScalar, Model, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, GeoJsonDataSource, ColorMaterialProperty, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, OrthographicFrustum, EasingFunction, SceneTransforms, CesiumInspector, defined, Cesium3DTileset, Matrix4, Matrix3, IonResource, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics } from 'cesium';
|
|
4
4
|
|
|
5
5
|
/*! *****************************************************************************
|
|
6
6
|
Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -1816,13 +1816,13 @@ var EntityUtils;
|
|
|
1816
1816
|
});
|
|
1817
1817
|
}); };
|
|
1818
1818
|
getEntityPositions = function (sample) { return __awaiter(_this, void 0, void 0, function () {
|
|
1819
|
-
var entityId, entity, tileset, tilesetId, evaluateRendered, evaluateRecord, renderedPosses, e_1, recordPosses, e_2, tSettings, pos3d, alt, alt, heading, pitch, roll, matrix4, offset, m1, hpr, transform, transformedOffset, sphere;
|
|
1819
|
+
var entityId, entity, tileset, tilesetId, disallowRendered, evaluateRendered, evaluateRecord, renderedPosses, e_1, recordPosses, e_2, tSettings, pos3d, alt, alt, heading, pitch, roll, matrix4, offset, m1, hpr, transform, transformedOffset, sphere;
|
|
1820
1820
|
var _this = this;
|
|
1821
1821
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
1822
1822
|
return __generator(this, function (_l) {
|
|
1823
1823
|
switch (_l.label) {
|
|
1824
1824
|
case 0:
|
|
1825
|
-
entityId = sample.entityId, entity = sample.entity, tileset = sample.tileset, tilesetId = sample.tilesetId;
|
|
1825
|
+
entityId = sample.entityId, entity = sample.entity, tileset = sample.tileset, tilesetId = sample.tilesetId, disallowRendered = sample.disallowRendered;
|
|
1826
1826
|
evaluateRendered = function () { return __awaiter(_this, void 0, void 0, function () {
|
|
1827
1827
|
var rego, posses, parts, i, part, visualHeightRef, hierarchy, hPosses, hPossesSample, step, i_1, pPosses, pPossesSample, step, i_2, pPosses, pPossesSample, step, i_3, pos3d_1, toAdjust, modelExt, sphere, semiMajorAxis, semiMinorAxis, height, radius, sphere, data_1, pos3d_2, toAdjust, sphere;
|
|
1828
1828
|
return __generator(this, function (_a) {
|
|
@@ -2044,45 +2044,48 @@ var EntityUtils;
|
|
|
2044
2044
|
}
|
|
2045
2045
|
});
|
|
2046
2046
|
}); };
|
|
2047
|
+
if (!(disallowRendered != true)) return [3 /*break*/, 2];
|
|
2047
2048
|
return [4 /*yield*/, evaluateRendered()];
|
|
2048
2049
|
case 1:
|
|
2049
2050
|
renderedPosses = _l.sent();
|
|
2050
2051
|
if (renderedPosses === null || renderedPosses === void 0 ? void 0 : renderedPosses.length) {
|
|
2051
2052
|
return [2 /*return*/, renderedPosses];
|
|
2052
2053
|
}
|
|
2053
|
-
if (!!entity) return [3 /*break*/, 5];
|
|
2054
|
-
if (!(apiCalls < MAX_API_CALLS)) return [3 /*break*/, 5];
|
|
2055
|
-
apiCalls += 1;
|
|
2056
2054
|
_l.label = 2;
|
|
2057
2055
|
case 2:
|
|
2058
|
-
|
|
2056
|
+
if (!!entity) return [3 /*break*/, 6];
|
|
2057
|
+
if (!(apiCalls < MAX_API_CALLS)) return [3 /*break*/, 6];
|
|
2058
|
+
apiCalls += 1;
|
|
2059
|
+
_l.label = 3;
|
|
2060
|
+
case 3:
|
|
2061
|
+
_l.trys.push([3, 5, , 6]);
|
|
2059
2062
|
return [4 /*yield*/, Entity$1.Get({
|
|
2060
2063
|
api: api,
|
|
2061
2064
|
entityId: entityId,
|
|
2062
2065
|
// Not expanding relative positions at first to see if the entity has valid location just by itself.
|
|
2063
2066
|
expandLocation: false
|
|
2064
2067
|
})];
|
|
2065
|
-
case 3:
|
|
2066
|
-
entity = (_l.sent()).entity;
|
|
2067
|
-
return [3 /*break*/, 5];
|
|
2068
2068
|
case 4:
|
|
2069
|
+
entity = (_l.sent()).entity;
|
|
2070
|
+
return [3 /*break*/, 6];
|
|
2071
|
+
case 5:
|
|
2069
2072
|
e_1 = _l.sent();
|
|
2070
2073
|
console.error(e_1);
|
|
2071
|
-
return [3 /*break*/,
|
|
2072
|
-
case
|
|
2074
|
+
return [3 /*break*/, 6];
|
|
2075
|
+
case 6:
|
|
2073
2076
|
if (!entity) {
|
|
2074
2077
|
return [2 /*return*/, []];
|
|
2075
2078
|
}
|
|
2076
2079
|
return [4 /*yield*/, evaluateRecord()];
|
|
2077
|
-
case
|
|
2080
|
+
case 7:
|
|
2078
2081
|
recordPosses = _l.sent();
|
|
2079
2082
|
if (recordPosses === null || recordPosses === void 0 ? void 0 : recordPosses.length) {
|
|
2080
2083
|
return [2 /*return*/, recordPosses];
|
|
2081
2084
|
}
|
|
2082
|
-
if (!(apiCalls < MAX_API_CALLS)) return [3 /*break*/,
|
|
2083
|
-
_l.label =
|
|
2084
|
-
case
|
|
2085
|
-
_l.trys.push([
|
|
2085
|
+
if (!(apiCalls < MAX_API_CALLS)) return [3 /*break*/, 11];
|
|
2086
|
+
_l.label = 8;
|
|
2087
|
+
case 8:
|
|
2088
|
+
_l.trys.push([8, 10, , 11]);
|
|
2086
2089
|
apiCalls += 1;
|
|
2087
2090
|
return [4 /*yield*/, Entity$1.Get({
|
|
2088
2091
|
api: api,
|
|
@@ -2090,31 +2093,31 @@ var EntityUtils;
|
|
|
2090
2093
|
// We'll be expanding relative positioning and related tilesets now.
|
|
2091
2094
|
expandLocation: true
|
|
2092
2095
|
})];
|
|
2093
|
-
case 8:
|
|
2094
|
-
entity = (_l.sent()).entity;
|
|
2095
|
-
return [3 /*break*/, 10];
|
|
2096
2096
|
case 9:
|
|
2097
|
+
entity = (_l.sent()).entity;
|
|
2098
|
+
return [3 /*break*/, 11];
|
|
2099
|
+
case 10:
|
|
2097
2100
|
e_2 = _l.sent();
|
|
2098
2101
|
console.warn(e_2);
|
|
2099
|
-
return [3 /*break*/,
|
|
2100
|
-
case
|
|
2102
|
+
return [3 /*break*/, 11];
|
|
2103
|
+
case 11:
|
|
2101
2104
|
if (!tilesetId) {
|
|
2102
2105
|
tilesetId = ((_a = entity.tilesetID) === null || _a === void 0 ? void 0 : _a.length) ? entity.tilesetID[0] : tilesetId;
|
|
2103
2106
|
}
|
|
2104
|
-
if (!!tileset) return [3 /*break*/,
|
|
2105
|
-
if (!(tilesetId && apiCalls < MAX_API_CALLS)) return [3 /*break*/,
|
|
2107
|
+
if (!!tileset) return [3 /*break*/, 13];
|
|
2108
|
+
if (!(tilesetId && apiCalls < MAX_API_CALLS)) return [3 /*break*/, 13];
|
|
2106
2109
|
apiCalls += 1;
|
|
2107
2110
|
return [4 /*yield*/, Tileset.Get({
|
|
2108
2111
|
api: api,
|
|
2109
2112
|
tilesetId: tilesetId
|
|
2110
2113
|
})];
|
|
2111
|
-
case 11:
|
|
2112
|
-
tileset = (_l.sent()).tileset;
|
|
2113
|
-
_l.label = 12;
|
|
2114
2114
|
case 12:
|
|
2115
|
+
tileset = (_l.sent()).tileset;
|
|
2116
|
+
_l.label = 13;
|
|
2117
|
+
case 13:
|
|
2115
2118
|
tSettings = tileset === null || tileset === void 0 ? void 0 : tileset.settings;
|
|
2116
2119
|
pos3d = null;
|
|
2117
|
-
if (!(((_b = entity === null || entity === void 0 ? void 0 : entity.location) === null || _b === void 0 ? void 0 : _b.longitude) || ((_c = tSettings === null || tSettings === void 0 ? void 0 : tSettings.location) === null || _c === void 0 ? void 0 : _c.longitude))) return [3 /*break*/,
|
|
2120
|
+
if (!(((_b = entity === null || entity === void 0 ? void 0 : entity.location) === null || _b === void 0 ? void 0 : _b.longitude) || ((_c = tSettings === null || tSettings === void 0 ? void 0 : tSettings.location) === null || _c === void 0 ? void 0 : _c.longitude))) return [3 /*break*/, 16];
|
|
2118
2121
|
if ((_d = entity === null || entity === void 0 ? void 0 : entity.location) === null || _d === void 0 ? void 0 : _d.longitude) {
|
|
2119
2122
|
alt = +entity.location.altitude;
|
|
2120
2123
|
if (isNaN(alt)) {
|
|
@@ -2129,7 +2132,7 @@ var EntityUtils;
|
|
|
2129
2132
|
}
|
|
2130
2133
|
pos3d = Cartesian3.fromDegrees(+tSettings.location.longitude, +tSettings.location.latitude, alt);
|
|
2131
2134
|
}
|
|
2132
|
-
if (!(entity === null || entity === void 0 ? void 0 : entity.worldPosition)) return [3 /*break*/,
|
|
2135
|
+
if (!(entity === null || entity === void 0 ? void 0 : entity.worldPosition)) return [3 /*break*/, 16];
|
|
2133
2136
|
heading = 0;
|
|
2134
2137
|
pitch = 0;
|
|
2135
2138
|
roll = 0;
|
|
@@ -2174,12 +2177,12 @@ var EntityUtils;
|
|
|
2174
2177
|
transform = Matrix3.fromHeadingPitchRoll(hpr);
|
|
2175
2178
|
transformedOffset = Matrix3.multiplyByVector(transform, offset, new Cartesian3());
|
|
2176
2179
|
pos3d = Matrix4.multiplyByPoint(m1, transformedOffset, new Cartesian3());
|
|
2177
|
-
if (!(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) return [3 /*break*/,
|
|
2180
|
+
if (!(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) return [3 /*break*/, 15];
|
|
2178
2181
|
return [4 /*yield*/, processPosHeight(pos3d, HeightReference.NONE)];
|
|
2179
|
-
case 13:
|
|
2180
|
-
pos3d = _l.sent();
|
|
2181
|
-
_l.label = 14;
|
|
2182
2182
|
case 14:
|
|
2183
|
+
pos3d = _l.sent();
|
|
2184
|
+
_l.label = 15;
|
|
2185
|
+
case 15:
|
|
2183
2186
|
if ((entity === null || entity === void 0 ? void 0 : entity.geometryRadius) && (pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
|
|
2184
2187
|
sphere = BoundingSphere.fromPoints([pos3d]);
|
|
2185
2188
|
// For now making sure it's less than x amount because we had a bug which made it huge.
|
|
@@ -2188,8 +2191,8 @@ var EntityUtils;
|
|
|
2188
2191
|
spheres.push(sphere);
|
|
2189
2192
|
}
|
|
2190
2193
|
}
|
|
2191
|
-
_l.label =
|
|
2192
|
-
case
|
|
2194
|
+
_l.label = 16;
|
|
2195
|
+
case 16:
|
|
2193
2196
|
if (pos3d) {
|
|
2194
2197
|
return [2 /*return*/, [pos3d]];
|
|
2195
2198
|
}
|
|
@@ -6156,7 +6159,7 @@ var RelationRenderEngine;
|
|
|
6156
6159
|
toPos = null;
|
|
6157
6160
|
updatingPosses = false;
|
|
6158
6161
|
updatePosses = function () { return __awaiter(_this, void 0, void 0, function () {
|
|
6159
|
-
var e_4;
|
|
6162
|
+
var fromData, toData, e_4;
|
|
6160
6163
|
return __generator(this, function (_a) {
|
|
6161
6164
|
switch (_a.label) {
|
|
6162
6165
|
case 0:
|
|
@@ -6167,30 +6170,34 @@ var RelationRenderEngine;
|
|
|
6167
6170
|
_a.label = 1;
|
|
6168
6171
|
case 1:
|
|
6169
6172
|
_a.trys.push([1, 4, , 5]);
|
|
6170
|
-
return [4 /*yield*/, EntityUtils.
|
|
6171
|
-
|
|
6172
|
-
|
|
6173
|
+
return [4 /*yield*/, EntityUtils.GetLocation({
|
|
6174
|
+
samples: [{
|
|
6175
|
+
entity: params.fromEntity,
|
|
6176
|
+
entityId: params.fromEntity.Bruce.ID,
|
|
6177
|
+
heightRef: HeightReference.CLAMP_TO_GROUND,
|
|
6178
|
+
returnHeightRef: HeightReference.NONE
|
|
6179
|
+
}],
|
|
6173
6180
|
viewer: params.viewer,
|
|
6174
6181
|
visualRegister: params.visualRegister,
|
|
6175
|
-
|
|
6176
|
-
recordHeightRef: HeightReference.CLAMP_TO_GROUND,
|
|
6177
|
-
api: params.apiGetter.getApi(),
|
|
6178
|
-
entityId: params.fromEntity.Bruce.ID
|
|
6182
|
+
api: params.apiGetter.getApi()
|
|
6179
6183
|
})];
|
|
6180
6184
|
case 2:
|
|
6181
|
-
|
|
6182
|
-
|
|
6183
|
-
|
|
6184
|
-
|
|
6185
|
+
fromData = _a.sent();
|
|
6186
|
+
fromPos = fromData.pos3d;
|
|
6187
|
+
return [4 /*yield*/, EntityUtils.GetLocation({
|
|
6188
|
+
samples: [{
|
|
6189
|
+
entity: params.toEntity,
|
|
6190
|
+
entityId: params.toEntity.Bruce.ID,
|
|
6191
|
+
heightRef: HeightReference.CLAMP_TO_GROUND,
|
|
6192
|
+
returnHeightRef: HeightReference.NONE
|
|
6193
|
+
}],
|
|
6185
6194
|
viewer: params.viewer,
|
|
6186
6195
|
visualRegister: params.visualRegister,
|
|
6187
|
-
|
|
6188
|
-
recordHeightRef: HeightReference.CLAMP_TO_GROUND,
|
|
6189
|
-
api: params.apiGetter.getApi(),
|
|
6190
|
-
entityId: params.toEntity.Bruce.ID
|
|
6196
|
+
api: params.apiGetter.getApi()
|
|
6191
6197
|
})];
|
|
6192
6198
|
case 3:
|
|
6193
|
-
|
|
6199
|
+
toData = _a.sent();
|
|
6200
|
+
toPos = toData.pos3d;
|
|
6194
6201
|
return [3 /*break*/, 5];
|
|
6195
6202
|
case 4:
|
|
6196
6203
|
e_4 = _a.sent();
|
|
@@ -21639,7 +21646,7 @@ var ViewRenderEngine;
|
|
|
21639
21646
|
ViewRenderEngine.Render = Render;
|
|
21640
21647
|
})(ViewRenderEngine || (ViewRenderEngine = {}));
|
|
21641
21648
|
|
|
21642
|
-
var VERSION = "3.5.
|
|
21649
|
+
var VERSION = "3.5.5";
|
|
21643
21650
|
|
|
21644
21651
|
export { VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
|
|
21645
21652
|
//# sourceMappingURL=bruce-cesium.es5.js.map
|