X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fthreedee%2FThreeDModel.java;h=65f1152e913861555bd10a8f5786415bbe9ce15e;hb=112bb0c9b46894adca9a33ed8c99ea712b253185;hp=db748c0bd825ccc917c87a6664ca94781c40196a;hpb=23959e65a6a0d581e657b07186d18b7a1ac5afeb;p=GpsPrune.git

diff --git a/tim/prune/threedee/ThreeDModel.java b/tim/prune/threedee/ThreeDModel.java
index db748c0..65f1152 100644
--- a/tim/prune/threedee/ThreeDModel.java
+++ b/tim/prune/threedee/ThreeDModel.java
@@ -18,16 +18,18 @@ public class ThreeDModel
 	private int _altitudeCap = -1;
 	private double _scaleFactor = 1.0;
 	private double _altFactor = 1.0;
-	// TODO: How to store rods (lifts) in data?
+	// MAYBE: How to store rods (lifts) in data?
 	private byte[] _pointTypes = null;
 	private byte[] _pointHeights = null;
 
 	private static final double DEFAULT_MODEL_SIZE = 10.0;
+	/** Minimum altitude cap */
 	public static final int MINIMUM_ALTITUDE_CAP = 100;
 
 	// Constants for point types
-	public static final byte POINT_TYPE_WAYPOINT = 1;
-	public static final byte POINT_TYPE_NORMAL_POINT = 2;
+	public static final byte POINT_TYPE_WAYPOINT      = 1;
+	public static final byte POINT_TYPE_NORMAL_POINT  = 2;
+	public static final byte POINT_TYPE_SEGMENT_START = 3;
 
 
 	/**
@@ -136,8 +138,8 @@ public class ThreeDModel
 		for (int i=0; i<numPoints; i++)
 		{
 			DataPoint point = _track.getPoint(i);
-			_pointTypes[i] = (point.isWaypoint()?POINT_TYPE_WAYPOINT:POINT_TYPE_NORMAL_POINT);
-			_pointHeights[i] = (byte) (point.getAltitude().getValue(Altitude.FORMAT_METRES) / 500);
+			_pointTypes[i] = (point.isWaypoint()?POINT_TYPE_WAYPOINT:(point.getSegmentStart()?POINT_TYPE_SEGMENT_START:POINT_TYPE_NORMAL_POINT));
+			_pointHeights[i] = (byte) (point.getAltitude().getValue(Altitude.Format.METRES) / 500);
 		}
 	}
 
@@ -178,11 +180,11 @@ public class ThreeDModel
 
 
 	/**
-	 * @return number of latitude lines
+	 * @return latitude lines
 	 */
-	public int getNumLatitudeLines()
+	public double[] getLatitudeLines()
 	{
-		return _scaler.getLatitudeLines().length;
+		return _scaler.getLatitudeLines();
 	}
 
 	/**
@@ -195,11 +197,11 @@ public class ThreeDModel
 	}
 
 	/**
-	 * @return number of longitude lines
+	 * @return longitude lines
 	 */
-	public int getNumLongitudeLines()
+	public double[] getLongitudeLines()
 	{
-		return _scaler.getLongitudeLines().length;
+		return _scaler.getLongitudeLines();
 	}
 
 	/**