diff --git a/include/usgscsm/UsgsAstroFrameSensorModel.h b/include/usgscsm/UsgsAstroFrameSensorModel.h
index 7da5473b85b261d84cb0e9cf8485022fb2b9ab67..d9a62d7308502f5ae291033980f3303dc7505241 100644
--- a/include/usgscsm/UsgsAstroFrameSensorModel.h
+++ b/include/usgscsm/UsgsAstroFrameSensorModel.h
@@ -356,6 +356,10 @@ protected:
double m_startingDetectorLine;
std::string m_targetName;
std::string m_modelName;
+ std::string m_sensorName;
+ std::string m_platformName;
+ std::string m_imageIdentifier;
+ std::string m_collectionIdentifier;
double m_ifov;
std::string m_instrumentID;
double m_focalLengthEpsilon;
@@ -369,6 +373,8 @@ protected:
int m_nSamples;
int m_nParameters;
+ csm::EcefCoord m_referencePointXyz;
+
json _state;
static const int _NUM_STATE_KEYWORDS;
static const int NUM_PARAMETERS;
diff --git a/include/usgscsm/UsgsAstroPlugin.h b/include/usgscsm/UsgsAstroPlugin.h
index a3a3c7670af77a69354318e29d9e9a664dbce5a9..8789106f3c83fc343a50bbeec6921d21b7be8821 100644
--- a/include/usgscsm/UsgsAstroPlugin.h
+++ b/include/usgscsm/UsgsAstroPlugin.h
@@ -55,11 +55,7 @@ private:
static const std::string _MANUFACTURER_NAME;
static const std::string _RELEASE_DATE;
static const int _N_SENSOR_MODELS;
- static const int _NUM_ISD_KEYWORDS;
static const std::string _ISD_KEYWORD[];
- static const int _NUM_STATE_KEYWORDS;
- static const std::string _STATE_KEYWORD[];
- static const json MODEL_KEYWORDS;
typedef csm::Model* (*sensorConstructor)(void);
static std::map<std::string, sensorConstructor> MODELS;
diff --git a/src/UsgsAstroFrameSensorModel.cpp b/src/UsgsAstroFrameSensorModel.cpp
index 2ef4aea3e71f0a36ae5a4fe7576bc6afc5cf8008..1f9dc373a86bb8c083517a29b1335e47bb9a8705 100644
--- a/src/UsgsAstroFrameSensorModel.cpp
+++ b/src/UsgsAstroFrameSensorModel.cpp
@@ -26,14 +26,16 @@ const std::string UsgsAstroFrameSensorModel::m_parameterName[] = {
"v3" // 6
};
-const int UsgsAstroFrameSensorModel::_NUM_STATE_KEYWORDS = 32;
-
UsgsAstroFrameSensorModel::UsgsAstroFrameSensorModel() {
reset();
}
void UsgsAstroFrameSensorModel::reset() {
m_modelName = _SENSOR_MODEL_NAME;
+ m_platformName = "";
+ m_sensorName = "";
+ m_imageIdentifier = "";
+ m_collectionIdentifier = "";
m_majorAxis = 0.0;
m_minorAxis = 0.0;
m_focalLength = 0.0;
@@ -67,6 +69,9 @@ void UsgsAstroFrameSensorModel::reset() {
m_iTransL = std::vector<double>(3, 0.0);
m_boresight = std::vector<double>(3, 0.0);
m_parameterType = std::vector<csm::param::Type>(NUM_PARAMETERS, csm::param::REAL);
+ m_referencePointXyz.x = 0;
+ m_referencePointXyz.y = 0;
+ m_referencePointXyz.z = 0;
}
@@ -147,9 +152,17 @@ csm::ImageCoordCovar UsgsAstroFrameSensorModel::groundToImage(const csm::EcefCoo
double *achievedPrecision,
csm::WarningList *warnings) const {
- throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,
- "Unsupported function",
- "UsgsAstroFrameSensorModel::groundToImage");
+ csm::EcefCoord gp;
+ gp.x = groundPt.x;
+ gp.y = groundPt.y;
+ gp.z = groundPt.z;
+
+ csm::ImageCoord ip = groundToImage(
+ gp, desiredPrecision, achievedPrecision, warnings);
+ csm::ImageCoordCovar result(ip.line, ip.samp);
+ // This is a partial, incorrect implementation to test if SocetGXP needs
+ // this method implemented in order to load the sensor.
+ return result;
}
@@ -210,9 +223,9 @@ csm::EcefCoordCovar UsgsAstroFrameSensorModel::imageToGround(const csm::ImageCoo
double heightVariance, double desiredPrecision,
double *achievedPrecision,
csm::WarningList *warnings) const {
- throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,
- "Unsupported function",
- "UsgsAstroFrameSensorModel::imageToGround");
+ // This is an incomplete implementation to see if SocetGXP needs this method implemented.
+ csm::EcefCoordCovar result;
+ return result;
}
@@ -533,9 +546,8 @@ const csm::CorrelationModel& UsgsAstroFrameSensorModel::getCorrelationModel() co
std::vector<double> UsgsAstroFrameSensorModel::getUnmodeledCrossCovariance(const csm::ImageCoord &pt1,
const csm::ImageCoord &pt2) const {
- throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,
- "Unsupported function",
- "UsgsAstroFrameSensorModel::getUnmodeledCrossCovariance");
+ // No unmodeled error
+ return std::vector<double>(4, 0.0);
}
@@ -550,52 +562,38 @@ std::string UsgsAstroFrameSensorModel::getModelName() const {
std::string UsgsAstroFrameSensorModel::getPedigree() const {
- throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,
- "Unsupported function",
- "UsgsAstroFrameSensorModel::getPedigree");
+ return "USGS_FRAMER";
}
std::string UsgsAstroFrameSensorModel::getImageIdentifier() const {
- throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,
- "Unsupported function",
- "UsgsAstroFrameSensorModel::getImageIdentifier");
+ return m_imageIdentifier;
}
void UsgsAstroFrameSensorModel::setImageIdentifier(const std::string& imageId,
csm::WarningList* warnings) {
- throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,
- "Unsupported function",
- "UsgsAstroFrameSensorModel::setImageIdentifier");
+ m_imageIdentifier = imageId;
}
std::string UsgsAstroFrameSensorModel::getSensorIdentifier() const {
- throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,
- "Unsupported function",
- "UsgsAstroFrameSensorModel::getSensorIdentifier");
+ return m_sensorName;
}
std::string UsgsAstroFrameSensorModel::getPlatformIdentifier() const {
- throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,
- "Unsupported function",
- "UsgsAstroFrameSensorModel::getPlatformIdentifier");
+ return m_platformName;
}
std::string UsgsAstroFrameSensorModel::getCollectionIdentifier() const {
- throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,
- "Unsupported function",
- "UsgsAstroFrameSensorModel::getCollectionIdentifier");
+ return m_collectionIdentifier;
}
std::string UsgsAstroFrameSensorModel::getTrajectoryIdentifier() const {
- throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,
- "Unsupported function",
- "UsgsAstroFrameSensorModel::getTrajectoryIdentifier");
+ return "";
}
@@ -610,15 +608,15 @@ std::string UsgsAstroFrameSensorModel::getSensorMode() const {
std::string UsgsAstroFrameSensorModel::getReferenceDateAndTime() const {
- throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,
- "Unsupported function",
- "UsgsAstroFrameSensorModel::getReferenceDateAndTime");
+ return "";
}
std::string UsgsAstroFrameSensorModel::getModelState() const {
json state = {
{"m_modelName", _SENSOR_MODEL_NAME},
+ {"m_sensorName", m_sensorName},
+ {"m_platformName", m_platformName},
{"m_focalLength" , m_focalLength},
{"m_iTransS", {m_iTransS[0], m_iTransS[1], m_iTransS[2]}},
{"m_iTransL", {m_iTransL[0], m_iTransL[1], m_iTransL[2]}},
@@ -642,10 +640,8 @@ std::string UsgsAstroFrameSensorModel::getModelState() const {
{"m_samplePp", m_samplePp},
{"m_minElevation", m_minElevation},
{"m_maxElevation", m_maxElevation},
- {"m_odtX", {m_odtX[0], m_odtX[1], m_odtX[2], m_odtX[3], m_odtX[4],
- m_odtX[5], m_odtX[6], m_odtX[7], m_odtX[8], m_odtX[9]}},
- {"m_odtY", {m_odtY[0], m_odtY[1], m_odtY[2], m_odtY[3], m_odtY[4],
- m_odtY[5], m_odtY[6], m_odtY[7], m_odtY[8], m_odtY[9]}},
+ {"m_odtX", m_odtX},
+ {"m_odtY", m_odtY},
{"m_originalHalfLines", m_originalHalfLines},
{"m_originalHalfSamples", m_originalHalfSamples},
{"m_spacecraftName", m_spacecraftName},
@@ -653,13 +649,14 @@ std::string UsgsAstroFrameSensorModel::getModelState() const {
{"m_ephemerisTime", m_ephemerisTime},
{"m_nLines", m_nLines},
{"m_nSamples", m_nSamples},
- {"m_currentParameterValue", {m_currentParameterValue[0], m_currentParameterValue[1],
- m_currentParameterValue[2], m_currentParameterValue[3],
- m_currentParameterValue[4], m_currentParameterValue[5],
- m_currentParameterValue[6]}},
+ {"m_currentParameterValue", m_currentParameterValue},
+ {"m_imageIdentifier", m_imageIdentifier},
+ {"m_collectionIdentifier", m_collectionIdentifier},
+ {"m_referencePointXyz", {m_referencePointXyz.x,
+ m_referencePointXyz.y,
+ m_referencePointXyz.z}},
{"m_currentParameterCovariance", m_currentParameterCovariance}
};
-
return state.dump();
}
@@ -737,7 +734,6 @@ bool UsgsAstroFrameSensorModel::isValidIsd(const std::string& Isd, csm::WarningL
void UsgsAstroFrameSensorModel::replaceModelState(const std::string& stringState) {
json state = json::parse(stringState);
-
// The json library's .at() will except if key is missing
try {
m_modelName = state.at("m_modelName").get<std::string>();
@@ -759,6 +755,16 @@ void UsgsAstroFrameSensorModel::replaceModelState(const std::string& stringState
m_transY = state.at("m_transY").get<std::vector<double>>();
m_iTransS = state.at("m_iTransS").get<std::vector<double>>();
m_iTransL = state.at("m_iTransL").get<std::vector<double>>();
+ m_imageIdentifier = state.at("m_imageIdentifier").get<std::string>();
+ m_platformName = state.at("m_platformName").get<std::string>();
+ m_sensorName = state.at("m_sensorName").get<std::string>();
+ m_collectionIdentifier = state.at("m_collectionIdentifier").get<std::string>();
+ std::vector<double> refpt = state.at("m_referencePointXyz").get<std::vector<double>>();
+ m_referencePointXyz.x = refpt[0];
+ m_referencePointXyz.y = refpt[1];
+ m_referencePointXyz.z = refpt[2];
+ m_currentParameterCovariance = state.at("m_currentParameterCovariance").get<std::vector<double>>();
+
// Leaving unused params commented out
// m_targetName = state.at("m_targetName").get<std::string>();
@@ -809,6 +815,9 @@ std::string UsgsAstroFrameSensorModel::constructStateFromIsd(const std::string&
try {
state["m_modelName"] = isd.at("name_model");
+ state["m_imageIdentifier"] = isd.at("image_identifier");
+ state["m_sensorName"] = isd.at("name_sensor");
+ state["m_platformName"] = isd.at("name_platform");
std::cerr << "Model Name Parsed!" << std::endl;
state["m_startingDetectorSample"] = isd.at("starting_detector_sample");
@@ -953,6 +962,12 @@ std::string UsgsAstroFrameSensorModel::constructStateFromIsd(const std::string&
std::cerr << "Focal To Pixel Transformation Parsed!" << std::endl;
+ state["m_referencePointXyz"] = std::vector<double>(3, 0.0);
+ state["m_currentParameterCovariance"] = std::vector<double>(NUM_PARAMETERS*NUM_PARAMETERS,0.0);
+ state["m_collectionIdentifier"] = "";
+
+ std::cerr << "Constants Set!" << std::endl;
+
}
catch(std::out_of_range& e) {
throw csm::Error(csm::Error::SENSOR_MODEL_NOT_CONSTRUCTIBLE,
@@ -971,16 +986,12 @@ std::string UsgsAstroFrameSensorModel::constructStateFromIsd(const std::string&
csm::EcefCoord UsgsAstroFrameSensorModel::getReferencePoint() const {
- throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,
- "Unsupported function",
- "UsgsAstroFrameSensorModel::getReferencePoint");
+ return m_referencePointXyz;
}
void UsgsAstroFrameSensorModel::setReferencePoint(const csm::EcefCoord &groundPt) {
- throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,
- "Unsupported function",
- "UsgsAstroFrameSensorModel::setReferencePoint");
+ m_referencePointXyz = groundPt;
}
@@ -1006,28 +1017,26 @@ std::string UsgsAstroFrameSensorModel::getParameterUnits(int index) const {
bool UsgsAstroFrameSensorModel::hasShareableParameters() const {
- throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,
- "Unsupported function",
- "UsgsAstroFrameSensorModel::hasShareableParameters");
+ return false;
}
bool UsgsAstroFrameSensorModel::isParameterShareable(int index) const {
- throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,
- "Unsupported function",
- "UsgsAstroFrameSensorModel::isParameterShareable");
+ return false;
}
csm::SharingCriteria UsgsAstroFrameSensorModel::getParameterSharingCriteria(int index) const {
- throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,
- "Unsupported function",
- "UsgsAstroFrameSensorModel::getParameterSharingCriteria");
+ // Parameter sharing is not supported for this sensor,
+ // all indices are out of range
+ throw csm::Error(
+ csm::Error::INDEX_OUT_OF_RANGE,
+ "Index out of range.",
+ "UsgsAstroLsSensorModel::getParameterSharingCriteria");
}
double UsgsAstroFrameSensorModel::getParameterValue(int index) const {
-
return m_currentParameterValue[index];
}
@@ -1049,46 +1058,48 @@ void UsgsAstroFrameSensorModel::setParameterType(int index, csm::param::Type pTy
double UsgsAstroFrameSensorModel::getParameterCovariance(int index1, int index2) const {
- throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,
- "Unsupported function",
- "UsgsAstroFrameSensorModel::getParameterCovariance");
+ int index = UsgsAstroFrameSensorModel::NUM_PARAMETERS * index1 + index2;
+ return m_currentParameterCovariance[index];
}
void UsgsAstroFrameSensorModel::setParameterCovariance(int index1, int index2, double covariance) {
- throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,
- "Unsupported function",
- "UsgsAstroFrameSensorModel::setParameterCovariance");
+ int index = UsgsAstroFrameSensorModel::NUM_PARAMETERS * index1 + index2;
+ m_currentParameterCovariance[index] = covariance;
}
int UsgsAstroFrameSensorModel::getNumGeometricCorrectionSwitches() const {
- throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,
- "Unsupported function",
- "UsgsAstroFrameSensorModel::getNumGeometricCorrectionSwitches");
+ return 0;
}
std::string UsgsAstroFrameSensorModel::getGeometricCorrectionName(int index) const {
- throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,
- "Unsupported function",
- "UsgsAstroFrameSensorModel::getGeometricCorrectionName");
+ // Since there are no geometric corrections, all indices are out of range
+ throw csm::Error(
+ csm::Error::INDEX_OUT_OF_RANGE,
+ "Index is out of range.",
+ "UsgsAstroLsSensorModel::getGeometricCorrectionName");
}
void UsgsAstroFrameSensorModel::setGeometricCorrectionSwitch(int index,
bool value,
csm::param::Type pType) {
- throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,
- "Unsupported function",
- "UsgsAstroFrameSensorModel::setGeometricCorrectionSwitch");
+ // Since there are no geometric corrections, all indices are out of range
+ throw csm::Error(
+ csm::Error::INDEX_OUT_OF_RANGE,
+ "Index is out of range.",
+ "UsgsAstroLsSensorModel::setGeometricCorrectionSwitch");
}
bool UsgsAstroFrameSensorModel::getGeometricCorrectionSwitch(int index) const {
- throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,
- "Unsupported function",
- "UsgsAstroFrameSensorModel::getGeometricCorrectionSwitch");
+ // Since there are no geometric corrections, all indices are out of range
+ throw csm::Error(
+ csm::Error::INDEX_OUT_OF_RANGE,
+ "Index is out of range.",
+ "UsgsAstroLsSensorModel::getGeometricCorrectionSwitch");
}
@@ -1096,9 +1107,14 @@ std::vector<double> UsgsAstroFrameSensorModel::getCrossCovarianceMatrix(
const GeometricModel &comparisonModel,
csm::param::Set pSet,
const GeometricModelList &otherModels) const {
- throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,
- "Unsupported function",
- "UsgsAstroFrameSensorModel::getCrossCovarianceMatrix");
+
+ // No correlation between models.
+ const std::vector<int>& indices = getParameterSetIndices(pSet);
+ size_t num_rows = indices.size();
+ const std::vector<int>& indices2 = comparisonModel.getParameterSetIndices(pSet);
+ size_t num_cols = indices.size();
+
+ return std::vector<double>(num_rows * num_cols, 0.0);
}
diff --git a/src/UsgsAstroLsSensorModel.cpp b/src/UsgsAstroLsSensorModel.cpp
index 779b0d90faaf28d11be5256b76d59634cdf5de2a..7bb0e8aa53460bf911302ebcf9c364b6125a4fcd 100644
--- a/src/UsgsAstroLsSensorModel.cpp
+++ b/src/UsgsAstroLsSensorModel.cpp
@@ -2671,7 +2671,7 @@ std::string UsgsAstroLsSensorModel::constructStateFromIsd(const std::string imag
int num_params = NUM_PARAMETERS;
- state["m_imageIdentifier"] = "UNKNOWN";
+ state["m_imageIdentifier"] = isd.at("image_identifier");
state["m_sensorType"] = "LINE_SCAN";
state["m_totalLines"] = isd.at("image_lines");
state["m_totalSamples"] = isd.at("image_samples");
diff --git a/src/UsgsAstroPlugin.cpp b/src/UsgsAstroPlugin.cpp
index fc67553f492ee68487ac64d6e0228570be2148bd..ed977106d0fc99a22ddc17762c2f480af9a9f142 100644
--- a/src/UsgsAstroPlugin.cpp
+++ b/src/UsgsAstroPlugin.cpp
@@ -30,7 +30,6 @@ const std::string UsgsAstroPlugin::_PLUGIN_NAME = "UsgsAstroPluginCSM";
const std::string UsgsAstroPlugin::_MANUFACTURER_NAME = "UsgsAstrogeology";
const std::string UsgsAstroPlugin::_RELEASE_DATE = "20170425";
const int UsgsAstroPlugin::_N_SENSOR_MODELS = 2;
-const int UsgsAstroPlugin::_NUM_ISD_KEYWORDS = 21;
const std::string UsgsAstroPlugin::_ISD_KEYWORD[] =
{
@@ -58,12 +57,6 @@ const std::string UsgsAstroPlugin::_ISD_KEYWORD[] =
"sun_position"
};
-// const json UsgsAstroPlugin::MODEL_KEYWORDS = {
-// {UsgsAstroFrameSensorModel::_SENSOR_MODEL_NAME, UsgsAstroFrameSensorModel::_STATE_KEYWORD},
-// {UsgsAstroLsSensorModel::_SENSOR_MODEL_NAME, UsgsAstroLsSensorModel::_STATE_KEYWORD}
-// };
-
-
// Static Instance of itself
const UsgsAstroPlugin UsgsAstroPlugin::m_registeredPlugin;
@@ -154,12 +147,15 @@ std::string UsgsAstroPlugin::loadImageSupportData(const csm::Isd &imageSupportDa
std::string imageFilename = imageSupportDataOriginal.filename();
size_t lastIndex = imageFilename.find_last_of(".");
std::string baseName = imageFilename.substr(0, lastIndex);
+ lastIndex = baseName.find_last_of(DIR_DELIMITER_STR);
+ std::string filename = baseName.substr(lastIndex + 1);
std::string isdFilename = baseName.append(".json");
try {
std::ifstream isd_sidecar(isdFilename);
json jsonisd;
isd_sidecar >> jsonisd;
+ jsonisd["image_identifier"] = filename;
return jsonisd.dump();
} catch (...) {
diff --git a/tests/FrameCameraTests.cpp b/tests/FrameCameraTests.cpp
index cab179e93ea159b3cbe7aa3b27eb1d396a071eb5..f3a22bc9adec13695ab53b6e29d99a23ba4cd6a9 100644
--- a/tests/FrameCameraTests.cpp
+++ b/tests/FrameCameraTests.cpp
@@ -86,6 +86,13 @@ TEST_F(FrameSensorModel, OffBody3) {
EXPECT_NEAR(groundPt.z, 14.99325304, 1e-8);
}
+TEST_F(FrameSensorModel, getReferencePoint) {
+ csm::EcefCoord groundPt = sensorModel->getReferencePoint();
+ EXPECT_EQ(groundPt.x, 0.0);
+ EXPECT_EQ(groundPt.y, 0.0);
+ EXPECT_EQ(groundPt.z, 0.0);
+}
+
TEST_F(FrameSensorModel, OffBody4) {
csm::ImageCoord imagePt(15.0, 15.0);
csm::EcefCoord groundPt = sensorModel->imageToGround(imagePt, 0.0);
@@ -94,6 +101,10 @@ TEST_F(FrameSensorModel, OffBody4) {
EXPECT_NEAR(groundPt.z, -14.99325304, 1e-8);
}
+TEST_F(FrameSensorModel, getImageIdentifier) {
+ EXPECT_EQ("simpleFramerISD", sensorModel->getImageIdentifier());
+}
+
TEST_F(FrameSensorModel, setFocalPlane1) {
csm::ImageCoord imagePt(7.5, 7.5);
double ux,uy;
diff --git a/tests/data/simpleFramerISD.json b/tests/data/simpleFramerISD.json
index 63fb79932c11b45d473506be5adc5fa58354d410..ddc5492815a0533b5bbccbc1ab9f260f8732bc62 100644
--- a/tests/data/simpleFramerISD.json
+++ b/tests/data/simpleFramerISD.json
@@ -1,5 +1,7 @@
{
"name_model" : "USGS_ASTRO_FRAME_SENSOR_MODEL",
+ "name_sensor": "SENSOR",
+ "name_platform": "CarryMe",
"center_ephemeris_time": 50,
"dt_ephemeris": 100,
"focal2pixel_lines": [0.0, 0.0, 10.0],