Migrate Liechtenstein, Bregenz & Vorarlberg to use VAO.

2025-07-18 16:29:51 +00:00 · 2015-09-10 14:58:02 +02:00 · 2015-09-10 14:58:02 +02:00 · 4c851ae4c5
commit 4c851ae4c5
parent 9b16fc6353
7 changed files with 901 additions and 155 deletions
--- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
@ -32,11 +32,13 @@ import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
+import java.util.Currency;
 import java.util.Date;
 import java.util.EnumSet;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
@ -58,6 +60,7 @@ import com.google.common.base.Charsets;
 import com.google.common.base.Strings;

 import de.schildbach.pte.dto.Departure;
+import de.schildbach.pte.dto.Fare;
 import de.schildbach.pte.dto.Line;
 import de.schildbach.pte.dto.Line.Attr;
 import de.schildbach.pte.dto.Location;
@ -91,14 +94,19 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 	protected final static String SERVER_PRODUCT = "hafas";
 	private static final String REQC_PROD = "hafas";
 	protected static final int DEFAULT_MAX_DEPARTURES = 100;
+	protected static final int DEFAULT_MAX_LOCATIONS = 50;

 	protected String stationBoardEndpoint;
 	protected String getStopEndpoint;
 	protected String queryEndpoint;
+	protected final String mgateEndpoint;
 	private @Nullable String extXmlEndpoint = null;
 	private Product[] productsMap;
 	private @Nullable String accessId = null;
 	private @Nullable String clientType = "ANDROID";
+	private @Nullable String jsonApiVersion;
+	private @Nullable String jsonApiAuthorization;
+	private @Nullable String jsonApiClient;
 	private Charset jsonGetStopsEncoding = Charsets.ISO_8859_1;
 	private boolean jsonGetStopsUseWeight = true;
 	private Charset jsonNearbyLocationsEncoding = Charsets.ISO_8859_1;
@ -133,6 +141,38 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 		}
 	}

+	@SuppressWarnings("serial")
+	public static class JsonContext implements QueryTripsContext
+	{
+		public final Location from, to;
+		public final Date date;
+		public final boolean dep;
+		public final Set<Product> products;
+		public final String laterContext, earlierContext;
+
+		public JsonContext(final Location from, final Location to, final Date date, final boolean dep, final Set<Product> products,
+				final String laterContext, final String earlierContext)
+		{
+			this.from = from;
+			this.to = to;
+			this.date = date;
+			this.dep = dep;
+			this.products = products;
+			this.laterContext = laterContext;
+			this.earlierContext = earlierContext;
+		}
+
+		public boolean canQueryLater()
+		{
+			return laterContext != null;
+		}
+
+		public boolean canQueryEarlier()
+		{
+			return earlierContext != null;
+		}
+	}
+
 	@SuppressWarnings("serial")
 	public static class QueryTripsBinaryContext implements QueryTripsContext
 	{
@ -169,6 +209,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 		this.stationBoardEndpoint = apiBase + "stboard.exe/" + apiLanguage;
 		this.getStopEndpoint = apiBase + "ajax-getstop.exe/" + apiLanguage;
 		this.queryEndpoint = apiBase + "query.exe/" + apiLanguage;
+		this.mgateEndpoint = apiBase + "mgate.exe";
 		this.productsMap = productsMap;
 	}

@ -192,14 +233,29 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 		this.extXmlEndpoint = extXmlEndpoint;
 	}

+	protected void setAccessId(final String accessId)
+	{
+		this.accessId = accessId;
+	}
+
 	protected void setClientType(final String clientType)
 	{
 		this.clientType = clientType;
 	}

