Get rid of XmlPullUtil.jumpToStartTag()

enabler/src/de/schildbach/pte/AbstractEfaProvider.java

@@ -958,7 +958,9 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 			pp.setInput(is, null);
 			final ResultHeader header = enterItdRequest(pp);
 
-			if (!XmlPullUtil.jumpToStartTag(pp, null, "itdOdv") || !"dm".equals(pp.getAttributeValue(null, "usage")))
+			XmlPullUtil.enter(pp, "itdDepartureMonitorRequest");
+
+			if (!XmlPullUtil.test(pp, "itdOdv") || !"dm".equals(pp.getAttributeValue(null, "usage")))
 				throw new IllegalStateException("cannot find <itdOdv usage=\"dm\" />");
 			XmlPullUtil.enter(pp, "itdOdv");
 
@@ -972,9 +974,11 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 				final Location ownLocation = processOdvNameElem(pp, place);
 				final Location ownStation = ownLocation.type == LocationType.STATION ? ownLocation : null;
 
+				XmlPullUtil.exit(pp, "itdOdvName");
+
 				final List<Location> stations = new ArrayList<Location>();
 
-				if (XmlPullUtil.jumpToStartTag(pp, null, "itdOdvAssignedStops"))
+				if (XmlPullUtil.test(pp, "itdOdvAssignedStops"))
 				{
 					XmlPullUtil.enter(pp, "itdOdvAssignedStops");
 					while (XmlPullUtil.test(pp, "itdOdvAssignedStop"))
@@ -987,6 +991,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 					XmlPullUtil.exit(pp, "itdOdvAssignedStops");
 				}
 
+				XmlPullUtil.exit(pp, "itdOdv");
+
 				if (ownStation != null && !stations.contains(ownStation))
 					stations.add(ownStation);
 
@@ -2409,417 +2415,416 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 			XmlPullUtil.next(pp);
 		}
 		XmlPullUtil.exit(pp, "itdDateTime");
+		XmlPullUtil.exit(pp, "itdTripDateTime");
+
+		XmlPullUtil.enter(pp, "itdTripOptions");
+		XmlPullUtil.exit(pp, "itdTripOptions");
+
+		XmlPullUtil.enter(pp, "itdItinerary");
 
 		final Calendar time = new GregorianCalendar(timeZone());
 		final List<Trip> trips = new ArrayList<Trip>();
 
-		if (XmlPullUtil.jumpToStartTag(pp, null, "itdRouteList"))
+		XmlPullUtil.enter(pp, "itdRouteList");
+
+		while (XmlPullUtil.test(pp, "itdRoute"))
 		{
-			XmlPullUtil.enter(pp, "itdRouteList");
+			final String id = useRouteIndexAsTripId ? pp.getAttributeValue(null, "routeIndex") + "-" + pp.getAttributeValue(null, "routeTripIndex")
+					: null;
+			final int numChanges = XmlPullUtil.intAttr(pp, "changes");
+			XmlPullUtil.enter(pp, "itdRoute");
 
-			while (XmlPullUtil.test(pp, "itdRoute"))
+			while (XmlPullUtil.test(pp, "itdDateTime"))
+				XmlPullUtil.next(pp);
+			if (XmlPullUtil.test(pp, "itdMapItemList"))
+				XmlPullUtil.next(pp);
+
+			XmlPullUtil.enter(pp, "itdPartialRouteList");
+			final List<Trip.Leg> legs = new LinkedList<Trip.Leg>();
+			Location firstDepartureLocation = null;
+			Location lastArrivalLocation = null;
+
+			boolean cancelled = false;
+
+			while (XmlPullUtil.test(pp, "itdPartialRoute"))
 			{
-				final String id = useRouteIndexAsTripId ? pp.getAttributeValue(null, "routeIndex") + "-"
+				final String partialRouteType = XmlPullUtil.attr(pp, "type");
-						+ pp.getAttributeValue(null, "routeTripIndex") : null;
+				final int distance = XmlPullUtil.optIntAttr(pp, "distance", 0);
-				final int numChanges = XmlPullUtil.intAttr(pp, "changes");
+				XmlPullUtil.enter(pp, "itdPartialRoute");
-				XmlPullUtil.enter(pp, "itdRoute");
 
-				while (XmlPullUtil.test(pp, "itdDateTime"))
+				XmlPullUtil.test(pp, "itdPoint");
-					XmlPullUtil.next(pp);
+				if (!"departure".equals(pp.getAttributeValue(null, "usage")))
+					throw new IllegalStateException();
+				final Location departureLocation = processItdPointAttributes(pp);
+				if (firstDepartureLocation == null)
+					firstDepartureLocation = departureLocation;
+				final Position departurePosition = normalizePlatformName(XmlPullUtil.optAttr(pp, "platformName", null));
+				XmlPullUtil.enter(pp, "itdPoint");
 				if (XmlPullUtil.test(pp, "itdMapItemList"))
 					XmlPullUtil.next(pp);
-
+				XmlPullUtil.require(pp, "itdDateTime");
-				XmlPullUtil.enter(pp, "itdPartialRouteList");
+				processItdDateTime(pp, time);
-				final List<Trip.Leg> legs = new LinkedList<Trip.Leg>();
+				final Date departureTime = time.getTime();
-				Location firstDepartureLocation = null;
+				final Date departureTargetTime;
-				Location lastArrivalLocation = null;
+				if (XmlPullUtil.test(pp, "itdDateTimeTarget"))
-
-				boolean cancelled = false;
-
-				while (XmlPullUtil.test(pp, "itdPartialRoute"))
 				{
-					final String partialRouteType = XmlPullUtil.attr(pp, "type");
-					final int distance = XmlPullUtil.optIntAttr(pp, "distance", 0);
-					XmlPullUtil.enter(pp, "itdPartialRoute");
-
-					XmlPullUtil.test(pp, "itdPoint");
-					if (!"departure".equals(pp.getAttributeValue(null, "usage")))
-						throw new IllegalStateException();
-					final Location departureLocation = processItdPointAttributes(pp);
-					if (firstDepartureLocation == null)
-						firstDepartureLocation = departureLocation;
-					final Position departurePosition = normalizePlatformName(XmlPullUtil.optAttr(pp, "platformName", null));
-					XmlPullUtil.enter(pp, "itdPoint");
-					if (XmlPullUtil.test(pp, "itdMapItemList"))
-						XmlPullUtil.next(pp);
-					XmlPullUtil.require(pp, "itdDateTime");
 					processItdDateTime(pp, time);
-					final Date departureTime = time.getTime();
+					departureTargetTime = time.getTime();
-					final Date departureTargetTime;
+				}
-					if (XmlPullUtil.test(pp, "itdDateTimeTarget"))
+				else
+				{
+					departureTargetTime = null;
+				}
+				XmlPullUtil.exit(pp, "itdPoint");
+
+				XmlPullUtil.test(pp, "itdPoint");
+				if (!"arrival".equals(pp.getAttributeValue(null, "usage")))
+					throw new IllegalStateException();
+				final Location arrivalLocation = processItdPointAttributes(pp);
+				lastArrivalLocation = arrivalLocation;
+				final Position arrivalPosition = normalizePlatformName(XmlPullUtil.optAttr(pp, "platformName", null));
+				XmlPullUtil.enter(pp, "itdPoint");
+				if (XmlPullUtil.test(pp, "itdMapItemList"))
+					XmlPullUtil.next(pp);
+				XmlPullUtil.require(pp, "itdDateTime");
+				processItdDateTime(pp, time);
+				final Date arrivalTime = time.getTime();
+				final Date arrivalTargetTime;
+				if (XmlPullUtil.test(pp, "itdDateTimeTarget"))
+				{
+					processItdDateTime(pp, time);
+					arrivalTargetTime = time.getTime();
+				}
+				else
+				{
+					arrivalTargetTime = null;
+				}
+				XmlPullUtil.exit(pp, "itdPoint");
+
+				XmlPullUtil.test(pp, "itdMeansOfTransport");
+				final String productName = pp.getAttributeValue(null, "productName");
+				if ("IT".equals(partialRouteType) || "Fussweg".equals(productName) || "Taxi".equals(productName))
+				{
+					final Trip.Individual.Type type = "Taxi".equals(productName) ? Trip.Individual.Type.TRANSFER : Trip.Individual.Type.WALK;
+
+					XmlPullUtil.enter(pp, "itdMeansOfTransport");
+					XmlPullUtil.exit(pp, "itdMeansOfTransport");
+
+					if (XmlPullUtil.test(pp, "itdStopSeq"))
+						XmlPullUtil.next(pp);
+
+					if (XmlPullUtil.test(pp, "itdFootPathInfo"))
+						XmlPullUtil.next(pp);
+
+					List<Point> path = null;
+					if (XmlPullUtil.test(pp, "itdPathCoordinates"))
+						path = processItdPathCoordinates(pp);
+
+					final Trip.Leg lastLeg = legs.size() > 0 ? legs.get(legs.size() - 1) : null;
+					if (lastLeg != null && lastLeg instanceof Trip.Individual && ((Trip.Individual) lastLeg).type == type)
 					{
-						processItdDateTime(pp, time);
+						final Trip.Individual lastIndividual = (Trip.Individual) legs.remove(legs.size() - 1);
-						departureTargetTime = time.getTime();
+						if (path != null && lastIndividual.path != null)
+							path.addAll(0, lastIndividual.path);
+						legs.add(new Trip.Individual(type, lastIndividual.departure, lastIndividual.departureTime, arrivalLocation, arrivalTime,
+								path, distance));
 					}
 					else
 					{
-						departureTargetTime = null;
+						legs.add(new Trip.Individual(type, departureLocation, departureTime, arrivalLocation, arrivalTime, path, distance));
 					}
-					XmlPullUtil.exit(pp, "itdPoint");
+				}
+				else if ("gesicherter Anschluss".equals(productName) || "nicht umsteigen".equals(productName)) // type97
+				{
+					// ignore
 
-					XmlPullUtil.test(pp, "itdPoint");
+					XmlPullUtil.enter(pp, "itdMeansOfTransport");
-					if (!"arrival".equals(pp.getAttributeValue(null, "usage")))
+					XmlPullUtil.exit(pp, "itdMeansOfTransport");
-						throw new IllegalStateException();
+				}
-					final Location arrivalLocation = processItdPointAttributes(pp);
+				else if ("PT".equals(partialRouteType))
-					lastArrivalLocation = arrivalLocation;
+				{
-					final Position arrivalPosition = normalizePlatformName(XmlPullUtil.optAttr(pp, "platformName", null));
+					final String destinationName = normalizeLocationName(pp.getAttributeValue(null, "destination"));
-					XmlPullUtil.enter(pp, "itdPoint");
+					final String destinationIdStr = pp.getAttributeValue(null, "destID");
-					if (XmlPullUtil.test(pp, "itdMapItemList"))
+					final int destinationId = (destinationIdStr != null && destinationIdStr.length() > 0) ? Integer.parseInt(destinationIdStr) : 0;
-						XmlPullUtil.next(pp);
+					final Location destination = new Location(destinationId > 0 ? LocationType.STATION : LocationType.ANY,
-					XmlPullUtil.require(pp, "itdDateTime");
+							destinationId > 0 ? destinationId : 0, null, destinationName);
-					processItdDateTime(pp, time);
+					final String lineLabel;
-					final Date arrivalTime = time.getTime();
+					final String motSymbol = pp.getAttributeValue(null, "symbol");
-					final Date arrivalTargetTime;
+					if ("AST".equals(motSymbol))
-					if (XmlPullUtil.test(pp, "itdDateTimeTarget"))
 					{
-						processItdDateTime(pp, time);
+						lineLabel = "BAST";
-						arrivalTargetTime = time.getTime();
 					}
 					else
 					{
-						arrivalTargetTime = null;
+						final String motType = pp.getAttributeValue(null, "motType");
+						final String motShortName = pp.getAttributeValue(null, "shortname");
+						final String motName = pp.getAttributeValue(null, "name");
+						final String motTrainName = pp.getAttributeValue(null, "trainName");
+						final String motTrainType = pp.getAttributeValue(null, "trainType");
+
+						lineLabel = parseLine(motType, motSymbol, motShortName, motName, motTrainType, motShortName, motTrainName);
 					}
-					XmlPullUtil.exit(pp, "itdPoint");
+					XmlPullUtil.enter(pp, "itdMeansOfTransport");
+					XmlPullUtil.require(pp, "motDivaParams");
+					final String divaNetwork = XmlPullUtil.attr(pp, "network");
+					final String divaLine = XmlPullUtil.attr(pp, "line");
+					final String divaSupplement = XmlPullUtil.optAttr(pp, "supplement", "");
+					final String divaDirection = XmlPullUtil.attr(pp, "direction");
+					final String divaProject = XmlPullUtil.attr(pp, "project");
+					final String lineId = divaNetwork + ':' + divaLine + ':' + divaSupplement + ':' + divaDirection + ':' + divaProject;
+					XmlPullUtil.exit(pp, "itdMeansOfTransport");
 
-					XmlPullUtil.test(pp, "itdMeansOfTransport");
+					final Integer departureDelay;
-					final String productName = pp.getAttributeValue(null, "productName");
+					final Integer arrivalDelay;
-					if ("IT".equals(partialRouteType) || "Fussweg".equals(productName) || "Taxi".equals(productName))
+					if (XmlPullUtil.test(pp, "itdRBLControlled"))
 					{
-						final Trip.Individual.Type type = "Taxi".equals(productName) ? Trip.Individual.Type.TRANSFER : Trip.Individual.Type.WALK;
+						departureDelay = XmlPullUtil.optIntAttr(pp, "delayMinutes", 0);
+						arrivalDelay = XmlPullUtil.optIntAttr(pp, "delayMinutesArr", 0);
 
-						XmlPullUtil.enter(pp, "itdMeansOfTransport");
+						cancelled |= (departureDelay == -9999 || arrivalDelay == -9999);
-						XmlPullUtil.exit(pp, "itdMeansOfTransport");
 
-						if (XmlPullUtil.test(pp, "itdStopSeq"))
+						XmlPullUtil.next(pp);
-							XmlPullUtil.next(pp);
-
-						if (XmlPullUtil.test(pp, "itdFootPathInfo"))
-							XmlPullUtil.next(pp);
-
-						List<Point> path = null;
-						if (XmlPullUtil.test(pp, "itdPathCoordinates"))
-							path = processItdPathCoordinates(pp);
-
-						final Trip.Leg lastLeg = legs.size() > 0 ? legs.get(legs.size() - 1) : null;
-						if (lastLeg != null && lastLeg instanceof Trip.Individual && ((Trip.Individual) lastLeg).type == type)
-						{
-							final Trip.Individual lastIndividual = (Trip.Individual) legs.remove(legs.size() - 1);
-							if (path != null && lastIndividual.path != null)
-								path.addAll(0, lastIndividual.path);
-							legs.add(new Trip.Individual(type, lastIndividual.departure, lastIndividual.departureTime, arrivalLocation, arrivalTime,
-									path, distance));
-						}
-						else
-						{
-							legs.add(new Trip.Individual(type, departureLocation, departureTime, arrivalLocation, arrivalTime, path, distance));
-						}
 					}
-					else if ("gesicherter Anschluss".equals(productName) || "nicht umsteigen".equals(productName)) // type97
+					else
 					{
-						// ignore
+						departureDelay = null;
-
+						arrivalDelay = null;
-						XmlPullUtil.enter(pp, "itdMeansOfTransport");
-						XmlPullUtil.exit(pp, "itdMeansOfTransport");
 					}
-					else if ("PT".equals(partialRouteType))
+
+					boolean lowFloorVehicle = false;
+					String message = null;
+					if (XmlPullUtil.test(pp, "itdInfoTextList"))
 					{
-						final String destinationName = normalizeLocationName(pp.getAttributeValue(null, "destination"));
+						if (!pp.isEmptyElementTag())
-						final String destinationIdStr = pp.getAttributeValue(null, "destID");
-						final int destinationId = (destinationIdStr != null && destinationIdStr.length() > 0) ? Integer.parseInt(destinationIdStr)
-								: 0;
-						final Location destination = new Location(destinationId > 0 ? LocationType.STATION : LocationType.ANY,
-								destinationId > 0 ? destinationId : 0, null, destinationName);
-						final String lineLabel;
-						final String motSymbol = pp.getAttributeValue(null, "symbol");
-						if ("AST".equals(motSymbol))
 						{
-							lineLabel = "BAST";
+							XmlPullUtil.enter(pp, "itdInfoTextList");
-						}
+							while (XmlPullUtil.test(pp, "infoTextListElem"))
-						else
-						{
-							final String motType = pp.getAttributeValue(null, "motType");
-							final String motShortName = pp.getAttributeValue(null, "shortname");
-							final String motName = pp.getAttributeValue(null, "name");
-							final String motTrainName = pp.getAttributeValue(null, "trainName");
-							final String motTrainType = pp.getAttributeValue(null, "trainType");
-
-							lineLabel = parseLine(motType, motSymbol, motShortName, motName, motTrainType, motShortName, motTrainName);
-						}
-						XmlPullUtil.enter(pp, "itdMeansOfTransport");
-						XmlPullUtil.require(pp, "motDivaParams");
-						final String divaNetwork = XmlPullUtil.attr(pp, "network");
-						final String divaLine = XmlPullUtil.attr(pp, "line");
-						final String divaSupplement = XmlPullUtil.optAttr(pp, "supplement", "");
-						final String divaDirection = XmlPullUtil.attr(pp, "direction");
-						final String divaProject = XmlPullUtil.attr(pp, "project");
-						final String lineId = divaNetwork + ':' + divaLine + ':' + divaSupplement + ':' + divaDirection + ':' + divaProject;
-						XmlPullUtil.exit(pp, "itdMeansOfTransport");
-
-						final Integer departureDelay;
-						final Integer arrivalDelay;
-						if (XmlPullUtil.test(pp, "itdRBLControlled"))
-						{
-							departureDelay = XmlPullUtil.optIntAttr(pp, "delayMinutes", 0);
-							arrivalDelay = XmlPullUtil.optIntAttr(pp, "delayMinutesArr", 0);
-
-							cancelled |= (departureDelay == -9999 || arrivalDelay == -9999);
-
-							XmlPullUtil.next(pp);
-						}
-						else
-						{
-							departureDelay = null;
-							arrivalDelay = null;
-						}
-
-						boolean lowFloorVehicle = false;
-						String message = null;
-						if (XmlPullUtil.test(pp, "itdInfoTextList"))
-						{
-							if (!pp.isEmptyElementTag())
 							{
-								XmlPullUtil.enter(pp, "itdInfoTextList");
+								XmlPullUtil.enter(pp, "infoTextListElem");
-								while (XmlPullUtil.test(pp, "infoTextListElem"))
+								final String text = pp.getText();
-								{
+								if ("Niederflurwagen soweit verfügbar".equals(text)) // KVV
-									XmlPullUtil.enter(pp, "infoTextListElem");
+									lowFloorVehicle = true;
-									final String text = pp.getText();
+								else if (text != null && text.toLowerCase().contains("ruf")) // RufBus, RufTaxi
-									if ("Niederflurwagen soweit verfügbar".equals(text)) // KVV
+									message = text;
-										lowFloorVehicle = true;
+								XmlPullUtil.exit(pp, "infoTextListElem");
-									else if (text != null && text.toLowerCase().contains("ruf")) // RufBus, RufTaxi
-										message = text;
-									XmlPullUtil.exit(pp, "infoTextListElem");
-								}
-								XmlPullUtil.exit(pp, "itdInfoTextList");
-							}
-							else
-							{
-								XmlPullUtil.next(pp);
 							}
+							XmlPullUtil.exit(pp, "itdInfoTextList");
 						}
-
+						else
-						if (XmlPullUtil.test(pp, "itdFootPathInfo"))
-							XmlPullUtil.next(pp);
-						if (XmlPullUtil.test(pp, "infoLink"))
-							XmlPullUtil.next(pp);
-
-						List<Stop> intermediateStops = null;
-						if (XmlPullUtil.test(pp, "itdStopSeq"))
 						{
-							XmlPullUtil.enter(pp, "itdStopSeq");
+							XmlPullUtil.next(pp);
-							intermediateStops = new LinkedList<Stop>();
+						}
-							while (XmlPullUtil.test(pp, "itdPoint"))
+					}
+
+					if (XmlPullUtil.test(pp, "itdFootPathInfo"))
+						XmlPullUtil.next(pp);
+					if (XmlPullUtil.test(pp, "infoLink"))
+						XmlPullUtil.next(pp);
+
+					List<Stop> intermediateStops = null;
+					if (XmlPullUtil.test(pp, "itdStopSeq"))
+					{
+						XmlPullUtil.enter(pp, "itdStopSeq");
+						intermediateStops = new LinkedList<Stop>();
+						while (XmlPullUtil.test(pp, "itdPoint"))
+						{
+							final Location stopLocation = processItdPointAttributes(pp);
+
+							final Position stopPosition = normalizePlatformName(XmlPullUtil.optAttr(pp, "platformName", null));
+
+							XmlPullUtil.enter(pp, "itdPoint");
+							XmlPullUtil.require(pp, "itdDateTime");
+
+							final Date plannedStopArrivalTime;
+							final Date predictedStopArrivalTime;
+							if (processItdDateTime(pp, time))
 							{
-								final Location stopLocation = processItdPointAttributes(pp);
+								plannedStopArrivalTime = time.getTime();
-
+								if (arrivalDelay != null)
-								final Position stopPosition = normalizePlatformName(XmlPullUtil.optAttr(pp, "platformName", null));
-
-								XmlPullUtil.enter(pp, "itdPoint");
-								XmlPullUtil.require(pp, "itdDateTime");
-
-								final Date plannedStopArrivalTime;
-								final Date predictedStopArrivalTime;
-								if (processItdDateTime(pp, time))
 								{
-									plannedStopArrivalTime = time.getTime();
+									time.add(Calendar.MINUTE, arrivalDelay);
-									if (arrivalDelay != null)
+									predictedStopArrivalTime = time.getTime();
-									{
-										time.add(Calendar.MINUTE, arrivalDelay);
-										predictedStopArrivalTime = time.getTime();
-									}
-									else
-									{
-										predictedStopArrivalTime = null;
-									}
 								}
 								else
 								{
-									plannedStopArrivalTime = null;
 									predictedStopArrivalTime = null;
 								}
-
-								final Date plannedStopDepartureTime;
-								final Date predictedStopDepartureTime;
-								if (XmlPullUtil.test(pp, "itdDateTime") && processItdDateTime(pp, time))
-								{
-									plannedStopDepartureTime = time.getTime();
-									if (departureDelay != null)
-									{
-										time.add(Calendar.MINUTE, departureDelay);
-										predictedStopDepartureTime = time.getTime();
-									}
-									else
-									{
-										predictedStopDepartureTime = null;
-									}
-								}
-								else
-								{
-									plannedStopDepartureTime = null;
-									predictedStopDepartureTime = null;
-								}
-
-								final Stop stop = new Stop(stopLocation, plannedStopArrivalTime, predictedStopArrivalTime, stopPosition, null,
-										plannedStopDepartureTime, predictedStopDepartureTime, stopPosition, null);
-
-								intermediateStops.add(stop);
-
-								XmlPullUtil.exit(pp, "itdPoint");
-							}
-							XmlPullUtil.exit(pp, "itdStopSeq");
-
-							// remove first and last, because they are not intermediate
-							final int size = intermediateStops.size();
-							if (size >= 2)
-							{
-								if (intermediateStops.get(size - 1).location.id != arrivalLocation.id)
-									throw new IllegalStateException();
-								intermediateStops.remove(size - 1);
-
-								if (intermediateStops.get(0).location.id != departureLocation.id)
-									throw new IllegalStateException();
-								intermediateStops.remove(0);
-							}
-						}
-
-						List<Point> path = null;
-						if (XmlPullUtil.test(pp, "itdPathCoordinates"))
-							path = processItdPathCoordinates(pp);
-
-						boolean wheelChairAccess = false;
-						if (XmlPullUtil.test(pp, "genAttrList"))
-						{
-							XmlPullUtil.enter(pp, "genAttrList");
-							while (XmlPullUtil.test(pp, "genAttrElem"))
-							{
-								XmlPullUtil.enter(pp, "genAttrElem");
-								XmlPullUtil.enter(pp, "name");
-								final String name = pp.getText();
-								XmlPullUtil.exit(pp, "name");
-								XmlPullUtil.enter(pp, "value");
-								final String value = pp.getText();
-								XmlPullUtil.exit(pp, "value");
-								XmlPullUtil.exit(pp, "genAttrElem");
-
-								// System.out.println("genAttrElem: name='" + name + "' value='" + value + "'");
-
-								if ("PlanWheelChairAccess".equals(name) && "1".equals(value))
-									wheelChairAccess = true;
-							}
-							XmlPullUtil.exit(pp, "genAttrList");
-						}
-
-						if (XmlPullUtil.test(pp, "nextDeps"))
-						{
-							XmlPullUtil.enter(pp, "nextDeps");
-							while (XmlPullUtil.test(pp, "itdDateTime"))
-							{
-								processItdDateTime(pp, time);
-								/* final Date nextDepartureTime = */time.getTime();
-							}
-							XmlPullUtil.exit(pp, "nextDeps");
-						}
-
-						final Set<Line.Attr> lineAttrs = new HashSet<Line.Attr>();
-						if (wheelChairAccess || lowFloorVehicle)
-							lineAttrs.add(Line.Attr.WHEEL_CHAIR_ACCESS);
-						final Line line = new Line(lineId, lineLabel, lineStyle(divaNetwork, lineLabel), lineAttrs);
-
-						final Stop departure = new Stop(departureLocation, true, departureTargetTime != null ? departureTargetTime : departureTime,
-								departureTime != null ? departureTime : null, departurePosition, null);
-						final Stop arrival = new Stop(arrivalLocation, false, arrivalTargetTime != null ? arrivalTargetTime : arrivalTime,
-								arrivalTime != null ? arrivalTime : null, arrivalPosition, null);
-
-						legs.add(new Trip.Public(line, destination, departure, arrival, intermediateStops, path, message));
-					}
-					else
-					{
-						throw new IllegalStateException("unknown type: '" + partialRouteType + "' '" + productName + "'");
-					}
-
-					XmlPullUtil.exit(pp, "itdPartialRoute");
-				}
-
-				XmlPullUtil.exit(pp, "itdPartialRouteList");
-
-				final List<Fare> fares = new ArrayList<Fare>(2);
-				if (XmlPullUtil.test(pp, "itdFare"))
-				{
-					if (!pp.isEmptyElementTag())
-					{
-						XmlPullUtil.enter(pp, "itdFare");
-						if (XmlPullUtil.test(pp, "itdSingleTicket"))
-						{
-							final String net = XmlPullUtil.attr(pp, "net");
-							final Currency currency = parseCurrency(XmlPullUtil.attr(pp, "currency"));
-							final String fareAdult = XmlPullUtil.optAttr(pp, "fareAdult", null);
-							final String fareChild = XmlPullUtil.optAttr(pp, "fareChild", null);
-							final String unitName = XmlPullUtil.optAttr(pp, "unitName", null);
-							final String unitsAdult = XmlPullUtil.optAttr(pp, "unitsAdult", null);
-							final String unitsChild = XmlPullUtil.optAttr(pp, "unitsChild", null);
-							final String levelAdult = XmlPullUtil.optAttr(pp, "levelAdult", null);
-							final String levelChild = XmlPullUtil.optAttr(pp, "levelChild", null);
-							if (fareAdult != null)
-								fares.add(new Fare(net, Type.ADULT, currency, Float.parseFloat(fareAdult) * fareCorrectionFactor,
-										levelAdult != null ? null : unitName, levelAdult != null ? levelAdult : unitsAdult));
-							if (fareChild != null)
-								fares.add(new Fare(net, Type.CHILD, currency, Float.parseFloat(fareChild) * fareCorrectionFactor,
-										levelChild != null ? null : unitName, levelChild != null ? levelChild : unitsChild));
-
-							if (!pp.isEmptyElementTag())
-							{
-								XmlPullUtil.enter(pp, "itdSingleTicket");
-								if (XmlPullUtil.test(pp, "itdGenericTicketList"))
-								{
-									XmlPullUtil.enter(pp, "itdGenericTicketList");
-									while (XmlPullUtil.test(pp, "itdGenericTicketGroup"))
-									{
-										final Fare fare = processItdGenericTicketGroup(pp, net, currency);
-										if (fare != null)
-											fares.add(fare);
-									}
-									XmlPullUtil.exit(pp, "itdGenericTicketList");
-								}
-								XmlPullUtil.exit(pp, "itdSingleTicket");
 							}
 							else
 							{
-								XmlPullUtil.next(pp);
+								plannedStopArrivalTime = null;
+								predictedStopArrivalTime = null;
 							}
+
+							final Date plannedStopDepartureTime;
+							final Date predictedStopDepartureTime;
+							if (XmlPullUtil.test(pp, "itdDateTime") && processItdDateTime(pp, time))
+							{
+								plannedStopDepartureTime = time.getTime();
+								if (departureDelay != null)
+								{
+									time.add(Calendar.MINUTE, departureDelay);
+									predictedStopDepartureTime = time.getTime();
+								}
+								else
+								{
+									predictedStopDepartureTime = null;
+								}
+							}
+							else
+							{
+								plannedStopDepartureTime = null;
+								predictedStopDepartureTime = null;
+							}
+
+							final Stop stop = new Stop(stopLocation, plannedStopArrivalTime, predictedStopArrivalTime, stopPosition, null,
+									plannedStopDepartureTime, predictedStopDepartureTime, stopPosition, null);
+
+							intermediateStops.add(stop);
+
+							XmlPullUtil.exit(pp, "itdPoint");
+						}
+						XmlPullUtil.exit(pp, "itdStopSeq");
+
+						// remove first and last, because they are not intermediate
+						final int size = intermediateStops.size();
+						if (size >= 2)
+						{
+							if (intermediateStops.get(size - 1).location.id != arrivalLocation.id)
+								throw new IllegalStateException();
+							intermediateStops.remove(size - 1);
+
+							if (intermediateStops.get(0).location.id != departureLocation.id)
+								throw new IllegalStateException();
+							intermediateStops.remove(0);
 						}
-						XmlPullUtil.exit(pp, "itdFare");
 					}
-					else
+
+					List<Point> path = null;
+					if (XmlPullUtil.test(pp, "itdPathCoordinates"))
+						path = processItdPathCoordinates(pp);
+
+					boolean wheelChairAccess = false;
+					if (XmlPullUtil.test(pp, "genAttrList"))
 					{
-						XmlPullUtil.next(pp);
+						XmlPullUtil.enter(pp, "genAttrList");
+						while (XmlPullUtil.test(pp, "genAttrElem"))
+						{
+							XmlPullUtil.enter(pp, "genAttrElem");
+							XmlPullUtil.enter(pp, "name");
+							final String name = pp.getText();
+							XmlPullUtil.exit(pp, "name");
+							XmlPullUtil.enter(pp, "value");
+							final String value = pp.getText();
+							XmlPullUtil.exit(pp, "value");
+							XmlPullUtil.exit(pp, "genAttrElem");
+
+							// System.out.println("genAttrElem: name='" + name + "' value='" + value + "'");
+
+							if ("PlanWheelChairAccess".equals(name) && "1".equals(value))
+								wheelChairAccess = true;
+						}
+						XmlPullUtil.exit(pp, "genAttrList");
 					}
+
+					if (XmlPullUtil.test(pp, "nextDeps"))
+					{
+						XmlPullUtil.enter(pp, "nextDeps");
+						while (XmlPullUtil.test(pp, "itdDateTime"))
+						{
+							processItdDateTime(pp, time);
+							/* final Date nextDepartureTime = */time.getTime();
+						}
+						XmlPullUtil.exit(pp, "nextDeps");
+					}
+
+					final Set<Line.Attr> lineAttrs = new HashSet<Line.Attr>();
+					if (wheelChairAccess || lowFloorVehicle)
+						lineAttrs.add(Line.Attr.WHEEL_CHAIR_ACCESS);
+					final Line line = new Line(lineId, lineLabel, lineStyle(divaNetwork, lineLabel), lineAttrs);
+
+					final Stop departure = new Stop(departureLocation, true, departureTargetTime != null ? departureTargetTime : departureTime,
+							departureTime != null ? departureTime : null, departurePosition, null);
+					final Stop arrival = new Stop(arrivalLocation, false, arrivalTargetTime != null ? arrivalTargetTime : arrivalTime,
+							arrivalTime != null ? arrivalTime : null, arrivalPosition, null);
+
+					legs.add(new Trip.Public(line, destination, departure, arrival, intermediateStops, path, message));
+				}
+				else
+				{
+					throw new IllegalStateException("unknown type: '" + partialRouteType + "' '" + productName + "'");
 				}
 
-				XmlPullUtil.exit(pp, "itdRoute");
+				XmlPullUtil.exit(pp, "itdPartialRoute");
-
-				final Trip trip = new Trip(id, firstDepartureLocation, lastArrivalLocation, legs, fares.isEmpty() ? null : fares, null, numChanges);
-
-				if (!cancelled)
-					trips.add(trip);
 			}
 
-			XmlPullUtil.exit(pp, "itdRouteList");
+			XmlPullUtil.exit(pp, "itdPartialRouteList");
 
-			return new QueryTripsResult(header, uri, from, via, to, new Context(commandLink((String) context, requestId)), trips);
+			final List<Fare> fares = new ArrayList<Fare>(2);
-		}
+			if (XmlPullUtil.test(pp, "itdFare"))
-		else
+			{
-		{
+				if (!pp.isEmptyElementTag())
-			return new QueryTripsResult(header, QueryTripsResult.Status.NO_TRIPS);
+				{
+					XmlPullUtil.enter(pp, "itdFare");
+					if (XmlPullUtil.test(pp, "itdSingleTicket"))
+					{
+						final String net = XmlPullUtil.attr(pp, "net");
+						final Currency currency = parseCurrency(XmlPullUtil.attr(pp, "currency"));
+						final String fareAdult = XmlPullUtil.optAttr(pp, "fareAdult", null);
+						final String fareChild = XmlPullUtil.optAttr(pp, "fareChild", null);
+						final String unitName = XmlPullUtil.optAttr(pp, "unitName", null);
+						final String unitsAdult = XmlPullUtil.optAttr(pp, "unitsAdult", null);
+						final String unitsChild = XmlPullUtil.optAttr(pp, "unitsChild", null);
+						final String levelAdult = XmlPullUtil.optAttr(pp, "levelAdult", null);
+						final String levelChild = XmlPullUtil.optAttr(pp, "levelChild", null);
+						if (fareAdult != null)
+							fares.add(new Fare(net, Type.ADULT, currency, Float.parseFloat(fareAdult) * fareCorrectionFactor,
+									levelAdult != null ? null : unitName, levelAdult != null ? levelAdult : unitsAdult));
+						if (fareChild != null)
+							fares.add(new Fare(net, Type.CHILD, currency, Float.parseFloat(fareChild) * fareCorrectionFactor,
+									levelChild != null ? null : unitName, levelChild != null ? levelChild : unitsChild));
+
+						if (!pp.isEmptyElementTag())
+						{
+							XmlPullUtil.enter(pp, "itdSingleTicket");
+							if (XmlPullUtil.test(pp, "itdGenericTicketList"))
+							{
+								XmlPullUtil.enter(pp, "itdGenericTicketList");
+								while (XmlPullUtil.test(pp, "itdGenericTicketGroup"))
+								{
+									final Fare fare = processItdGenericTicketGroup(pp, net, currency);
+									if (fare != null)
+										fares.add(fare);
+								}
+								XmlPullUtil.exit(pp, "itdGenericTicketList");
+							}
+							XmlPullUtil.exit(pp, "itdSingleTicket");
+						}
+						else
+						{
+							XmlPullUtil.next(pp);
+						}
+					}
+					XmlPullUtil.exit(pp, "itdFare");
+				}
+				else
+				{
+					XmlPullUtil.next(pp);
+				}
+			}
+
+			XmlPullUtil.exit(pp, "itdRoute");
+
+			final Trip trip = new Trip(id, firstDepartureLocation, lastArrivalLocation, legs, fares.isEmpty() ? null : fares, null, numChanges);
+
+			if (!cancelled)
+				trips.add(trip);
 		}
