Changeset 11992

Timestamp:

08/29/07 10:07:30 (1 year ago)

Author:

pka

Message:

Fix for area polygonisation with crossing lines (curves) as described in #1613

Files:

• trunk/gdal/ogr/ogrsf_frmts/ili/ili1reader.cpp (modified) (17 diffs)
• trunk/gdal/ogr/ogrsf_frmts/ili/ili1readerp.h (modified) (4 diffs)

trunk/gdal/ogr/ogrsf_frmts/ili/ili1reader.cpp

@@ -86 +86 @@
-    if( fpItf == NULL )
-    {
- 
- 
+
+
-                    pszFilename );
-
@@ -181 +181 @@
-  iom_init();
-
- 
+
-  // dumps all errors to stderr
-  iom_seterrlistener(iom_stderrlistener);
@@ -270 +270 @@
-    const char *topic = NULL;
-    int ret = TRUE;
-
+
-    while (ret && (tokens = ReadParseLine()))
-    {
@@ -277 +277 @@
-      {
-        //read description
- 
+
-        {
-          pszLine = CPLReadLine( fpItf );
@@ -287 +287 @@
-      {
-        //read model
- 
+
-        {
-          pszLine = CPLReadLine( fpItf );
@@ -338 +338 @@
-        CPLDebug( "OGR_ILI", "Unexpected token: %s", firsttok );
-      }
-
+
-      CSLDestroy(tokens);
-    }
@@ -366 +366 @@
-}
-
-
+, bool fix_crossing_lines
-{
-    OGRMultiPolygon *poPolygon = new OGRMultiPolygon();
+
+    if (poLines->getNumGeometries() == 0) return poPolygon;
-
-#if defined(POLYGONIZE_AREAS)
-    GEOSGeom *ahInGeoms = NULL;
-    int       i = 0;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        GEOSGeom_destroy( ahInGeoms[i] );
-    CPLFree( ahInGeoms );
+    if (poNoncrossingLines != poLines) delete poNoncrossingLines;
-
-    if( hResultGeom == NULL )
-        return NULL;
-
-OGRGeometry *
-
+
+
-    GEOSGeom_destroy( hResultGeom );
-
@@ -417 +429 @@
-      CPLDebug( "OGR_ILI", "Polygonizing layer %s with %d multilines", poAreaLayer->GetLayerDefn()->GetName(), gc->getNumGeometries());
-      OGRMultiPolygon* polys = Polygonize( gc );
+      if (polys->getNumGeometries() != poAreaLayer->GetFeatureCount())
+      {
+          delete polys;
+          polys = Polygonize( gc, true ); //try again with crossing line fix
+      }
+      delete gc;
-
-      //associate polygon feature with data row according to centroid
@@ -481 +499 @@
-
-int ILI1Reader::ReadTable() {
-
+
-    char **tokens = NULL;
-    const char *firsttok = NULL;
@@ -531 +549 @@
-            }
-          }
-
+
-          int fieldno = 0;
-          for (fIndex=1; fIndex<CSLCount(tokens) && fieldno < featureDef->GetFieldCount(); fIndex++, fieldno++)
@@ -592 +610 @@
-        CPLDebug( "OGR_ILI", "Unexpected token: %s", firsttok );
-      }
-
+
-      CSLDestroy(tokens);
-      fpos = VSIFTell(fpItf);
-    }
-
+
-    return ret;
-}
-
-void ILI1Reader::ReadGeom(char **stgeom, OGRwkbGeometryType eType, OGRFeature *feature) {
-
+
-    char **tokens = NULL;
-    const char *firsttok = NULL;
@@ -697 +715 @@
-        CPLDebug( "OGR_ILI", "Unexpected token: %s", firsttok );
-      }
-
+
-      CSLDestroy(tokens);
-    }
@@ -711 +729 @@
-    papoLayers = (OGRILI1Layer **)
-        CPLRealloc( papoLayers, sizeof(void*) * ++nLayers );
-
+
-    papoLayers[nLayers-1] = poNewLayer;
-}
@@ -728 +746 @@
-    papoAreaLineLayers = (OGRILI1Layer **)
-        CPLRealloc( papoAreaLineLayers, sizeof(void*) * nAreaLayers );
-
+
-    papoAreaLayers[nAreaLayers-1] = poAreaLayer;
-    papoAreaLineLayers[nAreaLayers-1] = poLineLayer;
@@ -746 +764 @@
-    papoSurfacePolyLayers = (OGRILI1Layer **)
-        CPLRealloc( papoSurfacePolyLayers, sizeof(void*) * nSurfaceLayers );
-
+
-    papoSurfaceLayers[nSurfaceLayers-1] = poDataLayer;
-    papoSurfacePolyLayers[nSurfaceLayers-1] = poPolyLayer;
@@ -801 +819 @@
-    if( fpItf == NULL )
-        return( NULL );
-
+
-    pszLine = CPLReadLine( fpItf );
-    if( pszLine == NULL )
-        return( NULL );
-
+
-    if (strlen(pszLine) == 0) return NULL;
-
+
-    tokens = CSLTokenizeString2( pszLine, " ", CSLT_PRESERVEESCAPES );
-    token = tokens[CSLCount(tokens)-1];
-
+
-    //Append CONT lines
-    while (strlen(pszLine) && EQUALN(token, "\\", 2))
@@ -817 +835 @@
-      CPLFree(tokens[CSLCount(tokens)-1]);
-      tokens[CSLCount(tokens)-1] = NULL;
-
+
-      pszLine = CPLReadLine( fpItf );
-      conttok = CSLTokenizeString2( pszLine, " ", CSLT_PRESERVEESCAPES );
-      if (!conttok || !EQUAL(conttok[0], "CONT")) break;
-
+
-      //append
-      tokens = CSLInsertStrings(tokens, -1, &conttok[1]);
-      token = tokens[CSLCount(tokens)-1];
-
+
-      CSLDestroy(conttok);
-    }

trunk/gdal/ogr/ogrsf_frmts/ili/ili1readerp.h

@@ -15 +15 @@
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- 
+
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- 
+
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -24 +24 @@
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- 
+
- * DEALINGS IN THE SOFTWARE.
- ****************************************************************************/
@@ -44 +44 @@
-
-class ILI1Reader : public IILI1Reader
-    
+
-private:
-    FILE         *fpItf;
@@ -74 +74 @@
-    void         AddSurfaceLayer( OGRILI1Layer * poDataLayer,  OGRILI1Layer * poPolyLayer );
-    int          AddIliGeom(OGRFeature *feature, int iField, long fpos);
-
+, bool fix_crossing_lines = false
-    void         PolygonizeAreaLayers();
-    void         JoinSurfaceLayers();