Changeset 14768

Timestamp:

06/25/08 15:37:42 (5 months ago)

Author:

warmerdam

Message:

support reading GML 3 posList geometry (#2311)

Files:

• trunk/autotest/ogr/ogr_gml_geom.py (modified) (2 diffs)
• trunk/gdal/ogr/gml2ogrgeometry.cpp (modified) (4 diffs)

trunk/autotest/ogr/ogr_gml_geom.py

@@ -105 +105 @@
-
-###############################################################################
+# Test GML 3.x "posList" element for a point.
+
+def gml_posList_line():
+
+    gml = '<LineString><posList>31 42 53 64 55 76</posList></LineString>'
+
+    geom = ogr.CreateGeometryFromGML( gml )
+
+    if geom.ExportToWkt() != 'LINESTRING (31 42,53 64,55 76)':
+        gdaltest.post_reason( '<gml:posList> not correctly parsed' )
+        return 'fail'
+
+    return 'success'
+
+###############################################################################
+# Test GML 3.x "polygon" element for a point.
+
+def gml_polygon():
+
+    gml = '<Polygon><exterior><LinearRing><posList>0 0 4 0 4 4 0 4 0 0</posList></LinearRing></exterior><interior><LinearRing><posList>1 1 2 1 2 2 1 2 1 1</posList></LinearRing></interior></Polygon>'
+    geom = ogr.CreateGeometryFromGML( gml )
+
+    if geom.ExportToWkt() != 'POLYGON ((0 0,4 0,4 4,0 4,0 0),(1 1,2 1,2 2,1 2,1 1))':
+        gdaltest.post_reason( '<gml:Polygon> not correctly parsed' )
+        return 'fail'
+
+    return 'success'
+
+###############################################################################
-# Private utility function to conver WKT to GML with assigned WGS 84 as SRS
-
@@ -301 +330 @@
-gdaltest_list.append( gml_space_test )
-gdaltest_list.append( gml_pos_point )
+gdaltest_list.append( gml_posList_line )
+gdaltest_list.append( gml_polygon )
-gdaltest_list.append( gml_out_point_srs )
-gdaltest_list.append( gml_out_point3d_srs )

trunk/gdal/ogr/gml2ogrgeometry.cpp

@@ -237 +237 @@
-
-/* -------------------------------------------------------------------- */
-
-
-
+
+
+
+
+
+
-    
-
-
+
+
+
+
+
+
+
+
-        char **papszTokens = CSLTokenizeStringComplex( 
-            GetElementText( psPos ), " ,", FALSE, FALSE );
@@ -268 +277 @@
-        }
-
+        CSLDestroy( papszTokens );
+
+        return bSuccess;
+    }
+    
+
+/* -------------------------------------------------------------------- */
+/*      Is this a "posList"?  GML 3 construct (SF profile).             */
+/* -------------------------------------------------------------------- */
+    CPLXMLNode *psPosList = FindBareXMLChild( psGeomNode, "posList" );
+    
+    if( psPosList != NULL )
+    {
+        char **papszTokens = CSLTokenizeStringComplex( 
+            GetElementText( psPosList ), " ,", FALSE, FALSE );
+        int bSuccess = FALSE;
+        int i=0, nCount=0;
+
+        /*assuming that it is a 2 dimension with x y values*/
+        /*we could also check to see if there is a count attribute and an srsDimension.
+          These attributes are only availabe for gml3.1.1 but not 
+          available for gml3.1 SF*/
+
+        nCount = CSLCount( papszTokens );
+       
+        if (nCount < 2  || fmod((double)nCount, 2.0) != 0)
+        {
+            
+            CPLError( CE_Failure, CPLE_AppDefined,
+                      "Did not get at least two values or invalid number of \n"
+                      "set of coordinates <gml:posList>%s</gml:posList>",
+                      GetElementText( psPosList ) );
+        }
+        else
+        {
+            i=0;
+            while (i<nCount)
+            {
+                bSuccess = AddPoint( poGeometry, 
+                                     atof(papszTokens[i]), 
+                                     atof(papszTokens[i+1]),
+                                     0.0, 2 );
+                i+=2;
+            }
+        }
-        CSLDestroy( papszTokens );
-
@@ -348 +402 @@
-        // Find outer ring.
-        psChild = FindBareXMLChild( psNode, "outerBoundaryIs" );
+        if (psChild == NULL)
+           psChild = FindBareXMLChild( psNode, "exterior");
+
-        if( psChild == NULL || psChild->psChild == NULL )
-        {
@@ -383 +440 @@
-        {
-            if( psChild->eType == CXT_Element
-
+
+
-            {
-                poRing = (OGRLinearRing *)