Changeset 13469

Timestamp:

12/31/07 12:35:58 (6 months ago)

Author:

rouault

Message:

Add support for GPX 1.0 reading

Files:

• trunk/gdal/ogr/ogrsf_frmts/gpx/drv_gpx.html (modified) (1 diff)
• trunk/gdal/ogr/ogrsf_frmts/gpx/ogr_gpx.h (modified) (2 diffs)
• trunk/gdal/ogr/ogrsf_frmts/gpx/ogrgpxdatasource.cpp (modified) (5 diffs)
• trunk/gdal/ogr/ogrsf_frmts/gpx/ogrgpxlayer.cpp (modified) (3 diffs)

trunk/gdal/ogr/ogrsf_frmts/gpx/drv_gpx.html

@@ -11 +11 @@
-
-OGR has support for GPX reading (if GDAL is build with <i>expat</i> library support) and writing.<p>
+
+Version supported are GPX 1.0 and 1.1 for reading, GPX 1.1 for writing.<p>
-
-The OGR driver supports reading and writing of all the GPX feature types :

trunk/gdal/ogr/ogrsf_frmts/gpx/ogr_gpx.h

@@ -176 +176 @@
-    OGRGPXValidity      validity;
-    int                 nElementsRead;
+    char*               pszVersion;
-    
-  public:
@@ -208 +209 @@
-    
-    void                startElementValidateCbk(const char *pszName, const char **ppszAttr);
+    
+    const char*         GetVersion() { return pszVersion; }
-};
-

trunk/gdal/ogr/ogrsf_frmts/gpx/ogrgpxdatasource.cpp

@@ -50 +50 @@
-
-    pszName = NULL;
+    pszVersion = NULL;
-}
-
@@ -71 +72 @@
-    CPLFree( pszExtensionsNS );
-    CPLFree( pszName );
+    CPLFree( pszVersion );
-}
-
@@ -162 +164 @@
-        if (strcmp(pszName, "gpx") == 0)
-        {
+            int i;
-            validity = GPX_VALIDITY_VALID;
+            for(i=0; ppszAttr[i] != NULL; i+= 2)
+            {
+                if (strcmp(ppszAttr[i], "version") == 0)
+                {
+                    pszVersion = CPLStrdup(ppszAttr[i+1]);
+                    break;
+                }
+            }
-        }
-        else
@@ -219 +230 @@
-    
-    validity = GPX_VALIDITY_UNKNOWN;
+    CPLFree(pszVersion);
+    pszVersion = NULL;
-    bUseExtensions = FALSE;
-    nElementsRead = 0;
@@ -287 +300 @@
-        if (bUseExtensions)
-            CPLDebug("GPX", "It uses <extensions>");
+
+        if (pszVersion == NULL)
+        {
+            /* Default to 1.1 */
+            CPLError(CE_Warning, CPLE_AppDefined, "GPX schema version is unknown. "
+                     "The driver may not be able to handle the file correctly and will behave as if it is GPX 1.1.");
+            pszVersion = CPLStrdup("1.1");
+        }
+        else if (strcmp(pszVersion, "1.0") == 0 || strcmp(pszVersion, "1.1") == 0)
+        {
+            /* Fine */
+        }
+        else
+        {
+            CPLError(CE_Warning, CPLE_AppDefined,
+                     "GPX schema version '%s' is not handled by the driver. "
+                     "The driver may not be able to handle the file correctly and will behave as if it is GPX 1.1.", pszVersion);
+        }
+
-        nLayers = 5;
-        papoLayers = (OGRGPXLayer **) CPLRealloc(papoLayers, nLayers * sizeof(OGRGPXLayer*));

trunk/gdal/ogr/ogrsf_frmts/gpx/ogrgpxlayer.cpp

@@ -46 +46 @@
-
-{
+    const char* gpxVersion = poDS->GetVersion();
+
-    int i;
-
@@ -106 +108 @@
-        poFeatureDefn->AddFieldDefn( &oFieldTime );
-        
+        if (gpxGeomType == GPX_TRACK_POINT &&
+            gpxVersion && strcmp(gpxVersion, "1.0") == 0)
+        {
+            OGRFieldDefn oFieldCourse("course", OFTReal );
+            poFeatureDefn->AddFieldDefn( &oFieldCourse );
+            
+            OGRFieldDefn oFieldSpeed("speed", OFTReal );
+            poFeatureDefn->AddFieldDefn( &oFieldSpeed );
+        }
+        
-        OGRFieldDefn oFieldMagVar("magvar", OFTReal );
-        poFeatureDefn->AddFieldDefn( &oFieldMagVar );
@@ -126 +138 @@
-        poFeatureDefn->AddFieldDefn( &oFieldSrc );
-        
-
-
-
-
-
-
+
+
+
+
-            
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-