mirror of
https://gitlab.com/oeffi/public-transport-enabler.git
synced 2025-07-17 20:19:50 +00:00
Get rid of SOAP dependency, remove Südtiroler Nahverkehr.
This commit is contained in:
Andreas Schildbach
parent
7e0d3d3c18
commit
f1c9c7dab0
4 changed files with 1 additions and 753 deletions
|
|
@ -15,36 +15,8 @@
|
|||
<version>1</version>
|
||||
</parent>
|
||||
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>googlecode-ksoap2-android</id>
|
||||
<name>googlecode-ksoap2-android</name>
|
||||
<url>http://ksoap2-android.googlecode.com/svn/m2-repo</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
<dependencies>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.google.code.ksoap2-android</groupId>
|
||||
<artifactId>ksoap2-android</artifactId>
|
||||
<version>2.6.0</version>
|
||||
<!-- Make whole dependency optional -->
|
||||
<optional>true</optional>
|
||||
<exclusions>
|
||||
<!-- Exclude net.sourceforge.kobjects:kobjects-j2me:jar:0.0-SNAPSHOT-20040926-2:compile -->
|
||||
<exclusion>
|
||||
<groupId>net.sourceforge.kobjects</groupId>
|
||||
<artifactId>kobjects-j2me</artifactId>
|
||||
</exclusion>
|
||||
<!-- Exclude net.sourceforge.kxml:kxml:jar:2.2.4:compile -->
|
||||
<exclusion>
|
||||
<groupId>net.sourceforge.kxml</groupId>
|
||||
<artifactId>kxml</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.json</groupId>
|
||||
<artifactId>json</artifactId>
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ public enum NetworkId
|
|||
PL,
|
||||
|
||||
// Italy
|
||||
ATC, SAD,
|
||||
ATC,
|
||||
|
||||
// United Arab Emirates
|
||||
DUB,
|
||||
|
|
|
|||
|
|
@ -1,483 +0,0 @@
|
|||
package de.schildbach.pte;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Calendar;
|
||||
import java.util.Collection;
|
||||
import java.util.Currency;
|
||||
import java.util.Date;
|
||||
import java.util.GregorianCalendar;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.TimeZone;
|
||||
|
||||
import org.ksoap2.SoapEnvelope;
|
||||
import org.ksoap2.serialization.SoapObject;
|
||||
import org.ksoap2.serialization.SoapSerializationEnvelope;
|
||||
import org.ksoap2.transport.HttpTransportSE;
|
||||
import org.xmlpull.v1.XmlPullParserException;
|
||||
|
||||
import de.schildbach.pte.dto.Fare;
|
||||
import de.schildbach.pte.dto.Fare.Type;
|
||||
import de.schildbach.pte.dto.Line;
|
||||
import de.schildbach.pte.dto.Location;
|
||||
import de.schildbach.pte.dto.LocationType;
|
||||
import de.schildbach.pte.dto.NearbyStationsResult;
|
||||
import de.schildbach.pte.dto.Product;
|
||||
import de.schildbach.pte.dto.QueryDeparturesResult;
|
||||
import de.schildbach.pte.dto.QueryTripsContext;
|
||||
import de.schildbach.pte.dto.QueryTripsResult;
|
||||
import de.schildbach.pte.dto.QueryTripsResult.Status;
|
||||
import de.schildbach.pte.dto.ResultHeader;
|
||||
import de.schildbach.pte.dto.Stop;
|
||||
import de.schildbach.pte.dto.Style;
|
||||
import de.schildbach.pte.dto.Trip;
|
||||
|
||||
public class SadProvider extends AbstractNetworkProvider {
|
||||
|
||||
public static final NetworkId NETWORK_ID = NetworkId.SAD;
|
||||
private static final String API_BASE = "http://timetables.sad.it/SIITimetablesMobile.php";
|
||||
private static final String SERVER_PRODUCT = "SOAP";
|
||||
private static final ResultHeader RESULT_HEADER = new ResultHeader(SERVER_PRODUCT);
|
||||
private static final int SOAP_VERSION = SoapEnvelope.VER11;
|
||||
private static final SimpleDateFormat RESPONSE_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.US);
|
||||
private static final SimpleDateFormat REQUEST_DATE_FORMAT = new SimpleDateFormat("dd.MM.yyyy", Locale.US);
|
||||
private static final SimpleDateFormat VALIDITY_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-ddZ", Locale.US);
|
||||
private static final Style DEFAULT_STYLE = new Style(Style.parseColor("#0000cc"), Style.WHITE);
|
||||
private static final int HOURS_AFTER_START = 5;
|
||||
|
||||
// Specifies in what language e.g. strings for station names are returned
|
||||
private static final Language LANGUAGE = Language.GERMAN;
|
||||
|
||||
// Languages supplied by SOAP API (sometimes also English or Ladin, but not consistently)
|
||||
private enum Language {
|
||||
GERMAN, ITALIAN
|
||||
}
|
||||
|
||||
public static class Context implements QueryTripsContext
|
||||
{
|
||||
public final String context;
|
||||
|
||||
public Context(final String context)
|
||||
{
|
||||
this.context = context;
|
||||
}
|
||||
|
||||
public boolean canQueryLater()
|
||||
{
|
||||
return context != null;
|
||||
}
|
||||
|
||||
public boolean canQueryEarlier()
|
||||
{
|
||||
return context != null;
|
||||
}
|
||||
}
|
||||
|
||||
public NetworkId id() {
|
||||
return NETWORK_ID;
|
||||
}
|
||||
|
||||
public boolean hasCapabilities(final Capability... capabilities) {
|
||||
for (final Capability capability : capabilities)
|
||||
if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.TRIPS)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public NearbyStationsResult queryNearbyStations(Location location, int maxDistance, int maxStations) throws IOException {
|
||||
// Not supported by SOAP API
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
public QueryDeparturesResult queryDepartures(String stationId, int maxDepartures, boolean equivs) throws IOException {
|
||||
// Not supported by SOAP API
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
public List<Location> autocompleteStations(final CharSequence constraint) throws IOException {
|
||||
|
||||
// Execute searchNodo SOAP request to get locations corresponding to contraint
|
||||
SoapObject response = executeSoap("searchNodo", new Object[] { "searchstring", constraint.toString() });
|
||||
|
||||
ArrayList<Location> list = new ArrayList<Location>();
|
||||
|
||||
// Go through all received locations
|
||||
for (int i = 0; i < response.getPropertyCount(); i++) {
|
||||
Object property = response.getProperty(i);
|
||||
if (property instanceof SoapObject) {
|
||||
// Add location to list
|
||||
list.add(soapToLocation((SoapObject) property));
|
||||
}
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
public QueryTripsResult queryTrips(Location from, Location via, Location to, Date date, boolean dep,
|
||||
Collection<Product> products, WalkSpeed walkSpeed, Accessibility accessibility, Set<Option> options) throws IOException {
|
||||
|
||||
// Select correct SOAP method depending on the dep flag
|
||||
final String soapMethod = dep ? "searchCollPartenza" : "searchCollArrivo";
|
||||
|
||||
// Create new calendar and put date object into it
|
||||
final Calendar cal = new GregorianCalendar(timeZone());
|
||||
cal.setTime(date);
|
||||
int hours = cal.get(Calendar.HOUR_OF_DAY);
|
||||
int minutes = cal.get(Calendar.MINUTE);
|
||||
|
||||
// Calculate ending time depending on the starting time, don't go over day boundaries
|
||||
final String writtenDate = REQUEST_DATE_FORMAT.format(date);
|
||||
final String timeMin = hours + ":" + minutes;
|
||||
final String timeMax = hours < 24 - HOURS_AFTER_START ? (hours + HOURS_AFTER_START) + ":" + minutes : "23:59";
|
||||
|
||||
// Check if the date is valid by querying the SOAP service
|
||||
Status validityStatus = checkDateValidity(date);
|
||||
if (validityStatus == Status.SERVICE_DOWN) {
|
||||
return new QueryTripsResult(RESULT_HEADER, Status.SERVICE_DOWN);
|
||||
} else if (validityStatus == Status.INVALID_DATE) {
|
||||
return new QueryTripsResult(RESULT_HEADER, Status.INVALID_DATE);
|
||||
}
|
||||
|
||||
// From and/or to locations have no ID -> use autocomplete metho
|
||||
if (!from.hasId() || !to.hasId()) {
|
||||
|
||||
List<Location> froms = Arrays.asList(from), tos = Arrays.asList(to);
|
||||
|
||||
// Get ID(s) from SOAP service corresponding to from's location name
|
||||
if (!from.hasId()) {
|
||||
froms = autocompleteStations(from.name);
|
||||
if (froms.isEmpty()) {
|
||||
return new QueryTripsResult(RESULT_HEADER, Status.UNKNOWN_FROM);
|
||||
}
|
||||
// Exactly one match
|
||||
else if (froms.size() == 1) {
|
||||
from = froms.get(0);
|
||||
}
|
||||
}
|
||||
// Get ID(s) from SOAP service corresponding to to's location name
|
||||
if (!to.hasId()) {
|
||||
tos = autocompleteStations(to.name);
|
||||
if (tos.isEmpty()) {
|
||||
return new QueryTripsResult(RESULT_HEADER, Status.UNKNOWN_TO);
|
||||
}
|
||||
// Exactly one match
|
||||
else if (tos.size() == 1) {
|
||||
to = tos.get(0);
|
||||
}
|
||||
}
|
||||
|
||||
// Check for ambiguities in which case an ambiguous result is returned
|
||||
if ((froms != null && froms.size() > 1) || (tos != null && tos.size() > 1)) {
|
||||
return new QueryTripsResult(RESULT_HEADER, froms, null, tos);
|
||||
}
|
||||
}
|
||||
|
||||
// Check if from and to locations are equal
|
||||
if (from.id.equals(to.id)) {
|
||||
return new QueryTripsResult(RESULT_HEADER, Status.TOO_CLOSE);
|
||||
}
|
||||
|
||||
// Execute SOAP request to get list of possible trips
|
||||
SoapObject response = executeSoap(soapMethod, new Object[] { "partenza", from.id + "", "arrivo", to.id + "", "giorno", writtenDate,
|
||||
"orario_min", timeMin, "orario_max", timeMax });
|
||||
|
||||
// Generate a valid response object with the SoapObject obtained from the SOAP service
|
||||
return calculateResponse(from, to, response, dep, date);
|
||||
}
|
||||
|
||||
public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
|
||||
{
|
||||
// Split and parse context
|
||||
final Context context = (Context) contextObj;
|
||||
final String commandUri = context.context;
|
||||
final String[] split = commandUri.split(",");
|
||||
if (split.length != 4) {
|
||||
return null;
|
||||
}
|
||||
final String fromId = split[0];
|
||||
final String toId = split[1];
|
||||
final boolean dep = Boolean.parseBoolean(split[2]);
|
||||
Date date = null;
|
||||
try {
|
||||
date = RESPONSE_DATE_FORMAT.parse(split[3]);
|
||||
} catch (ParseException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
final Calendar cal = new GregorianCalendar(timeZone());
|
||||
cal.setTime(date);
|
||||
|
||||
// Calculate new Date, depending on the specified next flag
|
||||
cal.add(Calendar.HOUR_OF_DAY, later ? HOURS_AFTER_START : -HOURS_AFTER_START);
|
||||
date = cal.getTime();
|
||||
|
||||
// Query for trips with new date/time value
|
||||
// NOTE: via, products, walkSpeed, accessibility are set to null
|
||||
return queryTrips(new Location(LocationType.STATION, fromId), null, new Location(LocationType.STATION, toId), date, dep,
|
||||
null, null, null, null);
|
||||
}
|
||||
|
||||
protected TimeZone timeZone() {
|
||||
// Set to Italian time zone
|
||||
return TimeZone.getTimeZone("Europe/Rome");
|
||||
}
|
||||
|
||||
/**
|
||||
* Utility function to parse a SoapObject into a Location.
|
||||
* @param nodo the SoapObject to convert
|
||||
* @return the location converted from the SoapObject
|
||||
*/
|
||||
private Location soapToLocation(SoapObject nodo) {
|
||||
|
||||
// Parse SoapObject's properties and create a Location object
|
||||
String id = nodo.getPropertyAsString("id");
|
||||
String name;
|
||||
if (LANGUAGE == Language.GERMAN) {
|
||||
name = (String) nodo.getPropertyAsString("nome_de");
|
||||
} else {
|
||||
name = (String) nodo.getPropertyAsString("nome_it");
|
||||
}
|
||||
// NOTE: place is set to null
|
||||
return new Location(LocationType.STATION, id, null, name);
|
||||
}
|
||||
|
||||
/**
|
||||
* Utility function to parse a SoapObject into a list of Date objects.
|
||||
* @param dateObject the SoapObject which is to be parsed into dates
|
||||
* @param propertyNames the names to look for in the SoapObject
|
||||
* @param format the date format which is used in the SoapObject
|
||||
* @return a list of Date Objects representing the input dateObject.
|
||||
* @throws ParseException
|
||||
*/
|
||||
private List<Date> soapToDate(SoapObject dateObject, String[] propertyNames, SimpleDateFormat format) throws ParseException {
|
||||
|
||||
List<Date> returnDate = new ArrayList<Date>();
|
||||
|
||||
// Go through all property names
|
||||
for (String s : propertyNames) {
|
||||
// Get property value as a string
|
||||
StringBuilder sb = new StringBuilder(dateObject.getPropertyAsString(s));
|
||||
// Remove ':' to correspond to valid time zone format, e.g. ...+02:00 -> ...+0200
|
||||
sb.deleteCharAt(sb.length() - 3);
|
||||
// Parse the date according to the supplied format and add it to the list
|
||||
returnDate.add(format.parse(sb.toString()));
|
||||
}
|
||||
|
||||
return returnDate;
|
||||
}
|
||||
|
||||
/**
|
||||
* Utility function to execute a SOAP request.
|
||||
* @param soapFunction the SOAP function's name which should be called
|
||||
* @param soapProperties the parameters which should be supplied to the function,
|
||||
* even indexes represent the parameter name and odd indexes represent the parameter value
|
||||
* @return the SoapObject which gets returned upon executing the SOAP request
|
||||
* @throws IOException
|
||||
*/
|
||||
private SoapObject executeSoap(final String soapFunction, final Object[] soapProperties) throws IOException {
|
||||
|
||||
// Construct SoapObject for making the request by supplying the API URL and the function name
|
||||
SoapObject request = new SoapObject(API_BASE, soapFunction);
|
||||
|
||||
// Add parameters to constructed SoapObject
|
||||
for (int i = 0; i < soapProperties.length; i += 2) {
|
||||
request.addPropertyIfValue(soapProperties[i].toString(), soapProperties[i + 1].toString());
|
||||
}
|
||||
|
||||
// Create a SOAP envelope around the SoapObject
|
||||
SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SOAP_VERSION);
|
||||
envelope.setOutputSoapObject(request);
|
||||
|
||||
// Execute the SOAP request via HTTP
|
||||
HttpTransportSE transport = new HttpTransportSE(API_BASE);
|
||||
try {
|
||||
transport.call(API_BASE + "#" + soapFunction, envelope);
|
||||
} catch (XmlPullParserException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
// Return the received response SoapObject
|
||||
return (SoapObject) envelope.getResponse();
|
||||
}
|
||||
|
||||
/**
|
||||
* Utility function which makes a SOAP request to check if the supplied date is in the valid range.
|
||||
* @param date the date whose validity is to be checked
|
||||
* @return if the supplied date is valid
|
||||
* @throws IOException
|
||||
*/
|
||||
private Status checkDateValidity(Date date) throws IOException {
|
||||
|
||||
// Execute the getValidita SOAP method
|
||||
SoapObject validityResponse = executeSoap("getValidita", new Object[] {});
|
||||
|
||||
// Parse the received string into a Date object
|
||||
List<Date> startEnd = null;
|
||||
try {
|
||||
startEnd = soapToDate(validityResponse, new String[] { "inizio", "fine" }, VALIDITY_DATE_FORMAT);
|
||||
// Check if exactly two dates (start and end) are parsed
|
||||
if (startEnd.size() != 2) {
|
||||
throw new ParseException("Expected 2 dates for start and end of service but got " + startEnd.size(), 0);
|
||||
}
|
||||
} catch (ParseException e1) {
|
||||
e1.printStackTrace();
|
||||
return Status.SERVICE_DOWN;
|
||||
}
|
||||
|
||||
// Check if the supplied date is within the valid range
|
||||
if (date.before(startEnd.get(0)) || date.after(startEnd.get(1))) {
|
||||
return Status.INVALID_DATE;
|
||||
} else {
|
||||
return Status.OK;
|
||||
}
|
||||
}
|
||||
|
||||
// Different fare types and their names
|
||||
private static final Map<String, String> FARE_TYPES = new HashMap<String, String>();
|
||||
|
||||
static {
|
||||
FARE_TYPES.put("aapass_1", "Südtirol Pass < 1000 km");
|
||||
FARE_TYPES.put("aapass_2", "Südtirol Pass < 10000 km");
|
||||
FARE_TYPES.put("aapass_3", "Südtirol Pass < 20000 km");
|
||||
FARE_TYPES.put("aapass_4", "Südtirol Pass > 20000 km");
|
||||
FARE_TYPES.put("aapass_fam_1", "Südtirol Pass family < 1000 km");
|
||||
FARE_TYPES.put("aapass_fam_2", "Südtirol Pass family < 10000 km");
|
||||
FARE_TYPES.put("aapass_fam_3", "Südtirol Pass family < 20000 km");
|
||||
FARE_TYPES.put("aapass_fam_4", "Südtirol Pass family > 20000 km");
|
||||
FARE_TYPES.put("carta_valore", "Wertkarte");
|
||||
FARE_TYPES.put("corsa_singola", "Einzelfahrtkarte");
|
||||
}
|
||||
|
||||
/**
|
||||
* Utility function to create a QueryTripsResult result object from the supplied parameters.
|
||||
* @param from the request's from location
|
||||
* @param to the request's to location
|
||||
* @param response the SoapObject which was received from the service as response
|
||||
* @param dep is the date referenced to departure (or arrival)
|
||||
* @param date the request's date
|
||||
* @return
|
||||
*/
|
||||
private QueryTripsResult calculateResponse(Location from, Location to, SoapObject response, boolean dep, Date date) {
|
||||
|
||||
// If no result was found return immediately
|
||||
if (response.getPropertyCount() == 0) {
|
||||
return new QueryTripsResult(RESULT_HEADER, Status.NO_TRIPS);
|
||||
}
|
||||
|
||||
// Lists to store the trips and from and to locations
|
||||
List<Trip> trips = new ArrayList<Trip>();
|
||||
List<Location> fromToLocs = new ArrayList<Location>();
|
||||
|
||||
// Go through all properties of the response's SoapObject
|
||||
for (int i = 0; i < response.getPropertyCount(); i++) {
|
||||
Object property = response.getProperty(i);
|
||||
if (property instanceof SoapObject) {
|
||||
SoapObject trip = (SoapObject) property;
|
||||
|
||||
// Get departure and arrival locations for current trip
|
||||
fromToLocs.clear();
|
||||
for (String prop : new String[] { "nodo_partenza", "nodo_arrivo" }) {
|
||||
Object temp = trip.getProperty(prop);
|
||||
if (temp instanceof SoapObject) {
|
||||
fromToLocs.add(soapToLocation((SoapObject) temp));
|
||||
}
|
||||
}
|
||||
|
||||
// Get legs of the current trip
|
||||
List<Trip.Leg> legs = new ArrayList<Trip.Leg>();
|
||||
Object temp = trip.getProperty("tratti");
|
||||
String networkName = null;
|
||||
if (temp instanceof SoapObject) {
|
||||
SoapObject tratti = (SoapObject) temp;
|
||||
// Go through all trip legs
|
||||
for (int j = 0; j < tratti.getPropertyCount(); j++) {
|
||||
boolean isFootway = false;
|
||||
SoapObject tratto = (SoapObject) tratti.getProperty(j);
|
||||
|
||||
SoapObject conc = (SoapObject) tratto.getProperty("concessionario");
|
||||
if (conc != null) {
|
||||
// Check if current track is footway (id = 9999)
|
||||
if (Integer.parseInt(conc.getPropertyAsString("id")) == 9999) {
|
||||
isFootway = true;
|
||||
}
|
||||
// Use non-footway name as network name
|
||||
else if (networkName == null) {
|
||||
networkName = conc.getPropertyAsString(LANGUAGE == Language.GERMAN ? "nome_de" : "nome_it");
|
||||
}
|
||||
}
|
||||
|
||||
// Add footway to legs list
|
||||
if (isFootway) {
|
||||
// NOTE: path is set to null
|
||||
throw new UnsupportedOperationException();
|
||||
// legs.add(new Trip.Individual(Integer.parseInt(tratto.getPropertyAsString("durata").split(":")[1]), 0, Trip.Individual.Type.WALK,
|
||||
// soapToLocation((SoapObject) tratto.getProperty("nodo_partenza")), soapToLocation((SoapObject) tratto
|
||||
// .getProperty("nodo_arrivo")), null));
|
||||
}
|
||||
|
||||
// Add trip to legs list
|
||||
else {
|
||||
// Get line ID
|
||||
String lineId = tratto.getPropertyAsString("linea");
|
||||
try {
|
||||
// Parse date from response SoapObject
|
||||
List<Date> responseDate = soapToDate(tratto, new String[] { "ora_partenza", "ora_arrivo" },
|
||||
RESPONSE_DATE_FORMAT);
|
||||
// NOTE: multiple null values: destination,
|
||||
// predictedDepartureTime, departurePosition,
|
||||
// predictedArrivalTime, arrivalPosition,
|
||||
// intermediateStops, path
|
||||
|
||||
final Stop departure = new Stop(soapToLocation((SoapObject) tratto.getProperty("nodo_partenza")), true,
|
||||
responseDate.get(0), null, null, null);
|
||||
final Stop arrival = new Stop(soapToLocation((SoapObject) tratto.getProperty("nodo_arrivo")), false,
|
||||
responseDate.get(1), null, null, null);
|
||||
|
||||
legs.add(new Trip.Public(new Line(lineId, lineId, DEFAULT_STYLE), null, departure, arrival, null, null, null));
|
||||
} catch (ParseException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Get fares for the current trip
|
||||
ArrayList<Fare> fares = new ArrayList<Fare>();
|
||||
temp = trip.getProperty("tariffazione_trasporto_integrato");
|
||||
if (temp instanceof SoapObject) {
|
||||
SoapObject tariffTraspIntegr = (SoapObject) temp;
|
||||
// Check if tariff information is supplied in the response
|
||||
if (tariffTraspIntegr.hasProperty("aapass_1")) {
|
||||
Currency curr = Currency.getInstance("EUR");
|
||||
// Go through all fare types
|
||||
for (String tariff : FARE_TYPES.keySet()) {
|
||||
int cents = Integer.parseInt(tariffTraspIntegr.getPropertyAsString(tariff));
|
||||
// NOTE: units is set to null
|
||||
fares.add(new Fare(networkName, Type.ADULT, curr, ((float) cents) / 100f, FARE_TYPES.get(tariff), null));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Only add to trips list if exactly one to and and one from location were found
|
||||
if (fromToLocs.size() == 2) {
|
||||
// NOTE: link, capacity set to null
|
||||
trips.add(new Trip(fromToLocs.get(0).toString() + fromToLocs.get(1).toString(), fromToLocs.get(0),
|
||||
fromToLocs.get(1), legs, fares, null, null));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Construct query URI to be used as context for queryMoreTrips()
|
||||
final String queryUri = from.id + "," + to.id + "," + dep + "," + RESPONSE_DATE_FORMAT.format(date);
|
||||
|
||||
// NOTE: via is set to null
|
||||
return new QueryTripsResult(RESULT_HEADER, queryUri, from, null, to, new Context(queryUri), trips);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,241 +0,0 @@
|
|||
/*
|
||||
* Copyright 2012-2014 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.live;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertNull;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import java.text.DateFormat;
|
||||
import java.util.List;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
import de.schildbach.pte.SadProvider;
|
||||
import de.schildbach.pte.dto.Location;
|
||||
import de.schildbach.pte.dto.LocationType;
|
||||
import de.schildbach.pte.dto.QueryTripsResult;
|
||||
import de.schildbach.pte.dto.QueryTripsResult.Status;
|
||||
import de.schildbach.pte.dto.Trip.Individual;
|
||||
import de.schildbach.pte.util.Iso8601Format;
|
||||
|
||||
/**
|
||||
* @author Oliver Gasser
|
||||
*/
|
||||
public class SadProviderLiveTest extends AbstractProviderLiveTest {
|
||||
|
||||
private DateFormat dateTimeFormat = Iso8601Format.newDateTimeFormat();
|
||||
|
||||
public SadProviderLiveTest()
|
||||
{
|
||||
super(new SadProvider());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void autoComplete() throws Exception {
|
||||
final List<Location> autocompletes = provider.autocompleteStations("haupt");
|
||||
|
||||
print(autocompletes);
|
||||
|
||||
assertFalse(autocompletes.isEmpty());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void tooCloseTrip() throws Exception {
|
||||
List<Location> schuffa = provider.autocompleteStations("Welschnofen");
|
||||
final QueryTripsResult result = queryTrips(schuffa.get(0), null, schuffa.get(0),
|
||||
dateTimeFormat.parse("2012-04-01 12:30:00"), true, null, null, null);
|
||||
|
||||
System.out.println(result);
|
||||
|
||||
assertEquals(Status.TOO_CLOSE, result.status);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void invalidDate() throws Exception {
|
||||
List<Location> bz = provider.autocompleteStations("Bozen Bhf.");
|
||||
List<Location> schuffa = provider.autocompleteStations("Welschnofen");
|
||||
|
||||
final QueryTripsResult result = queryTrips(bz.get(0), null, schuffa.get(0),
|
||||
dateTimeFormat.parse("2011-04-01 12:30:00"), true, null, null, null);
|
||||
|
||||
System.out.println(result);
|
||||
|
||||
assertEquals(Status.INVALID_DATE, result.status);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void tripWithFootway() throws Exception {
|
||||
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, null, null, "Bozen Bhf."), null,
|
||||
new Location(LocationType.STATION, null, null, "Bundschen"), dateTimeFormat.parse("2012-04-01 12:30:00"), true, null, null,
|
||||
null);
|
||||
|
||||
System.out.println(result);
|
||||
|
||||
assertEquals(Status.OK, result.status);
|
||||
|
||||
assertFalse(result.trips.isEmpty());
|
||||
|
||||
assertTrue(result.trips.get(0).legs.get(0) instanceof Individual);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void noTrips() throws Exception {
|
||||
QueryTripsResult result = queryTrips(new Location(LocationType.STATION, null, null, "Bozen Bhf."), null,
|
||||
new Location(LocationType.STATION, null, null, "Welschnofen"), dateTimeFormat.parse("2012-04-01 22:30:00"), true, null, null,
|
||||
null);
|
||||
|
||||
System.out.println(result);
|
||||
|
||||
// No trips between 22:30 and 23:59
|
||||
assertEquals(Status.NO_TRIPS, result.status);
|
||||
|
||||
assertNull(result.trips);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void queryMoreTrips() throws Exception {
|
||||
// Trips between 05:30 and 10:30
|
||||
QueryTripsResult result = queryTrips(new Location(LocationType.STATION, null, null, "Bozen Bhf."), null,
|
||||
new Location(LocationType.STATION, null, null, "Welschnofen"), dateTimeFormat.parse("2012-04-01 05:30:00"), true, null, null,
|
||||
null);
|
||||
|
||||
System.out.println(result);
|
||||
|
||||
assertEquals(Status.OK, result.status);
|
||||
|
||||
assertFalse(result.trips.isEmpty());
|
||||
|
||||
// No trips between 04:30 and 05:30
|
||||
QueryTripsResult moreResult = queryMoreTrips(result.context, false);
|
||||
|
||||
System.out.println(moreResult);
|
||||
|
||||
assertEquals(Status.NO_TRIPS, moreResult.status);
|
||||
|
||||
assertNull(moreResult.trips);
|
||||
|
||||
// Trips between 09:30 and 14:30
|
||||
moreResult = queryMoreTrips(result.context, true);
|
||||
|
||||
System.out.println(moreResult);
|
||||
|
||||
assertEquals(Status.OK, moreResult.status);
|
||||
|
||||
assertFalse(moreResult.trips.isEmpty());
|
||||
|
||||
System.out.println(moreResult);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void queryAmbiguous() throws Exception {
|
||||
// No ambiguities
|
||||
QueryTripsResult result = queryTrips(new Location(LocationType.STATION, null, null, "Welschn"), null,
|
||||
new Location(LocationType.STATION, null, null, "ozen Bh"), dateTimeFormat.parse("2012-04-01 12:30:00"), false, null, null,
|
||||
null);
|
||||
|
||||
System.out.println(result);
|
||||
|
||||
assertEquals(Status.OK, result.status);
|
||||
|
||||
assertFalse(result.trips.isEmpty());
|
||||
|
||||
// Ambiguous departure
|
||||
result = queryTrips(new Location(LocationType.STATION, null, null, "Welsch"), null, new Location(LocationType.STATION,
|
||||
null, null, "ozen Bh"), dateTimeFormat.parse("2012-04-01 12:30:00"), false, null, null, null);
|
||||
|
||||
System.out.println(result);
|
||||
|
||||
assertEquals(Status.AMBIGUOUS, result.status);
|
||||
|
||||
assertFalse(result.ambiguousFrom.isEmpty());
|
||||
|
||||
assertTrue(result.ambiguousFrom.size() > 1);
|
||||
|
||||
assertFalse(result.ambiguousTo.isEmpty());
|
||||
|
||||
assertFalse(result.ambiguousTo.size() > 1);
|
||||
|
||||
// Ambiguous arrival
|
||||
result = queryTrips(new Location(LocationType.STATION, null, null, "Welschn"), null, new Location(LocationType.STATION,
|
||||
null, null, "oze"), dateTimeFormat.parse("2012-04-01 12:30:00"), false, null, null, null);
|
||||
|
||||
System.out.println(result);
|
||||
|
||||
assertEquals(Status.AMBIGUOUS, result.status);
|
||||
|
||||
assertFalse(result.ambiguousFrom.isEmpty());
|
||||
|
||||
assertFalse(result.ambiguousFrom.size() > 1);
|
||||
|
||||
assertFalse(result.ambiguousTo.isEmpty());
|
||||
|
||||
assertTrue(result.ambiguousTo.size() > 1);
|
||||
|
||||
// Ambiguous departure and arrival
|
||||
result = queryTrips(new Location(LocationType.STATION, null, null, "Welsch"), null, new Location(LocationType.STATION,
|
||||
null, null, "oze"), dateTimeFormat.parse("2012-04-01 12:30:00"), false, null, null, null);
|
||||
|
||||
System.out.println(result);
|
||||
|
||||
assertEquals(Status.AMBIGUOUS, result.status);
|
||||
|
||||
assertFalse(result.ambiguousFrom.isEmpty());
|
||||
|
||||
assertTrue(result.ambiguousFrom.size() > 1);
|
||||
|
||||
assertFalse(result.ambiguousTo.isEmpty());
|
||||
|
||||
assertTrue(result.ambiguousTo.size() > 1);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void queryUnkown() throws Exception {
|
||||
// Unknown from
|
||||
QueryTripsResult result = queryTrips(new Location(LocationType.STATION, null, null, "Welschnoffen"), null,
|
||||
new Location(LocationType.STATION, null, null, "ozen Bh"), dateTimeFormat.parse("2012-04-01 12:30:00"), false, null, null,
|
||||
null);
|
||||
|
||||
System.out.println(result);
|
||||
|
||||
assertEquals(Status.UNKNOWN_FROM, result.status);
|
||||
|
||||
assertNull(result.trips);
|
||||
|
||||
// Unknown to
|
||||
result = queryTrips(new Location(LocationType.STATION, null, null, "Welsch"), null, new Location(LocationType.STATION,
|
||||
null, null, "ozenn Bh"), dateTimeFormat.parse("2012-04-01 12:30:00"), false, null, null, null);
|
||||
|
||||
System.out.println(result);
|
||||
|
||||
assertEquals(Status.UNKNOWN_TO, result.status);
|
||||
|
||||
assertNull(result.trips);
|
||||
|
||||
// Unknown from and to
|
||||
result = queryTrips(new Location(LocationType.STATION, null, null, "Welschnoffen"), null, new Location(
|
||||
LocationType.STATION, null, null, "ozenn Bh"), dateTimeFormat.parse("2012-04-01 12:30:00"), false, null, null, null);
|
||||
|
||||
System.out.println(result);
|
||||
|
||||
assertTrue(Status.UNKNOWN_FROM == result.status || Status.UNKNOWN_TO == result.status);
|
||||
|
||||
assertNull(result.trips);
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue