archive-gh-me/WebWorldWind
1
0
Fork 0
mirror of https://github.com/NASAWorldWind/WebWorldWind.git synced 2026-01-25 15:23:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/develop' into release/0.9.0

Browse Source
This commit is contained in:
David Collins 2017-11-22 09:11:50 -08:00
commit 3bb52ca285
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/BlueMarbleTimeSeries.js
View File

@ -31,8 +31,8 @@ requirejs(['./WorldWindShim',
backgroundLayer.hide = true; // Don't show it in the layer manager.
wwd.addLayer(backgroundLayer);
// Create the Blue Marble time series layer.
var blueMarbleTimeSeries = new WorldWind.BMNGRestLayer(null);
// Create the Blue Marble time series layer using REST tiles hosted at worldwind32.arc.nasa.gov.
var blueMarbleTimeSeries = new WorldWind.BMNGRestLayer("https://worldwind32.arc.nasa.gov/standalonedata/Earth/BlueMarble256");
blueMarbleTimeSeries.enabled = false;
blueMarbleTimeSeries.showSpinner = true;

4
examples/LayerManager.js
View File

@ -88,9 +88,9 @@ define(function () {
} else if (projectionName === "South UPS") {
this.flatGlobe.projection = new WorldWind.ProjectionUPS("South");
} else if (projectionName === "North Gnomonic") {
this.flatGlobe.projection = new WorldWind.ProjectionUPS("North");
this.flatGlobe.projection = new WorldWind.ProjectionGnomonic("North");
} else if (projectionName === "South Gnomonic") {
this.flatGlobe.projection = new WorldWind.ProjectionUPS("South");
this.flatGlobe.projection = new WorldWind.ProjectionGnomonic("South");
}
if (this.wwd.globe !== this.flatGlobe) {

23
src/layer/BMNGRestLayer.js
View File

@ -59,7 +59,14 @@ define([
*/
this.time = initialTime || new Date("2004-01");
this.pickEnabled = false;
// Intentionally not documented.
this.timeSequence = new PeriodicTimeSequence("2004-01-01/2004-12-01/P1M");
// Intentionally not documented.
this.serverAddress = serverAddress;
// Intentionally not documented.
this.pathToData = pathToData;
// Intentionally not documented.
this.layers = {}; // holds the layers as they're created.
@ -79,10 +86,8 @@ define([
{month: "BlueMarble-200411", time: BMNGRestLayer.availableTimes[10]},
{month: "BlueMarble-200412", time: BMNGRestLayer.availableTimes[11]}
];
this.timeSequence = new PeriodicTimeSequence("2004-01-01/2004-12-01/P1M");
this.serverAddress = serverAddress;
this.pathToData = pathToData;
this.pickEnabled = false;
};
BMNGRestLayer.prototype = Object.create(Layer.prototype);
@ -177,8 +182,14 @@ define([
};
BMNGRestLayer.prototype.createSubLayer = function (layerName) {
var dataPath = this.pathToData + layerName;
this.layers[layerName] = new RestTiledImageLayer(this.serverAddress, dataPath, this.displayName);
var subLayerPath = "";
if (this.pathToData) {
subLayerPath = this.pathToData + "/" + layerName;
} else {
subLayerPath = layerName;
}
this.layers[layerName] = new RestTiledImageLayer(this.serverAddress, subLayerPath, this.displayName);
};
// Intentionally not documented.