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

diff --git a/tim/prune/data/DataPoint.java b/tim/prune/data/DataPoint.java
index 5d66ec5..cd285d6 100644
--- a/tim/prune/data/DataPoint.java
+++ b/tim/prune/data/DataPoint.java
@@ -7,19 +7,19 @@ package tim.prune.data;
  */
 public class DataPoint
 {
-	// Hold these as Strings?  Or FieldValue objects?
+	/** Array of Strings holding raw values */
 	private String[] _fieldValues = null;
-	// list of fields
+	/** list of field definitions */
 	private FieldList _fieldList = null;
-	// Special fields for coordinates
+	/** Special fields for coordinates */
 	private Coordinate _latitude = null, _longitude = null;
 	private Altitude _altitude;
 	private Timestamp _timestamp = null;
+	private Photo _photo = null;
+	private String _waypointName = null;
 	private boolean _pointValid = false;
 
 
-	// TODO: Make it possible to turn track point into waypoint - may need to alter FieldList
-
 	/**
 	 * Constructor
 	 * @param inValueArray array of String values
@@ -32,22 +32,32 @@ public class DataPoint
 		_fieldValues = inValueArray;
 		// save list of fields
 		_fieldList = inFieldList;
+		// parse fields into objects
+		parseFields(inAltFormat);
+	}
 
-		// parse fields
+
+	/**
+	 * Parse the string values into objects eg Coordinates
+	 * @param inAltFormat altitude format
+	 */
+	private void parseFields(int 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);
 	}
 
 
 	/**
-	 * Private constructor for artificially generated points (eg interpolated)
+	 * Constructor for additional points (eg interpolated, photos)
 	 * @param inLatitude latitude
 	 * @param inLongitude longitude
 	 * @param inAltitude altitude
 	 */
-	private DataPoint(Coordinate inLatitude, Coordinate inLongitude, Altitude inAltitude)
+	public DataPoint(Coordinate inLatitude, Coordinate inLongitude, Altitude inAltitude)
 	{
 		// Only these three fields are available
 		_fieldValues = new String[0];
@@ -83,6 +93,46 @@ public class DataPoint
 	}
 
 
+	/**
+	 * Set (or edit) the specified field value
+	 * @param inField Field to set
+	 * @param inValue value to set
+	 */
+	public void setFieldValue(Field inField, String inValue)
+	{
+		// See if this data point already has this field
+		int fieldIndex = _fieldList.getFieldIndex(inField);
+		// Add to field list if necessary
+		if (fieldIndex < 0)
+		{
+			// If value is empty & field doesn't exist then do nothing
+			if (inValue == null || inValue.equals(""))
+			{
+				return;
+			}
+			// value isn't empty so extend field list
+			fieldIndex = _fieldList.extendList(inField);
+		}
+		// Extend array of field values if necessary
+		if (fieldIndex >= _fieldValues.length)
+		{
+			resizeValueArray(fieldIndex);
+		}
+		// Set field value in array
+		_fieldValues[fieldIndex] = inValue;
+		// Change Coordinate, Altitude, Name or Timestamp fields after edit
+		if (_altitude != null)
+		{
+			parseFields(_altitude.getFormat());
+		}
+		else
+		{
+			// use default altitude format of metres
+			parseFields(Altitude.FORMAT_METRES);
+		}
+	}
+
+
 	public Coordinate getLatitude()
 	{
 		return _latitude;
@@ -107,19 +157,22 @@ public class DataPoint
 	{
 		return _timestamp;
 	}
+	public String getWaypointName()
+	{
+		return _waypointName;
+	}
 
 	/**
 	 * @return true if point has a waypoint name
 	 */
 	public boolean isWaypoint()
 	{
-		String name = getFieldValue(Field.WAYPT_NAME);
-		return (name != null && !name.equals(""));
+		return (_waypointName != null && !_waypointName.equals(""));
 	}
 
+
 	/**
-	 * Compare two DataPoint objects to see if they
-	 * are duplicates
+	 * Compare two DataPoint objects to see if they are duplicates
 	 * @param inOther other object to compare
 	 * @return true if the points are equivalent
 	 */
@@ -131,26 +184,45 @@ public class DataPoint
 		{
 			return false;
 		}
+		// Make sure photo points aren't specified as duplicates
+		if (_photo != null) return false;
 		// Compare latitude and longitude
 		if (!_longitude.equals(inOther._longitude) || !_latitude.equals(inOther._latitude))
 		{
 			return false;
 		}
 		// Note that conversion from decimal to dms can make non-identical points into duplicates
-		// Compare description (if any)
-		String name1 = getFieldValue(Field.WAYPT_NAME);
-		String name2 = inOther.getFieldValue(Field.WAYPT_NAME);
-		if (name1 == null || name1.equals(""))
+		// Compare waypoint name (if any)
+		if (!isWaypoint())
 		{
-			return (name2 == null || name2.equals(""));
+			return !inOther.isWaypoint();
 		}
 		else
 		{
-			return (name2 != null && name2.equals(name1));
+			return (inOther._waypointName != null && inOther._waypointName.equals(_waypointName));
 		}
 	}
 
 
+	/**
+	 * Set the photo for this data point
+	 * @param inPhoto Photo object
+	 */
+	public void setPhoto(Photo inPhoto)
+	{
+		_photo = inPhoto;
+	}
+
+
+	/**
+	 * @return associated Photo object
+	 */
+	public Photo getPhoto()
+	{
+		return _photo;
+	}
+
+
 	/**
 	 * @return true if the point is valid
 	 */
@@ -210,4 +282,60 @@ public class DataPoint
 		// phew
 		return answer;
 	}
+
+
+	/**
+	 * Resize the value array
+	 * @param inNewIndex new index to allow
+	 */
+	private void resizeValueArray(int inNewIndex)
+	{
+		int newSize = inNewIndex + 1;
+		if (newSize > _fieldValues.length)
+		{
+			String[] newArray = new String[newSize];
+			System.arraycopy(_fieldValues, 0, newArray, 0, _fieldValues.length);
+			_fieldValues = newArray;
+		}
+	}
+
+
+	/**
+	 * @return a clone object with copied data
+	 */
+	public DataPoint clonePoint()
+	{
+		// Copy all values
+		String[] valuesCopy = new String[_fieldValues.length];
+		System.arraycopy(_fieldValues, 0, valuesCopy, 0, _fieldValues.length);
+		// Make new object to hold cloned data
+		DataPoint point = new DataPoint(valuesCopy, _fieldList, _altitude.getFormat());
+		return point;
+	}
+
+
+	/**
+	 * Restore the contents from another point
+	 * @param inOther point containing contents to copy
+	 * @return true if successful
+	 */
+	public boolean restoreContents(DataPoint inOther)
+	{
+		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;
+	}
 }