From b5be91a85d3ca0d12849668178ad3c7e8e046cdb Mon Sep 17 00:00:00 2001
From: "Kuijpers,Nico N.H.L" <nico.kuijpers@fontys.nl>
Date: Wed, 5 Jan 2022 17:46:11 +0100
Subject: [PATCH] Phobos, Deimos, Phoebe, Hyperion, Nereid, Proteus, moons of
 Pluto

---
 .idea/workspace.xml                           |  43 +---
 .../java/application/BodySelectorPanel.java   |   4 +-
 .../application/SolarSystemApplication.java   | 227 ++++++++++++------
 3 files changed, 163 insertions(+), 111 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 164d123d..9c655872 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,35 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e72a0bc4-6c29-4b10-a67c-fb732ae98422" name="Default Changelist" comment="Visualization: create objects when needed to save memory, new textures and models">
-      <change afterPath="$PROJECT_DIR$/EphemerisFiles/de405.bsp" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/EphemerisFiles/jup365_GalileanMoons_1970_2025.bsp" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/EphemerisFiles/mar097_MarsSystem_1970_2025.bsp" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/EphemerisFiles/nep081_NeptuneMoons_1970_2025.bsp" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/EphemerisFiles/plu058_PlutoSystem_1970_2025.bsp" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/EphemerisFiles/sat427_SaturnSystem_1970_2025.bsp" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/EphemerisFiles/ura111_UranusSystem_1970_2025.bsp" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/ephemeris/EphemerisAccurateBSP.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/ephemeris/EphemerisGalileanMoonsBSP.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/ephemeris/EphemerisMarsMoonsBSP.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/ephemeris/EphemerisNeptuneMoonsBSP.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/ephemeris/EphemerisPlutoSystemBSP.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/ephemeris/EphemerisSaturnMoonsBSP.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/ephemeris/EphemerisUranusMoonsBSP.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/ephemeris/SPK.java" afterDir="false" />
+    <list default="true" id="e72a0bc4-6c29-4b10-a67c-fb732ae98422" name="Default Changelist" comment="Accurate ephemeris for major planets and moons using BSP files">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/application/BodySelectorPanel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/application/BodySelectorPanel.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/application/SolarSystemApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/application/SolarSystemApplication.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/ephemeris/EphemerisApproximate.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ephemeris/EphemerisApproximate.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/ephemeris/EphemerisNeptuneMoons.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ephemeris/EphemerisTriton.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/ephemeris/EphemerisSolarSystem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ephemeris/EphemerisSolarSystem.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/ephemeris/EphemerisUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ephemeris/EphemerisUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/ephemeris/SolarSystemParameters.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ephemeris/SolarSystemParameters.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/solarsystem/SolarSystem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/solarsystem/SolarSystem.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/ephemeris/EphemerisApproximate.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/ephemeris/EphemerisApproximate.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/ephemeris/EphemerisSolarSystem.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/ephemeris/EphemerisSolarSystem.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/ephemeris/EphemerisUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/ephemeris/EphemerisUtil.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/ephemeris/SolarSystemParameters.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/ephemeris/SolarSystemParameters.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/solarsystem/SolarSystem.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/solarsystem/SolarSystem.class" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -359,11 +334,11 @@
       <recent name="$PROJECT_DIR$/EphemerisFiles" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="application" />
       <recent name="ephemeris" />
       <recent name="solarsystem" />
       <recent name="visualization" />
       <recent name="spacecraft" />
-      <recent name="particlesystem" />
     </key>
   </component>
   <component name="RunManager" selected="Application.SolarSystemApplication (1)">
@@ -778,7 +753,14 @@
       <option name="project" value="LOCAL" />
       <updated>1641388868269</updated>
     </task>
