Support saving of heading to session file

yarl · Jul 6, 2021 · 90b0904 · 90b0904
1 parent babf56e
commit 90b0904
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/src/main/java/cuploader/ImmutableCoordinate.java b/src/main/java/cuploader/ImmutableCoordinate.java
@@ -3,22 +3,29 @@
 public class ImmutableCoordinate {
   private final double latitude;
   private final double longitude;
+  private final String heading;
 
-  public ImmutableCoordinate(double latitude, double longitude) {
+  public ImmutableCoordinate(double latitude, double longitude, String heading) {
     this.latitude = latitude;
     this.longitude = longitude;
+    this.heading = heading;
   }
 
-  public ImmutableCoordinate(String latitude, String longitude) {
+  public ImmutableCoordinate(String latitude, String longitude, String heading) {
     this.latitude = Double.parseDouble(latitude.replace(",", "."));
     this.longitude = Double.parseDouble(longitude.replace(",", "."));
+    this.heading = heading;
   }
-  
+
   public double getLat() {
     return latitude;
   }
 
   public double getLon() {
     return longitude;
   }
+
+  public String getHeading() {
+    return heading;
+  }
 }
diff --git a/src/main/java/cuploader/PFile.java b/src/main/java/cuploader/PFile.java
@@ -70,7 +70,11 @@ public final class PFile extends javax.swing.JPanel implements KeyListener {
     public SessionFile returnData() {
       ImmutableCoordinate coorToExport = null;
       if (coor != null) {
-        coorToExport = new ImmutableCoordinate(coor.getLatDouble(), coor.getLonDouble());
+        coorToExport = new ImmutableCoordinate(
+          coor.getLatDouble(),
+          coor.getLonDouble(),
+          coor.getHeading()
+        );
       }
       SessionFile sessionFile = new SessionFile(
         tDate.getText(),        // date

diff --git a/src/main/java/cuploader/frames/FCoord.java b/src/main/java/cuploader/frames/FCoord.java
@@ -64,7 +64,7 @@ private ImmutableCoordinate getMapPosition() {
         GeoPosition centerPosition = mapViewer.getCenterPosition();
         double latitude = centerPosition.getLatitude();
         double longitude = centerPosition.getLongitude();
-        return new ImmutableCoordinate(latitude, longitude);
+        return new ImmutableCoordinate(latitude, longitude, "");
     }
 
     private Point getPoint(ImmutableCoordinate coordinate) {
@@ -77,7 +77,7 @@ private Point getPoint(ImmutableCoordinate coordinate) {
 
     private ImmutableCoordinate getMapPosition(Point point) {
         GeoPosition position = mapViewer.convertPointToGeoPosition(point);
-        return new ImmutableCoordinate(position.getLatitude(), position.getLongitude());
+        return new ImmutableCoordinate(position.getLatitude(), position.getLongitude(), "");
     }
 
     private void setMapPosition(ImmutableCoordinate coor, int coorZoom) {
@@ -155,7 +155,7 @@ public FCoord(int number, boolean multiEdit) {
         Coord fileCoord = Data.getFiles().get(number).coor;
 
         if(!multiEdit && fileCoord != null) {          
-          setMapPosition(new ImmutableCoordinate(fileCoord.getLat(), fileCoord.getLon()), 2);
+          setMapPosition(new ImmutableCoordinate(fileCoord.getLat(), fileCoord.getLon(), ""), 2);
           DecimalFormat df = new DecimalFormat("#.######", DecimalFormatSymbols.getInstance(Locale.US));
           GeoPosition coordinate = mapViewer.getCenterPosition();
           tCoor.setText(df.format(coordinate.getLatitude()) + ";" + df.format(coordinate.getLongitude()));

diff --git a/src/main/java/cuploader/frames/FFileLoading.java b/src/main/java/cuploader/frames/FFileLoading.java
@@ -138,6 +138,9 @@ public void run() {
                   Coord coord = null;
                   if (coordinate != null) {
                     coord = new Coord(coordinate.getLat(), coordinate.getLon());
+                    if (!coordinate.getHeading().isEmpty()) {
+                       coord.setHeading(coordinate.getHeading());
+                    }
                   }
                   f = new PFile(file, Data.getFiles().size(), false, false,
                           sessionFile.getName(),