+
+		XmlPullUtil.exit(pp, "itdRouteList");
+		XmlPullUtil.exit(pp, "itdItinerary");
+
+		return new QueryTripsResult(header, uri, from, via, to, new Context(commandLink((String) context, requestId)), trips);
 	}
 
 	private QueryTripsResult queryTripsMobile(final String uri, final Location from, final Location via, final Location to, final InputStream is)

enabler/src/de/schildbach/pte/AbstractHafasProvider.java

@@ -318,64 +318,6 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 			return new Position(platformText);
 	}
 
-	public List<Location> xmlLocValReq(final CharSequence constraint) throws IOException
-	{
-		final String locValReq = "<LocValReq id=\"req\" maxNr=\"20\"><ReqLoc match=\"" + constraint + "\" type=\"ALLTYPE\"/></LocValReq>";
-		final String request = wrapReqC(locValReq, null);
-
-		// System.out.println(ParserUtils.scrape(apiUri, true, request, null, false));
-
-		Reader reader = null;
-
-		try
-		{
-			reader = new InputStreamReader(ParserUtils.scrapeInputStream(queryEndpoint, request, null, null, null, 3), ISO_8859_1);
-
-			final List<Location> results = new ArrayList<Location>();
-
-			final XmlPullParserFactory factory = XmlPullParserFactory.newInstance(System.getProperty(XmlPullParserFactory.PROPERTY_NAME), null);
-			final XmlPullParser pp = factory.newPullParser();
-			pp.setInput(reader);
-
-			assertResC(pp);
-			XmlPullUtil.enter(pp, "ResC");
-
-			XmlPullUtil.require(pp, "LocValRes");
-			XmlPullUtil.requireAttr(pp, "id", "req");
-			XmlPullUtil.enter(pp, "LocalValRes");
-
-			while (pp.getEventType() == XmlPullParser.START_TAG)
-			{
-				final String tag = pp.getName();
-				if ("Station".equals(tag))
-					results.add(parseStation(pp));
-				else if ("Poi".equals(tag))
-					results.add(parsePoi(pp));
-				else if ("Address".equals(tag))
-					results.add(parseAddress(pp));
-				else if ("ReqLoc".equals(tag))
-					/* results.add(parseReqLoc(pp)) */;
-				else
-					System.out.println("cannot handle tag: " + tag);
-
-				XmlPullUtil.next(pp);
-			}
-
-			XmlPullUtil.exit(pp, "LocalValRes");
-
-			return results;
-		}
-		catch (final XmlPullParserException x)
-		{
-			throw new RuntimeException(x);
-		}
-		finally
-		{
-			if (reader != null)
-				reader.close();
-		}
-	}
-
 	protected StringBuilder jsonGetStopsParameters(final CharSequence constraint)
 	{
 		final StringBuilder parameters = new StringBuilder();
@@ -542,7 +484,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 		final String mlcReq = "<MLcReq><MLc n=\"" + constraint + "?\" t=\"ALLTYPE\" /></MLcReq>";
 		final String request = wrapReqC(mlcReq, xmlMlcResEncoding);
 
-		// ParserUtils.printXml(ParserUtils.scrape(apiUri, request, xmlMlcResEncoding, null));
+		// ParserUtils.printXml(ParserUtils.scrape(queryEndpoint, request, xmlMlcResEncoding, null));
 
 		Reader reader = null;
 
@@ -556,7 +498,6 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 
 			final List<Location> results = new ArrayList<Location>();
 
-			assertResC(pp);
 			XmlPullUtil.enter(pp, "ResC");
 			XmlPullUtil.enter(pp, "MLcRes");
 
@@ -1068,7 +1009,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 			final XmlPullParser pp = factory.newPullParser();
 			pp.setInput(reader);
 
-			assertResC(pp);
+			XmlPullUtil.require(pp, "ResC");
 			final String product = XmlPullUtil.attr(pp, "prod").split(" ")[0];
 			final ResultHeader header = new ResultHeader(SERVER_PRODUCT, product, 0, null);
 			XmlPullUtil.enter(pp, "ResC");
@@ -3059,10 +3000,4 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 			return new Line(null, lineStr, lineStyle(null, lineStr), attrSet, comment);
 		}
 	}
