Changeset 14459

Timestamp:

05/14/08 09:38:32 (2 months ago)

Author:

dron

Message:

Added support for NOAA-18(N) and METOP-2 datasets; tiny code refactoring.

Files:

• trunk/gdal/frmts/l1b/l1bdataset.cpp (modified) (42 diffs)

trunk/gdal/frmts/l1b/l1bdataset.cpp

@@ -53 +53 @@
-    NOAA15,     // NOAA-15(K)
-    NOAA16,     // NOAA-16(L)
-
+
+
+
-};
-
-Types of dataset
+Product type
-    HRPT,
-    LAC,
-
+
+
-};
-
@@ -97 +100 @@
-static const char *apszBandDesc[] =
-{
-NOAA-17
+METOP-2
-    "AVHRR Channel 1:  0.58  micrometers -- 0.68 micrometers",
-    "AVHRR Channel 2:  0.725 micrometers -- 1.10 micrometers",
@@ -105 +108 @@
-    // NOAA-13
-    "AVHRR Channel 5:  11.4  micrometers -- 12.4 micrometers",
-NOAA-17
+METOP-2
-    "AVHRR Channel 3A: 1.58  micrometers -- 1.64 micrometers",
-    "AVHRR Channel 3B: 3.55  micrometers -- 3.93 micrometers"
@@ -161 +164 @@
-    friend class L1BRasterBand;
-
-    GByte        pabyTBMHeader[TBM_HEADER_SIZE];
-    char        pszRevolution[6]; // Five-digit number identifying spacecraft revolution
-i
-i
+e
+e
-    TimeCode    sStartTime;
-    TimeCode    sStopTime;
@@ -173 +175 @@
-    int         iGCPCodeOffset;
-    int         nGCPsPerLine;
-i
+e
-
-    int         nBufferSize;
-i
-iDataType;      // LAC, GAC, HRPT
+e
+eProductType;   // LAC, GAC, HRPT, FRAC
-    int         iDataFormat;    // 10-bit packed or 16-bit unpacked
-    int         nRecordDataStart;
@@ -201 +203 @@
-                ~L1BDataset();
-    
-  
+
-    virtual const char *GetGCPProjection();
-    virtual const GDAL_GCP *GetGCPs();
+
+    static int  Identify( GDALOpenInfo * );
-    static GDALDataset *Open( GDALOpenInfo * );
-
@@ -257 +261 @@
-/*      Seek to data.                                                   */
-/* -------------------------------------------------------------------- */
-i
+e
-            poGDS->nDataStartOffset + nBlockYOff * poGDS->nRecordSize:
-            poGDS->nDataStartOffset +
-            (poGDS->GetRasterYSize() - nBlockYOff - 1) * poGDS->nRecordSize;
-
+L
-
-/* -------------------------------------------------------------------- */
@@ -272 +276 @@
-                // Read packed scanline
-                GUInt32 *iRawScan = (GUInt32 *)CPLMalloc(poGDS->nRecordSize);
-
+L
-
-                iScan = (GUInt16 *)CPLMalloc(poGDS->nBufferSize);
@@ -296 +300 @@
-                // Read unpacked scanline
-                GUInt16 *iRawScan = (GUInt16 *)CPLMalloc(poGDS->nRecordSize);
-
+L
-
-                iScan = (GUInt16 *)CPLMalloc(poGDS->GetRasterXSize()
@@ -315 +319 @@
-                // Read 8-bit unpacked scanline
-                GByte   *byRawScan = (GByte *)CPLMalloc(poGDS->nRecordSize);
-
+L
-                
-                iScan = (GUInt16 *)CPLMalloc(poGDS->GetRasterXSize()
@@ -330 +334 @@
-    
-    int nBlockSize = nBlockXSize * nBlockYSize;
-i
+e
-        for( i = 0, j = 0; i < nBlockSize; i++ )
-        {
@@ -359 +363 @@
-    pszGCPProjection = CPLStrdup( "GEOGCS[\"WGS 72\",DATUM[\"WGS_1972\",SPHEROID[\"WGS 72\",6378135,298.26,AUTHORITY[\"EPSG\",7043]],TOWGS84[0,0,4.5,0,0,0.554,0.2263],AUTHORITY[\"EPSG\",6322]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",8901]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",9108]],AXIS[\"Lat\",\"NORTH\"],AXIS[\"Long\",\"EAST\"],AUTHORITY[\"EPSG\",4322]]" );
-    nBands = 0;
-i
+e
-    iChannels = 0;
-    iInstrumentStatus = 0;
@@ -381 +385 @@
-        CPLFree( pszGCPProjection );
-    if( fp != NULL )
-
+L
-}
-
@@ -438 +442 @@
-
-/************************************************************************/
-NOAA17
+METOP2
-/************************************************************************/
-
@@ -483 +487 @@
-
-    // GCPs are located at center of pixel, so we will add a half pixel offset
-i
+e
-        iGCPStart + 0.5 : (GetRasterXSize() - (iGCPStart + 0.5));
-    j = iGCPOffset / (int)sizeof(piRecordHeader[0]);
@@ -507 +511 @@
-        pasGCPList[nGCPCount].dfGCPZ = 0.0;
-        pasGCPList[nGCPCount].dfGCPPixel = dfPixel;
-i
+e
-        pasGCPList[nGCPCount].dfGCPLine =
-i
+e
-            iLine : GetRasterYSize() - iLine - 1) + 0.5;
-        nGCPCount++;
@@ -516 +520 @@
-
-/************************************************************************/
-NOAA17
+METOP2
-/************************************************************************/
-
@@ -526 +530 @@
-
-    // GCPs are located at center of pixel, so we will add a half pixel offset
-i
+e
-        iGCPStart + 0.5 : (GetRasterXSize() - (iGCPStart + 0.5));
-    j = iGCPOffset / (int)sizeof(piRecordHeader[0]);
@@ -551 +555 @@
-        pasGCPList[nGCPCount].dfGCPZ = 0.0;
-        pasGCPList[nGCPCount].dfGCPPixel = dfPixel;
-i
+e
-        pasGCPList[nGCPCount].dfGCPLine =
-i
+e
-            iLine : GetRasterYSize() - iLine - 1) + 0.5;
-        nGCPCount++;
@@ -569 +573 @@
-
-    piRecordHeader = CPLMalloc(nRecordDataStart);
-
-
-
-i
+L
+L
+
+e
-        FetchNOAA9TimeCode(&sStartTime, (GByte *) piRecordHeader, &iLocInd);
-    else
-        FetchNOAA15TimeCode(&sStartTime, (GUInt16 *) piRecordHeader, &iLocInd);
-i
-
+e
+L
-              SEEK_SET);
-
-i
+L
+e
-        FetchNOAA9TimeCode(&sStopTime, (GByte *) piRecordHeader, &iLocInd);
-    else
@@ -616 +620 @@
-            iLine = nLineSkip * iStep;
-
-
-
-
-i
+L
+L
+
+e
-            FetchNOAA9GCPs( pasGCPList, (GInt16 *)piRecordHeader, iLine );
-        else
@@ -667 +671 @@
-    GUInt16 *piHeader;
-    piHeader = (GUInt16 *)CPLMalloc(nDataStartOffset);
-
-
-i
+L
+L
+e
-    {
-        iInstrumentStatus = (piHeader + 512)[58];
@@ -680 +684 @@
-
-/************************************************************************/
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    if( poOpenInfo->fp == NULL )
-NULL
+FALSE
-
-    // XXX: Signature is not very good
@@ -699 +701 @@
-        !EQUALN((const char *) poOpenInfo->pabyHeader + 60, ".", 1) ||
-        !EQUALN((const char *) poOpenInfo->pabyHeader + 69, ".", 1) )
+        return FALSE;
+
+    return TRUE;
+}
+
+/************************************************************************/
+/*                                Open()                                */
+/************************************************************************/
+
+GDALDataset *L1BDataset::Open( GDALOpenInfo * poOpenInfo )
+
+{
+    if ( !Identify(poOpenInfo) )
-        return NULL;
-
@@ -710 +725 @@
-    poDS = new L1BDataset();
-
-
-
+
+
+
+
+
+
-    
-/* -------------------------------------------------------------------- */
-/*      Read the header.                                                */
-/* -------------------------------------------------------------------- */
-
-
+
+
+
+
+
+
+
+
+
-
-    // Determine processing center where the dataset was created
-oDS->p
-i
-oDS->p
-i
-oDS->p
-i
-oDS->p
-i
+
+e
+
+e
+
+e
+
+e
-    else
-i
+e
-    
-    // Determine spacecraft type
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    else
+    {
+#ifdef DEBUG
+        CPLDebug( "L1B", "Unknown spacecraft type \"%.2s\".",
+                  pabyTBMHeader + 39 );
+#endif
-         goto bad;
+    }
-           
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    else
+    {
+#ifdef DEBUG
+        CPLDebug( "L1B", "Unknown product type \"%.4s\".",
+                  pabyTBMHeader + 34 );
+#endif
-         goto bad;
+    }
-
-    // Get revolution number as string, we don't need this value for processing
-oDS->p
-0
+
+'\0'
-
-    // Get receiving station name
-oDS->p
-i
-oDS->p
-i
-oDS->p
-i
-oDS->p
-i
-oDS->p
-i
-oDS->p
-i
-oDS->p
-i
+
+e
+
+e
+
+e
+
+e
+
+e
+
+e
+
+e
-    else
-
-
-
-
+
+
+
-    for ( i = 97; i < 117; i++ )
-
+
+
-        {
-            poDS->nBands++;
-            poDS->iChannels |= (1 << (i - 97));
-        }
+    }
-    if (poDS->nBands == 0 || poDS->nBands > 5)
-    {
@@ -806 +851 @@
-        poDS->iChannels = 0x1F;
-    }
-
-
+
+
+
+
-        poDS->iDataFormat = PACKED10BIT;
-oDS->p
+
-        poDS->iDataFormat = UNPACKED16BIT;
-oDS->p
+
-        poDS->iDataFormat = UNPACKED8BIT;
-    else
+    {
+#ifdef DEBUG
+        CPLDebug( "L1B", "Unknown data format \"%.2s\".",
+                  pabyTBMHeader + 117 );
+#endif
-        goto bad;
-
-
+
+
+
-    {
-        case HRPT:
-        case LAC:
+        case FRAC:
-            poDS->nRasterXSize = 2048;
-            poDS->nBufferSize = 20484;
@@ -825 +879 @@
-            poDS->iGCPStep = 40;
-            poDS->nGCPsPerLine = 51;
-i
+e
-            {
-                if (poDS->iDataFormat == PACKED10BIT)
@@ -889 +943 @@
-                poDS->iGCPOffset = 104;
-            }
-poDS->iSpacecraftID <= NOAA17
+ poDS->eSpacecraftID <= METOP2 
-            {
-                if (poDS->iDataFormat == PACKED10BIT)
@@ -962 +1016 @@
-            poDS->iGCPStep = 8;
-            poDS->nGCPsPerLine = 51;
-i
+e
-            {
-                if (poDS->iDataFormat == PACKED10BIT)
@@ -1024 +1078 @@
-                poDS->iGCPOffset = 104;
-            }
-poDS->iSpacecraftID <= NOAA17
+ poDS->eSpacecraftID <= METOP2 
-            {
-                if (poDS->iDataFormat == PACKED10BIT)
@@ -1115 +1169 @@
-        
-        // Channels descriptions
-iSpacecraftID >= NOAA6 && poDS->iSpacecraftID <= NOAA17
+eSpacecraftID >= NOAA6 && poDS->eSpacecraftID <= METOP2
-        {
-            if ( !(i & 0x01) && poDS->iChannels & 0x01 )
@@ -1131 +1185 @@
-            if ( !(i & 0x04) && poDS->iChannels & 0x04 )
-            {
-
+
+
-                    if (poDS->iInstrumentStatus & 0x0400)
-                        poDS->GetRasterBand(iBand)->SetDescription( apszBandDesc[7] );
@@ -1149 +1204 @@
-            if ( !(i & 0x10) && poDS->iChannels & 0x10 )
-            {
-i
+e
-                    poDS->GetRasterBand(iBand)->SetDescription( apszBandDesc[5] );
-i
-i
-i
+e
+e
+e
-                    poDS->GetRasterBand(iBand)->SetDescription( apszBandDesc[3] );
-                else
@@ -1166 +1221 @@
-/*      Do we have GCPs?                                                */
-/* -------------------------------------------------------------------- */
-oDS->p
+
-    {
-        poDS->ProcessRecordHeaders();
@@ -1182 +1237 @@
-        poDS->SetMetadataItem( "Y_BAND", "2" , "GEOLOCATION" );
-
-i
+e
-            poDS->iGCPStart : (poDS->nRasterXSize - poDS->iGCPStart) );
-        poDS->SetMetadataItem( "PIXEL_OFFSET", osTMP, "GEOLOCATION" );
-i
+e
-        poDS->SetMetadataItem( "PIXEL_STEP", osTMP, "GEOLOCATION" );
-
@@ -1197 +1252 @@
-/* -------------------------------------------------------------------- */
-    const char *pszText;
-i
+e
-    {
-        case TIROSN:
@@ -1241 +1296 @@
-            pszText = "NOAA-17(M)";
-        break;
+        case NOAA18:
+            pszText = "NOAA-18(N)";
+        break;
+        case METOP2:
+            pszText = "METOP-2(A)";
+        break;
-        default:
-            pszText = "Unknown";
-    }
-    poDS->SetMetadataItem( "SATELLITE",  pszText );
-iData
+eProduct
-    {
-        case LAC:
@@ -1256 +1317 @@
-            pszText = "AVHRR GAC";
-        break;
+        case FRAC:
+            pszText = "AVHRR FRAC";
+        break;
-        default:
-            pszText = "Unknown";
@@ -1261 +1325 @@
-    poDS->SetMetadataItem( "DATA_TYPE",  pszText );
-    poDS->SetMetadataItem( "REVOLUTION",  poDS->pszRevolution );
-i
+e
-    {
-        case DU:
@@ -1288 +1352 @@
-    }
-    poDS->SetMetadataItem( "SOURCE",  pszText );
-i
+e
-    {
-        case CMS:
@@ -1311 +1375 @@
-    poDS->SetMetadataItem( "STOP",  poDS->sStopTime.PrintTime() );
-    // AVHRR Earth location indication
-i
+e
-    {
-        case ASCEND:
-
-
+    
+    
-        case DESCEND:
-        default:
-
-
+    
+    
-    }
-
@@ -1329 +1393 @@
-
-    return( poDS );
+
-bad:
-    delete poDS;