Changeset 6488 for geovis/trunk/RendererCmd.cpp

Timestamp:

Aug 17, 2016, 9:00:52 PM (8 years ago)

Author:

ldelgass

Message:

Add verticalDatum override option to addElevationLayer, prep for adding to
protocol.

File:

• geovis/trunk/RendererCmd.cpp (modified) (4 diffs)

geovis/trunk/RendererCmd.cpp

@@ -1696 +1696 @@
             }
         }
+        // GDAL does not report vertical datum
+        // Options: geodetic (default), egm84, egm96, egm2008
+        const char *verticalDatum = NULL;
         int minLOD = 0;
         int maxLOD = 23;
@@ -1701 +1704 @@
             osgEarth::Drivers::GDALOptions opts;
             opts.url() = url;
-            g_renderer->addElevationLayer(name, opts, pos, cache, visible, minLOD, maxLOD);
+            g_renderer->addElevationLayer(name, opts, pos, cache, visible, verticalDatum, minLOD, maxLOD);
         } else if (driver[0] == 't' && strcmp(driver, "tms") == 0) {
             osgEarth::Drivers::TMSOptions opts;
@@ -1707 +1710 @@
             //opts.tmsType() = Tcl_GetString(objv[8]);
             //opts.format() = Tcl_GetString(objv[9]);
-            g_renderer->addElevationLayer(name, opts, pos, cache, visible, minLOD, maxLOD);
+            g_renderer->addElevationLayer(name, opts, pos, cache, visible, verticalDatum, minLOD, maxLOD);
         } else if (driver[0] == 'w' && strcmp(driver, "wcs") == 0) {
             osgEarth::Drivers::WCSOptions opts;
@@ -1724 +1727 @@
             //opts.srs() = Tcl_GetString(objv[11]);
             //opts.rangeSubset() = Tcl_GetString(objv[12]);
-            g_renderer->addElevationLayer(name, opts, pos, cache, visible, minLOD, maxLOD);
+            g_renderer->addElevationLayer(name, opts, pos, cache, visible, verticalDatum, minLOD, maxLOD);
         } else {
             Tcl_AppendResult(interp, "unknown elevation driver \"", driver,