Changeset 13553

Timestamp:

01/20/08 07:07:33 (4 months ago)

Author:

rouault

Message:

Fix performance problems in OGRGeometryFactory::organizePolygons (bug #1217)

Files:

• branches/1.5/gdal/ogr/ogrgeometryfactory.cpp (modified) (8 diffs)
• branches/1.5/gdal/ogr/ogrsf_frmts/bna/ogrbnalayer.cpp (modified) (2 diffs)
• branches/1.5/gdal/ogr/ogrsf_frmts/shape/shape2ogr.cpp (modified) (1 diff)

branches/1.5/gdal/ogr/ogrgeometryfactory.cpp

@@ -720 +720 @@
- * Analyse a set of rings (passed as simple polygons), and based on a 
- * geometric analysis convert them into a polygon with inner rings, 
-
-
-
-
-
-
+
+
+
+
- *
- * The passed in geometries become the responsibility of the method, but the
- * papoPolygons "pointer array" remains owned by the caller.
+ *
+ * For faster computation, a polygon is considered to be inside
+ * another one if a single point of its external ring is included into the other one.
+ * (unless 'OGR_DEBUG_ORGANIZE_POLYGONS' configuration option is set to TRUE.
+ * In that case, a slower algorithm that tests exact topological relationships 
+ * is used if GEOS is available.)
- * 
- * @param papoPolygons array of geometry pointers - should all be OGRPolygons.
@@ -750 +754 @@
-                                                   int *pbIsValidGeometry )
-{
+    int bUseFastVersion;
-    int i, j;
-    OGRGeometry* geom = NULL;
@@ -767 +772 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -794 +807 @@
-        papoPolygons[i]->getEnvelope(&envelopes[i]);
-
+        //fprintf(stderr, "[%d] %d points\n", i, ((OGRPolygon *)papoPolygons[i])->getExteriorRing()->getNumPoints());
+
-        if( wkbFlatten(papoPolygons[i]->getGeometryType()) == wkbPolygon
-
+
+
-        {
-            areas[i] = ((OGRPolygon *)papoPolygons[i])->get_Area();
@@ -806 +822 @@
-                    CE_Warning, CPLE_AppDefined, 
-                    "organizePolygons() received an unexpected geometry.\n"
-non-Polygon
-
+polygon with less than 4 points,
+or a non-Polygon 
-                bMixedUpGeometries = TRUE;
-            }
@@ -849 +865 @@
-        for(j=i+1; go_on && j<nPolygonCount;j++)
-        {
-
-
-
+
+
+
+
+
+
+
+
+
-            {
-                relations[i][j] = CONTAINS;
-                relations[j][i] = IS_CONTAINED_BY;
-            }
-
-
-
-
+
+
+
-            {
-                relations[j][i] = CONTAINS;
-                relations[i][j] = IS_CONTAINED_BY;
-            }
-
-            /* We use Overlaps instead of Intersects to be more 
-               tolerant about touching polygons */ 
-
-(haveGEOS() && !papoPolygons[i]->Overlaps(papoPolygons[j])
+bUseFastVersion || 
+!papoPolygons[i]->Overlaps(papoPolygons[j]
-            {
-                relations[i][j] = NOT_RELATED;
@@ -880 +900 @@
-                   polygons */
-                go_on = FALSE;
-
+
+
+
+
+
-                CPLDebug( "OGR", 
-                          "Bad intersection for polygons %d and %d\n"
@@ -886 +910 @@
-                          "geom %d: %s", 
-                          i, j, i, wkt1, j, wkt2 );
-                char* wkt1;
-                char* wkt2;
-                papoPolygons[i]->exportToWkt(&wkt1);
-                papoPolygons[j]->exportToWkt(&wkt2);
-                fprintf(stderr, "geom %d : %s\n", i, wkt1);
-                fprintf(stderr, "geom %d : %s\n", j, wkt2);
-                CPLFree(wkt1);
-                CPLFree(wkt2);

branches/1.5/gdal/ogr/ogrsf_frmts/bna/ogrbnalayer.cpp

@@ -676 +676 @@
-            if (!isValidGeometry)
-            {
-#ifdef HAVE_GEOS
-                CPLError(CE_Warning, CPLE_AppDefined, 
-                        "Geometry of polygon of fid %d starting at line %d cannot be translated to Simple Geometry. "
@@ -682 +681 @@
-                        fid,
-                        offsetAndLineFeaturesTable[fid].line + 1);
-#endif
-            }
-        }

branches/1.5/gdal/ogr/ogrsf_frmts/shape/shape2ogr.cpp

@@ -460 +460 @@
-            poOGRPoly->addRingDirectly( poRing );
-        }
-
+
+
+
-        {
-            OGRPolygon** tabPolygons = new OGRPolygon*[psShape->nParts];