Changeset 11249

Timestamp:

04/13/07 01:50:24 (2 years ago)

Author:

warmerdam

Message:

added support for writing PE_STRING nodes

Files:

• trunk/gdal/frmts/hfa/hfa.h (modified) (1 diff)
• trunk/gdal/frmts/hfa/hfadataset.cpp (modified) (1 diff)
• trunk/gdal/frmts/hfa/hfaopen.cpp (modified) (4 diffs)

trunk/gdal/frmts/hfa/hfa.h

@@ -144 +144 @@
-const Eprj_ProParameters CPL_DLL *HFAGetProParameters( HFAHandle );
-char CPL_DLL *HFAGetPEString( HFAHandle );
+CPLErr CPL_DLL HFASetPEString( HFAHandle hHFA, const char *pszPEString );
-CPLErr CPL_DLL HFASetProParameters( HFAHandle, const Eprj_ProParameters * );
-

trunk/gdal/frmts/hfa/hfadataset.cpp

@@ -1646 +1646 @@
-        sPro.proParams[7] = oSRS.GetProjParm(SRS_PP_FALSE_NORTHING);
-    }
+    // Anything we can't map, we store as an ESRI PE_STRING 
+    else if( oSRS.IsProjected() || oSRS.IsGeographic() )
+    {
+        char *pszPEString = NULL;
+        oSRS.morphToESRI();
+        oSRS.exportToWkt( &pszPEString );
+        // need to transform this into ESRI format.
+        HFASetPEString( hHFA, pszPEString );
+        CPLFree( pszPEString );
+    }
-    else
-    {

trunk/gdal/frmts/hfa/hfaopen.cpp

@@ -1072 +1072 @@
- 
-{
+    if( hHFA->nBands == 0 )
+        return NULL;
+
-/* -------------------------------------------------------------------- */
-/*      Get the HFA node.                                               */
@@ -1109 +1112 @@
-
-    return CPLStrdup( (const char *) pabyData );
+}
+
+/************************************************************************/
+/*                           HFASetPEString()                           */
+/************************************************************************/
+
+CPLErr HFASetPEString( HFAHandle hHFA, const char *pszPEString )
+
+{
+/* -------------------------------------------------------------------- */
+/*      Verify we don't already have the node, since update-in-place    */
+/*      is likely to be more complicated.                               */
+/* -------------------------------------------------------------------- */
+    if( hHFA->nBands == 0 )
+        return CE_None;
+
+    HFAEntry *poProX;
+
+    poProX = hHFA->papoBand[0]->poNode->GetNamedChild( "ProjectionX" );
+    if( poProX != NULL )
+    {
+        CPLError( CE_Failure, CPLE_AppDefined, 
+                  "HFASetPEString() failed because the ProjectionX node\n"
+                  "already exists and can't be reliably updated." );
+        return CE_Failure;
+    }
+
+/* -------------------------------------------------------------------- */
+/*      Create the node.                                                */
+/* -------------------------------------------------------------------- */
+    poProX = new HFAEntry( hHFA, "ProjectionX","Eprj_MapProjection842",
+                           hHFA->papoBand[0]->poNode );
+    if( poProX == NULL )
+        return CE_Failure;
+
+    GByte *pabyData = poProX->MakeData( 700 + strlen(pszPEString) );
+    memset( pabyData, 0, 250+strlen(pszPEString) );
+
+    poProX->SetPosition();
+
+    poProX->SetStringField( "projection.type.string", "PE_COORDSYS" );
+    poProX->SetStringField( "projection.MIFDictionary.string", 
+                            "{0:pcstring,}Emif_String,{1:x{0:pcstring,}Emif_String,coordSys,}PE_COORDSYS,." );
+
+/* -------------------------------------------------------------------- */
+/*      Use a gross hack to scan ahead to the actual projection         */
+/*      string. We do it this way because we don't have general         */
+/*      handling for MIFObjects.                                        */
+/* -------------------------------------------------------------------- */
+    pabyData = poProX->GetData();
+    int    nDataSize = poProX->GetDataSize();
+    GUInt32   iOffset = poProX->GetDataPos();
+    GUInt32   nSize;
+
+    while( nDataSize > 10 
+           && !EQUALN((const char *) pabyData,"PE_COORDSYS,.",13) ) {
+        pabyData++;
+        nDataSize--;
+        iOffset++;
+    }
+
+    CPLAssert( nDataSize > (int) strlen(pszPEString) + 10 );
+
+    pabyData += 14;
+    iOffset += 14;
+    
+/* -------------------------------------------------------------------- */
+/*      Set the size and offset of the mifobject.                       */
+/* -------------------------------------------------------------------- */
+    iOffset += 8;
+
+    nSize = strlen(pszPEString) + 9;
+
+    HFAStandard( 4, nSize );
+    memcpy( pabyData, &nSize, 4 );
+    pabyData += 4;
+    
+    HFAStandard( 4, &iOffset );
+    memcpy( pabyData, &iOffset, 4 );
+    pabyData += 4;
+
+/* -------------------------------------------------------------------- */
+/*      Set the size and offset of the string value.                    */
+/* -------------------------------------------------------------------- */
+    nSize = strlen(pszPEString) + 1;
+    
+    HFAStandard( 4, nSize );
+    memcpy( pabyData, &nSize, 4 );
+    pabyData += 4;
+
+    iOffset = 8;
+    HFAStandard( 4, &iOffset );
+    memcpy( pabyData, &iOffset, 4 );
+    pabyData += 4;
+
+/* -------------------------------------------------------------------- */
+/*      Place the string itself.                                        */
+/* -------------------------------------------------------------------- */
+    memcpy( pabyData, pszPEString, strlen(pszPEString)+1 );
+    
+    poProX->SetStringField( "title.string", "PE" );
+
+    return CE_None;
-}
-
@@ -1538 +1644 @@
-"{1:oEmif_String,dependent,}Eimg_DependentFile,{1:oEmif_String,ImageLayerName,}Eimg_DependentLayerName,{1:lnumrows,1:lnumcolumns,1:e13:EGDA_TYPE_U1,EGDA_TYPE_U2,EGDA_TYPE_U4,EGDA_TYPE_U8,EGDA_TYPE_S8,EGDA_TYPE_U16,EGDA_TYPE_S16,EGDA_TYPE_U32,EGDA_TYPE_S32,EGDA_TYPE_F32,EGDA_TYPE_F64,EGDA_TYPE_C64,EGDA_TYPE_C128,datatype,1:e4:EGDA_SCALAR_OBJECT,EGDA_TABLE_OBJECT,EGDA_MATRIX_OBJECT,EGDA_RASTER_OBJECT,objecttype,}Egda_BaseData,{1:*bvalueBD,}Eimg_NonInitializedValue,{1:dx,1:dy,}Eprj_Coordinate,{1:dwidth,1:dheight,}Eprj_Size,{0:pcproName,1:*oEprj_Coordinate,upperLeftCenter,",
-"1:*oEprj_Coordinate,lowerRightCenter,1:*oEprj_Size,pixelSize,0:pcunits,}Eprj_MapInfo,{0:pcdatumname,1:e3:EPRJ_DATUM_PARAMETRIC,EPRJ_DATUM_GRID,EPRJ_DATUM_REGRESSION,type,0:pdparams,0:pcgridname,}Eprj_Datum,{0:pcsphereName,1:da,1:db,1:deSquared,1:dradius,}Eprj_Spheroid,{1:e2:EPRJ_INTERNAL,EPRJ_EXTERNAL,proType,1:lproNumber,0:pcproExeName,0:pcproName,1:lproZone,0:pdproParams,1:*oEprj_Spheroid,proSpheroid,}Eprj_ProParameters,{1:dminimum,1:dmaximum,1:dmean,1:dmedian,1:dmode,1:dstddev,}Esta_Statistics,{1:lnumBins,1:e4:direct,linear,logarithmic,explicit,binFunctionType,1:dminLimit,1:dmaxLimit,1:*bbinLimits,}Edsc_BinFunction,{0:poEmif_String,LayerNames,1:*bExcludedValues,1:oEmif_String,AOIname,",
-
+
+
+
+
-NULL
-};
+
+
-
-/************************************************************************/
@@ -2490 +2601 @@
-                }
-            }
-            free( pszBinValues );
-        }
+        free( pszBinValues );
-    }
-