Changeset 6511 for geovis

Timestamp:

Aug 30, 2016 10:04:22 PM (8 years ago)

Author:

ldelgass

Message:

Add method to compute extent of terrain mask layer.

Location:

geovis/trunk

Files:

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

geovis/trunk/Renderer.cpp

@@ -2555 +2555 @@
             }
             TRACE("Image layer %s srs: %s extent: %g %g %g %g",
-                 name, ext.getSRS() ? ext.getSRS()->getName().c_str() : "nil",
-                 ext.xMin(), ext.yMin(), ext.xMax(), ext.yMax());
+                  name, ext.getSRS() ? ext.getSRS()->getName().c_str() : "nil",
+                  ext.xMin(), ext.yMin(), ext.xMax(), ext.yMax());
             return true;
         }
@@ -2580 +2580 @@
             }
             TRACE("Elevation Layer %s srs: %s extent: %g %g %g %g",
-                 name, ext.getSRS() ? ext.getSRS()->getName().c_str() : "nil",
-                 ext.xMin(), ext.yMin(), ext.xMax(), ext.yMax());
+                  name, ext.getSRS() ? ext.getSRS()->getName().c_str() : "nil",
+                  ext.xMin(), ext.yMin(), ext.xMax(), ext.yMax());
             return true;
         }
     } else {
         TRACE("Elevation layer not found: %s", name);
+    }
+    return false;
+}
+
+bool Renderer::getTerrainMaskLayerExtent(const char *name, osgEarth::GeoExtent &ext)
+{
+    if (!_map.valid()) {
+        ERROR("No map");
+        return false;
+    }
+    osgEarth::MaskLayer *layer = getTerrainMaskLayerByName(name);
+    if (layer != NULL) {
+        const osgEarth::SpatialReference *srs = getMapSRS();
+        osgEarth::GeoExtent newExt(srs);
+        osg::Vec3dArray *polypts = layer->getOrCreateMaskBoundary(1.0f, srs, NULL);
+        if (polypts) {
+            for (size_t i = 0; i < polypts->size(); i++) {
+                osg::Vec3d pt = (*polypts)[i];
+                newExt.expandToInclude(pt);
+            }
+        }
+        if (!newExt.isValid()) {
+            ERROR("Couldn't find extent of layer %s", name);
+            return false;
+        }
+        ext = newExt;
+        TRACE("Mask Layer %s srs: %s extent: %g %g %g %g",
+              name, ext.getSRS() ? ext.getSRS()->getName().c_str() : "nil",
+              ext.xMin(), ext.yMin(), ext.xMax(), ext.yMax());
+        return true;
+    } else {
+        TRACE("Terrain mask layer not found: %s", name);
     }
     return false;
@@ -2612 +2644 @@
             }
             TRACE("Model Layer %s srs: %s extent: %g %g %g %g",
-                 name, ext.getSRS() ? ext.getSRS()->getName().c_str() : "nil",
-                 ext.xMin(), ext.yMin(), ext.xMax(), ext.yMax());
+                  name, ext.getSRS() ? ext.getSRS()->getName().c_str() : "nil",
+                  ext.xMin(), ext.yMin(), ext.xMax(), ext.yMax());
             return true;
         }

geovis/trunk/Renderer.h

@@ -251 +251 @@
     }
 
-    void getImageLayerNames(std::vector<std::string>& names)
+    void getImageLayerNames(std::vector<std::string>& names) const
     {
         if (_map.valid()) {
@@ -299 +299 @@
     }
 
-    void getElevationLayerNames(std::vector<std::string>& names)
+    void getElevationLayerNames(std::vector<std::string>& names) const
     {
         if (_map.valid()) {
@@ -377 +377 @@
     void removeTerrainMaskLayer(const char *name);
 
+    bool getTerrainMaskLayerExtent(const char *name, osgEarth::GeoExtent &ext);
+
     // Model layers
 
@@ -384 +386 @@
     }
 
-    void getModelLayerNames(std::vector<std::string>& names)
+    void getModelLayerNames(std::vector<std::string>& names) const
     {
         if (_map.valid()) {

geovis/trunk/RendererCmd.cpp

@@ -606 +606 @@
         return TCL_OK;
     } else if (g_renderer->getElevationLayerExtent(name, ext)) {
+        g_renderer->setViewpointFromExtent(ext, duration);
+        return TCL_OK;
+    } else if (g_renderer->getTerrainMaskLayerExtent(name, ext)) {
         g_renderer->setViewpointFromExtent(ext, duration);
         return TCL_OK;