stationId is int in queryDepartures() as well

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

src/de/schildbach/pte/AbstractEfaProvider.java

@@ -1026,13 +1026,13 @@ public abstract class AbstractEfaProvider implements NetworkProvider
 				+ "'");
 	}
 
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException
 	{
 		final StringBuilder uri = new StringBuilder(apiBase);
 		uri.append("XSLT_DM_REQUEST");
 		appendCommonRequestParams(uri);
 		uri.append("&type_dm=stop&useRealtime=1&mode=direct");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
+		uri.append("&name_dm=").append(stationId);
 		uri.append("&deleteAssignedStops_dm=").append(equivs ? '0' : '1');
 		if (maxDepartures > 0)
 			uri.append("&limit=").append(maxDepartures);

src/de/schildbach/pte/BahnProvider.java

@@ -490,7 +490,7 @@ public final class BahnProvider extends AbstractHafasProvider
 		}
 	}
 
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("bhftafel.exe/dn");
@@ -501,7 +501,7 @@ public final class BahnProvider extends AbstractHafasProvider
 		uri.append("&L=vs_java3");
 		uri.append("&input=").append(stationId);
 
-		return xmlQueryDepartures(uri.toString(), Integer.parseInt(stationId));
+		return xmlQueryDepartures(uri.toString(), stationId);
 	}
 
 	@Override

src/de/schildbach/pte/BvgProvider.java

@@ -629,7 +629,7 @@ public final class BvgProvider extends AbstractHafasProvider
 
 	private static final String DEPARTURE_URL_LIVE = BASE_URL + "/IstAbfahrtzeiten/index/mobil?";
 
-	private String departuresQueryLiveUri(final String stationId)
+	private String departuresQueryLiveUri(final int stationId)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(DEPARTURE_URL_LIVE);
@@ -641,7 +641,7 @@ public final class BvgProvider extends AbstractHafasProvider
 
 	private static final String DEPARTURE_URL_PLAN = API_BASE + "stboard.bin/dox/dox?boardType=dep&disableEquivs=yes&start=yes&";
 
-	private String departuresQueryPlanUri(final String stationId, final int maxDepartures)
+	private String departuresQueryPlanUri(final int stationId, final int maxDepartures)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(DEPARTURE_URL_PLAN);
@@ -691,11 +691,11 @@ public final class BvgProvider extends AbstractHafasProvider
 	private static final Pattern P_DEPARTURES_LIVE_ERRORS = Pattern.compile("(Haltestelle:)|(Wartungsgründen)|(http-equiv=\"refresh\")",
 			Pattern.CASE_INSENSITIVE);
 
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException
 	{
 		final QueryDeparturesResult result = new QueryDeparturesResult();
 
-		if (stationId.length() == 6) // live
+		if (stationId < 1000000) // live
 		{
 			// scrape page
 			final String uri = departuresQueryLiveUri(stationId);
@@ -782,8 +782,8 @@ public final class BvgProvider extends AbstractHafasProvider
 					}
 				}
 
-				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId), placeAndName[0],
+				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId, placeAndName[0], placeAndName[1]),
-						placeAndName[1]), departures, null));
+						departures, null));
 				return result;
 			}
 			else
@@ -852,8 +852,8 @@ public final class BvgProvider extends AbstractHafasProvider
 					}
 				}
 
-				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId), placeAndName[0],
+				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId, placeAndName[0], placeAndName[1]),
-						placeAndName[1]), departures, null));
+						departures, null));
 				return result;
 			}
 			else

src/de/schildbach/pte/DsbProvider.java

@@ -167,7 +167,7 @@ public class DsbProvider extends AbstractHafasProvider
 		return 0;
 	}
 
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("stboard.exe/mn");
@@ -178,6 +178,6 @@ public class DsbProvider extends AbstractHafasProvider
 		uri.append("&L=vs_java3");
 		uri.append("&input=").append(stationId);
 
-		return xmlQueryDepartures(uri.toString(), Integer.parseInt(stationId));
+		return xmlQueryDepartures(uri.toString(), stationId);
 	}
 }

