S102: fix opening products with no uncertainty

Author: rouault

frmts/hdf5/hdf5drivercore.cpp

@@ -264,30 +264,48 @@ static bool IdentifySxx(GDALOpenInfo *poOpenInfo, const char *pszDriverName,
         // Works at least on:
         // - /vsis3/noaa-s102-pds/ed2.1.0/national_bathymetric_source/boston/dcf2/tiles/102US00_US4MA1GC.h5
         // - https://datahub.admiralty.co.uk/portal/sharing/rest/content/items/6fd07bde26124d48820b6dee60695389/data (S-102_Liverpool_Trial_Cells.zip)
-        const int nLenMainGroup =
-            static_cast<int>(strlen(pszMainGroupName) + 1);
-        const int nLenGroupF = static_cast<int>(strlen("Group_F\0") + 1);
+        const int nLenMainGroup = static_cast<int>(strlen(pszMainGroupName));
+        const int nLenGroupF = static_cast<int>(strlen("Group_F"));
+        const int nLenProductSpecification =
+            static_cast<int>(strlen("productSpecification"));
         bool bFoundMainGroup = false;
         bool bFoundGroupF = false;
-        for (int i = 0;
-             i < poOpenInfo->nHeaderBytes - std::max(nLenMainGroup, nLenGroupF);
-             ++i)
+        bool bFoundProductSpecification = false;
+        for (int iTry = 0; iTry < 2; ++iTry)
         {
-            if (poOpenInfo->pabyHeader[i] == pszMainGroupName[0] &&
-                memcmp(poOpenInfo->pabyHeader + i, pszMainGroupName,
-                       nLenMainGroup) == 0)
+            for (int i = 0; i <= poOpenInfo->nHeaderBytes - nLenGroupF; ++i)
             {
-                bFoundMainGroup = true;
-                if (bFoundGroupF)
-                    return true;
+                if (poOpenInfo->pabyHeader[i] == pszMainGroupName[0] &&
+                    i <= poOpenInfo->nHeaderBytes - nLenMainGroup &&
+                    memcmp(poOpenInfo->pabyHeader + i, pszMainGroupName,
+                           nLenMainGroup) == 0)
+                {
+                    bFoundMainGroup = true;
+                    if (bFoundGroupF)
+                        return true;
+                }
+                if (poOpenInfo->pabyHeader[i] == 'G' &&
+                    memcmp(poOpenInfo->pabyHeader + i, "Group_F", nLenGroupF) ==
+                        0)
+                {
+                    bFoundGroupF = true;
+                    if (bFoundMainGroup)
+                        return true;
+                }
+                if (poOpenInfo->pabyHeader[i] == 'p' &&
+                    i <= poOpenInfo->nHeaderBytes - nLenProductSpecification &&
+                    memcmp(poOpenInfo->pabyHeader + i, "productSpecification",
+                           nLenProductSpecification) == 0)
+                {
+                    // For 102DE00OS08J.H5
+                    bFoundProductSpecification = true;
+                }
             }
-            if (poOpenInfo->pabyHeader[i] == 'G' &&
-                memcmp(poOpenInfo->pabyHeader + i, "Group_F\0", nLenGroupF) ==
-                    0)
+            if (!(iTry == 0 && bFoundProductSpecification &&
+                  poOpenInfo->nHeaderBytes == 1024 &&
+                  poOpenInfo->TryToIngest(4096)))
             {
-                bFoundGroupF = true;
-                if (bFoundMainGroup)
-                    return true;
+                break;
             }
         }
     }

frmts/hdf5/s102dataset.cpp

@@ -199,7 +199,11 @@ GDALDataset *S102Dataset::Open(GDALOpenInfo *poOpenInfo)
     auto poBathymetryCoverage01 = poRootGroup->OpenGroupFromFullname(
         "/BathymetryCoverage/BathymetryCoverage.01");
     if (!poBathymetryCoverage01)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "S102: Cannot find /BathymetryCoverage/BathymetryCoverage.01");
         return nullptr;
+    }
 
     const bool bNorthUp = CPLTestBool(
         CSLFetchNameValueDef(poOpenInfo->papszOpenOptions, "NORTH_UP", "YES"));
@@ -225,18 +229,34 @@ GDALDataset *S102Dataset::Open(GDALOpenInfo *poOpenInfo)
 
     auto poGroup001 = poBathymetryCoverage01->OpenGroup("Group_001");
     if (!poGroup001)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "S102: Cannot find "
+                 "/BathymetryCoverage/BathymetryCoverage.01/Group_001");
         return nullptr;
+    }
     auto poValuesArray = poGroup001->OpenMDArray("values");
     if (!poValuesArray || poValuesArray->GetDimensionCount() != 2)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "S102: Cannot find "
