ENH: Read extra metadata

Modules/Core/Metadata/include/otbMetaDataKey.h

@@ -182,7 +182,9 @@ enum class MDStr
   BeamMode,
   BeamSwath,
   AreaOrPoint,
-  // ...
+  LayerType,
+  MetadataType,
+  OtbVersion,
   END
 };
 

Modules/Core/Metadata/src/otbImageMetadata.cxx

@@ -373,8 +373,6 @@ std::string ImageMetadataBase::ToJSON(bool multiline) const
 
 bool ImageMetadataBase::FromKeywordlist(const Keywordlist& kwl)
 {
-  // Return value
-  bool all_parsed = true;
   // search iterators
   for (const auto& kv : kwl)
   {
@@ -460,10 +458,10 @@ bool ImageMetadataBase::FromKeywordlist(const Keywordlist& kwl)
       this->Add(kv.first.substr(prefix.size()), kv.second);
       continue;
     }
-    otbLogMacro(Warning, << "The metadata named '" << kv.first << "' with value '" << kv.second << "' was not parsed.")
-    all_parsed = false;
+    otbLogMacro(Debug, << "The metadata named '" << kv.first << "' with value '" << kv.second << "' was add to ExtraKeys.");
+    this->Add(kv.first, kv.second);
   }
-  return all_parsed;
+  return true;
 }
 
 

Modules/Core/Metadata/src/otbMetaDataKey.cxx

@@ -422,7 +422,10 @@ MDStrBmType MDStrNames = bimapGenerator<MDStr>(std::map<MDStr, std::string> {
   {MDStr::EnhancedBandName,"EnhancedBandName"},
   {MDStr::BeamMode, "BeamMode"},
   {MDStr::BeamSwath, "BeamSwath"},
-  {MDStr::AreaOrPoint, "AreaOrPoint"},
+  {MDStr::AreaOrPoint, "AREA_OR_POINT"},
+  {MDStr::LayerType, "LAYER_TYPE"},
+  {MDStr::MetadataType, "METADATATYPE"},
+  {MDStr::OtbVersion, "OTB_VERSION"},
 });
 
 MDTimeBmType MDTimeNames = bimapGenerator<MDTime>(std::map<MDTime, std::string> {