Commit 3af52e5d authored by Julien Osman's avatar Julien Osman
Browse files

ENH: Improve code quality

parent e0e05761
Pipeline #7244 passed with stages
in 92 minutes and 12 seconds
...@@ -92,7 +92,7 @@ public: ...@@ -92,7 +92,7 @@ public:
void Parse(const MetadataSupplierInterface &) override; void Parse(const MetadataSupplierInterface &) override;
void ParseGdal(const MetadataSupplierInterface &); void ParseGdal(const MetadataSupplierInterface &) override;
void ParseGeom(const MetadataSupplierInterface &) override; void ParseGeom(const MetadataSupplierInterface &) override;
......
...@@ -117,7 +117,7 @@ public: ...@@ -117,7 +117,7 @@ public:
virtual void ParseGdal(const MetadataSupplierInterface &) =0; virtual void ParseGdal(const MetadataSupplierInterface &) =0;
virtual void ParseGeom(const MetadataSupplierInterface &) =0; virtual void ParseGeom(const MetadataSupplierInterface &) =0;
bool GetSAR(const MetadataSupplierInterface &, SARParam &); bool GetSAR(const MetadataSupplierInterface &, SARParam &) const;
std::vector<AzimuthFmRate> GetAzimuthFmRateGeom(const MetadataSupplierInterface &) const; std::vector<AzimuthFmRate> GetAzimuthFmRateGeom(const MetadataSupplierInterface &) const;
std::vector<DopplerCentroid> GetDopplerCentroidGeom(const MetadataSupplierInterface &) const; std::vector<DopplerCentroid> GetDopplerCentroidGeom(const MetadataSupplierInterface &) const;
std::vector<Orbit> GetOrbitsGeom(const MetadataSupplierInterface &) const; std::vector<Orbit> GetOrbitsGeom(const MetadataSupplierInterface &) const;
......
...@@ -312,8 +312,9 @@ void Radarsat2ImageMetadataInterface::ParseGeom(const MetadataSupplierInterface ...@@ -312,8 +312,9 @@ void Radarsat2ImageMetadataInterface::ParseGeom(const MetadataSupplierInterface
m_Imd.Add(MDNum::NumberOfLines, ProductMS.GetAs<int>("product.imageAttributes.rasterAttributes.numberOfLines")); m_Imd.Add(MDNum::NumberOfLines, ProductMS.GetAs<int>("product.imageAttributes.rasterAttributes.numberOfLines"));
m_Imd.Add(MDNum::NumberOfColumns, ProductMS.GetAs<int>("product.imageAttributes.rasterAttributes.numberOfSamplesPerLine")); m_Imd.Add(MDNum::NumberOfColumns, ProductMS.GetAs<int>("product.imageAttributes.rasterAttributes.numberOfSamplesPerLine"));
m_Imd.Add(MDTime::ProductionDate, m_Imd.Add(MDTime::ProductionDate,
ProductMS.GetFirstAs<MetaData::Time>("product.imageGenerationParameters.generalProcessingInformation.processingTime")); ProductMS.GetFirstAs<MetaData::Time>("product.imageGenerationParameters.generalProcessingInformation.processingTime"));
m_Imd.Add(MDNum::AverageSceneHeight, ProductMS.GetAs<double>("product.imageAttributes.geographicInformation.referenceEllipsoidParameters.geodeticTerrainHeight")); m_Imd.Add(MDNum::AverageSceneHeight,
ProductMS.GetAs<double>("product.imageAttributes.geographicInformation.referenceEllipsoidParameters.geodeticTerrainHeight"));
m_Imd.Add(MDNum::RadarFrequency, this->GetRadarFrequency()); m_Imd.Add(MDNum::RadarFrequency, this->GetRadarFrequency());
m_Imd.Add(MDNum::PRF, this->GetPRF()); m_Imd.Add(MDNum::PRF, this->GetPRF());
m_Imd.Add(MDNum::RSF, this->GetRSF()); m_Imd.Add(MDNum::RSF, this->GetRSF());
......
...@@ -220,7 +220,9 @@ std::vector<DopplerCentroid> SarImageMetadataInterface::GetDopplerCentroidGeom(c ...@@ -220,7 +220,9 @@ std::vector<DopplerCentroid> SarImageMetadataInterface::GetDopplerCentroidGeom(c
// Path: dopplerCentroid.dop_coef_list<listId>.{dop_coef_time,slant_range_time,{1,2,3}.dop_coef} // Path: dopplerCentroid.dop_coef_list<listId>.{dop_coef_time,slant_range_time,{1,2,3}.dop_coef}
// This streams wild hold the iteration number // This streams wild hold the iteration number
std::ostringstream oss; std::ostringstream oss;
for (int listId = 1 ; mds.GetAs<std::string>("", std::string("dopplerCentroid.dop_coef_list")+std::to_string(listId)+std::string(".slant_range_time")) != "" ; ++listId) for (int listId = 1 ;
mds.GetAs<std::string>("", std::string("dopplerCentroid.dop_coef_list")+std::to_string(listId)+std::string(".slant_range_time")) != "" ;
++listId)
{ {
oss.str(""); oss.str("");
oss << listId; oss << listId;
...@@ -334,7 +336,7 @@ std::vector<SARNoise> SarImageMetadataInterface::GetNoiseVectorGeom(const Metada ...@@ -334,7 +336,7 @@ std::vector<SARNoise> SarImageMetadataInterface::GetNoiseVectorGeom(const Metada
return noiseVector; return noiseVector;
} }
bool SarImageMetadataInterface::GetSAR(const MetadataSupplierInterface & mds, SARParam & sarParam) bool SarImageMetadataInterface::GetSAR(const MetadataSupplierInterface & mds, SARParam & sarParam) const
{ {
bool hasValue; bool hasValue;
mds.GetMetadataValue("calibration.count", hasValue); mds.GetMetadataValue("calibration.count", hasValue);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment