X-Git-Url: https://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fsave%2FGpxExporter.java;h=8d9df8a0c15f8a10f79fc98a0368b609b841d617;hp=19007ac920dc33c45c2522def2adb648ea1368c7;hb=7f5ed2be62905bd37717376dc22d09e5ea7edb4d;hpb=b361869e590bbca32664c16ac24d6296926594a5 diff --git a/tim/prune/save/GpxExporter.java b/tim/prune/save/GpxExporter.java index 19007ac..8d9df8a 100644 --- a/tim/prune/save/GpxExporter.java +++ b/tim/prune/save/GpxExporter.java @@ -35,7 +35,6 @@ import tim.prune.GpsPrune; import tim.prune.I18nManager; import tim.prune.UpdateMessageBroker; import tim.prune.config.Config; -import tim.prune.data.Altitude; import tim.prune.data.AudioClip; import tim.prune.data.Coordinate; import tim.prune.data.DataPoint; @@ -45,6 +44,7 @@ import tim.prune.data.Photo; import tim.prune.data.RecentFile; import tim.prune.data.Timestamp; import tim.prune.data.TrackInfo; +import tim.prune.data.UnitSetLibrary; import tim.prune.gui.DialogCloser; import tim.prune.load.GenericFileFilter; import tim.prune.save.xml.GpxCacherList; @@ -530,7 +530,7 @@ public class GpxExporter extends GenericFunction implements Runnable // Point has been modified - maybe it's possible to modify the source source = replaceGpxTags(source, "lat=\"", "\"", inPoint.getLatitude().output(Coordinate.FORMAT_DECIMAL_FORCE_POINT)); source = replaceGpxTags(source, "lon=\"", "\"", inPoint.getLongitude().output(Coordinate.FORMAT_DECIMAL_FORCE_POINT)); - source = replaceGpxTags(source, "", "", inPoint.getAltitude().getStringValue(Altitude.Format.METRES)); + source = replaceGpxTags(source, "", "", inPoint.getAltitude().getStringValue(UnitSetLibrary.UNITS_METRES)); source = replaceGpxTags(source, "", inPoint.getTimestamp().getText(Timestamp.FORMAT_ISO_8601)); if (inPoint.isWaypoint()) { @@ -726,7 +726,7 @@ public class GpxExporter extends GenericFunction implements Runnable if (inPoint.hasAltitude()) { inWriter.write("\t\t"); - inWriter.write("" + inPoint.getAltitude().getStringValue(Altitude.Format.METRES)); + inWriter.write("" + inPoint.getAltitude().getStringValue(UnitSetLibrary.UNITS_METRES)); inWriter.write("\n"); } // timestamp if available (point might have timestamp and then be turned into a waypoint) @@ -798,7 +798,7 @@ public class GpxExporter extends GenericFunction implements Runnable if (inPoint.hasAltitude()) { inWriter.write(""); - inWriter.write("" + inPoint.getAltitude().getStringValue(Altitude.Format.METRES)); + inWriter.write("" + inPoint.getAltitude().getStringValue(UnitSetLibrary.UNITS_METRES)); inWriter.write(""); } // timestamp if available (and selected)