Changeset 4957 for geovis/trunk

Timestamp:

Jan 28, 2015, 4:39:03 PM (10 years ago)

Author:

ldelgass

Message:

Add protocol option to enable/disable disk caching of image layers

Location:

geovis/trunk

Files:

• RenderServer.h (modified) (1 diff)
• Renderer.cpp (modified) (10 diffs)
• Renderer.h (modified) (2 diffs)
• RendererCmd.cpp (modified) (4 diffs)
• geovis_protocol.txt (modified) (1 diff)

geovis/trunk/RenderServer.h

@@ -21 +21 @@
 class Stats;
 
-#define GEOVIS_VERSION_STRING "0.6.0"
+#define GEOVIS_VERSION_STRING "0.6.1"
 
 #define MSECS_ELAPSED(t1, t2) \

geovis/trunk/Renderer.cpp

@@ -34 +34 @@
 #include <osgEarth/FileUtils>
 #include <osgEarth/Cache>
+#include <osgEarth/CachePolicy>
 #include <osgEarthDrivers/cache_filesystem/FileSystemCache>
 #include <osgEarth/MapNode>
@@ -1122 +1123 @@
 bool Renderer::addImageLayer(const char *name,
                              osgEarth::TileSourceOptions& opts,
+                             bool enableCache,
                              bool makeShared,
                              bool visible)
@@ -1139 +1141 @@
     if (makeShared) {
         layerOpts.shared() = true;
+    }
+    if (!enableCache) {
+        TRACE("Disabling cache for layer %s", name);
+        layerOpts.cachePolicy() = osgEarth::CachePolicy(osgEarth::CachePolicy::USAGE_NO_CACHE);
     }
     if (!visible) {
@@ -1241 +1247 @@
 void Renderer::setImageLayerVisibility(const char *name, bool state)
 {
-#if OSGEARTH_MIN_VERSION_REQUIRED(2, 4, 0)
     if (!_map.valid()) {
         ERROR("No map");
@@ -1253 +1258 @@
         TRACE("Image layer not found: %s", name);
     }
-#endif
 }
 
 void Renderer::addElevationLayer(const char *name,
-                                 osgEarth::TileSourceOptions& opts)
+                                 osgEarth::TileSourceOptions& opts,
+                                 bool enableCache,
+                                 bool visible)
 {
     if (!_map.valid()) {
@@ -1268 +1274 @@
     }
     osgEarth::ElevationLayerOptions layerOpts(name, opts);
+    if (!enableCache) {
+        layerOpts.cachePolicy() = osgEarth::CachePolicy(osgEarth::CachePolicy::USAGE_NO_CACHE);
+    }
+    if (!visible) {
+        layerOpts.visible() = false;
+    }
     // XXX: GDAL does not report vertical datum, it should be specified here
     // Common options: geodetic (default), egm96, egm84, egm2008
@@ -1307 +1319 @@
 void Renderer::setElevationLayerVisibility(const char *name, bool state)
 {
-#if OSGEARTH_MIN_VERSION_REQUIRED(2, 4, 0)
     if (!_map.valid()) {
         ERROR("No map");
@@ -1319 +1330 @@
         TRACE("Elevation layer not found: %s", name);
     }
-#endif
 }
 
@@ -1711 +1721 @@
 void Renderer::setModelLayerVisibility(const char *name, bool state)
 {
-#if OSGEARTH_MIN_VERSION_REQUIRED(2, 4, 0)
     if (!_map.valid()) {
         ERROR("No map");
@@ -1723 +1732 @@
         TRACE("Model layer not found: %s", name);
     }
-#endif
 }
 

geovis/trunk/Renderer.h

@@ -216 +216 @@
 
     bool addImageLayer(const char *name, osgEarth::TileSourceOptions& opts,
-                       bool makeShared = false, bool visible = true);
+                       bool enableCache = true, bool makeShared = false,
+                       bool visible = true);
 
     void removeImageLayer(const char *name);
@@ -250 +251 @@
     }
 
-    void addElevationLayer(const char *name, osgEarth::TileSourceOptions& opts);
+    void addElevationLayer(const char *name, osgEarth::TileSourceOptions& opts,
+                           bool enableCache = true, bool visible = true);
 
     void removeElevationLayer(const char *name);

