Changeset 6489 for geovis

Timestamp:

Aug 18, 2016 12:58:31 AM (8 years ago)

Author:

ldelgass

Message:

Add optional vertialDatum override to add elevation layer protocol.

Location:

geovis/trunk

Files:

• RendererCmd.cpp (modified) (2 diffs)
• geovis_protocol.txt (modified) (1 diff)

geovis/trunk/RendererCmd.cpp

@@ -1699 +1699 @@
         // Options: geodetic (default), egm84, egm96, egm2008
         const char *verticalDatum = NULL;
+        if (objc > 8) {
+            verticalDatum = Tcl_GetString(objv[8]);
+        }
         int minLOD = 0;
         int maxLOD = 23;
@@ -1714 +1717 @@
             osgEarth::Drivers::WCSOptions opts;
             opts.url() = url;
-            if (objc > 8) {
-                opts.identifier() = Tcl_GetString(objv[8]);
-            }
             if (objc > 9) {
+                opts.identifier() = Tcl_GetString(objv[9]);
+            }
+            if (objc > 10) {
                 // default = 'm'
-                opts.elevationUnit() = Tcl_GetString(objv[9]);
-            }
-            if (objc > 10) {
+                opts.elevationUnit() = Tcl_GetString(objv[10]);
+            }
+            if (objc > 11) {
                 // default = 'image/GeoTIFF'
-                opts.format() = Tcl_GetString(objv[10]);
-            }
-            //opts.srs() = Tcl_GetString(objv[11]);
-            //opts.rangeSubset() = Tcl_GetString(objv[12]);
+                opts.format() = Tcl_GetString(objv[11]);
+            }
+            //opts.srs() = Tcl_GetString(objv[12]);
+            //opts.rangeSubset() = Tcl_GetString(objv[13]);
             g_renderer->addElevationLayer(name, opts, pos, cache, visible, verticalDatum, minLOD, maxLOD);
         } else {

geovis/trunk/geovis_protocol.txt

@@ -252 +252 @@
 
 Elevation layers:
-map layer add <layerName> elevation <driver> <url> <?cache?>
+map layer add <layerName> elevation <driver> <url> <?cache?> <?verticalDatum?>
     Add an elevation image layer from a file or URL
     <driver> = gdal|tms|wcs
+    <verticalDatum> = override vertical datum in file.  This is required for
+    the gdal driver if the vertical datum is a geoid (i.e. not geodetic HAE).
 
 Feature/model layers: