X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fload%2Fxml%2FGpxHandler.java;h=4208014e44c1e9e8c9df262c0caa3083f3bd76f3;hb=649c5da6ee1bbc590699e11a92316ece2ea8512d;hp=8ab3e17978b878dca0221d8c80c9156fa9b5d1d4;hpb=112bb0c9b46894adca9a33ed8c99ea712b253185;p=GpsPrune.git

diff --git a/tim/prune/load/xml/GpxHandler.java b/tim/prune/load/xml/GpxHandler.java
index 8ab3e17..4208014 100644
--- a/tim/prune/load/xml/GpxHandler.java
+++ b/tim/prune/load/xml/GpxHandler.java
@@ -6,6 +6,7 @@ import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
 import tim.prune.data.Field;
+import tim.prune.load.TrackNameList;
 
 
 /**
@@ -13,19 +14,21 @@ import tim.prune.data.Field;
  */
 public class GpxHandler extends XmlHandler
 {
+	private boolean _insidePoint = false;
 	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 String _type = null;
+	private boolean _isTrackPoint = false;
+	private int _trackNum = -1;
+	private GpxTag _name = new GpxTag(), _trackName = new GpxTag();
+	private String _latitude = null, _longitude = null;
+	private GpxTag _elevation = new GpxTag(), _time = new GpxTag();
+	private GpxTag _type = new GpxTag(), _description = new GpxTag();
+	private GpxTag _link = new GpxTag();
+	private GpxTag _currentTag = null;
 	private ArrayList<String[]> _pointList = new ArrayList<String[]>();
+	private ArrayList<String> _linkList = new ArrayList<String>();
+	private TrackNameList _trackNameList = new TrackNameList();
 
-	// FIXME: Read waypoint type too
 
 	/**
 	 * Receive the start of a tag
@@ -35,40 +38,52 @@ public class GpxHandler extends XmlHandler
 		Attributes attributes) throws SAXException
 	{
 		// Read the parameters for waypoints and track points
-		if (qName.equalsIgnoreCase("wpt") || qName.equalsIgnoreCase("trkpt"))
+		String tag = qName.toLowerCase();
+		if (tag.equals("wpt") || tag.equals("trkpt") || tag.equals("rtept"))
 		{
-			_insideWaypoint = qName.equalsIgnoreCase("wpt");
-			int numAttributes = attributes.getLength();
+			_insidePoint = true;
+			_insideWaypoint = tag.equals("wpt");
+			_isTrackPoint = tag.equals("trkpt");
+			final int numAttributes = attributes.getLength();
 			for (int i=0; i<numAttributes; i++)
 			{
-				String att = attributes.getQName(i);
+				String att = attributes.getQName(i).toLowerCase();
 				if (att.equals("lat")) {_latitude = attributes.getValue(i);}
 				else if (att.equals("lon")) {_longitude = attributes.getValue(i);}
 			}
-			_elevation = null;
-			_name = null;
-			_time = null;
+			_elevation.setValue(null);
+			_name.setValue(null);
+			_time.setValue(null);
+			_type.setValue(null);
+			_link.setValue(null);
+			_description.setValue(null);
 		}
-		else if (qName.equalsIgnoreCase("ele"))
-		{
-			_insideElevation = true;
+		else if (tag.equals("ele")) {
+			_currentTag = _elevation;
 		}
-		else if (qName.equalsIgnoreCase("name"))
-		{
-			_insideName = true;
+		else if (tag.equals("name")) {
+			_currentTag = (_insidePoint?_name:_trackName);
 		}
-		else if (qName.equalsIgnoreCase("time"))
-		{
-			_insideTime = true;
+		else if (tag.equals("time")) {
+			_currentTag = _time;
 		}
-//		else if (qName.equalsIgnoreCase("type"))
-//		{
-//			_insideType = true;
-//		}
-		else if (qName.equalsIgnoreCase("trkseg"))
-		{
+		else if (tag.equals("type")) {
+			_currentTag = _type;
+		}
+		else if (tag.equals("description")) {
+			_currentTag = _description;
+		}
+		else if (tag.equals("link")) {
+			_link.setValue(attributes.getValue("href"));
+		}
+		else if (tag.equals("trkseg")) {
 			_startSegment = true;
 		}
+		else if (tag.equals("trk"))
+		{
+			_trackNum++;
+			_trackName.setValue(null);
+		}
 		super.startElement(uri, localName, qName, attributes);
 	}
 
@@ -80,21 +95,14 @@ public class GpxHandler extends XmlHandler
 	public void endElement(String uri, String localName, String qName)
 		throws SAXException
 	{
-		if (qName.equalsIgnoreCase("wpt") || qName.equalsIgnoreCase("trkpt"))
+		String tag = qName.toLowerCase();
+		if (tag.equals("wpt") || tag.equals("trkpt") || tag.equals("rtept"))
 		{
 			processPoint();
+			_insidePoint = false;
 		}
-		else if (qName.equalsIgnoreCase("ele"))
-		{
-			_insideElevation = false;
-		}
-		else if (qName.equalsIgnoreCase("name"))
-		{
-			_insideName = false;
-		}
-		else if (qName.equalsIgnoreCase("time"))
-		{
-			_insideTime = false;
+		else {
+			_currentTag = null;
 		}
 		super.endElement(uri, localName, qName);
 	}
@@ -108,9 +116,9 @@ public class GpxHandler extends XmlHandler
 		throws SAXException
 	{
 		String value = new String(ch, start, length);
-		if (_insideName && _insideWaypoint) {_name = checkCharacters(_name, value);}
-		else if (_insideElevation) {_elevation = checkCharacters(_elevation, value);}
-		else if (_insideTime) {_time = checkCharacters(_time, value);}
+		if (_currentTag != null) {
+			_currentTag.setValue(checkCharacters(_currentTag.getValue(), value));
+		}
 		super.characters(ch, start, length);
 	}
 
@@ -134,15 +142,22 @@ public class GpxHandler extends XmlHandler
 	private void processPoint()
 	{
 		// Put the values into a String array matching the order in getFieldArray()
-		String[] values = new String[6];
-		values[0] = _latitude; values[1] = _longitude;
-		values[2] = _elevation; values[3] = _name;
-		values[4] = _time;
-		if (_startSegment && !_insideWaypoint) {
+		String[] values = new String[8];
+		values[0] = _latitude;
+		values[1] = _longitude;
+		values[2] = _elevation.getValue();
+		if (_insideWaypoint) {values[3] = _name.getValue();}
+		values[4] = _time.getValue();
+		if (_startSegment && !_insideWaypoint)
+		{
 			values[5] = "1";
 			_startSegment = false;
 		}
+		values[6] = _type.getValue();
+		values[7] = _description.getValue();
 		_pointList.add(values);
+		_trackNameList.addPoint(_trackNum, _trackName.getValue(), _isTrackPoint);
+		_linkList.add(_link.getValue());
 	}
 
 
@@ -152,7 +167,8 @@ public class GpxHandler extends XmlHandler
 	public Field[] getFieldArray()
 	{
 		final Field[] fields = {Field.LATITUDE, Field.LONGITUDE, Field.ALTITUDE,
-			Field.WAYPT_NAME, Field.TIMESTAMP, Field.NEW_SEGMENT};
+			Field.WAYPT_NAME, Field.TIMESTAMP, Field.NEW_SEGMENT,
+			Field.WAYPT_TYPE, Field.DESCRIPTION};
 		return fields;
 	}
 
@@ -172,4 +188,28 @@ public class GpxHandler extends XmlHandler
 		}
 		return result;
 	}
+
+	/**
+	 * @return array of links, or null if none
+	 */
+	public String[] getLinkArray()
+	{
+		int numPoints = _linkList.size();
+		boolean hasLink = false;
+		String[] result = new String[numPoints];
+		for (int i=0; i<numPoints; i++)
+		{
+			result[i] = _linkList.get(i);
+			if (result[i] != null) {hasLink = true;}
+		}
+		if (!hasLink) {result = null;}
+		return result;
+	}
+
+	/**
+	 * @return track name list
+	 */
+	public TrackNameList getTrackNameList() {
+		return _trackNameList;
+	}
 }