X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fdata%2FDataPoint.java;h=966b5606b7d2bdfcd2c608a4c36136acd28a3f77;hb=112bb0c9b46894adca9a33ed8c99ea712b253185;hp=cd285d66790a83f263b78a44e0ef11ce1b7517cc;hpb=d3679d647d57c2ee7376ddbf6def2d5b23c04307;p=GpsPrune.git

diff --git a/tim/prune/data/DataPoint.java b/tim/prune/data/DataPoint.java
index cd285d6..966b560 100644
--- a/tim/prune/data/DataPoint.java
+++ b/tim/prune/data/DataPoint.java
@@ -1,5 +1,7 @@
 package tim.prune.data;
 
+import tim.prune.Config;
+
 /**
  * Class to represent a single data point in the series
  * including all its fields
@@ -17,7 +19,8 @@ public class DataPoint
 	private Timestamp _timestamp = null;
 	private Photo _photo = null;
 	private String _waypointName = null;
-	private boolean _pointValid = false;
+	private boolean _startOfSegment = false;
+	private boolean _markedForDeletion = false;
 
 
 	/**
@@ -26,28 +29,44 @@ public class DataPoint
 	 * @param inFieldList list of fields
 	 * @param inAltFormat altitude format
 	 */
-	public DataPoint(String[] inValueArray, FieldList inFieldList, int inAltFormat)
+	public DataPoint(String[] inValueArray, FieldList inFieldList, Altitude.Format inAltFormat)
 	{
 		// save data
 		_fieldValues = inValueArray;
 		// save list of fields
 		_fieldList = inFieldList;
 		// parse fields into objects
-		parseFields(inAltFormat);
+		parseFields(null, inAltFormat);
 	}
 
 
 	/**
 	 * Parse the string values into objects eg Coordinates
+	 * @param inField field which has changed, or null for all
 	 * @param inAltFormat altitude format
 	 */
-	private void parseFields(int inAltFormat)
+	private void parseFields(Field inField, Altitude.Format inAltFormat)
 	{
-		_latitude = new Latitude(getFieldValue(Field.LATITUDE));
-		_longitude = new Longitude(getFieldValue(Field.LONGITUDE));
-		_altitude = new Altitude(getFieldValue(Field.ALTITUDE), inAltFormat);
-		_timestamp = new Timestamp(getFieldValue(Field.TIMESTAMP));
-		_waypointName = getFieldValue(Field.WAYPT_NAME);
+		if (inField == null || inField == Field.LATITUDE) {
+			_latitude = new Latitude(getFieldValue(Field.LATITUDE));
+		}
+		if (inField == null || inField == Field.LONGITUDE) {
+			_longitude = new Longitude(getFieldValue(Field.LONGITUDE));
+		}
+		if (inField == null || inField == Field.ALTITUDE) {
+			_altitude = new Altitude(getFieldValue(Field.ALTITUDE), inAltFormat);
+		}
+		if (inField == null || inField == Field.TIMESTAMP) {
+			_timestamp = new Timestamp(getFieldValue(Field.TIMESTAMP));
+		}
+		if (inField == null || inField == Field.WAYPT_NAME) {
+			_waypointName = getFieldValue(Field.WAYPT_NAME);
+		}
+		if (inField == null || inField == Field.NEW_SEGMENT) {
+			String segmentStr = getFieldValue(Field.NEW_SEGMENT);
+			if (segmentStr != null) {segmentStr = segmentStr.trim();}
+			_startOfSegment = (segmentStr != null && (segmentStr.equals("1") || segmentStr.toUpperCase().equals("Y")));
+		}
 	}
 
 
@@ -60,11 +79,20 @@ public class DataPoint
 	public DataPoint(Coordinate inLatitude, Coordinate inLongitude, Altitude inAltitude)
 	{
 		// Only these three fields are available
-		_fieldValues = new String[0];
-		_fieldList = new FieldList();
+		_fieldValues = new String[3];
+		Field[] fields = {Field.LATITUDE, Field.LONGITUDE, Field.ALTITUDE};
+		_fieldList = new FieldList(fields);
 		_latitude = inLatitude;
+		_fieldValues[0] = inLatitude.output(Coordinate.FORMAT_DEG_MIN_SEC);
 		_longitude = inLongitude;
-		_altitude = inAltitude;
+		_fieldValues[1] = inLongitude.output(Coordinate.FORMAT_DEG_MIN_SEC);
+		if (inAltitude == null) {
+			_altitude = Altitude.NONE;
+		}
+		else {
+			_altitude = inAltitude;
+			_fieldValues[2] = "" + inAltitude.getValue(Altitude.Format.METRES); // units are ignored
+		}
 		_timestamp = new Timestamp(null);
 	}
 
@@ -121,47 +149,78 @@ public class DataPoint
 		// Set field value in array
 		_fieldValues[fieldIndex] = inValue;
 		// Change Coordinate, Altitude, Name or Timestamp fields after edit
