Merge branch 'master' into orbit-determination

src/main/java/org/orekit/files/sp3/SP3Parser.java

@@ -183,7 +183,7 @@ public class SP3Parser implements OrbitFileParser {
                     file.setDataUsed(scanner.next());
 
                     file.setCoordinateSystem(scanner.next());
-                    file.setOrbitType(SP3OrbitType.valueOf(scanner.next()));
+                    file.setOrbitType(SP3OrbitType.parseType(scanner.next()));
                     file.setAgency(scanner.next());
                     break;
                 }
@@ -251,9 +251,11 @@ public class SP3Parser implements OrbitFileParser {
 
                     // now identify the time system in use
                     final String tsStr = line.substring(9, 12).trim();
-                    final TimeSystem ts = TimeSystem.GPS;
-                    if (!tsStr.equalsIgnoreCase("ccc")) {
-                        TimeSystem.valueOf(tsStr);
+                    final TimeSystem ts;
+                    if (tsStr.equalsIgnoreCase("ccc")) {
+                        ts = TimeSystem.GPS;
+                    } else {
+                        ts = TimeSystem.valueOf(tsStr);
                     }
                     file.setTimeSystem(ts);