From 8393f75f6003008eb15f5cd00dabb7f99b97603a Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Sun, 9 Jan 2011 17:04:12 +0000 Subject: [PATCH] Trier git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@442 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/NetworkId.java | 2 +- src/de/schildbach/pte/VrtProvider.java | 132 ++++++++++++++++++ .../pte/live/VrtProviderLiveTest.java | 48 +++++++ 3 files changed, 181 insertions(+), 1 deletion(-) create mode 100644 src/de/schildbach/pte/VrtProvider.java create mode 100644 test/de/schildbach/pte/live/VrtProviderLiveTest.java diff --git a/src/de/schildbach/pte/NetworkId.java b/src/de/schildbach/pte/NetworkId.java index b7562f95..0f2e8285 100644 --- a/src/de/schildbach/pte/NetworkId.java +++ b/src/de/schildbach/pte/NetworkId.java @@ -23,7 +23,7 @@ package de.schildbach.pte; public enum NetworkId { // Germany - DB, BVG, RMV, MVV, INVG, AVV, VMV, SH, GVH, BSVAG, NASA, VVO, VMS, VGS, VRR, VRN, VVS, NALDO, DING, KVV, VVM, + DB, BVG, RMV, VRT, MVV, INVG, AVV, VMV, SH, GVH, BSVAG, NASA, VVO, VMS, VGS, VRR, VRN, VVS, NALDO, DING, KVV, VVM, // Austria OEBB, VOR, LINZ, SVV, IVB, STV, diff --git a/src/de/schildbach/pte/VrtProvider.java b/src/de/schildbach/pte/VrtProvider.java new file mode 100644 index 00000000..9e518c94 --- /dev/null +++ b/src/de/schildbach/pte/VrtProvider.java @@ -0,0 +1,132 @@ +/* + * 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 . + */ + +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 VrtProvider extends AbstractEfaProvider +{ + public static final NetworkId NETWORK_ID = NetworkId.VRT; + private final static String API_BASE = "http://efa9.vrn.de/vrt/"; + + public NetworkId id() + { + return NETWORK_ID; + } + + 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, "UTF-8")); + } + + @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(); + } +} diff --git a/test/de/schildbach/pte/live/VrtProviderLiveTest.java b/test/de/schildbach/pte/live/VrtProviderLiveTest.java new file mode 100644 index 00000000..2af48164 --- /dev/null +++ b/test/de/schildbach/pte/live/VrtProviderLiveTest.java @@ -0,0 +1,48 @@ +/* + * 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 . + */ + +package de.schildbach.pte.live; + +import org.junit.Test; + +import de.schildbach.pte.VrtProvider; +import de.schildbach.pte.dto.NearbyStationsResult; +import de.schildbach.pte.dto.QueryDeparturesResult; + +/** + * @author Andreas Schildbach + */ +public class VrtProviderLiveTest +{ + private final VrtProvider provider = new VrtProvider(); + + @Test + public void nearbyStation() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations("Trier", 0, 0, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + + @Test + public void queryDepartures() throws Exception + { + final QueryDeparturesResult result = provider.queryDepartures("17001301", 0); + + System.out.println(result.departures.size() + " " + result.departures); + } +}