X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fdata%2FSpeedCalculator.java;h=f6f429c7d477bc13cb29a5a9bb3212e467e99fcf;hp=d83a7bd306ff9f72aa480f2ce0619ce0f5239dbb;hb=7f5ed2be62905bd37717376dc22d09e5ea7edb4d;hpb=b361869e590bbca32664c16ac24d6296926594a5

diff --git a/tim/prune/data/SpeedCalculator.java b/tim/prune/data/SpeedCalculator.java
index d83a7bd..f6f429c 100644
--- a/tim/prune/data/SpeedCalculator.java
+++ b/tim/prune/data/SpeedCalculator.java
@@ -9,7 +9,7 @@ import tim.prune.config.Config;
 public abstract class SpeedCalculator
 {
 	/**
-	 * Calculate the speed value of the track at the specified index
+	 * Calculate the horizontal speed value of the track at the specified index
 	 * @param inTrack track object
 	 * @param inIndex index of point to calculate speed for
 	 * @param inValue object in which to place result of calculation
@@ -28,13 +28,10 @@ public abstract class SpeedCalculator
 		double  speedValue = 0.0;
 
 		// First, see if point has a speed value already
-		// FIXME: How do we know what units this speed is in?  m/s or mph or km/h or what?
-		String speedStr = point.getFieldValue(Field.SPEED);
-		try {
-			speedValue = Double.parseDouble(speedStr);
+		if (point.hasHSpeed()) {
+			speedValue = point.getHSpeed().getValue(Config.getUnitSet().getSpeedUnit());
 			pointHasSpeed = true;
 		}
-		catch (Exception e) {} // ignore, leave pointHasSpeed false
 
 		// otherwise, see if we can calculate it from the timestamps
 		if (!pointHasSpeed && point.hasTimestamp() && !point.isWaypoint())
@@ -127,15 +124,10 @@ public abstract class SpeedCalculator
 		double  speedValue = 0.0;
 
 		// First, see if point has a speed value already
-		if (point != null)
+		if (point != null && point.hasVSpeed())
 		{
-			// FIXME: Can we assume m/s or ft/s?
-			String speedStr = point.getFieldValue(Field.VERTICAL_SPEED);
-			try {
-				speedValue = Double.parseDouble(speedStr);
-				pointHasSpeed = true;
-			}
-			catch (Exception e) {} // ignore, leave pointHasSpeed false
+			speedValue = point.getVSpeed().getValue(Config.getUnitSet().getVerticalSpeedUnit());
+			pointHasSpeed = true;
 		}
 		// otherwise, see if we can calculate it from the heights and timestamps
 		if (!pointHasSpeed