Reworked some StringExpression code to support StringExpression

literals without having to use double quotes. If a script fails to execute then it will fall back on the source as the string literal. ../src/osgEarthDrivers/script_engine_duktape/DuktapeEngine.cpp ../data/splat/nlcd_2011_landcover_2011_edition_2014_03_31_tiled.tif ../data/splat/nlcd_2011_landcover_2011_edition_2014_03_31_tiled.tif.ovr
amoger · May 31, 2017 · ada8ffd · ada8ffd
1 parent 8160871
commit ada8ffd
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/src/osgEarthDrivers/script_engine_duktape/DuktapeEngine.cpp b/src/osgEarthDrivers/script_engine_duktape/DuktapeEngine.cpp
@@ -308,7 +308,7 @@ DuktapeEngine::run(const std::string&   code,
 
     if ( !ok )
     {
-        OE_WARN << LC << "Error: source =" << std::endl << code << std::endl;
+        OE_DEBUG << LC << "Error: source =" << std::endl << code << std::endl;
     }
 
     // pop the return value:

diff --git a/src/osgEarthFeatures/Feature.cpp b/src/osgEarthFeatures/Feature.cpp
@@ -402,7 +402,11 @@ Feature::eval( StringExpression& expr, FilterContext const* context ) const
           if (result.success())
             val = result.asString();
           else
-            OE_WARN << LC << "Feature Script error on '" << expr.expr() << "': " << result.message() << std::endl;
+          {
+            // Couldn't execute it as code, just take it as a string literal.
+            val = i->first;
+            OE_DEBUG << LC << "Feature Script error on '" << expr.expr() << "': " << result.message() << std::endl;
+          }
         }
       }
 
@@ -434,7 +438,11 @@ Feature::eval(StringExpression& expr, Session* session) const
                 if (result.success())
                     val = result.asString();
                 else
-                    OE_WARN << LC << "Feature Script error on '" << expr.expr() << "': " << result.message() << std::endl;
+                {
+                    // Couldn't execute it as code, just take it as a string literal.
+                    val = i->first;
+                    OE_DEBUG << LC << "Feature Script error on '" << expr.expr() << "': " << result.message() << std::endl;
+                }
             }
         }
 

diff --git a/tests/roads-flattened.earth b/tests/roads-flattened.earth
@@ -74,12 +74,12 @@
                 default {
                    stroke: #ffffff;
                    stroke-width: 12m;
-                   stroke-image: ""../data/road.png"";
+                   stroke-image: ../data/road.png;
                 }
                 asphalt {
                    stroke: #ffffff;
                    stroke-width: 4m;
-                   stroke-image: ""../data/asphalt.jpg"";
+                   stroke-image: ../data/asphalt.jpg;
                 }
             </style>
         </styles>

diff --git a/tests/roads.earth b/tests/roads.earth
@@ -34,7 +34,7 @@ http://readymap.org
                 default {
                    stroke: #ffffff;
                    stroke-width: 65m;
-                   stroke-image: ""../data/road.png"";
+                   stroke-image: "../data/road.png";
                 }
             </style>
         </styles>
@@ -65,7 +65,7 @@ http://readymap.org
                     stroke-width: 65m;
                     render-depth-test: false;
                     render-order: 2;
-                    stroke-image: ""../data/grid.png"";
+                    stroke-image: "../data/grid.png";
                 }
             </style>
         </styles>

diff --git a/tests/splat-with-mask-layer.earth b/tests/splat-with-mask-layer.earth
@@ -69,7 +69,7 @@
             <style type="text/css">
                 default {
                     stroke-width: 10m;
-                    stroke-image: ""../data/road.png"";
+                    stroke-image: "../data/road.png";
                 }
             </style>
         </styles>