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

diff --git a/tim/prune/data/UnitSetLibrary.java b/tim/prune/data/UnitSetLibrary.java
index b270124..37f3cfc 100644
--- a/tim/prune/data/UnitSetLibrary.java
+++ b/tim/prune/data/UnitSetLibrary.java
@@ -18,11 +18,21 @@ public abstract class UnitSetLibrary
 	/** Units for nautical miles */
 	public static final Unit UNITS_NAUTICAL_MILES = new Unit("nauticalmiles", 1/1852.0);
 
+	// Speed units - all conversion factors from metres per second
+	public static final Unit SPEED_UNITS_METRESPERSEC = new Unit(UNITS_METRES, "persec");
+	public static final Unit SPEED_UNITS_FEETPERSEC   = new Unit(UNITS_FEET, "persec");
+	public static final Unit SPEED_UNITS_MILESPERHOUR = new Unit(UNITS_MILES, "perhour", 60.0 * 60.0);
+	public static final Unit SPEED_UNITS_KNOTS        = new Unit(UNITS_NAUTICAL_MILES, "perhour", 60.0 * 60.0);
+	public static final Unit SPEED_UNITS_KMPERHOUR    = new Unit(UNITS_KILOMETRES, "perhour", 60.0 * 60.0);
+	public static final Unit[] ALL_SPEED_UNITS = {SPEED_UNITS_METRESPERSEC, SPEED_UNITS_KMPERHOUR,
+		SPEED_UNITS_FEETPERSEC, SPEED_UNITS_MILESPERHOUR};
+
 	/** Array of available unit sets */
-	private static UnitSet[] _sets = {
-		new UnitSet("unitset.kilometres", UNITS_KILOMETRES, UNITS_METRES, Altitude.Format.METRES),
-		new UnitSet("unitset.miles", UNITS_MILES, UNITS_FEET, Altitude.Format.FEET),
-		new UnitSet("unitset.nautical", UNITS_NAUTICAL_MILES, UNITS_FEET, Altitude.Format.FEET)
+	private static UnitSet[] _sets =
+	{
+		new UnitSet("unitset.kilometres", UNITS_KILOMETRES, UNITS_METRES, SPEED_UNITS_KMPERHOUR, SPEED_UNITS_METRESPERSEC),
+		new UnitSet("unitset.miles", UNITS_MILES, UNITS_FEET, SPEED_UNITS_MILESPERHOUR, SPEED_UNITS_FEETPERSEC),
+		new UnitSet("unitset.nautical", UNITS_NAUTICAL_MILES, UNITS_FEET, SPEED_UNITS_KNOTS, SPEED_UNITS_FEETPERSEC)
 	};
 
 	/**
@@ -53,9 +63,8 @@ public abstract class UnitSetLibrary
 	public static UnitSet getUnitSet(String inKey)
 	{
 		// Loop over all available unit sets
-		for (int i=0; i<getNumUnitSets(); i++)
+		for (UnitSet set : _sets)
 		{
-			UnitSet set = getUnitSet(i);
 			if (set.getNameKey().equals(inKey)) {
 				return set;
 			}