src/de/schildbach/pte/InvgProvider.java

@@ -147,7 +147,7 @@ public class InvgProvider extends AbstractHafasProvider
 		return 0;
 	}
 
-	private String departuresQueryUri(final String stationId, final int maxDepartures)
+	private String departuresQueryUri(final int stationId, final int maxDepartures)
 	{
 		final StringBuilder uri = new StringBuilder();
 
@@ -193,7 +193,7 @@ public class InvgProvider extends AbstractHafasProvider
 			+ "(?:<td class=\"center sepline top\">\n(" + ParserUtils.P_PLATFORM + ").*?)?" // position
 	, Pattern.DOTALL);
 
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException
 	{
 		final QueryDeparturesResult result = new QueryDeparturesResult();
 
@@ -208,8 +208,8 @@ public class InvgProvider extends AbstractHafasProvider
 			// messages
 			if (mHeadCoarse.group(4) != null)
 			{
-				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId)), Collections
+				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId),
-						.<Departure> emptyList(), null));
+						Collections.<Departure> emptyList(), null));
 				return result;
 			}
 			else if (mHeadCoarse.group(5) != null)

src/de/schildbach/pte/LuProvider.java

@@ -114,7 +114,7 @@ public class LuProvider extends AbstractHafasProvider
 		return 0;
 	}
 
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("stboard.exe/dn");
@@ -125,6 +125,6 @@ public class LuProvider extends AbstractHafasProvider
 		uri.append("&L=vs_java3");
 		uri.append("&input=").append(stationId);
 
-		return xmlQueryDepartures(uri.toString(), Integer.parseInt(stationId));
+		return xmlQueryDepartures(uri.toString(), stationId);
 	}
 }

src/de/schildbach/pte/NasaProvider.java

@@ -88,7 +88,7 @@ public class NasaProvider extends AbstractHafasProvider
 		}
 	}
 
-	private String departuresQueryUri(final String stationId, final int maxDepartures)
+	private String departuresQueryUri(final int stationId, final int maxDepartures)
 	{
 		final StringBuilder uri = new StringBuilder();
 
@@ -132,7 +132,7 @@ public class NasaProvider extends AbstractHafasProvider
 			+ "(?:<td class=\"center sepline top\">\n(" + ParserUtils.P_PLATFORM + ").*?)?" // position
 	, Pattern.DOTALL);
 
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException
 	{
 		final QueryDeparturesResult result = new QueryDeparturesResult();
 
@@ -147,8 +147,8 @@ public class NasaProvider extends AbstractHafasProvider
 			// messages
 			if (mHeadCoarse.group(3) != null)
 			{
-				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId)), Collections
+				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId),
-						.<Departure> emptyList(), null));
+						Collections.<Departure> emptyList(), null));
 				return result;
 			}
 			else if (mHeadCoarse.group(4) != null)
@@ -228,8 +228,7 @@ public class NasaProvider extends AbstractHafasProvider
 					}
 				}
 
-				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId), null, location),
+				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId, null, location), departures, null));
-						departures, null));
 				return result;
 			}
 			else

src/de/schildbach/pte/NetworkProvider.java

@@ -129,7 +129,7 @@ public interface NetworkProvider
 	 * @return result object containing the departures
 	 * @throws IOException
 	 */
