Commit aa9b736d authored by Kristin Berry's avatar Kristin Berry Committed by Jesse Mapel
Browse files

Update usgscm sensor models to output reference date and times in the ISO8601... 

Update usgscm sensor models to output reference date and times in the ISO8601 format, following the CSM specification
parent 498d9773

src/UsgsAstroFrameSensorModel.cpp

+3 −3
Original line number Diff line number Diff line
@@ -674,9 +674,9 @@ std::string UsgsAstroFrameSensorModel::getReferenceDateAndTime() const { 
  t.tm_mday = 1;

  time_t timeSinceEpoch = mktime(&t);

  time_t finalTime = ephemTime + timeSinceEpoch;

  char buffer[16];

  strftime(buffer, 16, "%Y%m%dT%H%M%S", localtime(&finalTime));

  buffer[15] = '\0';

  char buffer[22];

  strftime(buffer, 22, "%Y-%m-%dT%H:%M:%SZ", localtime(&finalTime));

  buffer[21] = '\0';



  return buffer;

}

src/UsgsAstroLsSensorModel.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1184,9 +1184,9 @@ std::string UsgsAstroLsSensorModel::getReferenceDateAndTime() const { 
  t.tm_mday = 1;

  time_t timeSinceEpoch = mktime(&t);

  time_t finalTime = ephemTime + timeSinceEpoch;

  char buffer[16];

  strftime(buffer, 16, "%Y%m%dT%H%M%S", localtime(&finalTime));

  buffer[15] = '\0';

  char buffer[22];

  strftime(buffer, 22, "%Y-%m-%dT%H:%M:%SZ", localtime(&finalTime));

  buffer[21] = '\0';



  return buffer;

}

src/UsgsAstroSarSensorModel.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1045,9 +1045,9 @@ string UsgsAstroSarSensorModel::getReferenceDateAndTime() const { 
  t.tm_mday = 1;

  time_t timeSinceEpoch = mktime(&t);

  time_t finalTime = ephemTime + timeSinceEpoch;

  char buffer[16];

  strftime(buffer, 16, "%Y%m%dT%H%M%S", localtime(&finalTime));

  buffer[15] = '\0';

  char buffer[22];

  strftime(buffer, 22, "%Y-%m-%dT%H:%M:%SZ", localtime(&finalTime));

  buffer[21] = '\0';



  return buffer;

}

tests/FrameCameraTests.cpp

+1 −1
Original line number Diff line number Diff line
@@ -736,5 +736,5 @@ TEST_F(FrameSensorModelLogging, losEllipsoidIntersect) { 


TEST_F(OrbitalFrameSensorModel, ReferenceDateTime) {

  std::string date = sensorModel->getReferenceDateAndTime();

  EXPECT_EQ(date, "20000101T001640");

  EXPECT_EQ(date, "2000-01-01T00:16:40Z");

}

tests/LineScanCameraTests.cpp

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ TEST_F(OrbitalLineScanSensorModel, InversionReallyHigh) { 


TEST_F(OrbitalLineScanSensorModel, ReferenceDateTime) {

  std::string date = sensorModel->getReferenceDateAndTime();

  EXPECT_EQ(date, "20000101T001639");

  EXPECT_EQ(date, "2000-01-01T00:16:39Z");

}



TEST_F(TwoLineScanSensorModels, CrossCovariance) {