Changeset 6488 for geovis

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.

Location:

geovis/trunk

Files:

• Renderer.cpp (modified) (2 diffs)
• Renderer.h (modified) (1 diff)
• RendererCmd.cpp (modified) (4 diffs)

geovis/trunk/Renderer.cpp

@@ -1479 +1479 @@
                                  bool enableCache,
                                  bool visible,
+                                 const char *verticalDatum,
                                  unsigned int minLOD, unsigned int maxLOD)
 {
@@ -1496 +1497 @@
         layerOpts.visible() = false;
     }
+    // Check for vertical datum override (required for GDAL driver if not using
+    // geodetic HAE).
+    if (verticalDatum != NULL && strlen(verticalDatum) > 0) {
+        layerOpts.verticalDatum() = verticalDatum;
+    }
     layerOpts.minLevel() = minLOD;
     layerOpts.maxLevel() = maxLOD;
-    // XXX: GDAL does not report vertical datum, it should be specified here
-    // Common options: geodetic (default), egm96, egm84, egm2008
-    //layerOpts.verticalDatum() = "egm96";
     osgEarth::ElevationLayer *layer = new osgEarth::ElevationLayer(layerOpts);
     _map->addElevationLayer(layer);

geovis/trunk/Renderer.h

@@ -316 +316 @@
                            bool enableCache = true,
                            bool visible = true,
+                           const char *verticalDatum = NULL,
                            unsigned int minLOD = 0,
                            unsigned int maxLOD = 23);

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,