Add GeoTiff parsing to ElevationModel and WcsEarthElevationModel

examples/GeoTiffExample.js

@@ -48,14 +48,19 @@ requirejs(['./WorldWindShim',
         // Create a layer manager for controlling layer visibility.
         var layerManager = new LayerManager(wwd);
 
-        var resourcesUrl = "https://worldwind.arc.nasa.gov/web/examples/data/black_sea_rgb.tif";
+        var resourceUrl = "https://worldwind.arc.nasa.gov/web/examples/data/black_sea_rgb.tif";
 
-        var geoTiffObject = new WorldWind.GeoTiffReader(resourcesUrl);
+        // Define a parser completion callback
+        var parserCallback = function (geoTiffReader, xhrStatus) {
+            if (!geoTiffReader) {
+                // Error, provide the status text to the console
+                console.log(xhrStatus);
+                return;
+            }
 
-        var geoTiffImage = geoTiffObject.readAsImage(function (canvas) {
             var surfaceGeoTiff = new WorldWind.SurfaceImage(
-                geoTiffObject.metadata.bbox,
-                new WorldWind.ImageSource(canvas)
+                geoTiffReader.metadata.bbox,
+                new WorldWind.ImageSource(geoTiffReader.getImage())
             );
 
             geoTiffLayer.addRenderable(surfaceGeoTiff);
@@ -67,5 +72,8 @@ requirejs(['./WorldWindShim',
             wwd.redraw();
 
             wwd.goTo(new WorldWind.Position(43.69, 28.54, 55000));
-        });
+        };
+
+        // Load the GeoTiff using the Reader's built in XHR retrieval function
+        WorldWind.GeoTiffReader.retrieveFromUrl(resourceUrl, parserCallback);
     });

karma.conf.js

@@ -18,7 +18,8 @@ module.exports = function(config) {
       'test/test-main.js',
       {pattern: 'test/**/*.test.js', included: false},
       {pattern: 'src/**/*.js', included: false},
-      {pattern: 'examples/data/KML_Samples.kml', included: false}
+      {pattern: 'examples/data/KML_Samples.kml', included: false},
+      {pattern: 'test/formats/geotiff/*.tif', included: false}
     ],
 
 

src/WorldWind.js

@@ -224,6 +224,7 @@ define([ // PLEASE KEEP ALL THIS IN ALPHABETICAL ORDER BY MODULE NAME (not direc
         './geom/Vec3',
         './layer/ViewControlsLayer',
         './formats/kml/util/ViewVolume',
+        './globe/WcsEarthElevationModel',
         './util/WcsTileUrlBuilder',
         './ogc/WfsCapabilities',
         './formats/wkt/Wkt',
@@ -464,6 +465,7 @@ define([ // PLEASE KEEP ALL THIS IN ALPHABETICAL ORDER BY MODULE NAME (not direc
               Vec3,
               ViewControlsLayer,
               ViewVolume,
+              WcsEarthElevationModel,
               WcsTileUrlBuilder,
               WfsCapabilities,
               Wkt,
@@ -873,6 +875,7 @@ define([ // PLEASE KEEP ALL THIS IN ALPHABETICAL ORDER BY MODULE NAME (not direc
         WorldWind['Vec2'] = Vec2;
         WorldWind['Vec3'] = Vec3;
         WorldWind['ViewControlsLayer'] = ViewControlsLayer;
+        WorldWind['WcsEarthElevationModel'] = WcsEarthElevationModel;
         WorldWind['WcsTileUrlBuilder'] = WcsTileUrlBuilder;
         WorldWind['WfsCapabilities'] = WfsCapabilities;
         WorldWind['Wkt'] = Wkt;