geovis/trunk/RendererCmd.cpp

@@ -956 +956 @@
             }
         }
+        bool cache = true;
+        if (objc > 7) {
+            if (GetBooleanFromObj(interp, objv[6], &cache) != TCL_OK) {
+                return TCL_ERROR;
+            }
+        }
         if (driver[0] == 'd' && strcmp(driver, "debug") == 0) {
             osgEarth::Drivers::DebugOptions opts;
             name = Tcl_GetString(objv[5]);
-            ret = g_renderer->addImageLayer(name, opts);
+            ret = g_renderer->addImageLayer(name, opts, cache);
         } else if (driver[0] == 'g' && strcmp(driver, "gdal") == 0) {
             osgEarth::Drivers::GDALOptions opts;
             opts.url() = url;
-            name = Tcl_GetString(objv[6]);
-            ret = g_renderer->addImageLayer(name, opts);
+            name = Tcl_GetString(objv[7]);
+            ret = g_renderer->addImageLayer(name, opts, cache);
         } else if (driver[0] == 't' && strcmp(driver, "tms") == 0) {
             osgEarth::Drivers::TMSOptions opts;
@@ -972 +978 @@
             //opts.tmsType() = tmsType;
             //opts.format() = format;
-            name = Tcl_GetString(objv[6]);
-            ret = g_renderer->addImageLayer(name, opts);
+            name = Tcl_GetString(objv[7]);
+            ret = g_renderer->addImageLayer(name, opts, cache);
         } else if (driver[0] == 'w' && strcmp(driver, "wms") == 0) {
             osgEarth::Drivers::WMSOptions opts;
-            char *wmsLayers = Tcl_GetString(objv[6]);
-            char *format = Tcl_GetString(objv[7]);
+            char *wmsLayers = Tcl_GetString(objv[7]);
+            char *format = Tcl_GetString(objv[8]);
             bool transparent;
-            if (GetBooleanFromObj(interp, objv[8], &transparent) != TCL_OK) {
+            if (GetBooleanFromObj(interp, objv[9], &transparent) != TCL_OK) {
                 return TCL_ERROR;
             }
@@ -987 +993 @@
             opts.transparent() = transparent;
 
-            name = Tcl_GetString(objv[9]);
-            ret = g_renderer->addImageLayer(name, opts);
+            name = Tcl_GetString(objv[10]);
+            ret = g_renderer->addImageLayer(name, opts, cache);
         } else if (driver[0] == 'x' && strcmp(driver, "xyz") == 0) {
             osgEarth::Drivers::XYZOptions opts;
@@ -996 +1002 @@
             //opts.invertY() = invertY;
             //opts.format() = Tcl_GetString(objv[6]);
-            name = Tcl_GetString(objv[6]);
-            ret = g_renderer->addImageLayer(name, opts);
+            name = Tcl_GetString(objv[7]);
+            ret = g_renderer->addImageLayer(name, opts, cache);
         } else {
             Tcl_AppendResult(interp, "unknown image driver \"", driver,

geovis/trunk/geovis_protocol.txt

@@ -133 +133 @@
 
 Specific image layer types:
-map layer add image gdal <url> <layerName>
+map layer add image gdal <url> <cache> <layerName>
     Add a GDAL image layer from a file or URL
-map layer add image wms <url> <layers> <format> <transparent> <layerName>
+map layer add image wms <url> <cache> <layers> <format> <transparent> <layerName>
     Add a WMS image layer from a URL + layer string
     <url> = URL of WMS service
+    <cache> = bool indicating if tiles should be cached on disk
     <layers> = layers string for WMS server
     <format> = Image format to return (e.g. 'png')
     <transparent> = bool
-map layer add image tms <url> <layerName>
+map layer add image tms <url> <cache> <layerName>
     Add a TMS image layer from a URL
     <url> = URL of TMS service
-map layer add image xyz <urlPattern> <layerName>
+    <cache> = bool indicating if tiles should be cached on disk
+map layer add image xyz <urlPattern> <cache> <layerName>
     Add an image layer from a web map using a template URL
+    <cache> = bool indicating if tiles should be cached on disk
 
 Elevation layers: