Changeset 6075 for geovis

Timestamp:

Feb 28, 2016 3:54:11 AM (8 years ago)

Author:

ldelgass

Message:

Parse CSS style and rewrite URLs.

File:

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

geovis/trunk/RendererCmd.cpp

@@ -31 +31 @@
 #include <osgEarthSymbology/Style>
 #include <osgEarthSymbology/StyleSheet>
+#include <osgEarthSymbology/CssUtils>
 #include <osgEarthSymbology/IconSymbol>
+#include <osgEarthSymbology/ModelSymbol>
 #include <osgEarthSymbology/LineSymbol>
 #include <osgEarthSymbology/RenderSymbol>
@@ -1679 +1681 @@
         styleConf.add("type", "text/css");
         INFO("style CSS: %s", styleConf.value().c_str());
+#if 1
+        geomOpts.styles() = new osgEarth::Symbology::StyleSheet();
+        // For relative paths:
+        //styleConf.setReferrer(g_renderer->getCacheDirectory());
+        std::string cssString = styleConf.value();
+        std::vector<std::string> blocks;
+        osgEarth::Symbology::CssUtils::split(cssString, blocks);
+        for (std::vector<std::string>::iterator itr = blocks.begin();
+             itr != blocks.end(); ++itr) {
+            osgEarth::Config blockConf(styleConf);
+            blockConf.value() = *itr;
+            osgEarth::Symbology::Style style(blockConf);
+
+            INFO("Style: %s", style.getName().c_str());
+            INFO("%s", itr->c_str());
+
+            if (style.has<osgEarth::Symbology::IconSymbol>()) {
+                INFO("Found icon symbol");
+                osgEarth::Symbology::IconSymbol *is =
+                    style.get<osgEarth::Symbology::IconSymbol>();
+                if (is->url().isSet()) {
+                    INFO("Icon url before: expr: '%s' eval: '%s'",
+                         is->url()->expr().c_str(), is->url()->eval().c_str());
+                    // eval() will try to evaluate the expr()
+                    std::string path = g_renderer->getCanonicalPath(is->url()->eval());
+                    //setInfix() to set the expr() string, setLiteral() will quote
+                    is->url()->setLiteral(path);
+                    INFO("Icon url after: %s", path.c_str());
+                }
+            }
+            if (style.has<osgEarth::Symbology::ModelSymbol>()) {
+                osgEarth::Symbology::ModelSymbol *ms =
+                    style.get<osgEarth::Symbology::ModelSymbol>();
+                if (ms->url().isSet()) {
+                    // eval() will try to evaluate the expr()
+                    std::string path = g_renderer->getCanonicalPath(ms->url()->eval());
+                    //setInfix() to set the expr() string, setLiteral() will quote
+                    ms->url()->setLiteral(path);
+                }
+            }
+            // Need to create a new style otherwise the original CSS is used
+            // without the re-written URLs
+            geomOpts.styles()->addStyle(osgEarth::Symbology::Style(style.getConfig(false)));
+        }
+#else
         osgEarth::Config stylesheetConf;
         stylesheetConf.add(styleConf);
         geomOpts.styles() = new osgEarth::Symbology::StyleSheet(stylesheetConf);
+#endif
 
         if (objc > 11) {
@@ -1700 +1748 @@
                 return TCL_ERROR;
             }
+            INFO("Num Selectors: %d", numSelectors);
             for (int i = 0; i < numSelectors; i++) {
                 int numFields;