ENH: Ensure that geotiff dataset calls base GetMetadata() and GetMeta…

…dataDomainList()
jmichel-otb · Jul 6, 2016 · a5a8adb · a5a8adb
1 parent a7b6a89
commit a5a8adb
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/gdal/frmts/gtiff/geotiff.cpp b/gdal/frmts/gtiff/geotiff.cpp
@@ -15817,10 +15817,22 @@ CPLErr GTiffDataset::SetGCPs( int nGCPCountIn, const GDAL_GCP *pasGCPListIn,
 
 char **GTiffDataset::GetMetadataDomainList()
 {
+  CPLDebug("GTiffDataset", "GetMetadataDomainList");
+
     LoadGeoreferencingAndPamIfNeeded();
 
+    char ** domainlist = CSLDuplicate(oGTiffMDMD.GetDomainList());
+    char ** baselist = GDALDataset::GetMetadataDomainList();
+
+    int nbBaseDomains = CSLCount(baselist);
+
+    for(int domainId = 0; domainId<nbBaseDomains;++domainId)
+      domainlist = CSLAddString(domainlist,baselist[domainId]);
+
+    CSLDestroy(baselist);
+
     return BuildMetadataDomainList(
-        CSLDuplicate(oGTiffMDMD.GetDomainList()),
+        domainlist,
         TRUE,
         "", "ProxyOverviewRequest", MD_DOMAIN_RPC, MD_DOMAIN_IMD,
         "SUBDATASETS", "EXIF",
@@ -15842,6 +15854,11 @@ char **GTiffDataset::GetMetadata( const char * pszDomain )
     if( pszDomain != NULL && EQUAL(pszDomain,"ProxyOverviewRequest") )
         return GDALPamDataset::GetMetadata( pszDomain );
 
+    if( pszDomain != NULL && EQUAL(pszDomain,"DERIVED_SUBDATASETS"))
+      {
+      return GDALDataset::GetMetadata(pszDomain);
+      }
+
     else if( pszDomain != NULL && (EQUAL(pszDomain, MD_DOMAIN_RPC) ||
                                    EQUAL(pszDomain, MD_DOMAIN_IMD) ||
                                    EQUAL(pszDomain, MD_DOMAIN_IMAGERY)) )