-	QueryDeparturesResult queryDepartures(String stationId, int maxDepartures, boolean equivs) throws IOException;
+	QueryDeparturesResult queryDepartures(int stationId, int maxDepartures, boolean equivs) throws IOException;
 
 	/**
 	 * Get colors of line

src/de/schildbach/pte/NsProvider.java

@@ -87,7 +87,7 @@ public class NsProvider extends AbstractHafasProvider
 		}
 	}
 
-	private String departuresQueryUri(final String stationId, final int maxDepartures)
+	private String departuresQueryUri(final int stationId, final int maxDepartures)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append("http://hari.b-rail.be/hari3/webserver1/bin/stboard.exe/dox");
@@ -122,7 +122,7 @@ public class NsProvider extends AbstractHafasProvider
 			+ "(?:<span class=\"delay\">([+-]?\\d+|Ausfall)</span>\r\n)?" // delay
 	, Pattern.DOTALL);
 
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException
 	{
 		final QueryDeparturesResult result = new QueryDeparturesResult();
 
@@ -180,8 +180,7 @@ public class NsProvider extends AbstractHafasProvider
 					}
 				}
 
-				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId), null, location),
+				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId, null, location), departures, null));
-						departures, null));
 				return result;
 			}
 			else

src/de/schildbach/pte/OebbProvider.java

@@ -481,7 +481,7 @@ public class OebbProvider extends AbstractHafasProvider
 		throw new UnsupportedOperationException();
 	}
 
-	private String departuresQueryUri(final String stationId, final int maxDepartures)
+	private String departuresQueryUri(final int stationId, final int maxDepartures)
 	{
 		final StringBuilder uri = new StringBuilder();
 
@@ -503,7 +503,7 @@ public class OebbProvider extends AbstractHafasProvider
 
 	private static final Pattern P_DEPARTURES_ERROR = Pattern.compile("(Verbindung zum Server konnte leider nicht hergestellt werden)");
 
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException
 	{
 		final QueryDeparturesResult result = new QueryDeparturesResult();
 

src/de/schildbach/pte/PlProvider.java

@@ -311,7 +311,7 @@ public class PlProvider extends AbstractHafasProvider
 		return 0;
 	}
 
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("stboard.exe/pn");
@@ -322,6 +322,6 @@ public class PlProvider extends AbstractHafasProvider
 		uri.append("&L=vs_java3");
 		uri.append("&input=").append(stationId);
 
-		return xmlQueryDepartures(uri.toString(), Integer.parseInt(stationId));
+		return xmlQueryDepartures(uri.toString(), stationId);
 	}
 }

src/de/schildbach/pte/RmvProvider.java

@@ -474,7 +474,7 @@ public class RmvProvider extends AbstractHafasProvider
 		}
 	}
 
-	private String departuresQueryUri(final String stationId, final int maxDepartures)
+	private String departuresQueryUri(final int stationId, final int maxDepartures)
 	{
 		final Calendar c = new GregorianCalendar(timeZone());
 
@@ -521,7 +521,7 @@ public class RmvProvider extends AbstractHafasProvider
 			+ "(?:<img src=\".+?\" alt=\"\" />\n<b>[^<]*</b>\n<br />\n)*" // (messages)
 	, Pattern.DOTALL);
 
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException
 	{
 		final QueryDeparturesResult result = new QueryDeparturesResult();
 

src/de/schildbach/pte/SbbProvider.java

@@ -101,7 +101,7 @@ public class SbbProvider extends AbstractHafasProvider
 		}
 	}
 
-	private String departuresQueryUri(final String stationId, final int maxDepartures)
+	private String departuresQueryUri(final int stationId, final int maxDepartures)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("bhftafel.exe/dox");
@@ -141,7 +141,7 @@ public class SbbProvider extends AbstractHafasProvider
 			+ ".*?" //
 	, Pattern.DOTALL);
 
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException
 	{
 		final QueryDeparturesResult result = new QueryDeparturesResult();
 
@@ -156,8 +156,8 @@ public class SbbProvider extends AbstractHafasProvider
 			// messages
 			if (mHeadCoarse.group(3) != null)
 			{
-				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId)), Collections
+				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId),
-						.<Departure> emptyList(), null));
+						Collections.<Departure> emptyList(), null));
 				return result;
 			}
 			else if (mHeadCoarse.group(5) != null)

src/de/schildbach/pte/SeptaProvider.java

@@ -145,7 +145,7 @@ public class SeptaProvider extends AbstractHafasProvider
 		}
 	}
 
-	private String departuresQueryUri(final String stationId, final int maxDepartures)
+	private String departuresQueryUri(final int stationId, final int maxDepartures)
 	{
 		final Calendar now = new GregorianCalendar(timeZone());
 
@@ -193,7 +193,7 @@ public class SeptaProvider extends AbstractHafasProvider
 			+ "(?:<td class=\"center sepline top\">\n(" + ParserUtils.P_PLATFORM + ").*?)?" // position
 	, Pattern.DOTALL);
 
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException
 	{
 		final QueryDeparturesResult result = new QueryDeparturesResult();
 
@@ -208,8 +208,8 @@ public class SeptaProvider extends AbstractHafasProvider
 			// messages
 			if (mPageCoarse.group(5) != null)
 			{
-				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId)), Collections
+				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId),
-						.<Departure> emptyList(), null));
+						Collections.<Departure> emptyList(), null));
 				return result;
 			}
 			else if (mPageCoarse.group(6) != null)
@@ -287,8 +287,7 @@ public class SeptaProvider extends AbstractHafasProvider
 				}
 			}
 
-			result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId), null, location),
+			result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId, null, location), departures, null));
-					departures, null));
 			return result;
 		}
 		else

src/de/schildbach/pte/ShProvider.java

@@ -121,7 +121,7 @@ public class ShProvider extends AbstractHafasProvider
 		return 0;
 	}
 
-	private String departuresQueryUri(final String stationId, final int maxDepartures)
+	private String departuresQueryUri(final int stationId, final int maxDepartures)
 	{
 		final StringBuilder uri = new StringBuilder();
 
@@ -165,7 +165,7 @@ public class ShProvider extends AbstractHafasProvider
 			+ "(?:<td class=\"center sepline top\">\n(" + ParserUtils.P_PLATFORM + ").*?)?" // position
 	, Pattern.DOTALL);
 
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException
 	{
 		final QueryDeparturesResult result = new QueryDeparturesResult();
 
@@ -180,8 +180,8 @@ public class ShProvider extends AbstractHafasProvider
 			// messages
 			if (mHeadCoarse.group(3) != null)
 			{
-				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId)), Collections
+				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId),
-						.<Departure> emptyList(), null));
+						Collections.<Departure> emptyList(), null));
 				return result;
 			}
 			else if (mHeadCoarse.group(4) != null)
@@ -261,8 +261,7 @@ public class ShProvider extends AbstractHafasProvider
 					}
 				}
 
-				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId), null, location),
+				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId, null, location), departures, null));
-						departures, null));
 				return result;
 			}
 			else

src/de/schildbach/pte/SncbProvider.java

@@ -94,7 +94,7 @@ public class SncbProvider extends AbstractHafasProvider
 		}
 	}
 
-	private String departuresQueryUri(final String stationId, final int maxDepartures)
+	private String departuresQueryUri(final int stationId, final int maxDepartures)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append("http://hari.b-rail.be/hari3/webserver1/bin/stboard.exe/dox");
@@ -129,7 +129,7 @@ public class SncbProvider extends AbstractHafasProvider
 			+ "(?:<span class=\"delay\">([+-]?\\d+|Ausfall)</span>\r\n)?" // delay
 	, Pattern.DOTALL);
 
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException
 	{
 		final QueryDeparturesResult result = new QueryDeparturesResult();
 
@@ -187,8 +187,7 @@ public class SncbProvider extends AbstractHafasProvider
 					}
 				}
 
-				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId), null, location),
+				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId, null, location), departures, null));
-						departures, null));
 				return result;
 			}
 			else

src/de/schildbach/pte/VgsProvider.java

@@ -108,7 +108,7 @@ public class VgsProvider extends AbstractHafasProvider
 		}
 	}
 
-	private String departuresQueryUri(final String stationId, final int maxDepartures)
+	private String departuresQueryUri(final int stationId, final int maxDepartures)
 	{
 		final StringBuilder uri = new StringBuilder();
 
@@ -152,7 +152,7 @@ public class VgsProvider extends AbstractHafasProvider
 			+ "(?:<td class=\"center sepline top\">\n(" + ParserUtils.P_PLATFORM + ").*?)?" // position
 	, Pattern.DOTALL);
 
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException
 	{
 		final QueryDeparturesResult result = new QueryDeparturesResult();
 
@@ -167,8 +167,8 @@ public class VgsProvider extends AbstractHafasProvider
 			// messages
 			if (mHeadCoarse.group(3) != null)
 			{
-				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId)), Collections
+				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId),
-						.<Departure> emptyList(), null));
+						Collections.<Departure> emptyList(), null));
 				return result;
 			}
 			else if (mHeadCoarse.group(4) != null)
@@ -248,8 +248,7 @@ public class VgsProvider extends AbstractHafasProvider
 					}
 				}
 
-				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId), null, location),
+				result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId, null, location), departures, null));
-						departures, null));
 				return result;
 			}
 			else

src/de/schildbach/pte/ZvvProvider.java

@@ -189,7 +189,7 @@ public class ZvvProvider extends AbstractHafasProvider
 		return 0;
 	}
 
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("stboard.exe/dn");
@@ -200,6 +200,6 @@ public class ZvvProvider extends AbstractHafasProvider
 		uri.append("&L=vs_java3");
 		uri.append("&input=").append(stationId);
 
-		return xmlQueryDepartures(uri.toString(), Integer.parseInt(stationId));
+		return xmlQueryDepartures(uri.toString(), stationId);
 	}
 }

test/de/schildbach/pte/live/AtcProviderLiveTest.java

@@ -70,7 +70,7 @@ public class AtcProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("740", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(740, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/AvvProviderLiveTest.java

@@ -69,7 +69,7 @@ public class AvvProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("100", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(100, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/BahnProviderLiveTest.java

@@ -58,7 +58,7 @@ public class BahnProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("692991", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(692991, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/BvbProviderLiveTest.java

@@ -69,7 +69,7 @@ public class BvbProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("10000", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(10000, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/BvgProviderLiveTest.java

@@ -64,7 +64,7 @@ public class BvgProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("309557", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(309557, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/DingProviderLiveTest.java

@@ -69,7 +69,7 @@ public class DingProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("90001611", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(90001611, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/DsbProviderLiveTest.java

@@ -69,7 +69,7 @@ public class DsbProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("8600858", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(8600858, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/InvgProviderLiveTest.java

@@ -65,7 +65,7 @@ public class InvgProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("80301", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(80301, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/IvbProviderLiveTest.java

@@ -69,7 +69,7 @@ public class IvbProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("60401187", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(60401187, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/KvvProviderLiveTest.java

@@ -73,7 +73,7 @@ public class KvvProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("7000090", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(7000090, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/LinzProviderLiveTest.java

@@ -81,7 +81,7 @@ public class LinzProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("60501720", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(60501720, 0, false);
 		System.out.println(result);
 	}
 

test/de/schildbach/pte/live/LuProviderLiveTest.java

@@ -65,7 +65,7 @@ public class LuProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("9865836", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(9865836, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/MariborProviderLiveTest.java

@@ -69,7 +69,7 @@ public class MariborProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("63203067", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(63203067, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/MetProviderLiveTest.java

@@ -69,7 +69,7 @@ public class MetProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("10001167", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(10001167, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/MvgProviderLiveTest.java

@@ -69,7 +69,7 @@ public class MvgProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("3", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(3, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/MvvProviderLiveTest.java

@@ -73,7 +73,7 @@ public class MvvProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("2", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(2, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/NaldoProviderLiveTest.java

@@ -69,7 +69,7 @@ public class NaldoProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("53019174", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(53019174, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/NasaProviderLiveTest.java

@@ -65,7 +65,7 @@ public class NasaProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("13000", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(13000, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/NsProviderLiveTest.java

@@ -40,7 +40,7 @@ public class NsProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("100080", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(100080, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/NvbwProviderLiveTest.java

@@ -69,7 +69,7 @@ public class NvbwProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("6900001", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(6900001, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/OebbProviderLiveTest.java

@@ -56,7 +56,7 @@ public class OebbProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("902006", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(902006, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/PlProviderLiveTest.java

@@ -65,7 +65,7 @@ public class PlProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("5100065", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(5100065, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/RmvProviderLiveTest.java

@@ -66,7 +66,7 @@ public class RmvProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("3000001", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(3000001, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/SbbProviderLiveTest.java

@@ -57,7 +57,7 @@ public class SbbProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("8500010", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(8500010, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/SeptaProviderLiveTest.java

@@ -65,7 +65,7 @@ public class SeptaProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("2090227", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(2090227, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/SfProviderLiveTest.java

@@ -69,7 +69,7 @@ public class SfProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("10001017", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(10001017, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/ShProviderLiveTest.java

@@ -65,7 +65,7 @@ public class ShProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("715210", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(715210, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/SncbProviderLiveTest.java

@@ -49,7 +49,7 @@ public class SncbProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("100080", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(100080, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/StvProviderLiveTest.java

@@ -69,7 +69,7 @@ public class StvProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("63203040", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(63203040, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/SvvProviderLiveTest.java

@@ -69,7 +69,7 @@ public class SvvProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("60650002", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(60650002, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/SydneyProviderLiveTest.java

@@ -69,7 +69,7 @@ public class SydneyProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("10101452", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(10101452, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/TflProviderLiveTest.java

@@ -73,7 +73,7 @@ public class TflProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("1000086", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(1000086, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/TleaProviderLiveTest.java

@@ -69,7 +69,7 @@ public class TleaProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("1001003", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(1001003, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/TlemProviderLiveTest.java

@@ -69,7 +69,7 @@ public class TlemProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("1001003", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(1001003, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/TlseProviderLiveTest.java

@@ -69,7 +69,7 @@ public class TlseProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("1001003", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(1001003, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/TlswProviderLiveTest.java

@@ -69,7 +69,7 @@ public class TlswProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("247616", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(247616, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/VagfrProviderLiveTest.java

@@ -69,7 +69,7 @@ public class VagfrProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("6930112", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(6930112, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/VblProviderLiveTest.java

@@ -69,7 +69,7 @@ public class VblProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("717", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(717, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/VgsProviderLiveTest.java

@@ -69,7 +69,7 @@ public class VgsProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("8000244", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(8000244, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/VmsProviderLiveTest.java

@@ -69,7 +69,7 @@ public class VmsProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("36030062", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(36030062, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/VmvProviderLiveTest.java

@@ -69,7 +69,7 @@ public class VmvProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("80001834", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(80001834, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/VorProviderLiveTest.java

@@ -69,7 +69,7 @@ public class VorProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("60203090", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(60203090, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/VrnProviderLiveTest.java

@@ -93,7 +93,7 @@ public class VrnProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("6032236", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(6032236, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/VrrProviderLiveTest.java

@@ -85,7 +85,7 @@ public class VrrProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("1007258", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(1007258, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/VrtProviderLiveTest.java

@@ -69,7 +69,7 @@ public class VrtProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("17001301", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(17001301, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/VvmProviderLiveTest.java

@@ -69,7 +69,7 @@ public class VvmProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("3000510", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(3000510, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/VvoProviderLiveTest.java

@@ -69,7 +69,7 @@ public class VvoProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("100", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(100, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/VvsProviderLiveTest.java

@@ -69,7 +69,7 @@ public class VvsProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("6118", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(6118, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/VvvProviderLiveTest.java

@@ -69,7 +69,7 @@ public class VvvProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("60001296", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(60001296, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}

test/de/schildbach/pte/live/ZvvProviderLiveTest.java

@@ -73,7 +73,7 @@ public class ZvvProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("183400", 0, false);
+		final QueryDeparturesResult result = provider.queryDepartures(183400, 0, false);
 
 		System.out.println(result.stationDepartures);
 	}