WIP: Code simplification and optimization in SarSensorModule

Modules/Adapters/OSSIMAdapters/include/otbImageKeywordlist.h

@@ -95,7 +95,12 @@ public:
   {
     m_Keywordlist.clear();
   }
- 
+
+  KeywordlistMapSizeType Empty() const
+  {
+    return m_Keywordlist.empty();
+  }
+
   KeywordlistMapSizeType GetSize(void) const
   {
     return m_Keywordlist.size();
@@ -113,7 +118,7 @@ public:
   virtual void AddKey(const std::string& key, const std::string& value);
 
   virtual void convertToOSSIMKeywordlist(ossimKeywordlist& kwl) const;
-  
+
   /** try to convert the image keywordlist into a GDALRpcInfo structure
    *  return true if successful, false otherwise */
   virtual bool convertToGDALRPC(GDALRPCInfo &rpc) const;

Modules/Adapters/OSSIMAdapters/src/otbImageKeywordlist.cxx

@@ -84,15 +84,7 @@ void
 ImageKeywordlist::
 SetKeywordlist(const ossimKeywordlist& kwl)
 {
-  m_Keywordlist.clear();
-  for (ossimKeywordlist::KeywordMap::const_iterator it = kwl.getMap().begin();
-       it != kwl.getMap().end();
-       ++it)
-    {
-    std::string first(it->first);
-    std::string second(it->second);
-    m_Keywordlist[first] = second;
-    }
+  m_Keywordlist = kwl.getMap();
 }
 
 const std::string&
@@ -118,7 +110,6 @@ HasKey(const std::string& key) const
 {
   KeywordlistMap::const_iterator it = m_Keywordlist.find(key);
 
-
   return (it != m_Keywordlist.end());
 }
 
@@ -140,14 +131,7 @@ void
 ImageKeywordlist::
 convertToOSSIMKeywordlist(ossimKeywordlist& kwl) const
 {
-  ossimKeywordlist::KeywordMap ossimMap;
-  for(KeywordlistMap::const_iterator it = m_Keywordlist.begin();
-      it != m_Keywordlist.end();
-      ++it)
-    {
-    ossimMap[it->first] = it->second;
-    }
-  kwl.getMap() = ossimMap;
+  kwl.getMap() = m_Keywordlist;
 }
 
 bool

Modules/Core/Metadata/src/otbSarImageMetadataInterface.cxx

@@ -28,7 +28,6 @@ namespace otb
 SarImageMetadataInterface
 ::SarImageMetadataInterface()
 {
-
 }
 
 const std::string
@@ -104,13 +103,9 @@ bool
 SarImageMetadataInterface
 ::HasCalibrationLookupDataFlag() const
 {
-  const ImageKeywordlist imageKeywordlist = this->GetImageKeywordlist();
+  const ImageKeywordlist & imageKeywordlist = this->GetImageKeywordlist();
   /* checking if the key exist is more than enough */
-  if (imageKeywordlist.HasKey("support_data.calibration_lookup_flag"))
-    {
-    return true;
-    }
-  return false;
+  return imageKeywordlist.HasKey("support_data.calibration_lookup_flag");
 }
 
 SarImageMetadataInterface::RealType

Modules/Core/Metadata/src/otbSentinel1ImageMetadataInterface.cxx

@@ -33,58 +33,52 @@ namespace otb
 Sentinel1ImageMetadataInterface
 ::Sentinel1ImageMetadataInterface()
 {
-
 }
 
 bool
 Sentinel1ImageMetadataInterface::CanRead() const
 {
-  std::string sensorID = GetSensorID();
+  const std::string sensorID = GetSensorID();
 
-  if (sensorID.find("SENTINEL-1") != std::string::npos)
-    {
-    return true;
-    }
-  else
-    return false;
+  return sensorID.find("SENTINEL-1") != std::string::npos;
 }
 
 void
 Sentinel1ImageMetadataInterface
 ::CreateCalibrationLookupData(const short type)
-  {
-    bool sigmaLut = false;
-    bool betaLut = false;
-    bool gammaLut = false;
-    bool dnLut = false;
+{
+  bool sigmaLut = false;
+  bool betaLut = false;
+  bool gammaLut = false;
+  bool dnLut = false;
 
-    switch (type)
-      {
-      case SarCalibrationLookupData::BETA:
+  switch (type)
+    {
+  case SarCalibrationLookupData::BETA:
       {
       betaLut = true;
       }
-      break;
+    break;
 
-      case SarCalibrationLookupData::GAMMA:
+  case SarCalibrationLookupData::GAMMA:
       {
       gammaLut = true;
       }
-      break;
+    break;
 
-      case SarCalibrationLookupData::DN:
+  case SarCalibrationLookupData::DN:
       {
       dnLut = true;
       }
-      break;
+    break;
 
-      case SarCalibrationLookupData::SIGMA:
-      default:
-        sigmaLut = true;
-        break;
-      }
+  case SarCalibrationLookupData::SIGMA:
+  default:
+    sigmaLut = true;
+    break;
+    }
 
-  const ImageKeywordlistType imageKeywordlist =  this->GetImageKeywordlist();
+  const ImageKeywordlistType imageKeywordlist = this->GetImageKeywordlist();
 
   // const double firstLineTime = Utils::LexicalCast<double>(imageKeywordlist.GetMetadataByKey("calibration.startTime"), "calibration.startTime(double)");
 
@@ -107,41 +101,42 @@ Sentinel1ImageMetadataInterface
 
     std::stringstream prefix;
     prefix << "calibration.calibrationVector[" << i << "].";
+    const std::string sPrefix = prefix.str();
 
-    calibrationVector.line = Utils::LexicalCast<int>(imageKeywordlist.GetMetadataByKey(prefix.str() + "line"), prefix.str() + "line");
+    calibrationVector.line = Utils::LexicalCast<int>(imageKeywordlist.GetMetadataByKey(sPrefix + "line"), sPrefix + "line");
 
     // TODO: don't manipulate doubles, but ModifiedJulianDate
-    calibrationVector.timeMJD =  toModifiedJulianDate(imageKeywordlist.GetMetadataByKey(prefix.str() + "azimuthTime")).as_day_frac();
+    calibrationVector.timeMJD =  toModifiedJulianDate(imageKeywordlist.GetMetadataByKey(sPrefix + "azimuthTime")).as_day_frac();
 
-    Utils::ConvertStringToVector(imageKeywordlist.GetMetadataByKey(prefix.str() + "pixel"), calibrationVector.pixels, prefix.str() + "pixel");
+    Utils::ConvertStringToVector(imageKeywordlist.GetMetadataByKey(sPrefix + "pixel"), calibrationVector.pixels, sPrefix + "pixel");
 
-    if (sigmaLut) {
-    Utils::ConvertStringToVector(imageKeywordlist.GetMetadataByKey(prefix.str() + "sigmaNought"), calibrationVector.vect, prefix.str() + "sigmaNought");
+    if (sigmaLut)
+      {
+      Utils::ConvertStringToVector(imageKeywordlist.GetMetadataByKey(sPrefix + "sigmaNought"), calibrationVector.vect, sPrefix + "sigmaNought");
       }
 
-    if (betaLut) {
-    Utils::ConvertStringToVector(imageKeywordlist.GetMetadataByKey(prefix.str() + "betaNought"), calibrationVector.vect, prefix.str() + "betaNought");
-    }
+    if (betaLut)
+      {
+      Utils::ConvertStringToVector(imageKeywordlist.GetMetadataByKey(sPrefix + "betaNought"), calibrationVector.vect, sPrefix + "betaNought");
+      }
 
-    if (gammaLut) {
-    Utils::ConvertStringToVector(imageKeywordlist.GetMetadataByKey(prefix.str() + "gamma"), calibrationVector.vect, prefix.str() + "gamma");
-    }
+    if (gammaLut)
+      {
+      Utils::ConvertStringToVector(imageKeywordlist.GetMetadataByKey(sPrefix + "gamma"), calibrationVector.vect, sPrefix + "gamma");
+      }
 
-    if (dnLut) {
-    Utils::ConvertStringToVector(imageKeywordlist.GetMetadataByKey(prefix.str() + "dn"), calibrationVector.vect, prefix.str() + "dn");
-    }
+    if (dnLut)
+      {
+      Utils::ConvertStringToVector(imageKeywordlist.GetMetadataByKey(sPrefix + "dn"), calibrationVector.vect, sPrefix + "dn");
+      }
 
     calibrationVectorList[i] = calibrationVector;
-
     }
 
-  Sentinel1CalibrationLookupData::Pointer sarLut;
-  sarLut = Sentinel1CalibrationLookupData::New();
+  Sentinel1CalibrationLookupData::Pointer sarLut = Sentinel1CalibrationLookupData::New();
   sarLut->InitParameters(type, firstLineTime.as_day_frac(), lastLineTime.as_day_frac(), numOfLines, count, calibrationVectorList);
   this->SetCalibrationLookupData(sarLut);
-
-
-  }
+}
 
 void
 Sentinel1ImageMetadataInterface
@@ -164,7 +159,6 @@ Sentinel1ImageMetadataInterface
     const std::string date_time_str = imageKeywordlist.GetMetadataByKey(key);
     Utils::ConvertStringToVector(date_time_str, dateFields, key, "T:-.");
     }
-
 }
 
 int
@@ -261,7 +255,6 @@ Sentinel1ImageMetadataInterface::GetProductionYear() const
     itkExceptionMacro( << "Invalid production year" );
     }
   return value;
-
 }
 
 int

Modules/IO/ImageIO/include/otbImageFileReader.txx

@@ -435,7 +435,7 @@ ImageFileReader<TOutputImage, ConvertPixelTraits>
     }
 
   // Don't add an empty ossim keyword list
-  if( otb_kwl.GetSize() != 0 )
+  if(!otb_kwl.Empty())
     {
       itk::EncapsulateMetaData<ImageKeywordlist>(dict,
                                                  MetaDataKey::OSSIMKeywordlistKey, otb_kwl);