Dubai

git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@374 0924bc21-9374-b0fa-ee44-9ff1593b38f0

src/de/schildbach/pte/AbstractEfaProvider.java

@@ -49,6 +49,7 @@ import de.schildbach.pte.dto.QueryConnectionsResult;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.Station;
 import de.schildbach.pte.dto.Stop;
+import de.schildbach.pte.dto.Fare.Type;
 import de.schildbach.pte.dto.QueryConnectionsResult.Status;
 import de.schildbach.pte.util.Color;
 import de.schildbach.pte.util.ParserUtils;
@@ -1154,25 +1155,45 @@ public abstract class AbstractEfaProvider implements NetworkProvider
 
 					XmlPullUtil.exit(pp, "itdPartialRouteList");
 
-					Fare fare = null;
+					final List<Fare> fares = new ArrayList<Fare>(2);
 					if (XmlPullUtil.test(pp, "itdFare") && !pp.isEmptyElementTag())
 					{
 						XmlPullUtil.enter(pp, "itdFare");
 						if (XmlPullUtil.test(pp, "itdSingleTicket"))
 						{
 							final String net = XmlPullUtil.attr(pp, "net");
-							final Currency currency = Currency.getInstance(XmlPullUtil.attr(pp, "currency"));
-							final float fareAdult = XmlPullUtil.floatAttr(pp, "fareAdult");
-							final float fareChild = XmlPullUtil.floatAttr(pp, "fareChild");
+							final Currency currency = parseCurrency(XmlPullUtil.attr(pp, "currency"));
+							final String fareAdult = XmlPullUtil.attr(pp, "fareAdult");
+							final String fareChild = XmlPullUtil.attr(pp, "fareChild");
 							final String unitName = XmlPullUtil.attr(pp, "unitName");
 							final String unitsAdult = XmlPullUtil.attr(pp, "unitsAdult");
 							final String unitsChild = XmlPullUtil.attr(pp, "unitsChild");
-							fare = new Fare(net, currency, unitName, fareAdult, fareChild, unitsAdult, unitsChild);
+							if (fareAdult != null && fareAdult.length() > 0)
+								fares.add(new Fare(net, Type.ADULT, currency, Float.parseFloat(fareAdult), unitName, unitsAdult));
+							if (fareChild != null && fareChild.length() > 0)
+								fares.add(new Fare(net, Type.CHILD, currency, Float.parseFloat(fareChild), unitName, 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");
+							}
 						}
 						XmlPullUtil.exit(pp, "itdFare");
 					}
 					connections.add(new Connection(id, uri, firstDepartureTime, lastArrivalTime, null, null, 0, firstDeparture, 0, lastArrival,
-							parts, fare));
+							parts, fares.isEmpty() ? null : fares));
 					XmlPullUtil.exit(pp, "itdRoute");
 				}
 
@@ -1191,6 +1212,54 @@ public abstract class AbstractEfaProvider implements NetworkProvider
 		}
 	}
 
+	private Fare processItdGenericTicketGroup(final XmlPullParser pp, final String net, final Currency currency) throws XmlPullParserException,
+			IOException
+	{
+		XmlPullUtil.enter(pp, "itdGenericTicketGroup");
+
+		Type type = null;
+		float fare = 0;
+
+		while (XmlPullUtil.test(pp, "itdGenericTicket"))
+		{
+			XmlPullUtil.enter(pp, "itdGenericTicket");
+
+			XmlPullUtil.enter(pp, "ticket");
+			final String key = pp.getText().trim();
+			XmlPullUtil.exit(pp, "ticket");
+
+			String value = null;
+			XmlPullUtil.require(pp, "value");
+			if (!pp.isEmptyElementTag())
+			{
+				XmlPullUtil.enter(pp, "value");
+				value = pp.getText().trim();
+				XmlPullUtil.exit(pp, "value");
+			}
+
+			if (key.equals("FOR_RIDER"))
+				type = Type.valueOf(value.split(" ")[0].toUpperCase());
+			else if (key.equals("PRICE"))
+				fare = Float.parseFloat(value);
+
+			XmlPullUtil.exit(pp, "itdGenericTicket");
+		}
+
+		XmlPullUtil.exit(pp, "itdGenericTicketGroup");
+
+		if (type != null)
+			return new Fare(net, type, currency, fare, null, null);
+		else
+			return null;
+	}
+
+	private Currency parseCurrency(String currencyStr)
+	{
+		if (currencyStr.equals("Dirham"))
+			currencyStr = "AED";
+		return Currency.getInstance(currencyStr);
+	}
+
 	private static final Pattern P_PLATFORM_GLEIS = Pattern.compile("Gleis (\\d+[a-z]?)(?: ([A-Z])\\s*-\\s*([A-Z]))?");
 
 	private static final String normalizePlatform(final String platform, final String platformName)

src/de/schildbach/pte/DubProvider.java

