X-Git-Url: https://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fdata%2FDataPoint.java;h=34d7bd72055275f81339e1fe23c434d2008603c6;hp=3d17cbc5edec4797a3dd63fee6e58579bcdd6025;hb=4d5796d02a15808311c09448d79e6e7d1de9d636;hpb=f1b92378a792131ac8fb33a869405851d5b2d1f7

diff --git a/tim/prune/data/DataPoint.java b/tim/prune/data/DataPoint.java
index 3d17cbc..34d7bd7 100644
--- a/tim/prune/data/DataPoint.java
+++ b/tim/prune/data/DataPoint.java
@@ -38,6 +38,8 @@ public class DataPoint
 		_fieldValues = inValueArray;
 		// save list of fields
 		_fieldList = inFieldList;
+		// Remove double quotes around values
+		removeQuotes(_fieldValues);
 		// parse fields into objects
 		parseFields(null, inAltFormat);
 	}
@@ -164,7 +166,7 @@ public class DataPoint
 		}
 		else {
 			// use default altitude format from config
-			parseFields(inField, Config.getConfigBoolean(Config.KEY_METRIC_UNITS)?Altitude.Format.METRES:Altitude.Format.FEET);
+			parseFields(inField, Config.getUnitSet().getDefaultAltitudeFormat());
 		}
 	}
 
@@ -363,6 +365,25 @@ public class DataPoint
 		return _photo != null || _audio != null;
 	}
 
+	/**
+	 * @return name of attached photo and/or audio
+	 */
+	public String getMediaName()
+	{
+		String mediaName = null;
+		if (_photo != null) mediaName = _photo.getName();
+		if (_audio != null)
+		{
+			if (mediaName == null) {
+				mediaName = _audio.getName();
+			}
+			else {
+				mediaName = mediaName + ", " + _audio.getName();
+			}
+		}
+		return mediaName;
+	}
+
 	/**
 	 * Interpolate a set of points between this one and the given one
 	 * @param inEndPoint end point of interpolation
@@ -457,6 +478,41 @@ public class DataPoint
 	}
 
 
+	/**
+	 * Remove all single and double quotes surrounding each value
+	 * @param inValues array of values
+	 */
+	private static void removeQuotes(String[] inValues)
+	{
+		if (inValues == null) {return;}
+		for (int i=0; i<inValues.length; i++)
+		{
+			inValues[i] = removeQuotes(inValues[i]);
+		}
+	}
+
+	/**
+	 * Remove any single or double quotes surrounding a value
+	 * @param inValue value to modify
+	 * @return modified String
+	 */
+	private static String removeQuotes(String inValue)
+	{
+		if (inValue == null) {return inValue;}
+		final int len = inValue.length();
+		if (len <= 1) {return inValue;}
+		// get the first and last characters
+		final char firstChar = inValue.charAt(0);
+		final char lastChar  = inValue.charAt(len-1);
+		if (firstChar == lastChar)
+		{
+			if (firstChar == '\"' || firstChar == '\'') {
+				return inValue.substring(1, len-1);
+			}
+		}
+		return inValue;
+	}
+
 	/**
 	 * Get string for debug
 	 * @see java.lang.Object#toString()