X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fload%2Fxml%2FKmlHandler.java;h=787dd0bd1cfc8d1df08cdd3caeb74c471a497bcb;hb=6814c830d470f73c7ec57c71235de333f5ea4279;hp=02c9be7cfe6b69b932f3e5acc3ea62d24e7943eb;hpb=ca9bdb3916f9c39adbbf95d06ac95c21dafbb4e6;p=GpsPrune.git

diff --git a/tim/prune/load/xml/KmlHandler.java b/tim/prune/load/xml/KmlHandler.java
index 02c9be7..787dd0b 100644
--- a/tim/prune/load/xml/KmlHandler.java
+++ b/tim/prune/load/xml/KmlHandler.java
@@ -17,7 +17,7 @@ public class KmlHandler extends XmlHandler
 	private boolean _insideCoordinates = false;
 	private String _name = null;
 	private StringBuffer _coordinates = null;
-	private ArrayList _pointList = new ArrayList();
+	private ArrayList<String[]> _pointList = new ArrayList<String[]>();
 
 
 	/**
@@ -86,7 +86,7 @@ public class KmlHandler extends XmlHandler
 	private void processPlacemark()
 	{
 		if (_coordinates == null) return;
-		String allCoords = _coordinates.toString();
+		String allCoords = _coordinates.toString().trim();
 		String[] coordArray = allCoords.split("[ \n]");
 		int numPoints = coordArray.length;
 		if (numPoints == 1)
@@ -97,11 +97,16 @@ public class KmlHandler extends XmlHandler
 		else if (numPoints > 1)
 		{
 			// Add each of the unnamed track points to list
+			boolean firstPoint = true;
 			for (int p=0; p<numPoints; p++)
 			{
-				String[] pointArray = makeStringArray(coordArray[p], null);
-				if (p==0) {pointArray[4] = "1";}
-				_pointList.add(pointArray);
+				if (coordArray[p] != null && coordArray[p].trim().length()>3)
+				{
+					String[] pointArray = makeStringArray(coordArray[p], null);
+					if (firstPoint) {pointArray[4] = "1";} // start of segment flag
+					firstPoint = false;
+					_pointList.add(pointArray);
+				}
 			}
 		}
 	}
@@ -144,7 +149,7 @@ public class KmlHandler 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;
 	}