@@ -0,0 +1,126 @@
+/*
+ * Copyright 2010 the original author or authors.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package de.schildbach.pte;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import de.schildbach.pte.dto.Location;
+import de.schildbach.pte.util.ParserUtils;
+
+/**
+ * @author Andreas Schildbach
+ */
+public class DubProvider extends AbstractEfaProvider
+{
+	public static final String NETWORK_ID = "wojhati.rta.ae";
+	private final static String API_BASE = "http://wojhati.rta.ae/dub/";
+
+	public boolean hasCapabilities(Capability... capabilities)
+	{
+		for (final Capability capability : capabilities)
+			if (capability == Capability.DEPARTURES || capability == Capability.CONNECTIONS)
+				return true;
+
+		return false;
+	}
+
+	private static final String AUTOCOMPLETE_URI = API_BASE
+			+ "XSLT_TRIP_REQUEST2?outputFormat=XML&coordOutputFormat=WGS84&locationServerActive=1&type_origin=any&name_origin=%s";
+
+	@Override
+	protected String autocompleteUri(final CharSequence constraint)
+	{
+		return String.format(AUTOCOMPLETE_URI, ParserUtils.urlEncode(constraint.toString(), "ISO-8859-1"));
+	}
+
+	@Override
+	protected String nearbyLatLonUri(final int lat, final int lon)
+	{
+		return null;
+	}
+
+	private static final String NEARBY_STATION_URI = API_BASE
+			+ "XSLT_DM_REQUEST"
+			+ "?outputFormat=XML&coordOutputFormat=WGS84&name_dm=%s&type_dm=stop&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct";
+
+	@Override
+	protected String nearbyStationUri(final String stationId)
+	{
+		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
+	}
+
+	@Override
+	protected String departuresQueryUri(final String stationId, final int maxDepartures)
+	{
+		final StringBuilder uri = new StringBuilder();
+		uri.append(API_BASE).append("XSLT_DM_REQUEST");
+		uri.append("?outputFormat=XML");
+		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&type_dm=stop");
+		uri.append("&name_dm=").append(stationId);
+		uri.append("&mode=direct");
+		uri.append("&useRealtime=1");
+		return uri.toString();
+	}
+
+	@Override
+	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
+			final String products, final WalkSpeed walkSpeed)
+	{
+		final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyyMMdd");
+		final DateFormat TIME_FORMAT = new SimpleDateFormat("HHmm");
+
+		final StringBuilder uri = new StringBuilder();
+		uri.append(API_BASE);
+		uri.append("XSLT_TRIP_REQUEST2");
+
+		uri.append("?language=de");
+		appendCommonConnectionParams(uri);
+
+		appendLocation(uri, from, "origin");
+		appendLocation(uri, to, "destination");
+		if (via != null)
+			appendLocation(uri, via, "via");
+
+		uri.append("&itdDate=").append(ParserUtils.urlEncode(DATE_FORMAT.format(date)));
+		uri.append("&itdTime=").append(ParserUtils.urlEncode(TIME_FORMAT.format(date)));
+		uri.append("&itdTripDateTimeDepArr=").append(dep ? "dep" : "arr");
+
+		uri.append("&ptOptionsActive=1");
+		uri.append("&changeSpeed=").append(WALKSPEED_MAP.get(walkSpeed));
+		uri.append(productParams(products));
+
+		uri.append("&locationServerActive=1");
+		uri.append("&useRealtime=1");
+
+		return uri.toString();
+	}
+
+	@Override
+	protected String commandLink(final String sessionId, final String command)
+	{
+		final StringBuilder uri = new StringBuilder();
+		uri.append(API_BASE);
+		uri.append("XSLT_TRIP_REQUEST2");
+		uri.append("?sessionID=").append(sessionId);
+		appendCommonConnectionParams(uri);
+		uri.append("&command=").append(command);
+		return uri.toString();
+	}
+}

src/de/schildbach/pte/dto/Connection.java

@@ -38,10 +38,11 @@ public final class Connection implements Serializable
 	public final int toId;
 	public final String to;
 	public final List<Part> parts;
-	public final Fare fare;
+	public final List<Fare> fares;
 
 	public Connection(final String id, final String link, final Date departureTime, final Date arrivalTime, final String line,
-			final int[] lineColors, final int fromId, final String from, final int toId, final String to, final List<Part> parts, final Fare fare)
+			final int[] lineColors, final int fromId, final String from, final int toId, final String to, final List<Part> parts,
+			final List<Fare> fares)
 	{
 		this.id = id;
 		this.link = link;
@@ -54,7 +55,7 @@ public final class Connection implements Serializable
 		this.toId = toId;
 		this.to = to;
 		this.parts = parts;
-		this.fare = fare;
+		this.fares = fares;
 	}
 
 	@Override

src/de/schildbach/pte/dto/Fare.java

@@ -25,23 +25,25 @@ import java.util.Currency;
  */
 public final class Fare implements Serializable
 {
-	public final String network;
-	public final Currency currency;
-	public final String unitName;
-	public final float fareAdult;
-	public final float fareChild;
-	public final String unitsAdult;
-	public final String unitsChild;
+	public enum Type
+	{
+		ADULT, CHILD, STUDENT, SENIOR
+	}
 
-	public Fare(final String network, final Currency currency, final String unitName, final float fareAdult, final float fareChild,
-			final String unitsAdult, final String unitsChild)
+	public final String network;
+	public final Type type;
+	public final Currency currency;
+	public final float fare;
+	public final String unitName;
+	public final String units;
+
+	public Fare(final String network, final Type type, final Currency currency, final float fare, final String unitName, final String units)
 	{
 		this.network = network;
+		this.type = type;
 		this.currency = currency;
+		this.fare = fare;
 		this.unitName = unitName;
-		this.fareAdult = fareAdult;
-		this.fareChild = fareChild;
-		this.unitsAdult = unitsAdult;
-		this.unitsChild = unitsChild;
+		this.units = units;
 	}
 }

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

@@ -99,7 +99,7 @@ public final class XmlPullUtil
 
 	public static String attr(final XmlPullParser pp, final String attrName)
 	{
-		return pp.getAttributeValue(null, attrName);
+		return pp.getAttributeValue(null, attrName).trim();
 	}
 
 	public static int intAttr(final XmlPullParser pp, final String attrName)