Changeset 6510

Timestamp:

Aug 30, 2016 9:06:42 PM (8 years ago)

Author:

ldelgass

Message:

First pass at new protocol for mask layer.

File:

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

geovis/trunk/RendererCmd.cpp

@@ -47 +47 @@
 #include <osgEarthDrivers/wms/WMSOptions>
 #include <osgEarthDrivers/xyz/XYZOptions>
+#include <osgEarthDrivers/mask_feature/FeatureMaskOptions>
 #include <osgEarthDrivers/model_feature_geom/FeatureGeomModelOptions>
 #include <osgEarthDrivers/model_simple/SimpleModelOptions>
@@ -1970 +1971 @@
         }
         g_renderer->addModelLayer(name, geomOpts, pos, cache, lighting, visible);
+    } else if (type[0] == 'm' && strcmp(type, "mask") == 0) {
+        char *driver = Tcl_GetString(objv[5]);
+        char *format = Tcl_GetString(objv[6]);
+        if (format && strlen(format) > 0 &&
+            strcmp(format, "json") != 0 && strcmp(format, "gml") != 0) {
+            Tcl_AppendResult(interp, "unknown format \"", format,
+                             "\": should be 'json' or 'gml'", (char*)NULL);
+            return TCL_ERROR;
+        }
+        char *typeName = Tcl_GetString(objv[7]);
+        osgEarth::Drivers::FeatureMaskOptions maskOpts;
+        std::string url;
+        if (objc > 8) {
+            char *urlIn = Tcl_GetString(objv[8]);
+            url = g_renderer->getCanonicalPath(std::string(urlIn));
+            if (url.empty()) {
+                Tcl_AppendResult(interp, "file not found: \"",
+                                 urlIn, "\"", (char*)NULL);
+                return TCL_ERROR;
+            }
+        }
+        if (driver[0] == 'o' && strcmp(driver, "ogr") == 0) {
+            osgEarth::Drivers::OGRFeatureOptions maskBoundaryOpts;
+            maskBoundaryOpts.url() = url;
+            maskOpts.featureOptions() = maskBoundaryOpts;
+        } else {
+            Tcl_AppendResult(interp, "unknown mask driver \"", driver,
+                             "\": should be 'db', 'ogr', 'tfs', or 'wfs'", (char*)NULL);
+            return TCL_ERROR;
+        }
+        int minLOD = 0;
+        if (objc > 9) {
+            if (Tcl_GetIntFromObj(interp, objv[9], &minLOD) != TCL_OK) {
+                return TCL_ERROR;
+            }
+        }
+        g_renderer->addTerrainMaskLayer(name, maskOpts, (unsigned)minLOD);
     } else if (type[0] == 'm' && strcmp(type, "model") == 0) {
         char *driver = Tcl_GetString(objv[5]);
@@ -2600 +2638 @@
         g_renderer->removeImageLayer(name);
         g_renderer->removeElevationLayer(name);
+        g_renderer->removeTerrainMaskLayer(name);
         g_renderer->removeModelLayer(name);
     } else {
@@ -2657 +2696 @@
         g_renderer->getImageLayerNames(layers);
         g_renderer->getElevationLayerNames(layers);
+        g_renderer->getTerrainMaskLayerNames(layers);
         g_renderer->getModelLayerNames(layers);
     } else {
@@ -2664 +2704 @@
         } else if (type[0] == 'e' && strcmp(type, "elevation") == 0) {
             g_renderer->getElevationLayerNames(layers);
+        } else if (type[0] == 'm' && strcmp(type, "mask") == 0) {
+            g_renderer->getTerrainMaskLayerNames(layers);
         } else if (type[0] == 'm' && strcmp(type, "model") == 0) {
             g_renderer->getModelLayerNames(layers);
         } else {
             Tcl_AppendResult(interp, "uknown type \"", type,
-                         "\": must be image, elevation or model", (char*)NULL);
+                             "\": must be image, elevation, mask or model",
+                             (char*)NULL);
             return TCL_ERROR;
         }