@cesium/engine 2.4.1 → 3.0.0
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/Build/Workers/cesiumWorkerBootstrapper.js +1 -1
- package/Build/Workers/createVerticesFromQuantizedTerrainMesh.js +0 -22
- package/Build/Workers/package.js +1 -1
- package/Build/Workers/transferTypedArrayTest.js +1 -1
- package/Source/Core/ArcGISTiledElevationTerrainProvider.js +0 -75
- package/Source/Core/CesiumTerrainProvider.js +0 -75
- package/Source/Core/CustomHeightmapTerrainProvider.js +0 -38
- package/Source/Core/EllipsoidTerrainProvider.js +0 -37
- package/Source/Core/GoogleEarthEnterpriseMetadata.js +0 -53
- package/Source/Core/GoogleEarthEnterpriseTerrainProvider.js +1 -101
- package/Source/Core/GoogleMaps.js +1 -1
- package/Source/Core/Ion.js +1 -2
- package/Source/Core/TerrainProvider.js +0 -22
- package/Source/Core/VRTheWorldTerrainProvider.js +0 -59
- package/Source/Core/sampleTerrain.js +0 -7
- package/Source/Core/sampleTerrainMostDetailed.js +0 -7
- package/Source/DataSources/Cesium3DTilesetVisualizer.js +6 -5
- package/Source/DataSources/KmlTour.js +1 -12
- package/Source/DataSources/ModelVisualizer.js +0 -12
- package/Source/Renderer/Context.js +10 -2
- package/Source/Scene/ArcGisMapServerImageryProvider.js +7 -335
- package/Source/Scene/ArcGisMapService.js +1 -1
- package/Source/Scene/Billboard.js +7 -0
- package/Source/Scene/BingMapsImageryProvider.js +0 -326
- package/Source/Scene/Camera.js +1 -1
- package/Source/Scene/Cesium3DTile.js +4 -5
- package/Source/Scene/Cesium3DTileContent.js +0 -16
- package/Source/Scene/Cesium3DTilesVoxelProvider.js +0 -123
- package/Source/Scene/Cesium3DTileset.js +183 -184
- package/Source/Scene/Cesium3DTilesetBaseTraversal.js +1 -1
- package/Source/Scene/Cesium3DTilesetCache.js +1 -3
- package/Source/Scene/Cesium3DTilesetSkipTraversal.js +5 -2
- package/Source/Scene/Cesium3DTilesetTraversal.js +2 -2
- package/Source/Scene/ClassificationPrimitive.js +5 -43
- package/Source/Scene/Composite3DTileContent.js +0 -27
- package/Source/Scene/CreditDisplay.js +0 -54
- package/Source/Scene/DerivedCommand.js +15 -10
- package/Source/Scene/Empty3DTileContent.js +0 -21
- package/Source/Scene/Geometry3DTileContent.js +0 -29
- package/Source/Scene/Globe.js +1 -9
- package/Source/Scene/GlobeSurfaceTile.js +13 -8
- package/Source/Scene/GlobeSurfaceTileProvider.js +8 -60
- package/Source/Scene/GltfPipeline/removeUnusedElements.js +27 -0
- package/Source/Scene/GltfPipeline/updateVersion.js +21 -4
- package/Source/Scene/GoogleEarthEnterpriseImageryProvider.js +1 -339
- package/Source/Scene/GoogleEarthEnterpriseMapsProvider.js +0 -326
- package/Source/Scene/GridImageryProvider.js +0 -274
- package/Source/Scene/GroundPolylinePrimitive.js +5 -38
- package/Source/Scene/GroundPrimitive.js +5 -43
- package/Source/Scene/I3SDataProvider.js +4 -99
- package/Source/Scene/I3SLayer.js +15 -22
- package/Source/Scene/Imagery.js +1 -9
- package/Source/Scene/ImageryLayer.js +1 -40
- package/Source/Scene/ImageryProvider.js +0 -138
- package/Source/Scene/Implicit3DTileContent.js +0 -23
- package/Source/Scene/IonImageryProvider.js +1 -369
- package/Source/Scene/MapboxImageryProvider.js +0 -276
- package/Source/Scene/MapboxStyleImageryProvider.js +0 -274
- package/Source/Scene/Model/Model.js +6 -249
- package/Source/Scene/Model/Model3DTileContent.js +0 -50
- package/Source/Scene/Model/ModelAnimationCollection.js +1 -1
- package/Source/Scene/Model/PointCloudStylingPipelineStage.js +1 -1
- package/Source/Scene/Multiple3DTileContent.js +0 -27
- package/Source/Scene/Primitive.js +10 -38
- package/Source/Scene/QuadtreePrimitive.js +3 -5
- package/Source/Scene/QuadtreeTileProvider.js +0 -10
- package/Source/Scene/Scene.js +3 -3
- package/Source/Scene/ScreenSpaceCameraController.js +5 -5
- package/Source/Scene/SingleTileImageryProvider.js +6 -302
- package/Source/Scene/TileCoordinatesImageryProvider.js +0 -273
- package/Source/Scene/TileMapServiceImageryProvider.js +3 -48
- package/Source/Scene/Tileset3DTileContent.js +0 -22
- package/Source/Scene/TimeDynamicPointCloud.js +0 -28
- package/Source/Scene/UrlTemplateImageryProvider.js +0 -375
- package/Source/Scene/Vector3DTileContent.js +0 -29
- package/Source/Scene/VoxelPrimitive.js +9 -49
- package/Source/Scene/VoxelProvider.js +0 -24
- package/Source/Scene/WebMapServiceImageryProvider.js +0 -274
- package/Source/Scene/WebMapTileServiceImageryProvider.js +0 -274
- package/Source/Scene/computeFlyToLocationForRectangle.js +0 -6
- package/Source/Scene/createGooglePhotorealistic3DTileset.js +5 -0
- package/Source/Widget/CesiumWidget.js +2 -19
- package/index.d.ts +62 -1183
- package/index.js +54 -57
- package/package.json +2 -2
- package/Source/Core/createWorldTerrain.js +0 -61
- package/Source/Scene/createOsmBuildings.js +0 -82
- package/Source/Scene/createWorldImagery.js +0 -47
|
@@ -51,28 +51,6 @@ define(['./AxisAlignedBoundingBox-4bfd84f3', './Matrix2-e1298525', './Matrix3-41
|
|
|
51
51
|
get: Check.DeveloperError.throwInstantiationError,
|
|
52
52
|
},
|
|
53
53
|
|
|
54
|
-
/**
|
|
55
|
-
* Gets a value indicating whether or not the provider is ready for use.
|
|
56
|
-
* @memberof TerrainProvider.prototype
|
|
57
|
-
* @type {boolean}
|
|
58
|
-
* @readonly
|
|
59
|
-
* @deprecated
|
|
60
|
-
*/
|
|
61
|
-
ready: {
|
|
62
|
-
get: Check.DeveloperError.throwInstantiationError,
|
|
63
|
-
},
|
|
64
|
-
|
|
65
|
-
/**
|
|
66
|
-
* Gets a promise that resolves to true when the provider is ready for use.
|
|
67
|
-
* @memberof TerrainProvider.prototype
|
|
68
|
-
* @type {Promise<boolean>}
|
|
69
|
-
* @readonly
|
|
70
|
-
* @deprecated
|
|
71
|
-
*/
|
|
72
|
-
readyPromise: {
|
|
73
|
-
get: Check.DeveloperError.throwInstantiationError,
|
|
74
|
-
},
|
|
75
|
-
|
|
76
54
|
/**
|
|
77
55
|
* Gets a value indicating whether or not the provider includes a water mask. The water mask
|
|
78
56
|
* indicates which areas of the globe are water rather than land, so they can be rendered
|
package/Build/Workers/package.js
CHANGED
|
@@ -3,7 +3,6 @@ import Check from "./Check.js";
|
|
|
3
3
|
import Credit from "./Credit.js";
|
|
4
4
|
import defaultValue from "./defaultValue.js";
|
|
5
5
|
import defined from "./defined.js";
|
|
6
|
-
import deprecationWarning from "./deprecationWarning.js";
|
|
7
6
|
import Ellipsoid from "./Ellipsoid.js";
|
|
8
7
|
import Event from "./Event.js";
|
|
9
8
|
import GeographicTilingScheme from "./GeographicTilingScheme.js";
|
|
@@ -31,7 +30,6 @@ const ALL_CHILDREN = 15;
|
|
|
31
30
|
* @property {Ellipsoid} [ellipsoid] The ellipsoid. If the tilingScheme is specified,
|
|
32
31
|
* this parameter is ignored and the tiling scheme's ellipsoid is used instead.
|
|
33
32
|
* If neither parameter is specified, the WGS84 ellipsoid is used.
|
|
34
|
-
* @property {Resource|string|Promise<Resource>|Promise<string>} [url] The URL of the ArcGIS ImageServer service. Deprecated.
|
|
35
33
|
*/
|
|
36
34
|
|
|
37
35
|
/**
|
|
@@ -77,8 +75,6 @@ TerrainProviderBuilder.prototype.build = function (provider) {
|
|
|
77
75
|
provider._tilesAvailabilityLoaded = this.tilesAvailabilityLoaded;
|
|
78
76
|
provider._levelZeroMaximumGeometricError = this.levelZeroMaximumGeometricError;
|
|
79
77
|
provider._terrainDataStructure = this.terrainDataStructure;
|
|
80
|
-
|
|
81
|
-
provider._ready = true;
|
|
82
78
|
};
|
|
83
79
|
|
|
84
80
|
function parseMetadataSuccess(terrainProviderBuilder, metadata) {
|
|
@@ -248,50 +244,13 @@ function ArcGISTiledElevationTerrainProvider(options) {
|
|
|
248
244
|
this._height = undefined;
|
|
249
245
|
this._encoding = undefined;
|
|
250
246
|
this._lodCount = undefined;
|
|
251
|
-
const token = options.token;
|
|
252
247
|
|
|
253
248
|
this._hasAvailability = false;
|
|
254
249
|
this._tilesAvailable = undefined;
|
|
255
250
|
this._tilesAvailabilityLoaded = undefined;
|
|
256
251
|
this._availableCache = {};
|
|
257
|
-
this._ready = false;
|
|
258
252
|
|
|
259
253
|
this._errorEvent = new Event();
|
|
260
|
-
|
|
261
|
-
if (defined(options.url)) {
|
|
262
|
-
deprecationWarning(
|
|
263
|
-
"ArcGISTiledElevationTerrainProvider options.url",
|
|
264
|
-
"options.url was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ArcGISTiledElevationTerrainProvider.fromUrl instead."
|
|
265
|
-
);
|
|
266
|
-
|
|
267
|
-
const that = this;
|
|
268
|
-
const terrainProviderBuilder = new TerrainProviderBuilder(options);
|
|
269
|
-
this._readyPromise = Promise.resolve(options.url).then(async function (
|
|
270
|
-
url
|
|
271
|
-
) {
|
|
272
|
-
let resource = Resource.createIfNeeded(url);
|
|
273
|
-
resource.appendForwardSlash();
|
|
274
|
-
if (defined(token)) {
|
|
275
|
-
resource = resource.getDerivedResource({
|
|
276
|
-
queryParameters: {
|
|
277
|
-
token: token,
|
|
278
|
-
},
|
|
279
|
-
});
|
|
280
|
-
}
|
|
281
|
-
that._resource = resource;
|
|
282
|
-
|
|
283
|
-
const metadataResource = resource.getDerivedResource({
|
|
284
|
-
queryParameters: {
|
|
285
|
-
f: "pjson",
|
|
286
|
-
},
|
|
287
|
-
});
|
|
288
|
-
|
|
289
|
-
await requestMetadata(terrainProviderBuilder, metadataResource, that);
|
|
290
|
-
terrainProviderBuilder.build(that);
|
|
291
|
-
|
|
292
|
-
return true;
|
|
293
|
-
});
|
|
294
|
-
}
|
|
295
254
|
}
|
|
296
255
|
|
|
297
256
|
Object.defineProperties(ArcGISTiledElevationTerrainProvider.prototype, {
|
|
@@ -334,40 +293,6 @@ Object.defineProperties(ArcGISTiledElevationTerrainProvider.prototype, {
|
|
|
334
293
|
},
|
|
335
294
|
},
|
|
336
295
|
|
|
337
|
-
/**
|
|
338
|
-
* Gets a value indicating whether or not the provider is ready for use.
|
|
339
|
-
* @memberof ArcGISTiledElevationTerrainProvider.prototype
|
|
340
|
-
* @type {boolean}
|
|
341
|
-
* @readonly
|
|
342
|
-
* @deprecated
|
|
343
|
-
*/
|
|
344
|
-
ready: {
|
|
345
|
-
get: function () {
|
|
346
|
-
deprecationWarning(
|
|
347
|
-
"ArcGISTiledElevationTerrainProvider.ready",
|
|
348
|
-
"ArcGISTiledElevationTerrainProvider.ready was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ArcGISTiledElevationTerrainProvider.fromUrl instead."
|
|
349
|
-
);
|
|
350
|
-
return this._ready;
|
|
351
|
-
},
|
|
352
|
-
},
|
|
353
|
-
|
|
354
|
-
/**
|
|
355
|
-
* Gets a promise that resolves to true when the provider is ready for use.
|
|
356
|
-
* @memberof ArcGISTiledElevationTerrainProvider.prototype
|
|
357
|
-
* @type {Promise<boolean>}
|
|
358
|
-
* @readonly
|
|
359
|
-
* @deprecated
|
|
360
|
-
*/
|
|
361
|
-
readyPromise: {
|
|
362
|
-
get: function () {
|
|
363
|
-
deprecationWarning(
|
|
364
|
-
"ArcGISTiledElevationTerrainProvider.readyPromise",
|
|
365
|
-
"ArcGISTiledElevationTerrainProvider.readyPromise was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use ArcGISTiledElevationTerrainProvider.fromUrl instead."
|
|
366
|
-
);
|
|
367
|
-
return this._readyPromise;
|
|
368
|
-
},
|
|
369
|
-
},
|
|
370
|
-
|
|
371
296
|
/**
|
|
372
297
|
* Gets a value indicating whether or not the provider includes a water mask. The water mask
|
|
373
298
|
* indicates which areas of the globe are water rather than land, so they can be rendered
|
|
@@ -5,7 +5,6 @@ import Check from "./Check.js";
|
|
|
5
5
|
import Credit from "./Credit.js";
|
|
6
6
|
import defaultValue from "./defaultValue.js";
|
|
7
7
|
import defined from "./defined.js";
|
|
8
|
-
import deprecationWarning from "./deprecationWarning.js";
|
|
9
8
|
import Event from "./Event.js";
|
|
10
9
|
import GeographicTilingScheme from "./GeographicTilingScheme.js";
|
|
11
10
|
import WebMercatorTilingScheme from "./WebMercatorTilingScheme.js";
|
|
@@ -48,7 +47,6 @@ function LayerInformation(layer) {
|
|
|
48
47
|
* @property {boolean} [requestMetadata=true] Flag that indicates if the client should request per tile metadata from the server, if available.
|
|
49
48
|
* @property {Ellipsoid} [ellipsoid] The ellipsoid. If not specified, the WGS84 ellipsoid is used.
|
|
50
49
|
* @property {Credit|string} [credit] A credit for the data source, which is displayed on the canvas.
|
|
51
|
-
* @property {Resource|string|Promise<Resource>|Promise<string>} [url] The URL of the Cesium terrain server. Deprecated.
|
|
52
50
|
*/
|
|
53
51
|
|
|
54
52
|
/**
|
|
@@ -112,8 +110,6 @@ TerrainProviderBuilder.prototype.build = function (provider) {
|
|
|
112
110
|
provider._hasWaterMask = this.hasWaterMask;
|
|
113
111
|
provider._hasVertexNormals = this.hasVertexNormals;
|
|
114
112
|
provider._hasMetadata = this.hasMetadata;
|
|
115
|
-
|
|
116
|
-
provider._ready = true;
|
|
117
113
|
};
|
|
118
114
|
|
|
119
115
|
async function parseMetadataSuccess(terrainProviderBuilder, data, provider) {
|
|
@@ -527,46 +523,9 @@ function CesiumTerrainProvider(options) {
|
|
|
527
523
|
this._tilingScheme = undefined;
|
|
528
524
|
this._levelZeroMaximumGeometricError = undefined;
|
|
529
525
|
this._layers = undefined;
|
|
530
|
-
|
|
531
|
-
this._ready = false;
|
|
532
526
|
this._tileCredits = undefined;
|
|
533
|
-
|
|
534
|
-
this._readyPromise = Promise.resolve(true);
|
|
535
|
-
if (defined(options.url)) {
|
|
536
|
-
deprecationWarning(
|
|
537
|
-
"CesiumTerrainProvider options.url",
|
|
538
|
-
"options.url was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use CesiumTerrainProvider.fromIonAssetId or CesiumTerrainProvider.fromUrl instead."
|
|
539
|
-
);
|
|
540
|
-
this._readyPromise = CesiumTerrainProvider._initializeReadyPromise(
|
|
541
|
-
options,
|
|
542
|
-
this
|
|
543
|
-
);
|
|
544
|
-
}
|
|
545
527
|
}
|
|
546
528
|
|
|
547
|
-
// Exposed for deprecation
|
|
548
|
-
CesiumTerrainProvider._initializeReadyPromise = async function (
|
|
549
|
-
options,
|
|
550
|
-
provider
|
|
551
|
-
) {
|
|
552
|
-
const url = await Promise.resolve(options.url);
|
|
553
|
-
|
|
554
|
-
const terrainProviderBuilder = new TerrainProviderBuilder(options);
|
|
555
|
-
const resource = Resource.createIfNeeded(url);
|
|
556
|
-
resource.appendForwardSlash();
|
|
557
|
-
terrainProviderBuilder.lastResource = resource;
|
|
558
|
-
terrainProviderBuilder.layerJsonResource = terrainProviderBuilder.lastResource.getDerivedResource(
|
|
559
|
-
{
|
|
560
|
-
url: "layer.json",
|
|
561
|
-
}
|
|
562
|
-
);
|
|
563
|
-
|
|
564
|
-
await requestLayerJson(terrainProviderBuilder, provider);
|
|
565
|
-
terrainProviderBuilder.build(provider);
|
|
566
|
-
|
|
567
|
-
return true;
|
|
568
|
-
};
|
|
569
|
-
|
|
570
529
|
/**
|
|
571
530
|
* When using the Quantized-Mesh format, a tile may be returned that includes additional extensions, such as PerVertexNormals, watermask, etc.
|
|
572
531
|
* This enumeration defines the unique identifiers for each type of extension data that has been appended to the standard mesh data.
|
|
@@ -1076,40 +1035,6 @@ Object.defineProperties(CesiumTerrainProvider.prototype, {
|
|
|
1076
1035
|
},
|
|
1077
1036
|
},
|
|
1078
1037
|
|
|
1079
|
-
/**
|
|
1080
|
-
* Gets a value indicating whether or not the provider is ready for use.
|
|
1081
|
-
* @memberof CesiumTerrainProvider.prototype
|
|
1082
|
-
* @type {boolean}
|
|
1083
|
-
* @readonly
|
|
1084
|
-
* @deprecated
|
|
1085
|
-
*/
|
|
1086
|
-
ready: {
|
|
1087
|
-
get: function () {
|
|
1088
|
-
deprecationWarning(
|
|
1089
|
-
"CesiumTerrainProvider.ready",
|
|
1090
|
-
"CesiumTerrainProvider.ready was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use CesiumTerrainProvider.fromIonAssetId or CesiumTerrainProvider.fromUrl instead."
|
|
1091
|
-
);
|
|
1092
|
-
return this._ready;
|
|
1093
|
-
},
|
|
1094
|
-
},
|
|
1095
|
-
|
|
1096
|
-
/**
|
|
1097
|
-
* Gets a promise that resolves to true when the provider is ready for use.
|
|
1098
|
-
* @memberof CesiumTerrainProvider.prototype
|
|
1099
|
-
* @type {Promise<boolean>}
|
|
1100
|
-
* @readonly
|
|
1101
|
-
* @deprecated
|
|
1102
|
-
*/
|
|
1103
|
-
readyPromise: {
|
|
1104
|
-
get: function () {
|
|
1105
|
-
deprecationWarning(
|
|
1106
|
-
"CesiumTerrainProvider.readyPromise",
|
|
1107
|
-
"CesiumTerrainProvider.readyPromise was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use CesiumTerrainProvider.fromIonAssetId or CesiumTerrainProvider.fromUrl instead."
|
|
1108
|
-
);
|
|
1109
|
-
return this._readyPromise;
|
|
1110
|
-
},
|
|
1111
|
-
},
|
|
1112
|
-
|
|
1113
1038
|
/**
|
|
1114
1039
|
* Gets a value indicating whether or not the provider includes a water mask. The water mask
|
|
1115
1040
|
* indicates which areas of the globe are water rather than land, so they can be rendered
|
|
@@ -2,7 +2,6 @@ import Check from "./Check.js";
|
|
|
2
2
|
import Credit from "./Credit.js";
|
|
3
3
|
import defaultValue from "./defaultValue.js";
|
|
4
4
|
import defined from "./defined.js";
|
|
5
|
-
import deprecationWarning from "./deprecationWarning.js";
|
|
6
5
|
import Ellipsoid from "./Ellipsoid.js";
|
|
7
6
|
import Event from "./Event.js";
|
|
8
7
|
import GeographicTilingScheme from "./GeographicTilingScheme.js";
|
|
@@ -89,9 +88,6 @@ function CustomHeightmapTerrainProvider(options) {
|
|
|
89
88
|
credit = new Credit(credit);
|
|
90
89
|
}
|
|
91
90
|
this._credit = credit;
|
|
92
|
-
|
|
93
|
-
this._ready = true;
|
|
94
|
-
this._readyPromise = Promise.resolve(true);
|
|
95
91
|
}
|
|
96
92
|
|
|
97
93
|
Object.defineProperties(CustomHeightmapTerrainProvider.prototype, {
|
|
@@ -134,40 +130,6 @@ Object.defineProperties(CustomHeightmapTerrainProvider.prototype, {
|
|
|
134
130
|
},
|
|
135
131
|
},
|
|
136
132
|
|
|
137
|
-
/**
|
|
138
|
-
* Gets a value indicating whether or not the provider is ready for use.
|
|
139
|
-
* @memberof CustomHeightmapTerrainProvider.prototype
|
|
140
|
-
* @type {boolean}
|
|
141
|
-
* @readonly
|
|
142
|
-
* @deprecated
|
|
143
|
-
*/
|
|
144
|
-
ready: {
|
|
145
|
-
get: function () {
|
|
146
|
-
deprecationWarning(
|
|
147
|
-
"CustomHeightmapTerrainProvider.ready",
|
|
148
|
-
"CustomHeightmapTerrainProvider.ready was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107."
|
|
149
|
-
);
|
|
150
|
-
return true;
|
|
151
|
-
},
|
|
152
|
-
},
|
|
153
|
-
|
|
154
|
-
/**
|
|
155
|
-
* Gets a promise that resolves to true when the provider is ready for use.
|
|
156
|
-
* @memberof CustomHeightmapTerrainProvider.prototype
|
|
157
|
-
* @type {Promise<boolean>}
|
|
158
|
-
* @readonly
|
|
159
|
-
* @deprecated
|
|
160
|
-
*/
|
|
161
|
-
readyPromise: {
|
|
162
|
-
get: function () {
|
|
163
|
-
deprecationWarning(
|
|
164
|
-
"CustomHeightmapTerrainProvider.readyPromise",
|
|
165
|
-
"CustomHeightmapTerrainProvider.readyPromise was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107."
|
|
166
|
-
);
|
|
167
|
-
return this._readyPromise;
|
|
168
|
-
},
|
|
169
|
-
},
|
|
170
|
-
|
|
171
133
|
/**
|
|
172
134
|
* Gets a value indicating whether or not the provider includes a water mask. The water mask
|
|
173
135
|
* indicates which areas of the globe are water rather than land, so they can be rendered
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import defaultValue from "./defaultValue.js";
|
|
2
2
|
import defined from "./defined.js";
|
|
3
|
-
import deprecationWarning from "./deprecationWarning.js";
|
|
4
3
|
import Ellipsoid from "./Ellipsoid.js";
|
|
5
4
|
import Event from "./Event.js";
|
|
6
5
|
import GeographicTilingScheme from "./GeographicTilingScheme.js";
|
|
@@ -43,8 +42,6 @@ function EllipsoidTerrainProvider(options) {
|
|
|
43
42
|
);
|
|
44
43
|
|
|
45
44
|
this._errorEvent = new Event();
|
|
46
|
-
this._ready = true;
|
|
47
|
-
this._readyPromise = Promise.resolve(true);
|
|
48
45
|
}
|
|
49
46
|
|
|
50
47
|
Object.defineProperties(EllipsoidTerrainProvider.prototype, {
|
|
@@ -87,40 +84,6 @@ Object.defineProperties(EllipsoidTerrainProvider.prototype, {
|
|
|
87
84
|
},
|
|
88
85
|
},
|
|
89
86
|
|
|
90
|
-
/**
|
|
91
|
-
* Gets a value indicating whether or not the provider is ready for use.
|
|
92
|
-
* @memberof EllipsoidTerrainProvider.prototype
|
|
93
|
-
* @type {boolean}
|
|
94
|
-
* @readonly
|
|
95
|
-
* @deprecated
|
|
96
|
-
*/
|
|
97
|
-
ready: {
|
|
98
|
-
get: function () {
|
|
99
|
-
deprecationWarning(
|
|
100
|
-
"EllipsoidTerrainProvider.ready",
|
|
101
|
-
"EllipsoidTerrainProvider.ready was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107."
|
|
102
|
-
);
|
|
103
|
-
return true;
|
|
104
|
-
},
|
|
105
|
-
},
|
|
106
|
-
|
|
107
|
-
/**
|
|
108
|
-
* Gets a promise that resolves to true when the provider is ready for use.
|
|
109
|
-
* @memberof EllipsoidTerrainProvider.prototype
|
|
110
|
-
* @type {Promise<boolean>}
|
|
111
|
-
* @readonly
|
|
112
|
-
* @deprecated
|
|
113
|
-
*/
|
|
114
|
-
readyPromise: {
|
|
115
|
-
get: function () {
|
|
116
|
-
deprecationWarning(
|
|
117
|
-
"EllipsoidTerrainProvider.readyPromise",
|
|
118
|
-
"EllipsoidTerrainProvider.readyPromise was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107."
|
|
119
|
-
);
|
|
120
|
-
return this._readyPromise;
|
|
121
|
-
},
|
|
122
|
-
},
|
|
123
|
-
|
|
124
87
|
/**
|
|
125
88
|
* Gets a value indicating whether or not the provider includes a water mask. The water mask
|
|
126
89
|
* indicates which areas of the globe are water rather than land, so they can be rendered
|
|
@@ -4,7 +4,6 @@ import Check from "./Check.js";
|
|
|
4
4
|
import Credit from "./Credit.js";
|
|
5
5
|
import defaultValue from "./defaultValue.js";
|
|
6
6
|
import defined from "./defined.js";
|
|
7
|
-
import deprecationWarning from "./deprecationWarning.js";
|
|
8
7
|
import GoogleEarthEnterpriseTileInformation from "./GoogleEarthEnterpriseTileInformation.js";
|
|
9
8
|
import isBitSet from "./isBitSet.js";
|
|
10
9
|
import loadAndExecuteScript from "./loadAndExecuteScript.js";
|
|
@@ -41,8 +40,6 @@ const defaultKey = stringToBuffer(
|
|
|
41
40
|
* @alias GoogleEarthEnterpriseMetadata
|
|
42
41
|
* @constructor
|
|
43
42
|
*
|
|
44
|
-
* @param {Resource|string} [resourceOrUrl] The url of the Google Earth Enterprise server hosting the imagery. Deprecated.
|
|
45
|
-
*
|
|
46
43
|
* @see GoogleEarthEnterpriseImageryProvider
|
|
47
44
|
* @see GoogleEarthEnterpriseTerrainProvider
|
|
48
45
|
*
|
|
@@ -100,39 +97,6 @@ function GoogleEarthEnterpriseMetadata(resourceOrUrl) {
|
|
|
100
97
|
this._quadPacketVersion = 1;
|
|
101
98
|
this._tileInfo = {};
|
|
102
99
|
this._subtreePromises = {};
|
|
103
|
-
|
|
104
|
-
this._readyPromise = Promise.resolve(true);
|
|
105
|
-
if (defined(resourceOrUrl)) {
|
|
106
|
-
deprecationWarning(
|
|
107
|
-
"GoogleEarthEnterpriseMetadata options.url",
|
|
108
|
-
"GoogleEarthEnterpriseMetadata constructor parmeter resourceOrUrl was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use GoogleEarthEnterpriseMetadata.fromUrl instead."
|
|
109
|
-
);
|
|
110
|
-
|
|
111
|
-
let url = resourceOrUrl;
|
|
112
|
-
|
|
113
|
-
if (typeof url !== "string" && !(url instanceof Resource)) {
|
|
114
|
-
url = resourceOrUrl.url;
|
|
115
|
-
}
|
|
116
|
-
|
|
117
|
-
const resource = Resource.createIfNeeded(url);
|
|
118
|
-
resource.appendForwardSlash();
|
|
119
|
-
this._resource = resource;
|
|
120
|
-
|
|
121
|
-
const that = this;
|
|
122
|
-
this._readyPromise = requestDbRoot(this)
|
|
123
|
-
.then(function () {
|
|
124
|
-
return that.getQuadTreePacket("", that._quadPacketVersion);
|
|
125
|
-
})
|
|
126
|
-
.then(function () {
|
|
127
|
-
return true;
|
|
128
|
-
})
|
|
129
|
-
.catch(function (e) {
|
|
130
|
-
const message = `An error occurred while accessing ${
|
|
131
|
-
getMetadataResource(that, "", 1).url
|
|
132
|
-
}.`;
|
|
133
|
-
return Promise.reject(new RuntimeError(message));
|
|
134
|
-
});
|
|
135
|
-
}
|
|
136
100
|
}
|
|
137
101
|
|
|
138
102
|
Object.defineProperties(GoogleEarthEnterpriseMetadata.prototype, {
|
|
@@ -171,23 +135,6 @@ Object.defineProperties(GoogleEarthEnterpriseMetadata.prototype, {
|
|
|
171
135
|
return this._resource;
|
|
172
136
|
},
|
|
173
137
|
},
|
|
174
|
-
|
|
175
|
-
/**
|
|
176
|
-
* Gets a promise that resolves to true when the metadata is ready for use.
|
|
177
|
-
* @memberof GoogleEarthEnterpriseMetadata.prototype
|
|
178
|
-
* @type {Promise<boolean>}
|
|
179
|
-
* @readonly
|
|
180
|
-
* @deprecated
|
|
181
|
-
*/
|
|
182
|
-
readyPromise: {
|
|
183
|
-
get: function () {
|
|
184
|
-
deprecationWarning(
|
|
185
|
-
"GoogleEarthEnterpriseMetadata.readyPromise",
|
|
186
|
-
"GoogleEarthEnterpriseMetadata.readyPromise was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use GoogleEarthEnterpriseMetadata.fromUrl instead."
|
|
187
|
-
);
|
|
188
|
-
return this._readyPromise;
|
|
189
|
-
},
|
|
190
|
-
},
|
|
191
138
|
});
|
|
192
139
|
|
|
193
140
|
/**
|
|
@@ -2,7 +2,6 @@ import Check from "./Check.js";
|
|
|
2
2
|
import Credit from "./Credit.js";
|
|
3
3
|
import defaultValue from "./defaultValue.js";
|
|
4
4
|
import defined from "./defined.js";
|
|
5
|
-
import deprecationWarning from "./deprecationWarning.js";
|
|
6
5
|
import Event from "./Event.js";
|
|
7
6
|
import GeographicTilingScheme from "./GeographicTilingScheme.js";
|
|
8
7
|
import GoogleEarthEnterpriseMetadata from "./GoogleEarthEnterpriseMetadata.js";
|
|
@@ -14,10 +13,8 @@ import Rectangle from "./Rectangle.js";
|
|
|
14
13
|
import Request from "./Request.js";
|
|
15
14
|
import RequestState from "./RequestState.js";
|
|
16
15
|
import RequestType from "./RequestType.js";
|
|
17
|
-
import Resource from "./Resource.js";
|
|
18
16
|
import RuntimeError from "./RuntimeError.js";
|
|
19
17
|
import TaskProcessor from "./TaskProcessor.js";
|
|
20
|
-
import TileProviderError from "./TileProviderError.js";
|
|
21
18
|
|
|
22
19
|
const TerrainState = {
|
|
23
20
|
UNKNOWN: 0,
|
|
@@ -74,8 +71,6 @@ TerrainCache.prototype.tidy = function () {
|
|
|
74
71
|
*
|
|
75
72
|
* @property {Ellipsoid} [ellipsoid] The ellipsoid. If not specified, the WGS84 ellipsoid is used.
|
|
76
73
|
* @property {Credit|string} [credit] A credit for the data source, which is displayed on the canvas.
|
|
77
|
-
* @property {Resource|string} [url] The url of the Google Earth Enterprise server hosting the imagery. Deprecated.
|
|
78
|
-
* @property {GoogleEarthEnterpriseMetadata} [metadata] A metadata object that can be used to share metadata requests with a GoogleEarthEnterpriseImageryProvider. Deprecated.
|
|
79
74
|
*/
|
|
80
75
|
|
|
81
76
|
/**
|
|
@@ -88,7 +83,7 @@ TerrainCache.prototype.tidy = function () {
|
|
|
88
83
|
* @alias GoogleEarthEnterpriseTerrainProvider
|
|
89
84
|
* @constructor
|
|
90
85
|
*
|
|
91
|
-
* @param {GoogleEarthEnterpriseTerrainProvider.ConstructorOptions} options An object describing initialization options
|
|
86
|
+
* @param {GoogleEarthEnterpriseTerrainProvider.ConstructorOptions} [options] An object describing initialization options
|
|
92
87
|
*
|
|
93
88
|
* @see GoogleEarthEnterpriseTerrainProvider.fromMetadata
|
|
94
89
|
* @see GoogleEarthEnterpriseMetadata.fromUrl
|
|
@@ -130,65 +125,6 @@ function GoogleEarthEnterpriseTerrainProvider(options) {
|
|
|
130
125
|
this._terrainRequests = {};
|
|
131
126
|
|
|
132
127
|
this._errorEvent = new Event();
|
|
133
|
-
this._ready = false;
|
|
134
|
-
|
|
135
|
-
if (defined(options.url)) {
|
|
136
|
-
deprecationWarning(
|
|
137
|
-
"GoogleEarthEnterpriseTerrainProvider options.url",
|
|
138
|
-
"options.url was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use GoogleEarthEnterpriseTerrainProvider.fromMetadata instead."
|
|
139
|
-
);
|
|
140
|
-
const resource = Resource.createIfNeeded(options.url);
|
|
141
|
-
const that = this;
|
|
142
|
-
let metadataError;
|
|
143
|
-
this._readyPromise = GoogleEarthEnterpriseMetadata.fromUrl(resource)
|
|
144
|
-
.then((metadata) => {
|
|
145
|
-
if (!metadata.terrainPresent) {
|
|
146
|
-
const e = new RuntimeError(
|
|
147
|
-
`The server ${metadata.url} doesn't have terrain`
|
|
148
|
-
);
|
|
149
|
-
|
|
150
|
-
return Promise.reject(e);
|
|
151
|
-
}
|
|
152
|
-
|
|
153
|
-
TileProviderError.reportSuccess(metadataError);
|
|
154
|
-
that._metadata = metadata;
|
|
155
|
-
that._ready = true;
|
|
156
|
-
return true;
|
|
157
|
-
})
|
|
158
|
-
.catch((e) => {
|
|
159
|
-
metadataError = TileProviderError.reportError(
|
|
160
|
-
metadataError,
|
|
161
|
-
that,
|
|
162
|
-
that._errorEvent,
|
|
163
|
-
e.message,
|
|
164
|
-
undefined,
|
|
165
|
-
undefined,
|
|
166
|
-
undefined,
|
|
167
|
-
e
|
|
168
|
-
);
|
|
169
|
-
|
|
170
|
-
throw e;
|
|
171
|
-
});
|
|
172
|
-
} else if (defined(options.metadata)) {
|
|
173
|
-
deprecationWarning(
|
|
174
|
-
"GoogleEarthEnterpriseTerrainProvider options.metadata",
|
|
175
|
-
"options.metadata was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107. Use GoogleEarthEnterpriseTerrainProvider.fromMetadata instead."
|
|
176
|
-
);
|
|
177
|
-
const metadata = options.metadata;
|
|
178
|
-
this._metadata = metadata;
|
|
179
|
-
const that = this;
|
|
180
|
-
this._readyPromise = Promise.resolve(this._metadata._readyPromise).then(
|
|
181
|
-
() => {
|
|
182
|
-
if (!metadata.terrainPresent) {
|
|
183
|
-
throw new RuntimeError(
|
|
184
|
-
`The server ${metadata.url} doesn't have terrain`
|
|
185
|
-
);
|
|
186
|
-
}
|
|
187
|
-
|
|
188
|
-
that._ready = true;
|
|
189
|
-
}
|
|
190
|
-
);
|
|
191
|
-
}
|
|
192
128
|
}
|
|
193
129
|
|
|
194
130
|
Object.defineProperties(GoogleEarthEnterpriseTerrainProvider.prototype, {
|
|
@@ -242,40 +178,6 @@ Object.defineProperties(GoogleEarthEnterpriseTerrainProvider.prototype, {
|
|
|
242
178
|
},
|
|
243
179
|
},
|
|
244
180
|
|
|
245
|
-
/**
|
|
246
|
-
* Gets a value indicating whether or not the provider is ready for use.
|
|
247
|
-
* @memberof GoogleEarthEnterpriseTerrainProvider.prototype
|
|
248
|
-
* @type {boolean}
|
|
249
|
-
* @readonly
|
|
250
|
-
* @deprecated
|
|
251
|
-
*/
|
|
252
|
-
ready: {
|
|
253
|
-
get: function () {
|
|
254
|
-
deprecationWarning(
|
|
255
|
-
"GoogleEarthEnterpriseTerrainProvider.ready",
|
|
256
|
-
"GoogleEarthEnterpriseTerrainProvider.ready was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107."
|
|
257
|
-
);
|
|
258
|
-
return this._ready;
|
|
259
|
-
},
|
|
260
|
-
},
|
|
261
|
-
|
|
262
|
-
/**
|
|
263
|
-
* Gets a promise that resolves to true when the provider is ready for use.
|
|
264
|
-
* @memberof GoogleEarthEnterpriseTerrainProvider.prototype
|
|
265
|
-
* @type {Promise<boolean>}
|
|
266
|
-
* @readonly
|
|
267
|
-
* @deprecated
|
|
268
|
-
*/
|
|
269
|
-
readyPromise: {
|
|
270
|
-
get: function () {
|
|
271
|
-
deprecationWarning(
|
|
272
|
-
"GoogleEarthEnterpriseTerrainProvider.readyPromise",
|
|
273
|
-
"GoogleEarthEnterpriseTerrainProvider.readyPromise was deprecated in CesiumJS 1.104. It will be removed in CesiumJS 1.107."
|
|
274
|
-
);
|
|
275
|
-
return this._readyPromise;
|
|
276
|
-
},
|
|
277
|
-
},
|
|
278
|
-
|
|
279
181
|
/**
|
|
280
182
|
* Gets the credit to display when this terrain provider is active. Typically this is used to credit
|
|
281
183
|
* the source of the terrain.
|
|
@@ -359,8 +261,6 @@ GoogleEarthEnterpriseTerrainProvider.fromMetadata = function (
|
|
|
359
261
|
|
|
360
262
|
const provider = new GoogleEarthEnterpriseTerrainProvider(options);
|
|
361
263
|
provider._metadata = metadata;
|
|
362
|
-
provider._readyPromise = Promise.resolve(true);
|
|
363
|
-
provider._ready = true;
|
|
364
264
|
|
|
365
265
|
return provider;
|
|
366
266
|
};
|
|
@@ -3,7 +3,7 @@ import defined from "./defined.js";
|
|
|
3
3
|
import Resource from "./Resource.js";
|
|
4
4
|
|
|
5
5
|
let defaultKeyCredit;
|
|
6
|
-
const defaultKey = "
|
|
6
|
+
const defaultKey = "AIzaSyCUMejKrafNiN2PiqvWNPxQJBuDRg-VqKQ";
|
|
7
7
|
|
|
8
8
|
/**
|
|
9
9
|
* Default settings for accessing the Google Maps API.
|
package/Source/Core/Ion.js
CHANGED
|
@@ -4,8 +4,7 @@ import Resource from "./Resource.js";
|
|
|
4
4
|
|
|
5
5
|
let defaultTokenCredit;
|
|
6
6
|
const defaultAccessToken =
|
|
7
|
-
"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.
|
|
8
|
-
|
|
7
|
+
"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJhYzVkMTc1ZS00NTRhLTRjY2QtYTQwZS01YmU2Mjg1ODAwN2YiLCJpZCI6MjU5LCJpYXQiOjE2ODgzOTgwMjl9.MZC_HUBRd0y5HJeB-F5QSpT-fEgTM6mI5gMaSND9FHc";
|
|
9
8
|
/**
|
|
10
9
|
* Default settings for accessing the Cesium ion API.
|
|
11
10
|
*
|
|
@@ -54,28 +54,6 @@ Object.defineProperties(TerrainProvider.prototype, {
|
|
|
54
54
|
get: DeveloperError.throwInstantiationError,
|
|
55
55
|
},
|
|
56
56
|
|
|
57
|
-
/**
|
|
58
|
-
* Gets a value indicating whether or not the provider is ready for use.
|
|
59
|
-
* @memberof TerrainProvider.prototype
|
|
60
|
-
* @type {boolean}
|
|
61
|
-
* @readonly
|
|
62
|
-
* @deprecated
|
|
63
|
-
*/
|
|
64
|
-
ready: {
|
|
65
|
-
get: DeveloperError.throwInstantiationError,
|
|
66
|
-
},
|
|
67
|
-
|
|
68
|
-
/**
|
|
69
|
-
* Gets a promise that resolves to true when the provider is ready for use.
|
|
70
|
-
* @memberof TerrainProvider.prototype
|
|
71
|
-
* @type {Promise<boolean>}
|
|
72
|
-
* @readonly
|
|
73
|
-
* @deprecated
|
|
74
|
-
*/
|
|
75
|
-
readyPromise: {
|
|
76
|
-
get: DeveloperError.throwInstantiationError,
|
|
77
|
-
},
|
|
78
|
-
|
|
79
57
|
/**
|
|
80
58
|
* Gets a value indicating whether or not the provider includes a water mask. The water mask
|
|
81
59
|
* indicates which areas of the globe are water rather than land, so they can be rendered
|