-    <option name="localTasksCounter" value="40" />
+    <task id="LOCAL-00040" summary="Accurate ephemeris for major planets and moons using BSP files">
+      <created>1641393115676</created>
+      <option name="number" value="00040" />
+      <option name="presentableId" value="LOCAL-00040" />
+      <option name="project" value="LOCAL" />
+      <updated>1641393115676</updated>
+    </task>
+    <option name="localTasksCounter" value="41" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -903,7 +885,8 @@
     <MESSAGE value="Offset revolution for Io adjusted for high-res texture image" />
     <MESSAGE value="Observe impact Shoemaker-Levy 9 from spacecraft Galileo" />
     <MESSAGE value="Visualization: create objects when needed to save memory, new textures and models" />
-    <option name="LAST_COMMIT_MESSAGE" value="Visualization: create objects when needed to save memory, new textures and models" />
+    <MESSAGE value="Accurate ephemeris for major planets and moons using BSP files" />
+    <option name="LAST_COMMIT_MESSAGE" value="Accurate ephemeris for major planets and moons using BSP files" />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/test/java/ephemeris/JulianDateConverterTest.java">
diff --git a/src/main/java/application/BodySelectorPanel.java b/src/main/java/application/BodySelectorPanel.java
index ef8d89be..8b6430fa 100644
--- a/src/main/java/application/BodySelectorPanel.java
+++ b/src/main/java/application/BodySelectorPanel.java
@@ -32,7 +32,7 @@ public class BodySelectorPanel extends Stage {
 
     // Definition of constant values
     private static final int PANELWIDTH = 370;
-    private static final int PANELHEIGHT = 290;
+    private static final int PANELHEIGHT = 315;
     private static final int CHECKBOXWIDTH = 110;
     private static final int GAPSIZE = 10;
     private static final int BORDERSIZE = 10;
@@ -94,7 +94,7 @@ public CheckBox createCheckBox(String label, String toolTipText) {
         checkBox.setTooltip(toolTip);
         grid.add(checkBox,colIndex,rowIndex,horsize,versize);
         rowIndex++;
-        if (rowIndex >= 10) {
+        if (rowIndex >= 11) {
             rowIndex = 0;
             colIndex++;
         }
diff --git a/src/main/java/application/SolarSystemApplication.java b/src/main/java/application/SolarSystemApplication.java
index 86a96fa3..74028f5b 100755
--- a/src/main/java/application/SolarSystemApplication.java
+++ b/src/main/java/application/SolarSystemApplication.java
@@ -446,6 +446,8 @@ public class SolarSystemApplication extends Application {
      * https://en.wikipedia.org/wiki/New_Horizons
      * 2015-07-14  11:49  Pluto fly by
      */
+    private GregorianCalendar startNewHorizonsPlutoFlyby =
+            CalendarUtil.createGregorianCalendar(2015, 7, 1, 0, 0, 0);
     private GregorianCalendar endNewHorizonsPlutoFlyby =
             CalendarUtil.createGregorianCalendar(2015, 7, 14, 12, 0, 0);
 
@@ -629,8 +631,8 @@ public void handle(MouseEvent event) {
         trajectoryStartDate.put("Rosetta", CalendarUtil.createGregorianCalendar(2004, 3, 2, 7, 17, 0));
         trajectoryStartDate.put("Apollo 8", CalendarUtil.createGregorianCalendar(1968, 12, 21, 12, 51, 0));
         trajectoryStartDate.put("ISS", CalendarUtil.createGregorianCalendar(1998, 11, 21, 0, 0, 0));
-        trajectoryStartDate.put("Cassini", CalendarUtil.createGregorianCalendar(1997, 10, 15, 11, 30, 0));
         trajectoryStartDate.put("Galileo", CalendarUtil.createGregorianCalendar(1989, 10, 19, 2, 0, 0));
+        trajectoryStartDate.put("Cassini", CalendarUtil.createGregorianCalendar(1997, 10, 15, 11, 30, 0));
 
         // Define spacecraft names
         spacecraftNames = new ArrayList<>();
@@ -1158,7 +1160,7 @@ public void changed(ObservableValue<? extends Number> observable, Number oldValu
         createCircle("Saturn", 9, Color.ORANGE);
         createCircle("Uranus", 7, Color.LIGHTBLUE);
         createCircle("Neptune", 7, Color.CADETBLUE);
-        createCircle("Pluto", 3, Color.LIGHTBLUE);
+        createCircle("Pluto System", 2, Color.WHITE);
         createCircle("Eris", 3, Color.LIGHTSALMON);
         createCircle("Chiron", 4, Color.CRIMSON);
         createCircle("Ceres", 3, Color.ORANGE);
@@ -1174,6 +1176,8 @@ public void changed(ObservableValue<? extends Number> observable, Number oldValu
         createCircle("Shoemaker-Levy 9", 5, Color.PINK);
         createCircle("Florence", 3, Color.LIGHTGREEN);
         createCircle("Ultima Thule", 3, Color.RED);
+        createCircle("Phobos", 3, Color.BROWN);
+        createCircle("Deimos", 3, Color.LIGHTGRAY);
         createCircle("Io", 3, Color.YELLOW);
         createCircle("Europa", 3, Color.LIGHTBLUE);
         createCircle("Ganymede", 3, Color.LIGHTGRAY);
@@ -1186,41 +1190,44 @@ public void changed(ObservableValue<? extends Number> observable, Number oldValu
         createCircle("Titan", 3, Color.PEACHPUFF);
         createCircle("Hyperion", 3, Color.LIGHTCORAL);
         createCircle("Iapetus", 3, Color.ALICEBLUE);
+        createCircle("Phoebe", 3, Color.CORAL);
         createCircle("Miranda", 3, Color.LIGHTGRAY);
         createCircle("Ariel", 3, Color.ALICEBLUE);
         createCircle("Umbriel", 3, Color.PEACHPUFF);
         createCircle("Titania", 3, Color.LIGHTSALMON);
         createCircle("Oberon", 3, Color.BISQUE);
         createCircle("Triton", 3, Color.LIGHTGRAY);
+        createCircle("Nereid", 3, Color.LIGHTSKYBLUE);
+        createCircle("Proteus", 3, Color.BISQUE);
+        createCircle("Pluto", 3, Color.LIGHTBLUE);
+        createCircle("Charon", 3, Color.GRAY);
+        createCircle("Nix", 2, Color.LIGHTGRAY);
+        createCircle("Hydra", 2, Color.LIGHTCORAL);
+        createCircle("Kerberos", 2, Color.LIGHTGOLDENRODYELLOW);
+        createCircle("Styx", 2, Color.LIGHTSKYBLUE);
         createCircle("EarthMoonBarycenter", 2, Color.WHITE);
         for (String spacecraftName : spacecraftNames) {
             createCircle(spacecraftName, 3, Color.LIGHTYELLOW);
         }
 
-        // Compare EphemerisUranusMoons to HORIZONS (Jan 24, 1986)
-        /*
-        createCircle("MirandaHOR", 3, Color.YELLOW);
-        createCircle("ArielHOR", 3, Color.YELLOW);
-        createCircle("UmbrielHOR", 3, Color.YELLOW);
-        createCircle("TitaniaHOR", 3, Color.YELLOW);
-        createCircle("OberonHOR", 3, Color.YELLOW);
-        */
-
-        // Compare EphemerisNeptuneMoons to HORIZONS (Aug 25, 1989)
-        // createCircle("TritonHOR", 3, Color.YELLOW);
-
-
-
         // Initialize flags to indicate whether moons are shown
         showMoons = new HashMap<>();
+        showMoons.put("Mars", false);
         showMoons.put("Jupiter", false);
         showMoons.put("Saturn", false);
         showMoons.put("Uranus", false);
         showMoons.put("Neptune", false);
+        showMoons.put("Pluto System", false);
 
         // Names of moons per planet
         moons = new HashMap<>();
 
+        // Names of moons of Mars
+        List<String> marsMoons = new ArrayList<>();
+        marsMoons.add("Phobos");
+        marsMoons.add("Deimos");
+        moons.put("Mars", marsMoons);
+
         // Names of moons of Jupiter
         List<String> jupiterMoons = new ArrayList<>();
         jupiterMoons.add("Io");
@@ -1237,7 +1244,9 @@ public void changed(ObservableValue<? extends Number> observable, Number oldValu
         saturnMoons.add("Dione");
         saturnMoons.add("Rhea");
         saturnMoons.add("Titan");
+        saturnMoons.add("Hyperion");
         saturnMoons.add("Iapetus");
+        saturnMoons.add("Phoebe");
         moons.put("Saturn", saturnMoons);
 
         // Names of moons of Uranus
@@ -1252,8 +1261,20 @@ public void changed(ObservableValue<? extends Number> observable, Number oldValu
         // Names of moons of Neptune
         List<String> neptuneMoons = new ArrayList<>();
         neptuneMoons.add("Triton");
+        neptuneMoons.add("Nereid");
+        neptuneMoons.add("Proteus");
         moons.put("Neptune", neptuneMoons);
 
+        // Names of moons of Pluto System
+        List<String> plutoSystemMoons = new ArrayList<>();
+        plutoSystemMoons.add("Pluto");
+        plutoSystemMoons.add("Charon");
+        plutoSystemMoons.add("Nix");
+        plutoSystemMoons.add("Hydra");
+        plutoSystemMoons.add("Kerberos");
+        plutoSystemMoons.add("Styx");
+        moons.put("Pluto System", plutoSystemMoons);
+
         // Button to select Solar System bodies
         rowIndex++;
         Button buttonBodySelector = new Button("Select Solar System bodies");
@@ -1324,7 +1345,7 @@ private void createAllCheckBoxes() {
         createCheckBox("Neptune", "Neptune",
                 "Neptune was discovered in 1846. "
                         + "Visited by Voyager 2 on 25 August 1989.");
-        createCheckBox("Pluto", "Pluto",
+        createCheckBox("Pluto System", "Pluto",
                 "Pluto was discovered in 1930 and was considered the "
                         + "ninth planet until 2006. Visited by New Horizons on 14 July 2015.");
         createCheckBox("Eris", "Eris",
@@ -1366,15 +1387,19 @@ private void createAllCheckBoxes() {
         createCheckBox("Hale-Bopp", "Hale-Bopp",
                 "Hale-Bopp passed perihelion on 1 April 1997 and "
                         + "was visible to the naked eye for 18 months.");
+        createCheckBox("MarsMoons", "Mars Sys",
+                "Mars has two moons, Phobos and Deimos");
         createCheckBox("JupiterMoons", "Jupiter Sys",
                 "The four largest moons of Jupiter are the Galilean moons " +
                         "Io, Europa, Ganymede, and Callisto.");
         createCheckBox("SaturnMoons", "Saturn Sys",
-                "Saturn moons Mimas, Enceladus, Tethys, Dione, Rhea, Titan, and Iapetus.");
+                "Saturn moons Mimas, Enceladus, Tethys, Dione, Rhea, Titan, Hyperion, Iapetus, and Phoebe.");
         createCheckBox("UranusMoons", "Uranus Sys",
                 "Uranus moons Miranda, Ariel, Umbriel, Titania, and Oberon");
         createCheckBox("NeptuneMoons", "Neptune Sys",
-                "Neptune moon Triton");
+                "Neptune moons Triton, Nereid, and Proteus");
+        createCheckBox("Pluto SystemMoons", "Pluto moons",
+                "The Pluto System consists of Pluto, Charon, Nix, Hydra, Kerberos, and Styx");
         createCheckBox("EarthMoonBarycenter", "E-M Bary",
                 "Earth-Moon barycenter is located on average 4671 km from Earth's center.");
     }
@@ -2240,7 +2265,26 @@ private void drawOrbitCorrespondingToPositionVelocity(String centerBodyName, Par
         // Compute orbit of particle relative to center body
         Vector3D positionRelativeToCenterBody = positionParticle.minus(positionCenterBody);
         Vector3D velocityRelativeToCenterBody = velocityParticle.minus(velocityCenterBody);
-        double muCenterBody = solarSystem.getParticle(centerBodyName).getMu();
+        double muCenterBody;
+        if ("Pluto System".equals(centerBodyName)) {
+            /*
+             * In the Pluto System, all particles orbit around the barycenter which is
+             * located in between Pluto and Charon, outside of Pluto.
+             * To visualise the orbit of a particle of the Pluto System, the gravitational
+             * parameter is estimated under the assumption that the orbit is circular.
+             * For circular orbits, the gravitational parameter mu can be obtained from
+             * v = sqrt(mu/r),
+             * where v is the velocity relative to the barycenter and r the distance to
+             * the barycenter
+             * https://en.wikipedia.org/wiki/Circular_orbit
+             */
+            double v = velocityRelativeToCenterBody.magnitude();
+            double r = positionRelativeToCenterBody.magnitude();
+            muCenterBody = v * v * r;
+        }
+        else {
+            muCenterBody = solarSystem.getParticle(centerBodyName).getMu();
+        }
         Vector3D[] orbitRelativeToCenterBody = EphemerisUtil.computeOrbit(muCenterBody,
                 positionRelativeToCenterBody,velocityRelativeToCenterBody);
 
@@ -2820,7 +2864,7 @@ private void showInformationPanel(final String bodyName) {
     }
 
     /**
-     * Update visualizaton settings.
+     * Update visualization settings.
      */
     private void updateVisualizationSettings() {
         if (viewMode.equals(SolarSystemViewMode.TELESCOPE)) {
@@ -2832,7 +2876,7 @@ private void updateVisualizationSettings() {
     }
 
     /**
-     * Update visualizaton settings for telescope view.
+     * Update visualization settings for telescope view.
      */
     private void updateVisualizationSettingsTelescopeView() {
         VisualizationSettings currentSettings = (VisualizationSettings) eventSelector.getValue();
@@ -2929,7 +2973,7 @@ private void updateVisualizationSettingsTelescopeView() {
     }
 
     /**
-     * Update visualizaton settings for spacecraft view.
+     * Update visualization settings for spacecraft view.
      */
     private void updateVisualizationSettingsSpacecraftView() {
         VisualizationSettings currentSettings = (VisualizationSettings) eventSelector.getValue();
@@ -3254,6 +3298,16 @@ private void updateVisualizationSettingsSpacecraftView() {
                      * https://en.wikipedia.org/wiki/New_Horizons
                      * 2015-07-14  11:49  Pluto fly by
                      */
+                    if (solarSystem.getSimulationDateTime().after(startNewHorizonsPlutoFlyby) &&
+                            solarSystem.getSimulationDateTime().before(endNewHorizonsPlutoFlyby)) {
+                        checkBoxesBodies.get("Pluto SystemMoons").setSelected(true);
+                        observedBody = "Pluto";
+                        // observedBody = "Charon";
+                        sliderZoomView.setValue(100.0);
+                    }
+                    else {
+                        checkBoxesBodies.get("Pluto SystemMoons").setSelected(false);
+                    }
                     if (solarSystem.getSimulationDateTime().after(endNewHorizonsPlutoFlyby)) {
                         observedBody = "Ultima Thule";
                     }
@@ -3264,12 +3318,12 @@ private void updateVisualizationSettingsSpacecraftView() {
                         showMessage("Error",ex.getMessage());
                     }
                 }
-                if ("Cassini".equals(selectedBody)) {
-                    if ("Saturn".equals(closestBody)) {
-                        checkBoxesBodies.get("SaturnMoons").setSelected(true);
+                if ("Galileo".equals(selectedBody)) {
+                    if ("Jupiter".equals(closestBody)) {
+                        checkBoxesBodies.get("JupiterMoons").setSelected(true);
                         String closestMoonFound = "";
                         double minMoonDistance = Double.MAX_VALUE;
-                        for (String moonName : SolarSystemParameters.getInstance().getMoonsOfPlanet("Saturn")) {
+                        for (String moonName : SolarSystemParameters.getInstance().getMoonsOfPlanet("Jupiter")) {
                             Vector3D moonPosition = null;
                             try {
                                 moonPosition = solarSystem.getPosition(moonName);
@@ -3282,25 +3336,21 @@ private void updateVisualizationSettingsSpacecraftView() {
                                 closestMoonFound = moonName;
                             }
                         }
-                        if (minMoonDistance < 5.0E8 && "Titan".equals(closestMoonFound)) {
-                            Vector3D titanPosition = solarSystem.getParticle("Titan").getPosition();
-                            if (spacecraftPosition.magnitude() < titanPosition.magnitude() || minMoonDistance < 1.5E8) {
-                                observedBody = "Titan";
-                            }
-                        }
-                        else {
-                            if (minMoonDistance < 1.5E8) {
-                                observedBody = closestMoonFound;
-                            }
+                        if (minMoonDistance < 1.5E8) {
+                            observedBody = closestMoonFound;
+                            // Minimum distance to Jupiter moon varies between 200 and 3000 km
+                            // At such low distances, simulation progresses slowly
+                            // To encounter this problem, minDistance is increased with 20,000 km (= 2.0E07 m)
+                            minDistance = 1.5*minMoonDistance + 2.0E07;
                         }
                     }
                 }
-                if ("Galileo".equals(selectedBody)) {
-                    if ("Jupiter".equals(closestBody)) {
-                        checkBoxesBodies.get("JupiterMoons").setSelected(true);
+                if ("Cassini".equals(selectedBody)) {
+                    if ("Saturn".equals(closestBody)) {
+                        checkBoxesBodies.get("SaturnMoons").setSelected(true);
                         String closestMoonFound = "";
                         double minMoonDistance = Double.MAX_VALUE;
-                        for (String moonName : SolarSystemParameters.getInstance().getMoonsOfPlanet("Jupiter")) {
+                        for (String moonName : SolarSystemParameters.getInstance().getMoonsOfPlanet("Saturn")) {
                             Vector3D moonPosition = null;
                             try {
                                 moonPosition = solarSystem.getPosition(moonName);
@@ -3313,12 +3363,18 @@ private void updateVisualizationSettingsSpacecraftView() {
                                 closestMoonFound = moonName;
                             }
                         }
-                        if (minMoonDistance < 1.5E8) {
-                            observedBody = closestMoonFound;
-                            // Minimum distance to Jupiter moon varies between 200 and 3000 km
-                            // At such low distances, simulation progresses slowly
-                            // To encounter this problem, minDistance is increased with 20,000 km (= 2.0E07 m)
-                            minDistance = 1.5*minMoonDistance + 2.0E07;
+                        if (minMoonDistance < 5.0E8 && "Titan".equals(closestMoonFound)) {
+                            Vector3D titanPosition = solarSystem.getParticle("Titan").getPosition();
+                            if (spacecraftPosition.magnitude() < titanPosition.magnitude() || minMoonDistance < 1.5E8) {
+                                observedBody = "Titan";
+                                minDistance = Math.min(minDistance, 10.0 * minMoonDistance + 2.0E07);
+                            }
+                        }
+                        else {
+                            if (minMoonDistance < 1.5E8) {
+                                observedBody = closestMoonFound;
+                                minDistance = Math.min(minDistance, 5.0 * minMoonDistance);
+                            }
                         }
                     }
                 }
@@ -3529,7 +3585,7 @@ private List<VisualizationSettings> createVisualizationSettings() {
         VisualizationSettings outer = new VisualizationSettings();
         outer.setEventName("Outer planets (current time)");
         outer.setBodiesShown(new HashSet<>(Arrays.asList("Sun","Jupiter","Saturn",
-                "Uranus","Neptune","Pluto")));
+                "Uranus","Neptune","Pluto System")));
         outer.setValueTopFrontView(15);
         outer.setValueZoomView(5);
         events.add(outer);
@@ -3545,6 +3601,12 @@ private List<VisualizationSettings> createVisualizationSettings() {
                 "Juno","Vesta","Eros","Bennu","Florence")));
         ast.setValueZoomView(23);
         events.add(ast);
+        VisualizationSettings mar = new VisualizationSettings();
+        mar.setEventName("Mars system (current time)");
+        mar.setBodiesShown(new HashSet<>(Arrays.asList("Mars","MarsMoons")));
+        mar.setSelectedBody("Mars");
+        mar.setValueZoomView(100);
+        events.add(mar);
         VisualizationSettings jup = new VisualizationSettings();
         jup.setEventName("Jupiter system (current time)");
         jup.setBodiesShown(new HashSet<>(Arrays.asList("Jupiter","JupiterMoons")));
@@ -3570,6 +3632,13 @@ private List<VisualizationSettings> createVisualizationSettings() {
         nep.setSelectedBody("Neptune");
         nep.setValueZoomView(88);
         events.add(nep);
+        VisualizationSettings plu = new VisualizationSettings();
+        plu.setEventName("Pluto system (current time)");
+        plu.setBodiesShown(new HashSet<>(Arrays.asList("Pluto System","Pluto SystemMoons")));
+        plu.setSelectedBody("Pluto System");
+        plu.setValueTopFrontView(40);
+        plu.setValueZoomView(100);
+        events.add(plu);
         VisualizationSettings sol = new VisualizationSettings();
         sol.setEventName("Solar eclipse Nancy (1999-08-11)");
         GregorianCalendar solStartDateTime = CalendarUtil.createGregorianCalendar(1999,8,11,9,10, 0);
@@ -3657,7 +3726,7 @@ private List<VisualizationSettings> createVisualizationSettings() {
         pvnh.setEventName("Spacecraft leaving the Solar System");
         pvnh.setSimulationStartDateTime(trajectoryStartDate.get("Pioneer 10"));
         pvnh.setBodiesShown(new HashSet<>(Arrays.asList("Sun","Earth","Jupiter","Saturn","Uranus","Neptune",
-                "Pluto","Ultima Thule","Pioneer 10","Pioneer 11","Voyager 1","Voyager 2","New Horizons")));
+                "Pluto System","Ultima Thule","Pioneer 10","Pioneer 11","Voyager 1","Voyager 2","New Horizons")));
         pvnh.setSelectedBody("Sun");
         pvnh.setShowEphemeris(false);
         pvnh.setShowRuler(true);
@@ -3720,34 +3789,6 @@ private List<VisualizationSettings> createVisualizationSettings() {
         voy2.setViewMode(SolarSystemViewMode.FROMSPACECRAFT);
         voy2.setAutomaticView(true);
         events.add(voy2);
-        VisualizationSettings ros = new VisualizationSettings();
-        ros.setEventName("Launch Rosetta (2004-03-02  07:17)");
-        ros.setSimulationStartDateTime(trajectoryStartDate.get("Rosetta"));
-        ros.setBodiesShown(new HashSet<>(Arrays.asList("Sun","Earth","Mars","67P/Churyumov-Gerasimenko",
-                "Rosetta")));
-        ros.setSelectedBody("Rosetta");
-        ros.setShowEphemeris(false);
-        ros.setShowRuler(true);
-        ros.setStepMode(false);
-        ros.setValueZoomView(20);
-        ros.setValueSimulationSpeed(100);
-        ros.setViewMode(SolarSystemViewMode.FROMSPACECRAFT);
-        ros.setAutomaticView(true);
-        events.add(ros);
-        VisualizationSettings cas = new VisualizationSettings();
-        cas.setEventName("Launch Cassini (1997-10-15)");
-        cas.setSimulationStartDateTime(trajectoryStartDate.get("Cassini"));
-        cas.setBodiesShown(new HashSet<>(Arrays.asList("Sun","Venus","Earth","Moon","Jupiter","Saturn",
-                "Cassini")));
-        cas.setSelectedBody("Cassini");
-        cas.setShowEphemeris(false);
-        cas.setShowRuler(true);
-        cas.setStepMode(false);
-        cas.setValueZoomView(20);
-        cas.setValueSimulationSpeed(100);
-        cas.setViewMode(SolarSystemViewMode.FROMSPACECRAFT);
-        cas.setAutomaticView(true);
-        events.add(cas);
         VisualizationSettings gal = new VisualizationSettings();
         gal.setEventName("Launch Galileo (1989-10-18)");
         gal.setSimulationStartDateTime(trajectoryStartDate.get("Galileo"));
@@ -3762,11 +3803,39 @@ private List<VisualizationSettings> createVisualizationSettings() {
         gal.setViewMode(SolarSystemViewMode.FROMSPACECRAFT);
         gal.setAutomaticView(true);
         events.add(gal);
+        VisualizationSettings cas = new VisualizationSettings();
+        cas.setEventName("Launch Cassini (1997-10-15)");
+        cas.setSimulationStartDateTime(trajectoryStartDate.get("Cassini"));
+        cas.setBodiesShown(new HashSet<>(Arrays.asList("Sun","Venus","Earth","Moon","Jupiter","Saturn",
+                "Cassini")));
+        cas.setSelectedBody("Cassini");
+        cas.setShowEphemeris(false);
+        cas.setShowRuler(true);
+        cas.setStepMode(false);
+        cas.setValueZoomView(20);
+        cas.setValueSimulationSpeed(100);
+        cas.setViewMode(SolarSystemViewMode.FROMSPACECRAFT);
+        cas.setAutomaticView(true);
+        events.add(cas);
+        VisualizationSettings ros = new VisualizationSettings();
+        ros.setEventName("Launch Rosetta (2004-03-02  07:17)");
+        ros.setSimulationStartDateTime(trajectoryStartDate.get("Rosetta"));
+        ros.setBodiesShown(new HashSet<>(Arrays.asList("Sun","Earth","Mars","67P/Churyumov-Gerasimenko",
+                "Rosetta")));
+        ros.setSelectedBody("Rosetta");
+        ros.setShowEphemeris(false);
+        ros.setShowRuler(true);
+        ros.setStepMode(false);
+        ros.setValueZoomView(20);
+        ros.setValueSimulationSpeed(100);
+        ros.setViewMode(SolarSystemViewMode.FROMSPACECRAFT);
+        ros.setAutomaticView(true);
+        events.add(ros);
         VisualizationSettings nh = new VisualizationSettings();
         nh.setEventName("Launch New Horizons (2006-01-19  19:00)");
         nh.setSimulationStartDateTime(trajectoryStartDate.get("New Horizons"));
-        nh.setBodiesShown(new HashSet<>(Arrays.asList("Sun","Earth","Jupiter","Saturn","Uranus","Neptune","Pluto",
-                "Ultima Thule","New Horizons")));
+        nh.setBodiesShown(new HashSet<>(Arrays.asList("Sun","Earth","Jupiter","Saturn","Uranus","Neptune",
+                "Pluto System", "Ultima Thule","New Horizons")));
         nh.setSelectedBody("New Horizons");
         nh.setShowEphemeris(false);
         nh.setShowRuler(true);