X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fload%2Fxml%2FGpxHandler.java;h=b4ae07a4e662c719d80b7b242be0519cbc532472;hb=1ee49ae3c8ef3aa2e63eadd458531e5f8bd4f92c;hp=962b495741909fb0e46c1fc07c62c254df18a3d1;hpb=5625a1abadb5f2ca5f017fe7dbda1d5141cb637b;p=GpsPrune.git

diff --git a/tim/prune/load/xml/GpxHandler.java b/tim/prune/load/xml/GpxHandler.java
index 962b495..b4ae07a 100644
--- a/tim/prune/load/xml/GpxHandler.java
+++ b/tim/prune/load/xml/GpxHandler.java
@@ -13,25 +13,29 @@ import tim.prune.data.Field;
  */
 public class GpxHandler extends XmlHandler
 {
+	private boolean _insideWaypoint = false;
 	private boolean _insideName = false;
 	private boolean _insideElevation = false;
 	private boolean _insideTime = false;
+	private boolean _insideType = false;
+	private boolean _startSegment = true;
 	private String _name = null, _latitude = null, _longitude = null;
 	private String _elevation = null;
 	private String _time = null;
-	private ArrayList _pointList = new ArrayList();
-
+	private String _type = null;
+	private ArrayList<String[]> _pointList = new ArrayList<String[]>();
 
 	/**
 	 * Receive the start of a tag
 	 * @see org.xml.sax.ContentHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
 	 */
 	public void startElement(String uri, String localName, String qName,
-			Attributes attributes) throws SAXException
+		Attributes attributes) throws SAXException
 	{
 		// Read the parameters for waypoints and track points
-		if (qName.equalsIgnoreCase("wpt") || qName.equalsIgnoreCase("trkpt"))
+		if (qName.equalsIgnoreCase("wpt") || qName.equalsIgnoreCase("trkpt") || qName.equalsIgnoreCase("rtept"))
 		{
+			_insideWaypoint = qName.equalsIgnoreCase("wpt");
 			int numAttributes = attributes.getLength();
 			for (int i=0; i<numAttributes; i++)
 			{
@@ -42,6 +46,7 @@ public class GpxHandler extends XmlHandler
 			_elevation = null;
 			_name = null;
 			_time = null;
+			_type = null;
 		}
 		else if (qName.equalsIgnoreCase("ele"))
 		{
@@ -55,6 +60,14 @@ public class GpxHandler extends XmlHandler
 		{
 			_insideTime = true;
 		}
+		else if (qName.equalsIgnoreCase("type"))
+		{
+			_insideType = true;
+		}
+		else if (qName.equalsIgnoreCase("trkseg"))
+		{
+			_startSegment = true;
+		}
 		super.startElement(uri, localName, qName, attributes);
 	}
 
@@ -64,9 +77,9 @@ public class GpxHandler extends XmlHandler
 	 * @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
 	 */
 	public void endElement(String uri, String localName, String qName)
-	throws SAXException
+		throws SAXException
 	{
-		if (qName.equalsIgnoreCase("wpt") || qName.equalsIgnoreCase("trkpt"))
+		if (qName.equalsIgnoreCase("wpt") || qName.equalsIgnoreCase("trkpt") || qName.equalsIgnoreCase("rtept"))
 		{
 			processPoint();
 		}
@@ -82,6 +95,10 @@ public class GpxHandler extends XmlHandler
 		{
 			_insideTime = false;
 		}
+		else if (qName.equalsIgnoreCase("type"))
+		{
+			_insideType = false;
+		}
 		super.endElement(uri, localName, qName);
 	}
 
@@ -91,12 +108,13 @@ public class GpxHandler extends XmlHandler
 	 * @see org.xml.sax.ContentHandler#characters(char[], int, int)
 	 */
 	public void characters(char[] ch, int start, int length)
-			throws SAXException
+		throws SAXException
 	{
 		String value = new String(ch, start, length);
-		if (_insideName) {_name = checkCharacters(_name, value);}
+		if (_insideName && _insideWaypoint) {_name = checkCharacters(_name, value);}
 		else if (_insideElevation) {_elevation = checkCharacters(_elevation, value);}
 		else if (_insideTime) {_time = checkCharacters(_time, value);}
+		else if (_insideType) {_type = checkCharacters(_type, value);}
 		super.characters(ch, start, length);
 	}
 
@@ -120,10 +138,15 @@ 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[7];
 		values[0] = _latitude; values[1] = _longitude;
 		values[2] = _elevation; values[3] = _name;
 		values[4] = _time;
+		if (_startSegment && !_insideWaypoint) {
+			values[5] = "1";
+			_startSegment = false;
+		}
+		values[6] = _type;
 		_pointList.add(values);
 	}
 
@@ -134,7 +157,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, Field.WAYPT_TYPE};
 		return fields;
 	}
 
@@ -150,7 +173,7 @@ public class GpxHandler extends XmlHandler
 		String[][] result = new String[numPoints][];
 		for (int i=0; i<numPoints; i++)
 		{
-			result[i] = (String[]) _pointList.get(i);
+			result[i] = _pointList.get(i);
 		}
 		return result;
 	}