bruce-cesium 0.5.9 → 0.6.1
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 +24 -8
- package/dist/bruce-cesium.es5.js.map +1 -1
- package/dist/bruce-cesium.umd.js +23 -7
- package/dist/bruce-cesium.umd.js.map +1 -1
- package/dist/lib/rendering/tile-render-engine.js +18 -6
- package/dist/lib/rendering/tile-render-engine.js.map +1 -1
- package/dist/lib/rendering/visuals-register.js +5 -1
- package/dist/lib/rendering/visuals-register.js.map +1 -1
- package/package.json +2 -2
package/dist/bruce-cesium.es5.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { BruceEvent, Cartes, Carto, Geometry, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, DelayQueue, Entity as Entity$1, BatchedDataGetter, ObjectUtils, Tileset, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, TilesetExtMapTiles, ProgramKey, Camera } from 'bruce-models';
|
|
2
|
-
import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, HeadingPitchRange, OrthographicFrustum,
|
|
2
|
+
import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, HeadingPitchRange, OrthographicFrustum, Matrix4, Cesium3DTileset, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, EllipsoidGeodesic, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, JulianDate, createOsmBuildings, Cesium3DTileStyle } from 'cesium';
|
|
3
3
|
|
|
4
4
|
var TIME_LAG = 300;
|
|
5
5
|
var POSITION_CHECK_TIMER = 950;
|
|
@@ -2015,7 +2015,11 @@ function select(viewer, visual) {
|
|
|
2015
2015
|
var processGraphic = function (graphicKey, materialKey) {
|
|
2016
2016
|
if (entity[graphicKey]) {
|
|
2017
2017
|
if (entity[graphicKey][ORG_COLOR_KEY] == null) {
|
|
2018
|
-
|
|
2018
|
+
var orgColor = entity[graphicKey][materialKey];
|
|
2019
|
+
if (!orgColor) {
|
|
2020
|
+
orgColor = Color.WHITE;
|
|
2021
|
+
}
|
|
2022
|
+
entity[graphicKey][ORG_COLOR_KEY] = orgColor.clone ? orgColor.clone() : orgColor;
|
|
2019
2023
|
}
|
|
2020
2024
|
entity[graphicKey][materialKey] = color.clone();
|
|
2021
2025
|
}
|
|
@@ -4411,6 +4415,18 @@ function isLegacyImageryDefault(name) {
|
|
|
4411
4415
|
name = legacyMapIdToDefaultId(name);
|
|
4412
4416
|
return ProjectViewTile.DefaultImagery.find(function (x) { return x.id == name; }) != null;
|
|
4413
4417
|
}
|
|
4418
|
+
/**
|
|
4419
|
+
* We don't need to provide the "." in the file extension to Cesium's providers.
|
|
4420
|
+
* @param ext
|
|
4421
|
+
* @returns
|
|
4422
|
+
*/
|
|
4423
|
+
function prepareFileExt(ext) {
|
|
4424
|
+
if (!ext) {
|
|
4425
|
+
return null;
|
|
4426
|
+
}
|
|
4427
|
+
ext = ext.replace(".", "");
|
|
4428
|
+
return ext;
|
|
4429
|
+
}
|
|
4414
4430
|
var TileRenderEngine;
|
|
4415
4431
|
(function (TileRenderEngine) {
|
|
4416
4432
|
/**
|
|
@@ -4481,7 +4497,7 @@ var TileRenderEngine;
|
|
|
4481
4497
|
case 5:
|
|
4482
4498
|
provider = new OpenStreetMapImageryProvider({
|
|
4483
4499
|
url: tile.SourceUrl,
|
|
4484
|
-
fileExtension: tile.FileExtension,
|
|
4500
|
+
fileExtension: prepareFileExt(tile.FileExtension),
|
|
4485
4501
|
minimumLevel: min,
|
|
4486
4502
|
maximumLevel: max
|
|
4487
4503
|
});
|
|
@@ -4489,7 +4505,7 @@ var TileRenderEngine;
|
|
|
4489
4505
|
case 6:
|
|
4490
4506
|
provider = new TileMapServiceImageryProvider({
|
|
4491
4507
|
url: tile.SourceUrl,
|
|
4492
|
-
fileExtension: tile.FileExtension,
|
|
4508
|
+
fileExtension: prepareFileExt(tile.FileExtension),
|
|
4493
4509
|
minimumLevel: min,
|
|
4494
4510
|
maximumLevel: max
|
|
4495
4511
|
});
|
|
@@ -4497,7 +4513,7 @@ var TileRenderEngine;
|
|
|
4497
4513
|
case 7:
|
|
4498
4514
|
provider = new OpenStreetMapImageryProvider({
|
|
4499
4515
|
url: tile.SourceUrl,
|
|
4500
|
-
fileExtension: tile.FileExtension,
|
|
4516
|
+
fileExtension: prepareFileExt(tile.FileExtension),
|
|
4501
4517
|
minimumLevel: min,
|
|
4502
4518
|
maximumLevel: max
|
|
4503
4519
|
});
|
|
@@ -4689,7 +4705,7 @@ var TileRenderEngine;
|
|
|
4689
4705
|
if (!(tileset.type === Tileset.EType.GeoMap)) return [3 /*break*/, 4];
|
|
4690
4706
|
provider = new TileMapServiceImageryProvider({
|
|
4691
4707
|
url: Tileset.GetPublicFileUrl(api, meta.tilesetId, ""),
|
|
4692
|
-
fileExtension: "
|
|
4708
|
+
fileExtension: "png"
|
|
4693
4709
|
});
|
|
4694
4710
|
return [3 /*break*/, 15];
|
|
4695
4711
|
case 4:
|
|
@@ -4733,13 +4749,13 @@ var TileRenderEngine;
|
|
|
4733
4749
|
case 11:
|
|
4734
4750
|
provider = new OpenStreetMapImageryProvider({
|
|
4735
4751
|
url: settings.url,
|
|
4736
|
-
fileExtension: settings.sourceExt
|
|
4752
|
+
fileExtension: prepareFileExt(settings.sourceExt)
|
|
4737
4753
|
});
|
|
4738
4754
|
return [3 /*break*/, 13];
|
|
4739
4755
|
case 12:
|
|
4740
4756
|
provider = new TileMapServiceImageryProvider({
|
|
4741
4757
|
url: settings.url,
|
|
4742
|
-
fileExtension: settings.sourceExt
|
|
4758
|
+
fileExtension: prepareFileExt(settings.sourceExt)
|
|
4743
4759
|
});
|
|
4744
4760
|
return [3 /*break*/, 13];
|
|
4745
4761
|
case 13: return [3 /*break*/, 15];
|