Fixed issue 839

391a7958 · Pascal Parraud · f052e4ba · 391a7958 · 391a7958 · 391a7958
Commit 391a7958 authored Oct 06, 2021 by Pascal Parraud
--- a/src/main/java/org/orekit/files/ccsds/ndm/odm/oem/OemWriter.java
+++ b/src/main/java/org/orekit/files/ccsds/ndm/odm/oem/OemWriter.java
@@ -276,6 +276,16 @@ public class OemWriter extends AbstractMessageWriter<Header, OemSegment, Oem> {
        // add an empty line for presentation
        generator.newLine();

+        final ContextBinding oldContext = getContext();
+        setContext(new ContextBinding(oldContext::getConventions,
+                                      oldContext::isSimpleEOP,
+                                      oldContext::getDataContext,
+                                      oldContext::getParsedUnitsBehavior,
+                                      oldContext::getReferenceDate,
+                                      metadata::getTimeSystem,
+                                      oldContext::getClockCount,
+                                      oldContext::getClockRate));
+
        // Start metadata
        generator.enterSection(generator.getFormat() == FileFormat.KVN ?
                               KvnStructureKey.META.name() :

--- a/src/test/java/org/orekit/files/ccsds/ndm/odm/oem/OemWriterTest.java
+++ b/src/test/java/org/orekit/files/ccsds/ndm/odm/oem/OemWriterTest.java
@@ -37,7 +37,9 @@ public class OemWriterTest extends AbstractWriterTest<Header, OemSegment, Oem> {
    }

    protected OemWriter getWriter() {
-        return new WriterBuilder().buildOemWriter();
+        return new WriterBuilder().
+                   withMissionReferenceDate(new AbsoluteDate("1996-12-17T00:00:00.000", TimeScalesFactory.getUTC())).
+                   buildOemWriter();
    }

    @Test
@@ -80,4 +82,9 @@ public class OemWriterTest extends AbstractWriterTest<Header, OemSegment, Oem> {
        doTest("/ccsds/odm/oem/OEMExample8.txt");
    }

+    @Test
+    public void testIssue839() {
+        doTest("/ccsds/odm/oem/OEM-Issue839.txt");
+    }
+
 }
--- a/src/test/resources/ccsds/odm/oem/OEM-Issue839.txt
+++ b/src/test/resources/ccsds/odm/oem/OEM-Issue839.txt
+CCSDS_OEM_VERS = 3.0
+CREATION_DATE = 1996-11-04T17:22:31
+ORIGINATOR = NASA/JPL
+
+
+META_START
+OBJECT_NAME         = MARS GLOBAL SURVEYOR
+OBJECT_ID           = 1996-062A
+CENTER_NAME         = MARS BARYCENTER
+REF_FRAME           = J2000
+TIME_SYSTEM         = TAI
+START_TIME          = 1996-12-18T12:00:00.331
+USEABLE_START_TIME  = 1996-12-18T12:10:00.331
+USEABLE_STOP_TIME   = 1996-12-28T21:23:00.331
+STOP_TIME           = 1996-12-28T21:28:00.331
+INTERPOLATION       = HERMITE
+INTERPOLATION_DEGREE = 7
+META_STOP
+COMMENT This file was produced by M.R. Somebody, MSOO NAV/JPL, 1996NOV 04. It is
+COMMENT to be used for DSN scheduling purposes only.
+
+1996-12-18T12:00:00.331 2789.619 -280.045 -1746.755 4.73372 -2.49586 -1.04195
+1996-12-18T12:01:00.331 2783.419 -308.143 -1877.071 5.18604 -2.42124 -1.99608
+1996-12-18T12:02:00.331 2776.033 -336.859 -2008.682 5.63678 -2.33951 -1.94687
+1996-12-28T21:28:00.331 -3881.024 563.959 -682.773 -3.28827 -3.66735 1.63861
+
+
+META_START
+OBJECT_NAME         = MARS GLOBAL SURVEYOR
+OBJECT_ID           = 1996-062A
+CENTER_NAME         = MARS BARYCENTER
+REF_FRAME           = J2000
+TIME_SYSTEM         = TAI
+START_TIME          = 1996-12-28T21:29:07.267
+USEABLE_START_TIME  = 1996-12-28T22:08:02.5
+USEABLE_STOP_TIME   = 1996-12-30T01:18:02.5
+STOP_TIME           = 1996-12-30T01:28:02.267
+INTERPOLATION       = HERMITE
+INTERPOLATION_DEGREE = 7
+META_STOP
+
+COMMENT This block begins after trajectory correction maneuver TCM-3.
+
+1996-12-28T21:29:07.267 -2432.166 -063.042 1742.754 7.33702 -3.495867 -1.041945
+1996-12-28T21:59:02.267 -2445.234 -878.141 1873.073 1.86043 -3.421256 -0.996366
+1996-12-28T22:00:02.267 -2458.079 -683.858 2007.684 6.36786 -3.339563 -0.946654
+1996-12-30T01:28:02.267 2164.375 1115.811 -688.131 -3.53328 -2.88452 0.88535
+
+COVARIANCE_START
+EPOCH = 1996-12-28T21:29:07.267
+COV_REF_FRAME = EME2000
+3.3313494e-04
+4.6189273e-04 6.7824216e-04
+-3.0700078e-04 -4.2212341e-04 3.2319319e-04
+-3.3493650e-07 -4.6860842e-07 2.4849495e-07 4.2960228e-10
+-2.2118325e-07 -2.8641868e-07 1.7980986e-07 2.6088992e-10 1.7675147e-10
+-3.0413460e-07 -4.9894969e-07 3.5403109e-07 1.8692631e-10 1.0088625e-10 6.2244443e-10
+COVARIANCE_STOP
+
+META_START
+COMMENT comment
+OBJECT_NAME = MARS GLOBAL SURVEYOR
+OBJECT_ID = 1996-062A
+CENTER_NAME = MARS BARYCENTER
+REF_FRAME = EME2000
+TIME_SYSTEM = TAI
+START_TIME = 1996-12-28T21:29:07.267
+USEABLE_START_TIME = 1996-12-28T22:08:02.5
+USEABLE_STOP_TIME = 1996-12-30T01:18:02.5
+STOP_TIME = 1996-12-30T01:28:02.267
+INTERPOLATION = HERMITE
+INTERPOLATION_DEGREE = 7
+META_STOP
+
+COMMENT This block begins after trajectory correction maneuver TCM-3.
+1996-12-28T21:29:07.267 -2432.166 -063.042 1742.754 7.33702 -3.495867 -1.041945
+1996-12-28T21:59:02.267 -2445.234 -878.141 1873.073 1.86043 -3.421256 -0.996366
+1996-12-28T22:00:02.267 -2458.079 -683.858 2007.684 6.36786 -3.339563 -0.946654
+1996-12-30T01:28:02.267 2164.375 1115.811 -688.131 -3.53328 -2.88452 0.88535
+1996-12-30T01:28:02.267 2164.375 1115.811 -688.131 -3.53328 -2.88452 0.88535
+
+
+COVARIANCE_START
+EPOCH = 1996-12-28T21:29:07.267
+COV_REF_FRAME = RTN
+
+3.3313494e-04
+4.6189273e-04 6.7824216e-04
+-3.0700078e-04 -4.2212341e-04 3.2319319e-04
+-3.3493650e-07 -4.6860842e-07 2.4849495e-07 4.2960228e-10
+-2.2118325e-07 -2.8641868e-07 1.7980986e-07 2.6088992e-10 1.7675147e-10
+-3.0413460e-07 -4.9894969e-07 3.5403109e-07 1.8692631e-10 1.0088625e-10 6.2244443e-10
+
+EPOCH = 1996-12-29T21:00:00
+COV_REF_FRAME = EME2000
+3.4424505e-04
+4.5078162e-04 6.8935327e-04
+-3.0600067e-04 -4.1101230e-04 3.3420420e-04
+-3.2382549e-07 -4.5750731e-07 2.3738384e-07 4.3071339e-10
+-2.1007214e-07 -2.7530757e-07 1.6870875e-07 2.5077881e-10 1.8786258e-10
+-3.0302350e-07 -4.8783858e-07 3.4302008e-07 1.7581520e-10 1.0077514e-10 6.2244443e-10
+COVARIANCE_STOP
\ No newline at end of file