diff --git a/Apps/Sandcastle/gallery/ArcticDEM.html b/Apps/Sandcastle/gallery/ArcticDEM.html
index ef1a79acdff3..a3c10a68e835 100644
--- a/Apps/Sandcastle/gallery/ArcticDEM.html
+++ b/Apps/Sandcastle/gallery/ArcticDEM.html
@@ -4,8 +4,8 @@
-
-
+
+
Cesium Demo
@@ -27,66 +27,64 @@
function startup(Cesium) {
'use strict';
//Sandcastle_Begin
+// High-resolution arctic terrain from the Arctic DEM project (Release 4), tiled and hosted by Cesium ion.
+// https://www.pgc.umn.edu/data/arcticdem/
var viewer = new Cesium.Viewer('cesiumContainer', {
- // Load ArcticDEM terrain
terrainProvider: new Cesium.CesiumTerrainProvider({
- url: 'https://assets.agi.com/stk-terrain/v1/tilesets/ArticDEM/tiles',
- requestWaterMask: true,
- requestVertexNormals: true
+ url: Cesium.IonResource.fromAssetId(3956)
})
});
// Add Alaskan locations
Sandcastle.addDefaultToolbarMenu([{
- text : 'Denali',
- onselect : function() {
+ text: 'Denali',
+ onselect: function() {
viewer.scene.camera.flyTo({
- destination : Cesium.Cartesian3.fromRadians(-2.6399828792482234, 1.0993550795541742, 5795),
- orientation : {
- heading : 3.8455,
- pitch : -0.4535,
- roll : 0.0
+ destination: Cesium.Cartesian3.fromRadians(-2.6399828792482234, 1.0993550795541742, 5795),
+ orientation: {
+ heading: 3.8455,
+ pitch: -0.4535,
+ roll: 0.0
}
});
}
}, {
- text : 'Anchorage Area',
- onselect : function() {
+ text: 'Anchorage Area',
+ onselect: function() {
viewer.scene.camera.flyTo({
- destination : Cesium.Cartesian3.fromRadians(-2.610708034601548, 1.0671172431736584, 1900),
- orientation : {
- heading : 4.6,
- pitch : -0.341,
- roll : 0.0
+ destination: Cesium.Cartesian3.fromRadians(-2.610708034601548, 1.0671172431736584, 1900),
+ orientation: {
+ heading: 4.6,
+ pitch: -0.341,
+ roll: 0.0
}
});
}
}, {
- text : 'Peaks',
- onselect : function() {
+ text: 'Peaks',
+ onselect: function() {
viewer.scene.camera.flyTo({
- destination : Cesium.Cartesian3.fromRadians(-2.6928866820212813, 1.072394255273859, 3700),
- orientation : {
- heading : 1.6308222948889464,
- pitch : -0.6473480165020193,
- roll : 0.0
+ destination: Cesium.Cartesian3.fromRadians(-2.6928866820212813, 1.072394255273859, 3700),
+ orientation: {
+ heading: 1.6308222948889464,
+ pitch: -0.6473480165020193,
+ roll: 0.0
}
});
}
}, {
- text : 'Riverbed',
- onselect : function() {
+ text: 'Riverbed',
+ onselect: function() {
viewer.scene.camera.flyTo({
- destination : Cesium.Cartesian3.fromRadians(-2.6395623497608596, 1.0976443174490356, 2070),
- orientation : {
- heading : 6.068794108659519,
- pitch : -0.08514161789475816,
- roll : 0.0
+ destination: Cesium.Cartesian3.fromRadians(-2.6395623497608596, 1.0976443174490356, 2070),
+ orientation: {
+ heading: 6.068794108659519,
+ pitch: -0.08514161789475816,
+ roll: 0.0
}
});
}
}], 'toolbar');
-
//Sandcastle_End
Sandcastle.finishedLoading();
}
diff --git a/Apps/Sandcastle/gallery/ArcticDEM.jpg b/Apps/Sandcastle/gallery/ArcticDEM.jpg
index 12241d04d90b..907dedc885ba 100644
Binary files a/Apps/Sandcastle/gallery/ArcticDEM.jpg and b/Apps/Sandcastle/gallery/ArcticDEM.jpg differ
diff --git a/Apps/Sandcastle/gallery/Blue Marble.html b/Apps/Sandcastle/gallery/Blue Marble.html
new file mode 100644
index 000000000000..ebbaba72154c
--- /dev/null
+++ b/Apps/Sandcastle/gallery/Blue Marble.html
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+ Cesium Demo
+
+
+
+
+
+
+
+Loading...
+
+
+
+
diff --git a/Apps/Sandcastle/gallery/Blue Marble.jpg b/Apps/Sandcastle/gallery/Blue Marble.jpg
new file mode 100644
index 000000000000..647f20dcf8d2
Binary files /dev/null and b/Apps/Sandcastle/gallery/Blue Marble.jpg differ
diff --git a/Apps/Sandcastle/gallery/Cesium World Terrain.html b/Apps/Sandcastle/gallery/Cesium World Terrain.html
new file mode 100644
index 000000000000..03d7dd1aa81a
--- /dev/null
+++ b/Apps/Sandcastle/gallery/Cesium World Terrain.html
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+ Cesium Demo
+
+
+
+
+
+
+
+Loading...
+
+
+
+
diff --git a/Apps/Sandcastle/gallery/Cesium World Terrain.jpg b/Apps/Sandcastle/gallery/Cesium World Terrain.jpg
new file mode 100644
index 000000000000..71bad75a3f19
Binary files /dev/null and b/Apps/Sandcastle/gallery/Cesium World Terrain.jpg differ
diff --git a/Apps/Sandcastle/gallery/Earth at Night.html b/Apps/Sandcastle/gallery/Earth at Night.html
new file mode 100644
index 000000000000..fc24182fc2ec
--- /dev/null
+++ b/Apps/Sandcastle/gallery/Earth at Night.html
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+ Cesium Demo
+
+
+
+
+
+
+
+Loading...
+
+
+
+
diff --git a/Apps/Sandcastle/gallery/Earth at Night.jpg b/Apps/Sandcastle/gallery/Earth at Night.jpg
new file mode 100644
index 000000000000..4a0a0b24a922
Binary files /dev/null and b/Apps/Sandcastle/gallery/Earth at Night.jpg differ
diff --git a/Apps/Sandcastle/gallery/Google Earth Enterprise.jpg b/Apps/Sandcastle/gallery/Google Earth Enterprise.jpg
index 5d635cf88088..6b8f7b7f0200 100644
Binary files a/Apps/Sandcastle/gallery/Google Earth Enterprise.jpg and b/Apps/Sandcastle/gallery/Google Earth Enterprise.jpg differ
diff --git a/Apps/Sandcastle/gallery/Imagery Layers Split.html b/Apps/Sandcastle/gallery/Imagery Layers Split.html
index 2ea5e9fefb00..6da53ef94797 100644
--- a/Apps/Sandcastle/gallery/Imagery Layers Split.html
+++ b/Apps/Sandcastle/gallery/Imagery Layers Split.html
@@ -58,12 +58,8 @@
});
var layers = viewer.imageryLayers;
-var blackMarble = layers.addImageryProvider(Cesium.createTileMapServiceImageryProvider({
- url : 'https://cesiumjs.org/blackmarble',
- credit : 'Black Marble imagery courtesy NASA Earth Observatory',
- flipXY : true // Only old gdal2tile.py generated tilesets need this flag.
-}));
-blackMarble.splitDirection = Cesium.ImagerySplitDirection.LEFT; // Only show to the left of the slider.
+var earthAtNight = layers.addImageryProvider(new Cesium.IonImageryProvider({ assetId: 3812 }));
+earthAtNight.splitDirection = Cesium.ImagerySplitDirection.LEFT; // Only show to the left of the slider.
// Sync the position of the slider with the split position
var slider = document.getElementById('slider');
diff --git a/Apps/Sandcastle/gallery/Imagery Layers.html b/Apps/Sandcastle/gallery/Imagery Layers.html
index 524d60262158..643dd7ea3ca1 100644
--- a/Apps/Sandcastle/gallery/Imagery Layers.html
+++ b/Apps/Sandcastle/gallery/Imagery Layers.html
@@ -35,13 +35,9 @@
});
var layers = viewer.imageryLayers;
-var blackMarble = layers.addImageryProvider(Cesium.createTileMapServiceImageryProvider({
- url : 'https://cesiumjs.org/blackmarble',
- credit : 'Black Marble imagery courtesy NASA Earth Observatory',
- flipXY : true // Only old gdal2tile.py generated tilesets need this flag.
-}));
-blackMarble.alpha = 0.5;
-blackMarble.brightness = 2.0;
+var earthAtNight = layers.addImageryProvider(new Cesium.IonImageryProvider({ assetId: 3812 }));
+earthAtNight.alpha = 0.5;
+earthAtNight.brightness = 2.0;
layers.addImageryProvider(new Cesium.SingleTileImageryProvider({
url : '../images/Cesium_Logo_overlay.png',
diff --git a/Apps/Sandcastle/gallery/Natural Earth II.html b/Apps/Sandcastle/gallery/Natural Earth II.html
new file mode 100644
index 000000000000..3f7db4c8ae97
--- /dev/null
+++ b/Apps/Sandcastle/gallery/Natural Earth II.html
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+ Cesium Demo
+
+
+
+
+
+
+
+Loading...
+
+
+
+
diff --git a/Apps/Sandcastle/gallery/Natural Earth II.jpg b/Apps/Sandcastle/gallery/Natural Earth II.jpg
new file mode 100644
index 000000000000..12fc684764ef
Binary files /dev/null and b/Apps/Sandcastle/gallery/Natural Earth II.jpg differ
diff --git a/Apps/Sandcastle/gallery/PATerrain.html b/Apps/Sandcastle/gallery/PAMAP Terrain.html
similarity index 90%
rename from Apps/Sandcastle/gallery/PATerrain.html
rename to Apps/Sandcastle/gallery/PAMAP Terrain.html
index 1ed736193b7a..61e775de5fb3 100644
--- a/Apps/Sandcastle/gallery/PATerrain.html
+++ b/Apps/Sandcastle/gallery/PAMAP Terrain.html
@@ -4,8 +4,8 @@
-
-
+
+
Cesium Demo
@@ -27,12 +27,11 @@
function startup(Cesium) {
'use strict';
//Sandcastle_Begin
+// High resolution terrain of Pennsylvania curated by Pennsylvania Spatial Data Access (PASDA)
+// http://www.pasda.psu.edu/
var viewer = new Cesium.Viewer('cesiumContainer', {
- // Load PA terrain
terrainProvider: new Cesium.CesiumTerrainProvider({
- url: 'https://assets.agi.com/stk-terrain/v1/tilesets/PAMAP/tiles',
- requestWaterMask: true,
- requestVertexNormals: true
+ url: Cesium.IonResource.fromAssetId(3957)
})
});
@@ -98,7 +97,6 @@
});
}
}], 'toolbar');
-
//Sandcastle_End
Sandcastle.finishedLoading();
}
diff --git a/Apps/Sandcastle/gallery/PATerrain.jpg b/Apps/Sandcastle/gallery/PAMAP Terrain.jpg
similarity index 100%
rename from Apps/Sandcastle/gallery/PATerrain.jpg
rename to Apps/Sandcastle/gallery/PAMAP Terrain.jpg
diff --git a/Apps/Sandcastle/gallery/Sentinel-2.html b/Apps/Sandcastle/gallery/Sentinel-2.html
new file mode 100644
index 000000000000..37f7007681f3
--- /dev/null
+++ b/Apps/Sandcastle/gallery/Sentinel-2.html
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+ Cesium Demo
+
+
+
+
+
+
+
+Loading...
+
+
+
+
diff --git a/Apps/Sandcastle/gallery/Sentinel-2.jpg b/Apps/Sandcastle/gallery/Sentinel-2.jpg
new file mode 100644
index 000000000000..6090323f0352
Binary files /dev/null and b/Apps/Sandcastle/gallery/Sentinel-2.jpg differ
diff --git a/Apps/Sandcastle/gallery/Washington DC 2017.html b/Apps/Sandcastle/gallery/Washington DC 2017.html
new file mode 100644
index 000000000000..24ce8601dfc9
--- /dev/null
+++ b/Apps/Sandcastle/gallery/Washington DC 2017.html
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+ Cesium Demo
+
+
+
+
+
+
+
+Loading...
+
+
+
+
diff --git a/Apps/Sandcastle/gallery/Washington DC 2017.jpg b/Apps/Sandcastle/gallery/Washington DC 2017.jpg
new file mode 100644
index 000000000000..4ada1af2ec21
Binary files /dev/null and b/Apps/Sandcastle/gallery/Washington DC 2017.jpg differ
diff --git a/Source/Widgets/BaseLayerPicker/BaseLayerPicker.js b/Source/Widgets/BaseLayerPicker/BaseLayerPicker.js
index 9d94976d8833..99de39cc9229 100644
--- a/Source/Widgets/BaseLayerPicker/BaseLayerPicker.js
+++ b/Source/Widgets/BaseLayerPicker/BaseLayerPicker.js
@@ -66,16 +66,12 @@ define([
* }));
*
* imageryViewModels.push(new Cesium.ProviderViewModel({
- * name : 'Black Marble',
+ * name : 'Earth at Night',
* iconUrl : Cesium.buildModuleUrl('Widgets/Images/ImageryProviders/blackMarble.png'),
* tooltip : 'The lights of cities and villages trace the outlines of civilization \
* in this global view of the Earth at night as seen by NASA/NOAA\'s Suomi NPP satellite.',
* creationFunction : function() {
- * return Cesium.createTileMapServiceImageryProvider({
- * url : 'https://cesiumjs.org/blackmarble',
- * credit : 'Black Marble imagery courtesy NASA Earth Observatory',
- * flipXY : true
- * });
+ * return new Cesium.IonImageryProvider({ assetId: 3812 });
* }
* }));
*
diff --git a/Source/Widgets/BaseLayerPicker/createDefaultImageryProviderViewModels.js b/Source/Widgets/BaseLayerPicker/createDefaultImageryProviderViewModels.js
index 4ee11ebfbd9d..d8b87b38a1f0 100644
--- a/Source/Widgets/BaseLayerPicker/createDefaultImageryProviderViewModels.js
+++ b/Source/Widgets/BaseLayerPicker/createDefaultImageryProviderViewModels.js
@@ -5,6 +5,7 @@ define([
'../../Scene/BingMapsStyle',
'../../Scene/createOpenStreetMapImageryProvider',
'../../Scene/createTileMapServiceImageryProvider',
+ '../../Scene/IonImageryProvider',
'../../Scene/MapboxImageryProvider',
'../BaseLayerPicker/ProviderViewModel'
], function(
@@ -14,6 +15,7 @@ define([
BingMapsStyle,
createOpenStreetMapImageryProvider,
createTileMapServiceImageryProvider,
+ IonImageryProvider,
MapboxImageryProvider,
ProviderViewModel) {
'use strict';
@@ -180,16 +182,29 @@ area washes and organic edges over a paper texture to add warm pop to any map.\n
}));
providerViewModels.push(new ProviderViewModel({
- name : 'The Black Marble',
- iconUrl : buildModuleUrl('Widgets/Images/ImageryProviders/blackMarble.png'),
- tooltip : 'The lights of cities and villages trace the outlines of civilization in this global view of the \
-Earth at night as seen by NASA/NOAA\'s Suomi NPP satellite.',
+ name : 'Sentinel-2',
+ iconUrl : buildModuleUrl('Widgets/Images/ImageryProviders/sentinel-2.png'),
+ tooltip : 'Sentinel-2 cloudless by EOX IT Services GmbH (Contains modified Copernicus Sentinel data 2016 and 2017).',
creationFunction : function() {
- return createTileMapServiceImageryProvider({
- url : 'https://cesiumjs.org/blackmarble',
- flipXY : true,
- credit : 'Black Marble imagery courtesy NASA Earth Observatory'
- });
+ return new IonImageryProvider({ assetId: 3954 });
+ }
+ }));
+
+ providerViewModels.push(new ProviderViewModel({
+ name : 'Blue Marble',
+ iconUrl : buildModuleUrl('Widgets/Images/ImageryProviders/blueMarble.png'),
+ tooltip : 'Blue Marble Next Generation July, 2004 imagery from NASA.',
+ creationFunction : function() {
+ return new IonImageryProvider({ assetId: 3845 });
+ }
+ }));
+
+ providerViewModels.push(new ProviderViewModel({
+ name : 'Earth at night',
+ iconUrl : buildModuleUrl('Widgets/Images/ImageryProviders/earthAtNight.png'),
+ tooltip : 'The Earth at night, also known as The Black Marble, is a 500 meter resolution global composite imagery layer released by NASA.',
+ creationFunction : function() {
+ return new IonImageryProvider({ assetId: 3812 });
}
}));
diff --git a/Source/Widgets/Images/ImageryProviders/blueMarble.png b/Source/Widgets/Images/ImageryProviders/blueMarble.png
new file mode 100644
index 000000000000..b8b5b7b1a19f
Binary files /dev/null and b/Source/Widgets/Images/ImageryProviders/blueMarble.png differ
diff --git a/Source/Widgets/Images/ImageryProviders/blackMarble.png b/Source/Widgets/Images/ImageryProviders/earthAtNight.png
similarity index 100%
rename from Source/Widgets/Images/ImageryProviders/blackMarble.png
rename to Source/Widgets/Images/ImageryProviders/earthAtNight.png
diff --git a/Source/Widgets/Images/ImageryProviders/sentinel-2.png b/Source/Widgets/Images/ImageryProviders/sentinel-2.png
new file mode 100644
index 000000000000..775fb38ce12a
Binary files /dev/null and b/Source/Widgets/Images/ImageryProviders/sentinel-2.png differ