Merge branch 'master' of github.com:gwaldron/osgearth

Author: gwaldron

src/osgEarthFeatures/BuildGeometryFilter.cpp

@@ -515,6 +515,7 @@ BuildGeometryFilter::tileAndBuildPolygon(Geometry*               ring,
 
 #define MAX_POINTS_PER_CROP_TILE 1024
 
+    bool built = false;
     unsigned count = ring->getTotalPointCount();
     if ( count > MAX_POINTS_PER_CROP_TILE )
     {
@@ -530,6 +531,7 @@ BuildGeometryFilter::tileAndBuildPolygon(Geometry*               ring,
         osg::ref_ptr<Polygon> poly = new Polygon;
         poly->resize( 4 );
 
+        built = true;
         for(int x=0; x<(int)tx; ++x)
         {
             for(int y=0; y<(int)ty; ++y)
@@ -552,13 +554,30 @@ BuildGeometryFilter::tileAndBuildPolygon(Geometry*               ring,
                 }
                 else 
                 {
-                    // This just means the crop resulted in empty geometry, which is legal.
-                    //OE_WARN << LC << "Crop failed; tile skipped!" << std::endl;
+                    // If crop resulted in empty geometry (valid case) ringTile will still be valid,
+                    // otherwise we need to process the entire polygon without tiling.
+                    if (!ringTile.valid())
+                    {
+                        //clean up geometry
+                        osgGeom->setVertexArray(0L);
+                        if (osgGeom->getNumPrimitiveSets())
+                            osgGeom->removePrimitiveSet(0, osgGeom->getNumPrimitiveSets());
+
+                        OE_NOTICE << LC << "GEOS crop failed, tessellating feature without tiling." << std::endl;
+
+                        built = false;
+                        break;
+                    }
                 }
             }
+
+            // GEOS failed 
+            if (!built)
+                break;
         }
     }
-    else
+
+    if ( !built )
     {
         buildPolygon(ring, featureSRS, mapSRS, makeECEF, tessellate, osgGeom, world2local);
     }

src/osgEarthSymbology/Geometry.cpp

@@ -230,6 +230,8 @@ bool
 Geometry::crop( const Polygon* cropPoly, osg::ref_ptr<Geometry>& output ) const
 {
 #ifdef OSGEARTH_HAVE_GEOS
+    bool success = false;
+    output = 0L;
 
     GEOSContext gc;
 
@@ -256,20 +258,38 @@ Geometry::crop( const Polygon* cropPoly, osg::ref_ptr<Geometry>& output ) const
         if ( outGeom )
         {
             output = gc.exportGeometry( outGeom );
-            gc.disposeGeometry( outGeom );
 
-            if ( output.valid() && !output->isValid() )
+            if ( output.valid())
             {
-                output = 0L;
+                if ( output->isValid() )
+                {
+                    success = true;
+                }
+                else
+                {
+                    // GEOS result is invalid
+                    output = 0L;
+                }
             }
+            else
+            {
+                // set output to empty geometry to indicate the (valid) empty case,
+                // still returning false but allows for check.
+                if (outGeom->getNumPoints() == 0)
+                {
+                    output = new osgEarth::Symbology::Geometry();
+                }
+            }
+
+            gc.disposeGeometry( outGeom );
         }
     }
 
     //Destroy the geometry
     gc.disposeGeometry( cropGeom );
     gc.disposeGeometry( inGeom );
 
-    return output.valid();
+    return success;
 
 #else // OSGEARTH_HAVE_GEOS