mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-12 00:08:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

return Location in departures result

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@319 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-10-23 14:33:37 +00:00
parent 6811870b0e
commit 62b992a805
10 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -703,7 +703,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider
XmlPullUtil.skipRestOfTree(pp); XmlPullUtil.skipRestOfTree(pp);
} }
return new QueryDeparturesResult(locationId, location, departures); return new QueryDeparturesResult(new Location(LocationType.STATION, locationId, 0, 0, location), departures);
} }
else if ("notidentified".equals(nameState)) else if ("notidentified".equals(nameState))
{ {

2
src/de/schildbach/pte/BahnProvider.java
View file

@ -516,7 +516,7 @@ public final class BahnProvider implements NetworkProvider
} }
} }
return new QueryDeparturesResult(Integer.parseInt(stationId), null, departures); return new QueryDeparturesResult(new Location(LocationType.STATION, Integer.parseInt(stationId), 0, 0, null), departures);
} }
private static final Pattern P_NORMALIZE_LINE_NUMBER = Pattern.compile("\\d{2,5}"); private static final Pattern P_NORMALIZE_LINE_NUMBER = Pattern.compile("\\d{2,5}");

2
src/de/schildbach/pte/BvgProvider.java
View file

@ -531,7 +531,7 @@ public final class BvgProvider implements NetworkProvider
} }
} }
return new QueryDeparturesResult(Integer.parseInt(stationId), location, departures); return new QueryDeparturesResult(new Location(LocationType.STATION, Integer.parseInt(stationId), 0, 0, location), departures);
} }
else else
{ {

3
src/de/schildbach/pte/NasaProvider.java
View file

@ -31,6 +31,7 @@ import java.util.regex.Pattern;
import de.schildbach.pte.dto.Departure; import de.schildbach.pte.dto.Departure;
import de.schildbach.pte.dto.GetConnectionDetailsResult; import de.schildbach.pte.dto.GetConnectionDetailsResult;
import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.Location;
import de.schildbach.pte.dto.LocationType;
import de.schildbach.pte.dto.QueryConnectionsResult; import de.schildbach.pte.dto.QueryConnectionsResult;
import de.schildbach.pte.dto.QueryDeparturesResult; import de.schildbach.pte.dto.QueryDeparturesResult;
import de.schildbach.pte.dto.QueryDeparturesResult.Status; import de.schildbach.pte.dto.QueryDeparturesResult.Status;
@ -206,7 +207,7 @@ public class NasaProvider extends AbstractHafasProvider
} }
} }
return new QueryDeparturesResult(Integer.parseInt(stationId), location, departures); return new QueryDeparturesResult(new Location(LocationType.STATION, Integer.parseInt(stationId), 0, 0, location), departures);
} }
else else
{ {

2
src/de/schildbach/pte/OebbProvider.java
View file

@ -565,7 +565,7 @@ public class OebbProvider extends AbstractHafasProvider
} }
} }
return new QueryDeparturesResult(locationId, location, departures); return new QueryDeparturesResult(new Location(LocationType.STATION, locationId, 0, 0, location), departures);
} }
catch (final JSONException x) catch (final JSONException x)
{ {

2
src/de/schildbach/pte/RmvProvider.java
View file

@ -545,7 +545,7 @@ public class RmvProvider extends AbstractHafasProvider
} }
} }
return new QueryDeparturesResult(locationId, location, departures); return new QueryDeparturesResult(new Location(LocationType.STATION, locationId, 0, 0, location), departures);
} }
else else
{ {

4
src/de/schildbach/pte/SbbProvider.java
View file

@ -27,6 +27,8 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import de.schildbach.pte.dto.Departure; import de.schildbach.pte.dto.Departure;
import de.schildbach.pte.dto.Location;
import de.schildbach.pte.dto.LocationType;
import de.schildbach.pte.dto.QueryDeparturesResult; import de.schildbach.pte.dto.QueryDeparturesResult;
import de.schildbach.pte.dto.QueryDeparturesResult.Status; import de.schildbach.pte.dto.QueryDeparturesResult.Status;
import de.schildbach.pte.util.ParserUtils; import de.schildbach.pte.util.ParserUtils;
@ -170,7 +172,7 @@ public class SbbProvider extends AbstractHafasProvider
} }
} }
return new QueryDeparturesResult(locationId, location, departures); return new QueryDeparturesResult(new Location(LocationType.STATION, locationId, 0, 0, location), departures);
} }
else else
{ {

4
src/de/schildbach/pte/SncbProvider.java
View file

@ -27,6 +27,8 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import de.schildbach.pte.dto.Departure; import de.schildbach.pte.dto.Departure;
import de.schildbach.pte.dto.Location;
import de.schildbach.pte.dto.LocationType;
import de.schildbach.pte.dto.QueryDeparturesResult; import de.schildbach.pte.dto.QueryDeparturesResult;
import de.schildbach.pte.dto.QueryDeparturesResult.Status; import de.schildbach.pte.dto.QueryDeparturesResult.Status;
import de.schildbach.pte.util.ParserUtils; import de.schildbach.pte.util.ParserUtils;
@ -154,7 +156,7 @@ public class SncbProvider extends AbstractHafasProvider
} }
} }
return new QueryDeparturesResult(Integer.parseInt(stationId), location, departures); return new QueryDeparturesResult(new Location(LocationType.STATION, Integer.parseInt(stationId), 0, 0, location), departures);
} }
else else
{ {

3
src/de/schildbach/pte/VgsProvider.java
View file

@ -31,6 +31,7 @@ import java.util.regex.Pattern;
import de.schildbach.pte.dto.Departure; import de.schildbach.pte.dto.Departure;
import de.schildbach.pte.dto.GetConnectionDetailsResult; import de.schildbach.pte.dto.GetConnectionDetailsResult;
import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.Location;
import de.schildbach.pte.dto.LocationType;
import de.schildbach.pte.dto.QueryConnectionsResult; import de.schildbach.pte.dto.QueryConnectionsResult;
import de.schildbach.pte.dto.QueryDeparturesResult; import de.schildbach.pte.dto.QueryDeparturesResult;
import de.schildbach.pte.dto.QueryDeparturesResult.Status; import de.schildbach.pte.dto.QueryDeparturesResult.Status;
@ -206,7 +207,7 @@ public class VgsProvider extends AbstractHafasProvider
} }
} }
return new QueryDeparturesResult(Integer.parseInt(stationId), location, departures); return new QueryDeparturesResult(new Location(LocationType.STATION, Integer.parseInt(stationId), 0, 0, location), departures);
} }
else else
{ {

9
src/de/schildbach/pte/dto/QueryDeparturesResult.java
View file

@ -30,14 +30,12 @@ public final class QueryDeparturesResult
} }
public final Status status; public final Status status;
public final int locationId; public final Location location;
public final String location;
public final List<Departure> departures; public final List<Departure> departures;
public QueryDeparturesResult(final int locationId, final String location, final List<Departure> departures) public QueryDeparturesResult(final Location location, final List<Departure> departures)
{ {
this.status = Status.OK; this.status = Status.OK;
this.locationId = locationId;
this.location = location; this.location = location;
this.departures = departures; this.departures = departures;
} }
@ -45,8 +43,7 @@ public final class QueryDeparturesResult
public QueryDeparturesResult(final Status status, final int locationId) public QueryDeparturesResult(final Status status, final int locationId)
{ {
this.status = status; this.status = status;
this.locationId = locationId; this.location = new Location(LocationType.STATION, locationId, 0, 0, null);
this.location = null;
this.departures = null; this.departures = null;
} }
} }