-		if (_altitude != null)
-		{
-			parseFields(_altitude.getFormat());
+		if (_altitude != null && _altitude.getFormat() != Altitude.Format.NO_FORMAT) {
+			// Altitude already present so reuse format
+			parseFields(inField, _altitude.getFormat());
 		}
-		else
-		{
-			// use default altitude format of metres
-			parseFields(Altitude.FORMAT_METRES);
+		else {
+			// use default altitude format from config
+			parseFields(inField, Config.getConfigBoolean(Config.KEY_METRIC_UNITS)?Altitude.Format.METRES:Altitude.Format.FEET);
 		}
 	}
 
+	/** @param inFlag true for start of track segment */
+	public void setSegmentStart(boolean inFlag)
+	{
+		setFieldValue(Field.NEW_SEGMENT, inFlag?"1":null);
+	}
 
+	/**
+	 * Mark the point for deletion
+	 * @param inFlag true to delete, false to keep
+	 */
+	public void setMarkedForDeletion(boolean inFlag) {
+		_markedForDeletion = inFlag;
+	}
+
+	/** @return latitude */
 	public Coordinate getLatitude()
 	{
 		return _latitude;
 	}
+	/** @return longitude */
 	public Coordinate getLongitude()
 	{
 		return _longitude;
 	}
+	/** @return true if point has altitude */
 	public boolean hasAltitude()
 	{
 		return _altitude.isValid();
 	}
+	/** @return altitude */
 	public Altitude getAltitude()
 	{
 		return _altitude;
 	}
+	/** @return true if point has timestamp */
 	public boolean hasTimestamp()
 	{
 		return _timestamp.isValid();
 	}
+	/** @return timestamp */
 	public Timestamp getTimestamp()
 	{
 		return _timestamp;
 	}
+	/** @return waypoint name, if any */
 	public String getWaypointName()
 	{
 		return _waypointName;
 	}
 
+	/** @return true if start of new track segment */
+	public boolean getSegmentStart()
+	{
+		return _startOfSegment;
+	}
+
+	/** @return true if point marked for deletion */
+	public boolean getDeleteFlag()
+	{
+		return _markedForDeletion;
+	}
+
 	/**
 	 * @return true if point has a waypoint name
 	 */
@@ -197,10 +256,7 @@ public class DataPoint
 		{
 			return !inOther.isWaypoint();
 		}
-		else
-		{
-			return (inOther._waypointName != null && inOther._waypointName.equals(_waypointName));
-		}
+		return (inOther._waypointName != null && inOther._waypointName.equals(_waypointName));
 	}
 
 
@@ -241,21 +297,33 @@ public class DataPoint
 	public DataPoint[] interpolate(DataPoint inEndPoint, int inNumPoints)
 	{
 		DataPoint[] range = new DataPoint[inNumPoints];
-		Coordinate endLatitude = inEndPoint.getLatitude();
-		Coordinate endLongitude = inEndPoint.getLongitude();
-		Altitude endAltitude = inEndPoint.getAltitude();
-
 		// Loop over points
 		for (int i=0; i<inNumPoints; i++)
 		{
-			Coordinate latitude = Coordinate.interpolate(_latitude, endLatitude, i, inNumPoints);
-			Coordinate longitude = Coordinate.interpolate(_longitude, endLongitude, i, inNumPoints);
-			Altitude altitude = Altitude.interpolate(_altitude, endAltitude, i, inNumPoints);
+			Coordinate latitude = Coordinate.interpolate(_latitude, inEndPoint.getLatitude(), i, inNumPoints);
+			Coordinate longitude = Coordinate.interpolate(_longitude, inEndPoint.getLongitude(), i, inNumPoints);
+			Altitude altitude = Altitude.interpolate(_altitude, inEndPoint.getAltitude(), i, inNumPoints);
 			range[i] = new DataPoint(latitude, longitude, altitude);
 		}
 		return range;
 	}
 
+	/**
+	 * Interpolate between the two given points
+	 * @param inStartPoint start point
+	 * @param inEndPoint end point
+	 * @param inFrac fractional distance from first point (0.0 to 1.0)
+	 * @return new DataPoint object between two given ones
+	 */
+	public static DataPoint interpolate(DataPoint inStartPoint, DataPoint inEndPoint, double inFrac)
+	{
+		if (inStartPoint == null || inEndPoint == null) {return null;}
+		return new DataPoint(
+			Coordinate.interpolate(inStartPoint.getLatitude(), inEndPoint.getLatitude(), inFrac),
+			Coordinate.interpolate(inStartPoint.getLongitude(), inEndPoint.getLongitude(), inFrac),
+			Altitude.interpolate(inStartPoint.getAltitude(), inEndPoint.getAltitude(), inFrac)
+		);
+	}
 
 	/**
 	 * Calculate the number of radians between two points (for distance calculation)
@@ -315,27 +383,11 @@ public class DataPoint
 
 
 	/**
-	 * Restore the contents from another point
-	 * @param inOther point containing contents to copy
-	 * @return true if successful
+	 * Get string for debug
+	 * @see java.lang.Object#toString()
 	 */
-	public boolean restoreContents(DataPoint inOther)
+	public String toString()
 	{
-		if (inOther != null)
-		{
-			// Copy string values across
-			_fieldValues = inOther._fieldValues;
-			if (_altitude != null)
-			{
-				parseFields(_altitude.getFormat());
-			}
-			else
-			{
-				// use default altitude format of metres
-				parseFields(Altitude.FORMAT_METRES);
-			}
-			return true;
-		}
-		return false;
+		return "[Lat=" + getLatitude().toString() + ", Lon=" + getLongitude().toString() + "]";
 	}
 }