-	protected void setAccessId(final String accessId)
+	protected void setJsonApiVersion(final String jsonApiVersion)
 	{
-		this.accessId = accessId;
+		this.jsonApiVersion = jsonApiVersion;
+	}
+
+	protected void setJsonApiAuthorization(final String jsonApiAuthorization)
+	{
+		this.jsonApiAuthorization = jsonApiAuthorization;
+	}
+
+	protected void setJsonApiClient(final String jsonApiClient)
+	{
+		this.jsonApiClient = jsonApiClient;
 	}

 	protected void setDominantPlanStopTime(final boolean dominantPlanStopTime)
@ -406,7 +462,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 	public SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException
 	{
 		final StringBuilder uri = new StringBuilder(getStopEndpoint);
-		appendJsonGetStopsParameters(uri, constraint, 0);
+		appendJsonGetStopsParameters(uri, checkNotNull(constraint), 0);

 		return jsonGetStops(uri.toString());
 	}
@ -826,6 +882,557 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 	{
 	}

+	protected final NearbyLocationsResult jsonLocGeoPos(final EnumSet<LocationType> types, final int lat, final int lon) throws IOException
+	{
+		final boolean getPOIs = types.contains(LocationType.POI);
+		final String request = wrapJsonApiRequest("LocGeoPos", "{\"ring\":" //
+				+ "{\"cCrd\":{\"x\":" + lon + ",\"y\":" + lat + "}}," //
+				+ "\"getPOIs\":" + getPOIs + "}", //
+				false);
+
+		final String uri = checkNotNull(mgateEndpoint);
+		final CharSequence page = httpClient.get(uri, request, "application/json", Charsets.UTF_8);
+
+		try
+		{
+			final JSONObject head = new JSONObject(page.toString());
+			final String headErr = head.optString("err", null);
+			if (headErr != null)
+				throw new RuntimeException(headErr);
+			final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT, head.getString("ver"), 0, null);
+
+			final JSONArray svcResList = head.getJSONArray("svcResL");
+			checkState(svcResList.length() == 1);
+			final JSONObject svcRes = svcResList.optJSONObject(0);
+			checkState("LocGeoPos".equals(svcRes.getString("meth")));
+			final String err = svcRes.getString("err");
+			if (!"OK".equals(err))
+			{
+				final String errTxt = svcRes.getString("errTxt");
+				throw new RuntimeException(err + ": " + errTxt);
+			}
+			final JSONObject res = svcRes.getJSONObject("res");
+
+			final JSONObject common = res.getJSONObject("common");
+			/* final List<String[]> remarks = */ parseRemList(common.getJSONArray("remL"));
+
+			final JSONArray locL = res.optJSONArray("locL");
+			final List<Location> locations;
+			if (locL != null)
+			{
+				locations = parseLocList(locL);
+
+				// filter unwanted location types
+				for (Iterator<Location> i = locations.iterator(); i.hasNext();)
+				{
+					final Location location = i.next();
+					if (!types.contains(location.type))
+						i.remove();
+				}
+			}
+			else
+			{
+				locations = Collections.emptyList();
+			}
+
+			return new NearbyLocationsResult(header, locations);
+		}
+		catch (final JSONException x)
+		{
+			throw new ParserException("cannot parse json: '" + page + "' on " + uri, x);
+		}
+	}
+
+	protected final QueryDeparturesResult jsonStationBoard(final String stationId, final @Nullable Date time, final int maxDepartures,
+			final boolean equivs) throws IOException
+	{
+		final Calendar c = new GregorianCalendar(timeZone);
+		c.setTime(time);
+		final CharSequence jsonDate = jsonDate(c);
+		final CharSequence jsonTime = jsonTime(c);
+		final CharSequence normalizedStationId = normalizeStationId(stationId);
+		final CharSequence stbFltrEquiv = Boolean.toString(!equivs);
+		final CharSequence maxJny = Integer.toString(maxDepartures != 0 ? maxDepartures : DEFAULT_MAX_DEPARTURES);
+		final CharSequence getPasslist = Boolean.toString(true); // traffic expensive
+		final String request = wrapJsonApiRequest("StationBoard", "{\"type\":\"DEP\"," //
+				+ "\"date\":\"" + jsonDate + "\"," //
+				+ "\"time\":\"" + jsonTime + "\"," //
+				+ "\"stbLoc\":{\"type\":\"S\"," + "\"state\":\"F\"," // F/M
+				+ "\"extId\":" + JSONObject.quote(normalizedStationId.toString()) + "}," //
+				+ "\"stbFltrEquiv\":" + stbFltrEquiv + ",\"maxJny\":" + maxJny + ",\"getPasslist\":" + getPasslist + "}", false);
+
+		final String uri = checkNotNull(mgateEndpoint);
+		final CharSequence page = httpClient.get(uri, request, "application/json", Charsets.UTF_8);
+
+		try
+		{
+			final JSONObject head = new JSONObject(page.toString());
+			final String headErr = head.optString("err", null);
+			if (headErr != null)
+				throw new RuntimeException(headErr);
+			final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT, head.getString("ver"), 0, null);
+			final QueryDeparturesResult result = new QueryDeparturesResult(header);
+
+			final JSONArray svcResList = head.getJSONArray("svcResL");
+			checkState(svcResList.length() == 1);
+			final JSONObject svcRes = svcResList.optJSONObject(0);
+			checkState("StationBoard".equals(svcRes.getString("meth")));
+			final String err = svcRes.getString("err");
+			if (!"OK".equals(err))
+			{
+				final String errTxt = svcRes.getString("errTxt");
+				if ("LOCATION".equals(err) && "HCI Service: location missing or invalid".equals(errTxt))
+					return new QueryDeparturesResult(header, QueryDeparturesResult.Status.INVALID_STATION);
+				else
+					throw new RuntimeException(err + ": " + errTxt);
+			}
+			final JSONObject res = svcRes.getJSONObject("res");
+
+			final JSONObject common = res.getJSONObject("common");
+			/* final List<String[]> remarks = */ parseRemList(common.getJSONArray("remL"));
+			final List<String> operators = parseOpList(common.getJSONArray("opL"));
+			final List<Line> lines = parseProdList(common.getJSONArray("prodL"), operators);
+			final JSONArray locList = common.getJSONArray("locL");
+			final List<Location> locations = parseLocList(locList);
+
+			final JSONArray jnyList = res.optJSONArray("jnyL");
+			if (jnyList != null)
+			{
+				for (int iJny = 0; iJny < jnyList.length(); iJny++)
+				{
+					final JSONObject jny = jnyList.getJSONObject(iJny);
+					final JSONObject stbStop = jny.getJSONObject("stbStop");
+
+					final String stbStopPlatformS = stbStop.optString("dPlatfS", null);
+					c.clear();
+					ParserUtils.parseIsoDate(c, jny.getString("date"));
+					final Date baseDate = c.getTime();
+
+					final Date plannedTime = parseJsonTime(c, baseDate, stbStop.getString("dTimeS"));
+
+					final Date predictedTime = parseJsonTime(c, baseDate, stbStop.optString("dTimeR", null));
+
+					final Line line = lines.get(stbStop.getInt("dProdX"));
+
+					final Location location = equivs ? locations.get(stbStop.getInt("locX")) : new Location(LocationType.STATION, stationId);
+					final Position position = normalizePosition(stbStopPlatformS);
+
+					final String jnyDirTxt = jny.getString("dirTxt");
+					final JSONArray stopList = jny.optJSONArray("stopL");
+					final Location destination;
+					if (stopList != null)
+					{
+						final int lastStopIdx = stopList.getJSONObject(stopList.length() - 1).getInt("locX");
+						final String lastStopName = locList.getJSONObject(lastStopIdx).getString("name");
+						if (jnyDirTxt.equals(lastStopName))
+							destination = locations.get(lastStopIdx);
+						else
+							destination = new Location(LocationType.ANY, null, null, jnyDirTxt);
+					}
+					else
+					{
+						destination = new Location(LocationType.ANY, null, null, jnyDirTxt);
+					}
+
+					final Departure departure = new Departure(plannedTime, predictedTime, line, position, destination, null, null);
+
+					StationDepartures stationDepartures = findStationDepartures(result.stationDepartures, location);
+					if (stationDepartures == null)
+					{
+						stationDepartures = new StationDepartures(location, new ArrayList<Departure>(8), null);
+						result.stationDepartures.add(stationDepartures);
+					}
+
+					stationDepartures.departures.add(departure);
+				}
+			}
+
+			// sort departures
+			for (final StationDepartures stationDepartures : result.stationDepartures)
+				Collections.sort(stationDepartures.departures, Departure.TIME_COMPARATOR);
+
+			return result;
+		}
+		catch (final JSONException x)
+		{
+			throw new ParserException("cannot parse json: '" + page + "' on " + uri, x);
+		}
+	}
+
+	protected final SuggestLocationsResult jsonLocMatch(final CharSequence constraint) throws IOException
+	{
+		final String request = wrapJsonApiRequest("LocMatch", "{\"input\":{\"field\":\"S\",\"loc\":{\"name\":"
+				+ JSONObject.quote(checkNotNull(constraint).toString()) + ",\"meta\":false},\"maxLoc\":" + DEFAULT_MAX_LOCATIONS + "}}", true);
+
+		final String uri = checkNotNull(mgateEndpoint);
+		final CharSequence page = httpClient.get(uri, request, "application/json", Charsets.UTF_8);
+
+		try
+		{
+			final JSONObject head = new JSONObject(page.toString());
+			final String headErr = head.optString("err", null);
+			if (headErr != null)
+				throw new RuntimeException(headErr);
+			final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT, head.getString("ver"), 0, null);
+
+			final JSONArray svcResList = head.getJSONArray("svcResL");
+			checkState(svcResList.length() == 1);
+			final JSONObject svcRes = svcResList.optJSONObject(0);
+			checkState("LocMatch".equals(svcRes.getString("meth")));
+			final String err = svcRes.getString("err");
+			if (!"OK".equals(err))
+			{
+				final String errTxt = svcRes.getString("errTxt");
+				throw new RuntimeException(err + ": " + errTxt);
+			}
+			final JSONObject res = svcRes.getJSONObject("res");
+
+			final JSONObject common = res.getJSONObject("common");
+			/* final List<String[]> remarks = */ parseRemList(common.getJSONArray("remL"));
+
+			final JSONObject match = res.getJSONObject("match");
+			final List<Location> locations = parseLocList(match.optJSONArray("locL"));
+			final List<SuggestedLocation> suggestedLocations = new ArrayList<SuggestedLocation>(locations.size());
+			for (final Location location : locations)
+				suggestedLocations.add(new SuggestedLocation(location));
+			// TODO weight
+
+			return new SuggestLocationsResult(header, suggestedLocations);
+		}
+		catch (final JSONException x)
+		{
+			throw new ParserException("cannot parse json: '" + page + "' on " + uri, x);
+		}
+	}
+
+	protected final QueryTripsResult jsonTripSearch(final Location from, final Location to, final Date time, final boolean dep,
+			final @Nullable Set<Product> products, final String moreContext) throws IOException
+	{
+		final Calendar c = new GregorianCalendar(timeZone);
+		c.setTime(time);
+		final CharSequence outDate = jsonDate(c);
+		final CharSequence outTime = jsonTime(c);
+		final CharSequence outFrwd = Boolean.toString(dep);
+		final CharSequence jnyFltr = productsString(products);
+		final CharSequence jsonContext = moreContext != null ? "\"ctxScr\":" + JSONObject.quote(moreContext) + "," : "";
+		final String request = wrapJsonApiRequest("TripSearch", "{" //
+				+ jsonContext //
+				+ "\"depLocL\":[" + jsonLocation(from) + "]," //
+				+ "\"arrLocL\":[" + jsonLocation(to) + "]," //
+				+ "\"outDate\":\"" + outDate + "\"," //
+				+ "\"outTime\":\"" + outTime + "\"," //
+				+ "\"outFrwd\":" + outFrwd + "," //
+				+ "\"jnyFltrL\":[{\"value\":\"" + jnyFltr + "\",\"mode\":\"BIT\",\"type\":\"PROD\"}]," //
+				+ "\"gisFltrL\":[{\"mode\":\"FB\",\"profile\":{\"type\":\"F\",\"linDistRouting\":false,\"maxdist\":2000},\"type\":\"P\"}]," //
+				+ "\"getPolyline\":false,\"getPasslist\":true,\"liveSearch\":false,\"getIST\":false,\"getEco\":false,\"extChgTime\":-1,\"economic\":false}", //
+				false);
+
+		final String uri = checkNotNull(mgateEndpoint);
+		final CharSequence page = httpClient.get(uri, request, "application/json", Charsets.UTF_8);
+
+		try
+		{
+			final JSONObject head = new JSONObject(page.toString());
+			final String headErr = head.optString("err", null);
+			if (headErr != null)
+				throw new RuntimeException(headErr);
+			final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT, head.getString("ver"), 0, null);
+
+			final JSONArray svcResList = head.getJSONArray("svcResL");
+			checkState(svcResList.length() == 1);
+			final JSONObject svcRes = svcResList.optJSONObject(0);
+			checkState("TripSearch".equals(svcRes.getString("meth")));
+			final String err = svcRes.getString("err");
+			if (!"OK".equals(err))
+			{
+				if ("H890".equals(err)) // No connections found.
+					return new QueryTripsResult(header, QueryTripsResult.Status.NO_TRIPS);
+				if ("H895".equals(err)) // Departure/Arrival are too near.
+					return new QueryTripsResult(header, QueryTripsResult.Status.TOO_CLOSE);
+				if ("H9220".equals(err)) // Nearby to the given address stations could not be found.
+					return new QueryTripsResult(header, QueryTripsResult.Status.UNRESOLVABLE_ADDRESS);
+				final String errTxt = svcRes.getString("errTxt");
+				throw new RuntimeException(err + ": " + errTxt);
+			}
+			final JSONObject res = svcRes.getJSONObject("res");
+
+			final JSONObject common = res.getJSONObject("common");
+			/* final List<String[]> remarks = */ parseRemList(common.getJSONArray("remL"));
+			final List<Location> locations = parseLocList(common.getJSONArray("locL"));
+			final List<String> operators = parseOpList(common.getJSONArray("opL"));
+			final List<Line> lines = parseProdList(common.getJSONArray("prodL"), operators);
+
+			final JSONArray outConList = res.optJSONArray("outConL");
+			final List<Trip> trips = new ArrayList<Trip>(outConList.length());
+			for (int iOutCon = 0; iOutCon < outConList.length(); iOutCon++)
+			{
+				final JSONObject outCon = outConList.getJSONObject(iOutCon);
+				final Location tripFrom = locations.get(outCon.getJSONObject("dep").getInt("locX"));
+				final Location tripTo = locations.get(outCon.getJSONObject("arr").getInt("locX"));
+
+				c.clear();
+				ParserUtils.parseIsoDate(c, outCon.getString("date"));
+				final Date baseDate = c.getTime();
+
+				final JSONArray secList = outCon.optJSONArray("secL");
+				final List<Trip.Leg> legs = new ArrayList<Trip.Leg>(secList.length());
+				for (int iSec = 0; iSec < secList.length(); iSec++)
+				{
+					final JSONObject sec = secList.getJSONObject(iSec);
+					final String secType = sec.getString("type");
+
+					final JSONObject secDep = sec.getJSONObject("dep");
+					final Stop departureStop = parseJsonStop(secDep, locations, c, baseDate);
+
+					final JSONObject secArr = sec.getJSONObject("arr");
+					final Stop arrivalStop = parseJsonStop(secArr, locations, c, baseDate);
+
+					final Trip.Leg leg;
+					if ("JNY".equals(secType))
+					{
+						final JSONObject jny = sec.getJSONObject("jny");
+						final Line line = lines.get(jny.getInt("prodX"));
+						final String dirTxt = jny.optString("dirTxt", null);
+						final Location destination = dirTxt != null ? new Location(LocationType.ANY, null, null, dirTxt) : null;
+
+						final JSONArray stopList = jny.getJSONArray("stopL");
+						checkState(stopList.length() >= 2);
+						final List<Stop> intermediateStops = new ArrayList<Stop>(stopList.length());
+						for (int iStop = 1; iStop < stopList.length() - 1; iStop++)
+						{
+							final JSONObject stop = stopList.getJSONObject(iStop);
+							final Stop intermediateStop = parseJsonStop(stop, locations, c, baseDate);
+							intermediateStops.add(intermediateStop);
+						}
+
+						leg = new Trip.Public(line, destination, departureStop, arrivalStop, intermediateStops, null, null);
+					}
+					else if ("WALK".equals(secType) || "TRSF".equals(secType))
+					{
+						final JSONObject gis = sec.getJSONObject("gis");
+						final int distance = gis.getInt("dist");
+						leg = new Trip.Individual(Trip.Individual.Type.WALK, departureStop.location, departureStop.getDepartureTime(),
+								arrivalStop.location, arrivalStop.getArrivalTime(), null, distance);
+					}
+					else
+					{
+						throw new IllegalStateException("cannot handle type: " + secType);
+					}
+
+					legs.add(leg);
+				}
+
+				final JSONObject trfRes = outCon.optJSONObject("trfRes");
+				final List<Fare> fares = new LinkedList<Fare>();
+				if (trfRes != null)
+				{
+					final JSONArray fareSetList = trfRes.getJSONArray("fareSetL");
+					for (int iFareSet = 0; iFareSet < fareSetList.length(); iFareSet++)
+					{
+						final JSONObject fareSet = fareSetList.getJSONObject(iFareSet);
+						final String network = fareSet.optString("name", null);
+						if (network != null)
+						{
+							final JSONArray fareList = fareSet.getJSONArray("fareL");
+							for (int iFare = 0; iFare < fareList.length(); iFare++)
+							{
+								final JSONObject jsonFare = fareList.getJSONObject(iFare);
+								final String name = jsonFare.getString("name");
+								if (name.endsWith("- Jahreskarte") || name.endsWith("- Monatskarte"))
+									continue;
+
+								final Currency currency = Currency.getInstance(jsonFare.getString("cur"));
+								final float price = jsonFare.getInt("prc") / 100f;
+
+								if (name.startsWith("Vollpreis - "))
+									fares.add(new Fare(network, Fare.Type.ADULT, currency, price, name.substring(12), null));
+								else if (name.startsWith("Kind - "))
+									fares.add(new Fare(network, Fare.Type.CHILD, currency, price, name.substring(7), null));
+							}
+						}
+					}
+				}
+
+				final Trip trip = new Trip(null, tripFrom, tripTo, legs, fares, null, null);
+				trips.add(trip);
+			}
+
+			final JsonContext context = new JsonContext(from, to, time, dep, products, res.getString("outCtxScrF"), res.getString("outCtxScrB"));
+			return new QueryTripsResult(header, null, from, null, to, context, trips);
+		}
+		catch (final JSONException x)
+		{
+			throw new ParserException("cannot parse json: '" + page + "' on " + uri, x);
+		}
+	}
+
+	private String wrapJsonApiRequest(final String meth, final String req, final boolean formatted)
+	{
+		return "{" //
+				+ "\"auth\":" + checkNotNull(jsonApiAuthorization) + "," //
+				+ "\"client\":" + checkNotNull(jsonApiClient) + "," //
+				+ "\"ver\":\"" + checkNotNull(jsonApiVersion) + "\",\"lang\":\"eng\"," //
+				+ "\"svcReqL\":[{\"cfg\":{\"polyEnc\":\"GPA\"},\"meth\":\"" + meth + "\",\"req\":" + req + "}]," //
+				+ "\"formatted\":" + formatted + "}";
+	}
+
+	private String jsonLocation(final Location location)
+	{
+		if (location.type == LocationType.STATION && location.hasId())
+			return "{\"type\":\"S\",\"extId\":" + JSONObject.quote(location.id) + "}";
+		else if (location.type == LocationType.ADDRESS && location.hasId())
+			return "{\"type\":\"A\",\"lid\":" + JSONObject.quote(location.id) + "}";
+		else
+			throw new IllegalArgumentException("cannot handle: " + location);
+	}
+
+	private CharSequence jsonDate(final Calendar time)
+	{
+		final int year = time.get(Calendar.YEAR);
+		final int month = time.get(Calendar.MONTH) + 1;
+		final int day = time.get(Calendar.DAY_OF_MONTH);
+		return String.format(Locale.ENGLISH, "%04d%02d%02d", year, month, day);
+	}
+
+	private CharSequence jsonTime(final Calendar time)
+	{
+		final int hour = time.get(Calendar.HOUR_OF_DAY);
+		final int minute = time.get(Calendar.MINUTE);
+		return String.format(Locale.ENGLISH, "%02d%02d00", hour, minute);
+	}
+
+	private static final Pattern P_JSON_TIME = Pattern.compile("(\\d{2})?(\\d{2})(\\d{2})(\\d{2})");
+
+	private final Date parseJsonTime(final Calendar calendar, final Date baseDate, final CharSequence str)
+	{
+		if (str == null)
+			return null;
+
+		final Matcher m = P_JSON_TIME.matcher(str);
+		if (m.matches())
+		{
+			calendar.setTime(baseDate);
+
+			if (m.group(1) != null)
+				calendar.add(Calendar.DAY_OF_YEAR, Integer.parseInt(m.group(1)));
+			calendar.set(Calendar.HOUR_OF_DAY, Integer.parseInt(m.group(2)));
+			calendar.set(Calendar.MINUTE, Integer.parseInt(m.group(3)));
+			calendar.set(Calendar.SECOND, Integer.parseInt(m.group(4)));
+
+			return calendar.getTime();
+		}
+
+		throw new RuntimeException("cannot parse: '" + str + "'");
+	}
+
+	private Stop parseJsonStop(final JSONObject json, final List<Location> locations, final Calendar c, final Date baseDate) throws JSONException
+	{
+		final Location location = locations.get(json.getInt("locX"));
+
+		final boolean arrivalCancelled = json.optBoolean("aCncl", false);
+		final Date plannedArrivalTime = parseJsonTime(c, baseDate, json.optString("aTimeS", null));
+		final Date predictedArrivalTime = parseJsonTime(c, baseDate, json.optString("aTimeR", null));
+		final Position plannedArrivalPosition = normalizePosition(json.optString("aPlatfS", null));
+		final Position predictedArrivalPosition = normalizePosition(json.optString("aPlatfR", null));
+
+		final boolean departureCancelled = json.optBoolean("dCncl", false);
+		final Date plannedDepartureTime = parseJsonTime(c, baseDate, json.optString("dTimeS", null));
+		final Date predictedDepartureTime = parseJsonTime(c, baseDate, json.optString("dTimeR", null));
+		final Position plannedDeparturePosition = normalizePosition(json.optString("dPlatfS", null));
+		final Position predictedDeparturePosition = normalizePosition(json.optString("dPlatfR", null));
+
+		return new Stop(location, plannedArrivalTime, predictedArrivalTime, plannedArrivalPosition, predictedArrivalPosition, arrivalCancelled,
+				plannedDepartureTime, predictedDepartureTime, plannedDeparturePosition, predictedDeparturePosition, departureCancelled);
+	}
+
+	private List<String[]> parseRemList(final JSONArray remList) throws JSONException
+	{
+		final List<String[]> remarks = new ArrayList<String[]>(remList.length());
+
+		for (int i = 0; i < remList.length(); i++)
+		{
+			final JSONObject rem = remList.getJSONObject(i);
+			final String code = rem.getString("code");
+			final String txt = rem.getString("txtN");
+			remarks.add(new String[] { code, txt });
+		}
+
+		return remarks;
+	}
+
+	private List<Location> parseLocList(final JSONArray locList) throws JSONException
+	{
+		final List<Location> locations = new ArrayList<Location>(locList.length());
+
+		for (int iLoc = 0; iLoc < locList.length(); iLoc++)
+		{
+			final JSONObject loc = locList.getJSONObject(iLoc);
+			final String type = loc.getString("type");
+
+			final JSONObject crd = loc.getJSONObject("crd");
+
+			if ("S".equals(type))
+			{
+				final String[] placeAndName = splitStationName(loc.getString("name"));
+				final int pCls = loc.optInt("pCls", -1);
+				final Set<Product> products = pCls != -1 ? intToProducts(pCls) : null;
+				final String id = normalizeStationId(loc.getString("extId"));
+				locations.add(new Location(LocationType.STATION, id, crd.getInt("y"), crd.getInt("x"), placeAndName[0], placeAndName[1], products));
+			}
+			else if ("P".equals(type))
+			{
+				final String[] placeAndName = splitPOI(loc.getString("name"));
+				final String id = normalizeStationId(loc.getString("extId"));
+				locations.add(new Location(LocationType.POI, id, crd.getInt("y"), crd.getInt("x"), placeAndName[0], placeAndName[1]));
+			}
+			else if ("A".equals(type))
+			{
+				final String[] placeAndName = splitAddress(loc.getString("name"));
+				final String id = loc.getString("lid");
+				locations.add(new Location(LocationType.ADDRESS, id, crd.getInt("y"), crd.getInt("x"), placeAndName[0], placeAndName[1]));
+			}
+			else
+			{
+				throw new RuntimeException("Unknown type " + type + ": " + loc);
+			}
+		}
+
+		return locations;
+	}
+
+	private List<String> parseOpList(final JSONArray opList) throws JSONException
+	{
+		final List<String> operators = new ArrayList<String>(opList.length());
+
+		for (int i = 0; i < opList.length(); i++)
+		{
+			final JSONObject op = opList.getJSONObject(i);
+			final String operator = op.getString("name");
+			operators.add(operator);
+		}
+
+		return operators;
+	}
+
+	private List<Line> parseProdList(final JSONArray prodList, final List<String> operators) throws JSONException
+	{
+		final List<Line> lines = new ArrayList<Line>(prodList.length());
+
+		for (int iProd = 0; iProd < prodList.length(); iProd++)
+		{
+			final JSONObject prod = prodList.getJSONObject(iProd);
+			final int oprIndex = prod.optInt("oprX", -1);
+			final String operator = oprIndex != -1 ? operators.get(oprIndex) : null;
+			final int cls = prod.optInt("cls", -1);
+			final Product product = cls != -1 ? intToProduct(cls) : null;
+			final String name = prod.getString("name");
+			final Line line = new Line(null, operator, product, name, lineStyle(operator, product, name));
+			lines.add(line);
+		}
+
+		return lines;
+	}
+
 	public QueryTripsResult queryTrips(final Location from, final @Nullable Location via, final Location to, final Date date, final boolean dep,
 			final @Nullable Set<Product> products, final @Nullable Optimize optimize, final @Nullable WalkSpeed walkSpeed,
 			final @Nullable Accessibility accessibility, final @Nullable Set<Option> options) throws IOException