Commit 4dfd9947 authored by Victor Poughon's avatar Victor Poughon
Browse files

Merge branch 'rfc-53-spot7_metadata' into develop

parents f3e31303 02981bd9
......@@ -37,7 +37,7 @@ bool
Spot6ImageMetadataInterface::CanRead() const
{
std::string sensorID = GetSensorID();
if (sensorID.find("SPOT 6") != std::string::npos)
if (sensorID.find("SPOT 6") != std::string::npos || sensorID.find("SPOT 7") != std::string::npos)
return true;
else
return false;
......@@ -789,7 +789,7 @@ Spot6ImageMetadataInterface
if (nbBands == 1)
{
//if (sensorId.find("PHR") != std::string::npos)
if (sensorId == "SPOT 6") // todo
if (sensorId == "SPOT 6" || sensorId == "SPOT 7") // todo: updated values for Spot7
{
const float pan[601] =
{
......@@ -1406,7 +1406,7 @@ Spot6ImageMetadataInterface
}
else if (nbBands > 1 && nbBands < 5)
{
if (sensorId == "SPOT 6") // todo
if (sensorId == "SPOT 6" || sensorId == "SPOT 7") // todo: updated values for Spot7
{
//band B0 (blue band)
const float b0[601] =
......
......@@ -1693,7 +1693,10 @@ namespace ossimplugins
ossimString metadataProfile;
if ( (nodeValue != "S6_SENSOR")
&& (nodeValue != "S6_ORTHO")
&& (nodeValue != "S6_MOSAIC") )
&& (nodeValue != "S6_MOSAIC")
&& (nodeValue != "S7_SENSOR")
&& (nodeValue != "S7_ORTHO")
&& (nodeValue != "S7_MOSAIC") )
{
if (traceDebug())
{
......@@ -1717,7 +1720,7 @@ namespace ossimplugins
if ((nodeValue == "PRODUCT"))
theMetadataSubProfile = OSSIM_Spot6_METADATA_SUBPROFILE_PRODUCT;
else if ( (nodeValue == "RPC") && (metadataProfile == "S6_SENSOR") )
else if ( (nodeValue == "RPC") && ((metadataProfile == "S6_SENSOR") || (metadataProfile == "S7_SENSOR")) )
theMetadataSubProfile = OSSIM_Spot6_METADATA_SUBPROFILE_RPC;
else
{
......@@ -2156,7 +2159,9 @@ namespace ossimplugins
}
if (nodeValue == "6")
theSensorID = "SPOT 6";
theSensorID = "SPOT 6";
else if (nodeValue == "7")
theSensorID = "SPOT 7";
else
{
setErrorStatus();
......
Supports Markdown
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