X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fload%2Fxml%2FGpxHandler.java;h=b58ec3127cc63bab9541d465a339afcb448d9841;hp=771621b57f75b98ca1d5229704dda7b63e3a446b;hb=ca9bdb3916f9c39adbbf95d06ac95c21dafbb4e6;hpb=63f178fd6c6b30b99a01f2a2d700963ea2dfef8b

diff --git a/tim/prune/load/xml/GpxHandler.java b/tim/prune/load/xml/GpxHandler.java
index 771621b..b58ec31 100644
--- a/tim/prune/load/xml/GpxHandler.java
+++ b/tim/prune/load/xml/GpxHandler.java
@@ -17,6 +17,7 @@ public class GpxHandler extends XmlHandler
 	private boolean _insideName = false;
 	private boolean _insideElevation = false;
 	private boolean _insideTime = false;
+	private boolean _startSegment = true;
 	private String _name = null, _latitude = null, _longitude = null;
 	private String _elevation = null;
 	private String _time = null;
@@ -57,6 +58,10 @@ public class GpxHandler extends XmlHandler
 		{
 			_insideTime = true;
 		}
+		else if (qName.equalsIgnoreCase("trkseg"))
+		{
+			_startSegment = true;
+		}
 		super.startElement(uri, localName, qName, attributes);
 	}
 
@@ -122,10 +127,14 @@ public class GpxHandler extends XmlHandler
 	private void processPoint()
 	{
 		// Put the values into a String array matching the order in getFieldArray()
-		String[] values = new String[5];
+		String[] values = new String[6];
 		values[0] = _latitude; values[1] = _longitude;
 		values[2] = _elevation; values[3] = _name;
 		values[4] = _time;
+		if (_startSegment && !_insideWaypoint) {
+			values[5] = "1";
+			_startSegment = false;
+		}
 		_pointList.add(values);
 	}
 
@@ -136,7 +145,7 @@ public class GpxHandler extends XmlHandler
 	public Field[] getFieldArray()
 	{
 		final Field[] fields = {Field.LATITUDE, Field.LONGITUDE, Field.ALTITUDE,
-			Field.WAYPT_NAME, Field.TIMESTAMP};
+			Field.WAYPT_NAME, Field.TIMESTAMP, Field.NEW_SEGMENT};
 		return fields;
 	}