Changeset 12446

Timestamp:

10/16/07 16:32:26 (1 year ago)

Author:

warmerdam

Message:

implement serialization support for geoloc transformer (#1919)

Files:

• trunk/gdal/alg/gdalgeoloc.cpp (modified) (6 diffs)
• trunk/gdal/alg/gdaltransformer.cpp (modified) (4 diffs)

trunk/gdal/alg/gdalgeoloc.cpp

@@ -40 +40 @@
-CPL_CVSID("$Id$");
-
+CPL_C_START
+CPLXMLNode *GDALSerializeGeoLocTransformer( void *pTransformArg );
+void *GDALDeserializeGeoLocTransformer( CPLXMLNode *psTree );
+CPL_C_END
+
-/************************************************************************/
-/* ==================================================================== */
@@ -82 +87 @@
-    double           dfLINE_OFFSET;
-    double           dfLINE_STEP;
+
+    char **          papszGeolocationInfo;
-
-} GDALGeoLocTransformInfo;
@@ -599 +606 @@
-    psTransform->sTI.pfnTransform = GDALGeoLocTransform;
-    psTransform->sTI.pfnCleanup = GDALDestroyGeoLocTransformer;
-
+
+
-
-/* -------------------------------------------------------------------- */
@@ -626 +634 @@
-        psTransform->hDS_X = hBaseDS;
-        GDALReferenceDataset( psTransform->hDS_X );
+        psTransform->papszGeolocationInfo = 
+            CSLSetNameValue( psTransform->papszGeolocationInfo, 
+                             "X_DATASET", 
+                             GDALGetDescription( hBaseDS ) );
-    }
-
@@ -637 +649 @@
-        psTransform->hDS_Y = hBaseDS;
-        GDALReferenceDataset( psTransform->hDS_Y );
+        psTransform->papszGeolocationInfo = 
+            CSLSetNameValue( psTransform->papszGeolocationInfo, 
+                             "Y_DATASET", 
+                             GDALGetDescription( hBaseDS ) );
-    }
-
@@ -857 +873 @@
-    return TRUE;
-}
+
+/************************************************************************/
+/*                   GDALSerializeGeoLocTransformer()                   */
+/************************************************************************/
+
+CPLXMLNode *GDALSerializeGeoLocTransformer( void *pTransformArg )
+
+{
+    VALIDATE_POINTER1( pTransformArg, "GDALSerializeGeoLocTransformer", NULL );
+
+    CPLXMLNode *psTree;
+    GDALGeoLocTransformInfo *psInfo = 
+        (GDALGeoLocTransformInfo *)(pTransformArg);
+
+    psTree = CPLCreateXMLNode( NULL, CXT_Element, "GeoLocTransformer" );
+
+/* -------------------------------------------------------------------- */
+/*      Serialize bReversed.                                            */
+/* -------------------------------------------------------------------- */
+    CPLCreateXMLElementAndValue( 
+        psTree, "Reversed", 
+        CPLSPrintf( "%d", psInfo->bReversed ) );
+                                 
+/* -------------------------------------------------------------------- */
+/*      geoloc metadata.                                                */
+/* -------------------------------------------------------------------- */
+    char **papszMD = psInfo->papszGeolocationInfo;
+    CPLXMLNode *psMD= CPLCreateXMLNode( psTree, CXT_Element, 
+                                        "Metadata" );
+
+    for( int i = 0; papszMD != NULL && papszMD[i] != NULL; i++ )
+    {
+        const char *pszRawValue;
+        char *pszKey;
+        CPLXMLNode *psMDI;
+                
+        pszRawValue = CPLParseNameValue( papszMD[i], &pszKey );
+                
+        psMDI = CPLCreateXMLNode( psMD, CXT_Element, "MDI" );
+        CPLSetXMLValue( psMDI, "#key", pszKey );
+        CPLCreateXMLNode( psMDI, CXT_Text, pszRawValue );
+                
+        CPLFree( pszKey );
+    }
+
+    return psTree;
+}
+
+/************************************************************************/
+/*                   GDALDeserializeGeoLocTransformer()                 */
+/************************************************************************/
+
+void *GDALDeserializeGeoLocTransformer( CPLXMLNode *psTree )
+
+{
+    void *pResult;
+    int bReversed;
+    char **papszMD = NULL;
+    CPLXMLNode *psMDI, *psMetadata;
+
+/* -------------------------------------------------------------------- */
+/*      Collect metadata.                                               */
+/* -------------------------------------------------------------------- */
+    psMetadata = CPLGetXMLNode( psTree, "Metadata" );
+
+    if( psMetadata->eType != CXT_Element
+        || !EQUAL(psMetadata->pszValue,"Metadata") )
+        return NULL;
+    
+    for( psMDI = psMetadata->psChild; psMDI != NULL; 
+         psMDI = psMDI->psNext )
+    {
+        if( !EQUAL(psMDI->pszValue,"MDI") 
+            || psMDI->eType != CXT_Element 
+            || psMDI->psChild == NULL 
+            || psMDI->psChild->psNext == NULL 
+            || psMDI->psChild->eType != CXT_Attribute
+            || psMDI->psChild->psChild == NULL )
+            continue;
+        
+        papszMD = 
+            CSLSetNameValue( papszMD, 
+                             psMDI->psChild->psChild->pszValue, 
+                             psMDI->psChild->psNext->pszValue );
+    }
+
+/* -------------------------------------------------------------------- */
+/*      Get other flags.                                                */
+/* -------------------------------------------------------------------- */
+    bReversed = atoi(CPLGetXMLValue(psTree,"Reversed","0"));
+
+/* -------------------------------------------------------------------- */
+/*      Generate transformation.                                        */
+/* -------------------------------------------------------------------- */
+    pResult = GDALCreateGeoLocTransformer( NULL, papszMD, bReversed );
+    
+/* -------------------------------------------------------------------- */
+/*      Cleanup GCP copy.                                               */
+/* -------------------------------------------------------------------- */
+    CSLDestroy( papszMD );
+
+    return pResult;
+}