+                 "/BathymetryCoverage/BathymetryCoverage.01/Group_001/values");
         return nullptr;
-
+    }
     const auto &oType = poValuesArray->GetDataType();
     if (oType.GetClass() != GEDTC_COMPOUND)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "S102: Wrong type for "
+                 "/BathymetryCoverage/BathymetryCoverage.01/Group_001/values");
         return nullptr;
+    }
     const auto &oComponents = oType.GetComponents();
-    if (oComponents.size() != 2 || oComponents[0]->GetName() != "depth" ||
-        oComponents[1]->GetName() != "uncertainty")
+    if (oComponents.size() == 0 || oComponents[0]->GetName() != "depth")
     {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "S102: Wrong type for "
+                 "/BathymetryCoverage/BathymetryCoverage.01/Group_001/values");
         return nullptr;
     }
 
@@ -288,11 +308,6 @@ GDALDataset *S102Dataset::Open(GDALOpenInfo *poOpenInfo)
         }
     }();
 
-    auto poUncertainty = poValuesArray->GetView("[\"uncertainty\"]");
-    const double dfUncertaintyNoData = poUncertainty->GetNoDataValueAsDouble();
-    auto poUncertaintyDS =
-        std::unique_ptr<GDALDataset>(poUncertainty->AsClassicDataset(1, 0));
-
     poDS->nRasterXSize = poDepthDS->GetRasterXSize();
     poDS->nRasterYSize = poDepthDS->GetRasterYSize();
 
@@ -330,33 +345,46 @@ GDALDataset *S102Dataset::Open(GDALOpenInfo *poOpenInfo)
 
     poDS->SetBand(1, poDepthBand);
 
-    // Create uncertainty band
-    auto poUncertaintyBand = new S102RasterBand(std::move(poUncertaintyDS));
-    poUncertaintyBand->SetDescription("uncertainty");
-
-    auto poMinimumUncertainty = poGroup001->GetAttribute("minimumUncertainty");
-    if (poMinimumUncertainty &&
-        poMinimumUncertainty->GetDataType().GetClass() == GEDTC_NUMERIC)
+    const bool bHasUncertainty =
+        oComponents.size() >= 2 && oComponents[1]->GetName() == "uncertainty";
+    if (bHasUncertainty)
     {
-        const double dfVal = poMinimumUncertainty->ReadAsDouble();
-        if (dfVal != dfUncertaintyNoData)
+        // Create uncertainty band
+        auto poUncertainty = poValuesArray->GetView("[\"uncertainty\"]");
+        const double dfUncertaintyNoData =
+            poUncertainty->GetNoDataValueAsDouble();
+        auto poUncertaintyDS =
+            std::unique_ptr<GDALDataset>(poUncertainty->AsClassicDataset(1, 0));
+
+        auto poUncertaintyBand = new S102RasterBand(std::move(poUncertaintyDS));
+        poUncertaintyBand->SetDescription("uncertainty");
+
+        auto poMinimumUncertainty =
+            poGroup001->GetAttribute("minimumUncertainty");
+        if (poMinimumUncertainty &&
+            poMinimumUncertainty->GetDataType().GetClass() == GEDTC_NUMERIC)
         {
-            poUncertaintyBand->m_dfMinimum = dfVal;
+            const double dfVal = poMinimumUncertainty->ReadAsDouble();
+            if (dfVal != dfUncertaintyNoData)
+            {
+                poUncertaintyBand->m_dfMinimum = dfVal;
+            }
         }
-    }
 
-    auto poMaximumUncertainty = poGroup001->GetAttribute("maximumUncertainty");
-    if (poMaximumUncertainty &&
-        poMaximumUncertainty->GetDataType().GetClass() == GEDTC_NUMERIC)
-    {
-        const double dfVal = poMaximumUncertainty->ReadAsDouble();
-        if (dfVal != dfUncertaintyNoData)
+        auto poMaximumUncertainty =
+            poGroup001->GetAttribute("maximumUncertainty");
+        if (poMaximumUncertainty &&
+            poMaximumUncertainty->GetDataType().GetClass() == GEDTC_NUMERIC)
         {
-            poUncertaintyBand->m_dfMaximum = dfVal;
+            const double dfVal = poMaximumUncertainty->ReadAsDouble();
+            if (dfVal != dfUncertaintyNoData)
+            {
+                poUncertaintyBand->m_dfMaximum = dfVal;
+            }
         }
-    }
 
-    poDS->SetBand(2, poUncertaintyBand);
+        poDS->SetBand(2, poUncertaintyBand);
+    }
 
     poDS->GDALDataset::SetMetadataItem(GDALMD_AREA_OR_POINT, GDALMD_AOP_POINT);