Changeset 5882

Timestamp:

Sep 23, 2015 2:34:40 PM (9 years ago)

Author:

ldelgass

Message:

Initial support for generic feature layer with styles, scripts and selectors.

File:

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

geovis/trunk/RendererCmd.cpp

@@ -26 +26 @@
 #include <osgEarth/Registry>
 #include <osgEarth/Units>
+#include <osgEarth/Config>
 #include <osgEarthFeatures/FeatureModelSource>
 #include <osgEarthSymbology/Color>
@@ -1438 +1439 @@
             return TCL_ERROR;
         }
+    } else if (type[0] == 'f' && strcmp(type, "feature") == 0) {
+        // Generic feature geometry layer
+        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]);
+        char *urlIn = Tcl_GetString(objv[8]);
+        std::string url = g_renderer->getCanonicalPath(std::string(urlIn));
+        if (url.empty()) {
+            Tcl_AppendResult(interp, "file not found: \"",
+                             urlIn, "\"", (char*)NULL);
+            return TCL_ERROR;
+        }
+        if (GetBooleanFromObj(interp, objv[9], &cache) != TCL_OK) {
+            return TCL_ERROR;
+        }
+
+        bool lighting = true;
+        osgEarth::Drivers::FeatureGeomModelOptions geomOpts;
+        osgEarth::Config styleConf("style", Tcl_GetString(objv[10]));
+        styleConf.add("type", "text/css");
+        INFO("style CSS: %s", styleConf.value().c_str());
+        osgEarth::Config stylesheetConf;
+        stylesheetConf.add(styleConf);
+        geomOpts.styles() = new osgEarth::Symbology::StyleSheet(stylesheetConf);
+
+        if (objc > 11) {
+            std::string scripts(Tcl_GetString(objv[11]));
+            if (!scripts.empty()) {
+                INFO("script: %s", scripts.c_str());
+                osg::ref_ptr<osgEarth::Symbology::StyleSheet::ScriptDef> scriptDef = 
+                    new osgEarth::Symbology::StyleSheet::ScriptDef(scripts);
+                geomOpts.styles()->setScript(scriptDef.get());
+            } else {
+                INFO("no script");
+            }
+        }
+        if (objc > 12) {
+            int numSelectors;
+            Tcl_Obj **selectors;
+            if (Tcl_ListObjGetElements(interp, objv[12], &numSelectors, &selectors) != TCL_OK) {
+                return TCL_ERROR;
+            }
+            for (int i = 0; i < numSelectors; i++) {
+                int numFields;
+                Tcl_Obj **fields;
+                if (Tcl_ListObjGetElements(interp, selectors[i], &numFields, &fields) != TCL_OK ||
+                    numFields % 2 != 0) {
+                    return TCL_ERROR;
+                }
+                std::map<std::string, std::string> fieldMap;
+                std::map<std::string, std::string>::iterator itr;
+                for (int f = 0; f < numFields; f+=2) {
+                    char *name = Tcl_GetString(fields[f]);
+                    char *value = Tcl_GetString(fields[f+1]);
+                    fieldMap[name] = value;
+                    INFO("selector[%s] = %s", name, value);
+                }
+                osgEarth::Symbology::StyleSelector ss;
+                itr = fieldMap.find("name");
+                if (itr != fieldMap.end()) {
+                    ss.name() = itr->second;
+                }
+                itr = fieldMap.find("style");
+                if (itr != fieldMap.end()) {
+                    ss.styleName() = itr->second;
+                }
+                itr = fieldMap.find("styleExpression");
+                if (itr != fieldMap.end()) {
+                    INFO("selector: %s", itr->second.c_str());
+                    ss.styleExpression() = osgEarth::Symbology::StringExpression(itr->second);
+                }
+                itr = fieldMap.find("query");
+                if (itr != fieldMap.end()) {
+                    osgEarth::Symbology::Query query;
+                    query.expression() = itr->second;
+                    itr = fieldMap.find("queryOrderBy");
+                    if (itr != fieldMap.end()) {
+                        query.orderby() = itr->second;
+                    }
+                    itr = fieldMap.find("queryBounds");
+                    if (itr !=  fieldMap.end()) {
+                        double xmin, ymin, xmax, ymax;
+                        if (sscanf(itr->second.c_str(), "%lf %lf %lf %lf", &xmin, &ymin, &xmax, &ymax) != 4) {
+                            return TCL_ERROR;
+                        }
+                        INFO("query bounds: %g %g %g %g", xmin, ymin, xmax, ymax);
+                        query.bounds() = osgEarth::Bounds(xmin, ymin, xmax, ymax);
+                    }
+                    ss.query() = query;
+                }
+                geomOpts.styles()->selectors().push_back(ss);
+            }
+        }
+        geomOpts.enableLighting() = lighting;
+        geomOpts.minRange() = 0.f;
+        geomOpts.maxRange() = FLT_MAX;
+        if (objc > 13) {
+            float min, max;
+            if (GetFloatFromObj(interp, objv[13], &min) != TCL_OK ||
+                GetFloatFromObj(interp, objv[14], &max) != TCL_OK) {
+                return TCL_ERROR;
+            }
+            geomOpts.minRange() = min;
+            geomOpts.maxRange() = max;
+        }
+        if (driver[0] == 'o' && strcmp(driver, "ogr") == 0) {
+            osgEarth::Drivers::OGRFeatureOptions opts;
+            if (osgDB::getLowerCaseFileExtension(url) == "csv") {
+                url = loadCSVLayer(url.c_str());
+            }
+            opts.url() = url;
+            geomOpts.featureOptions() = opts;
+        } else if (driver[0] == 't' && strcmp(driver, "tfs") == 0) {
+            osgEarth::Drivers::TFSFeatureOptions opts;
+            opts.url() = url;
+            opts.format() = format;
+            geomOpts.featureOptions() = opts;
+        } else if (driver[0] == 'w' && strcmp(driver, "wfs") == 0) {
+            osgEarth::Drivers::WFSFeatureOptions opts;
+            opts.url() = url;
+            opts.outputFormat() = format;
+            opts.typeName() = typeName;
+            geomOpts.featureOptions() = opts;
+        } else {
+            Tcl_AppendResult(interp, "unknown feature driver \"", driver,
+                             "\": should be 'ogr', 'tfs', or 'wfs'", (char*)NULL);
+            return TCL_ERROR;
+        }
+        g_renderer->addModelLayer(name, geomOpts, cache, lighting, visible);
     } else if (type[0] == 'i' && strcmp(type, "icon") == 0) {
         char *driver = Tcl_GetString(objv[5]);
@@ -1497 +1633 @@
         alt->technique() = osgEarth::Symbology::AltitudeSymbol::TECHNIQUE_DRAPE;
         //alt->technique() = osgEarth::Symbology::AltitudeSymbol::TECHNIQUE_GPU;
+        //alt->verticalOffset() = osgEarth::Symbology::NumericExpression();
+        //alt->verticalScale() = osgEarth::Symbology::NumericExpression();
 #endif
 #ifdef USE_DEPTH_OFFSET
@@ -1593 +1731 @@
         alt->clamping() = clamping;
         alt->technique() = technique;
+        //alt->verticalOffset() = osgEarth::Symbology::NumericExpression();
+        //alt->verticalScale() = osgEarth::Symbology::NumericExpression();
 
 #if 1 || defined(USE_DEPTH_OFFSET)
@@ -1710 +1850 @@
         alt->clamping() = clamping;
         alt->technique() = technique;
+        //alt->verticalOffset() = osgEarth::Symbology::NumericExpression();
+        //alt->verticalScale() = osgEarth::Symbology::NumericExpression();
 
 #if 1 || defined(USE_DEPTH_OFFSET)
@@ -1834 +1976 @@
         alt->clamping() = clamping;
         alt->technique() = technique;
+        //alt->clampingResolution() = 1.0f;
+        //alt->binding() = osgEarth::Symbology::AltitudeSymbol::BINDING_VERTEX; //BINDING_CENTROID
+        //alt->verticalOffset() = osgEarth::Symbology::NumericExpression();
+        //alt->verticalScale() = osgEarth::Symbology::NumericExpression();
 
 #if 1 || defined(USE_DEPTH_OFFSET)
@@ -3163 +3309 @@
     Tcl_MakeSafe(interp);
 
-    Tcl_CreateObjCommand(interp, "camera",         CameraCmd,         clientData, NULL);
-    Tcl_CreateObjCommand(interp, "clientinfo",     ClientInfoCmd,     clientData, NULL);
-    Tcl_CreateObjCommand(interp, "colormap",       ColorMapCmd,       clientData, NULL);
-    Tcl_CreateObjCommand(interp, "file",           FileCmd,           clientData, NULL);
-    Tcl_CreateObjCommand(interp, "imgflush",       ImageFlushCmd,     clientData, NULL);
-    Tcl_CreateObjCommand(interp, "key",            KeyCmd,            clientData, NULL);
-    Tcl_CreateObjCommand(interp, "legend",         LegendCmd,         clientData, NULL);
-    Tcl_CreateObjCommand(interp, "map",            MapCmd,            clientData, NULL);
-    Tcl_CreateObjCommand(interp, "mouse",          MouseCmd,          clientData, NULL);
-    Tcl_CreateObjCommand(interp, "renderer",       RendererCmd,       clientData, NULL);
-    Tcl_CreateObjCommand(interp, "screen",         ScreenCmd,         clientData, NULL);
+    Tcl_CreateObjCommand(interp, "camera",     CameraCmd,     clientData, NULL);
+    Tcl_CreateObjCommand(interp, "clientinfo", ClientInfoCmd, clientData, NULL);
+    Tcl_CreateObjCommand(interp, "colormap",   ColorMapCmd,   clientData, NULL);
+    Tcl_CreateObjCommand(interp, "file",       FileCmd,       clientData, NULL);
+    Tcl_CreateObjCommand(interp, "imgflush",   ImageFlushCmd, clientData, NULL);
+    Tcl_CreateObjCommand(interp, "key",        KeyCmd,        clientData, NULL);
+    Tcl_CreateObjCommand(interp, "legend",     LegendCmd,     clientData, NULL);
+    Tcl_CreateObjCommand(interp, "map",        MapCmd,        clientData, NULL);
+    Tcl_CreateObjCommand(interp, "mouse",      MouseCmd,      clientData, NULL);
+    Tcl_CreateObjCommand(interp, "renderer",   RendererCmd,   clientData, NULL);
+    Tcl_CreateObjCommand(interp, "screen",     ScreenCmd,     clientData, NULL);
 }