trunk/gdal/alg/gdaltransformer.cpp

@@ -41 +41 @@
-CPLXMLNode *GDALSerializeTPSTransformer( void *pTransformArg );
-void *GDALDeserializeTPSTransformer( CPLXMLNode *psTree );
+CPLXMLNode *GDALSerializeGeoLocTransformer( void *pTransformArg );
+void *GDALDeserializeGeoLocTransformer( CPLXMLNode *psTree );
-CPL_C_END
-
@@ -967 +969 @@
-
-/* -------------------------------------------------------------------- */
+/*      Handle TPS transformation.                                      */
+/* -------------------------------------------------------------------- */
+    else if( psInfo->pSrcGeoLocTransformArg != NULL )
+    {
+        CPLXMLNode *psTransformerContainer;
+        CPLXMLNode *psTransformer;
+
+        psTransformerContainer = 
+            CPLCreateXMLNode( psTree, CXT_Element, "SrcGeoLocTransformer" );
+
+        psTransformer = 
+            GDALSerializeTransformer( NULL, psInfo->pSrcGeoLocTransformArg);
+        if( psTransformer != NULL )
+            CPLAddXMLChild( psTransformerContainer, psTransformer );
+    }
+
+/* -------------------------------------------------------------------- */
-/*      Handle source geotransforms.                                    */
-/* -------------------------------------------------------------------- */
@@ -1105 +1124 @@
-
-/* -------------------------------------------------------------------- */
+/*      Src GeoLoc Transform                                            */
+/* -------------------------------------------------------------------- */
+    psSubtree = CPLGetXMLNode( psTree, "SrcGeoLocTransformer" );
+    if( psSubtree != NULL && psSubtree->psChild != NULL )
+    {
+        psInfo->pSrcGeoLocTransformArg = 
+            GDALDeserializeGeoLocTransformer( psSubtree->psChild );
+    }
+
+/* -------------------------------------------------------------------- */
-/*      DstGeotransform                                                 */
-/* -------------------------------------------------------------------- */
@@ -1823 +1852 @@
-        *ppTransformArg = GDALDeserializeTPSTransformer( psTree );
-    }
+    else if( EQUAL(psTree->pszValue,"GeoLocTransformer") )
+    {
+        *ppfnFunc = GDALGeoLocTransform;
+        *ppTransformArg = GDALDeserializeGeoLocTransformer( psTree );
+    }
-    else if( EQUAL(psTree->pszValue,"ApproxTransformer") )
-    {