-
-	private void assertResC(final XmlPullParser pp) throws XmlPullParserException, IOException
-	{
-		if (!XmlPullUtil.jumpToStartTag(pp, null, "ResC"))
-			throw new IOException("cannot find <ResC />");
-	}
 }

enabler/src/de/schildbach/pte/util/XmlPullUtil.java

@@ -15,27 +15,23 @@ import org.xmlpull.v1.XmlPullParserException;
  */
 public final class XmlPullUtil
 {
-
 	public static boolean test(final XmlPullParser pp, final String tagName) throws XmlPullParserException, IOException
 	{
-		if (pp.getEventType() == XmlPullParser.TEXT && pp.isWhitespace())
+		skipWhitespace(pp);
-			pp.next();
 
 		return pp.getEventType() == XmlPullParser.START_TAG && pp.getName().equals(tagName);
 	}
 
 	public static void require(final XmlPullParser pp, final String tagName) throws XmlPullParserException, IOException
 	{
-		if (pp.getEventType() == XmlPullParser.TEXT && pp.isWhitespace())
+		skipWhitespace(pp);
-			pp.next();
 
 		pp.require(XmlPullParser.START_TAG, null, tagName);
 	}
 
 	public static void enter(final XmlPullParser pp) throws XmlPullParserException, IOException
 	{
-		if (pp.getEventType() == XmlPullParser.TEXT && pp.isWhitespace())
+		skipWhitespace(pp);
-			pp.next();
 
 		if (pp.getEventType() != XmlPullParser.START_TAG)
 			throw new IllegalStateException("expecting start tag to enter");
@@ -47,8 +43,7 @@ public final class XmlPullUtil
 
 	public static void enter(final XmlPullParser pp, final String tagName) throws XmlPullParserException, IOException
 	{
-		if (pp.getEventType() == XmlPullParser.TEXT && pp.isWhitespace())
+		skipWhitespace(pp);
-			pp.next();
 
 		pp.require(XmlPullParser.START_TAG, null, tagName);
 		enter(pp);
@@ -85,6 +80,14 @@ public final class XmlPullUtil
 		}
 	}
 
+	private static void skipWhitespace(final XmlPullParser pp) throws XmlPullParserException, IOException
+	{
+		if (pp.getEventType() == XmlPullParser.START_DOCUMENT)
+			pp.next();
+		if (pp.getEventType() == XmlPullParser.TEXT && pp.isWhitespace())
+			pp.next();
+	}
+
 	public static void requireSkip(final XmlPullParser pp, final String tagName) throws XmlPullParserException, IOException
 	{
 		require(pp, tagName);
@@ -227,36 +230,4 @@ public final class XmlPullUtil
 
 		return text;
 	}
-
-	/**
-	 * This method bypasses all events until it finds a start tag that has passed in namespace (if not null) and
-	 * namespace (if not null).
-	 * 
-	 * @return true if such START_TAG was found or false otherwise (and parser is on END_DOCUMENT).
-	 */
-	public static boolean jumpToStartTag(final XmlPullParser pp, final String tagNamespace, final String tagName) throws XmlPullParserException,
-			IOException
-	{
-		if (tagNamespace == null && tagName == null)
-			throw new IllegalArgumentException("namespace and name argument can not be both null:" + pp.getPositionDescription());
-
-		while (true)
-		{
-			final int eventType = pp.next();
-
-			if (eventType == XmlPullParser.START_TAG)
-			{
-				final String name = pp.getName();
-				final String namespace = pp.getNamespace();
-
-				boolean matches = (tagNamespace != null && tagNamespace.equals(namespace)) || (tagName != null && tagName.equals(name));
-				if (matches)
-					return true;
-			}
-			else if (eventType == XmlPullParser.END_DOCUMENT)
-			{
-				return false;
-			}
-		}
-	}
 }