Skip to content
GitLab
Commit 5234ebf7 authored by Pascal Parraud's avatar Pascal Parraud
Browse files

Merge branch 'issue-908' into 'develop' 

Fixed unmanaged comment in OMM

See merge request orekit/orekit!248
parents eb94e257 bb9eb2d5
Hide whitespace changes
Inline Side-by-side
src/changes/changes.xml
View file @ 5234ebf7
......@@ -21,6 +21,9 @@
</properties>
<body>
<release version="11.2" date="TBD" description="TBD">
<action dev="pascal" type="fix" issue="908">
Fixed unmanaged comment in OMM.
</action>
<action dev="pascal" type="fix" issue="906">
Fixed unmanaged units in OMM.
</action>
......
src/main/java/org/orekit/files/ccsds/ndm/odm/omm/OmmTleKey.java
View file @ 5234ebf7
......@@ -19,6 +19,7 @@ package org.orekit.files.ccsds.ndm.odm.omm;
import org.orekit.files.ccsds.definitions.Units;
import org.orekit.files.ccsds.utils.ContextBinding;
import org.orekit.files.ccsds.utils.lexical.ParseToken;
import org.orekit.files.ccsds.utils.lexical.TokenType;
/** Keys for {@link OmmTle TLE} entries.
......@@ -27,6 +28,10 @@ import org.orekit.files.ccsds.utils.lexical.ParseToken;
*/
public enum OmmTleKey {
/** Comment entry. */
COMMENT((token, context, container) ->
token.getType() == TokenType.ENTRY ? container.addComment(token.getContentAsNormalizedString()) : true),
/** Ephemeris Type, only required if MEAN_ELEMENT_THEORY = SGP/SGP4. */
EPHEMERIS_TYPE((token, context, container) -> token.processAsInteger(container::setEphemerisType)),
......
src/test/resources/ccsds/odm/omm/OMM-with-units.xml
View file @ 5234ebf7
......@@ -22,6 +22,7 @@
<data>
<meanElements>
<COMMENT>mean Elements</COMMENT>
<EPOCH>2007-064T10:34:41.4264</EPOCH>
<MEAN_MOTION units="rev/day">1.00273272</MEAN_MOTION>
<ECCENTRICITY>0.0005013</ECCENTRICITY>
......@@ -32,6 +33,7 @@
<GM>398600.8</GM>
</meanElements>
<tleParameters>
<COMMENT>tle Parameters</COMMENT>
<NORAD_CAT_ID>23581</NORAD_CAT_ID>
<ELEMENT_SET_NO>0925</ELEMENT_SET_NO>
<REV_AT_EPOCH>4316</REV_AT_EPOCH>
......@@ -40,6 +42,7 @@
<MEAN_MOTION_DDOT units="rev/day**3">0.0</MEAN_MOTION_DDOT>
</tleParameters>
<covarianceMatrix>
<COMMENT>covariance Matrix</COMMENT>
<COV_REF_FRAME>TEME</COV_REF_FRAME>
<CX_X>3.331349476038534e-04</CX_X>
<CY_X>4.618927349220216e-04</CY_X>
......
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