Skip to content

Commit 06fecc2

Browse files
authoredMar 8, 2023
Merge pull request #11075 from CesiumGS/imagery-ready-promise
Deprecate ImageryProvider ready promises
2 parents 065c9a6 + ae0792b commit 06fecc2

File tree

76 files changed

+9376
-6557
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+9376
-6557
lines changed
 

‎Apps/CesiumViewer/CesiumViewer.js

+7-6
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
queryToObject,
1212
CzmlDataSource,
1313
GeoJsonDataSource,
14+
ImageryLayer,
1415
KmlDataSource,
1516
GpxDataSource,
1617
Terrain,
@@ -42,15 +43,15 @@ async function main() {
4243
*/
4344
const endUserOptions = queryToObject(window.location.search.substring(1));
4445

45-
let imageryProvider;
46+
let baseLayer;
4647
if (defined(endUserOptions.tmsImageryUrl)) {
47-
imageryProvider = new TileMapServiceImageryProvider({
48-
url: endUserOptions.tmsImageryUrl,
49-
});
48+
baseLayer = ImageryLayer.fromProviderAsync(
49+
TileMapServiceImageryProvider.fromUrl(endUserOptions.tmsImageryUrl)
50+
);
5051
}
5152

5253
const loadingIndicator = document.getElementById("loadingIndicator");
53-
const hasBaseLayerPicker = !defined(imageryProvider);
54+
const hasBaseLayerPicker = !defined(baseLayer);
5455

5556
const terrain = Terrain.fromWorldTerrain({
5657
requestWaterMask: true,
@@ -60,7 +61,7 @@ async function main() {
6061
let viewer;
6162
try {
6263
viewer = new Viewer("cesiumContainer", {
63-
imageryProvider: imageryProvider,
64+
baseLayer: baseLayer,
6465
baseLayerPicker: hasBaseLayerPicker,
6566
scene3DOnly: endUserOptions.scene3DOnly,
6667
requestRenderMode: true,

‎Apps/Sandcastle/gallery/ArcGIS MapServer.html

+5-4
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@
3333
"use strict";
3434
//Sandcastle_Begin
3535
const viewer = new Cesium.Viewer("cesiumContainer", {
36-
imageryProvider: new Cesium.ArcGisMapServerImageryProvider({
37-
url:
38-
"https://services.arcgisonline.com/ArcGIS/rest/services/NatGeo_World_Map/MapServer/",
39-
}),
36+
baseLayer: Cesium.ImageryLayer.fromProviderAsync(
37+
Cesium.ArcGisMapServerImageryProvider.fromUrl(
38+
"https://services.arcgisonline.com/ArcGIS/rest/services/NatGeo_World_Map/MapServer/"
39+
)
40+
),
4041
});
4142
//Sandcastle_End
4243
};

0 commit comments

Comments
 (0)
Please sign in to comment.