X-Git-Url: https://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fdata%2FUnitSet.java;h=7239ead76177fde38ba9c1a8ad614a60f90c0d8d;hp=bd53e1b98b6da732945e977981b874281ff12866;hb=7f5ed2be62905bd37717376dc22d09e5ea7edb4d;hpb=b361869e590bbca32664c16ac24d6296926594a5

diff --git a/tim/prune/data/UnitSet.java b/tim/prune/data/UnitSet.java
index bd53e1b..7239ead 100644
--- a/tim/prune/data/UnitSet.java
+++ b/tim/prune/data/UnitSet.java
@@ -10,7 +10,6 @@ public class UnitSet
 	private Unit _speedUnit = null;
 	private Unit _altitudeUnit = null;
 	private Unit _vertSpeedUnit = null;
-	private Altitude.Format _defaultAltitudeFormat = Altitude.Format.METRES;
 
 	/**
 	 * Constructor
@@ -18,16 +17,17 @@ public class UnitSet
 	 * @param inDistanceUnit distance unit
 	 * @param inAltitudeUnit altitude unit
 	 * @param inAltitudeFormat default altitude format
+	 * @param inSpeedUnit unit for horizontal speeds
+	 * @param inVerticalSpeedUnit unit for vertical speeds
 	 */
 	public UnitSet(String inNameKey, Unit inDistanceUnit,
-		Unit inAltitudeUnit, Altitude.Format inAltitudeFormat)
+		Unit inAltitudeUnit, Unit inSpeedUnit, Unit inVerticalSpeedUnit)
 	{
 		_nameKey = inNameKey;
 		_distanceUnit = inDistanceUnit;
-		_speedUnit = new Unit(_distanceUnit, "perhour");
 		_altitudeUnit = inAltitudeUnit;
-		_defaultAltitudeFormat = inAltitudeFormat;
-		_vertSpeedUnit = new Unit(_altitudeUnit, "persec");
+		_speedUnit = inSpeedUnit;
+		_vertSpeedUnit = inVerticalSpeedUnit;
 	}
 
 	/**
@@ -66,9 +66,14 @@ public class UnitSet
 	}
 
 	/**
-	 * @return default altitude format
+	 * @return default point creation options for this unit set
 	 */
-	public Altitude.Format getDefaultAltitudeFormat() {
-		return _defaultAltitudeFormat;
+	public PointCreateOptions getDefaultOptions()
+	{
+		PointCreateOptions options = new PointCreateOptions();
+		options.setAltitudeUnits(getAltitudeUnit());
+		options.setSpeedUnits(getSpeedUnit());
+		options.setVerticalSpeedUnits(getVerticalSpeedUnit(), true);
+		return options;
 	}
 }