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

merge Station dto into Location dto

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@492 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-02-11 18:06:30 +00:00
parent 240e95d19b
commit 3d14d7da8b
6 changed files with 20 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -40,7 +40,6 @@ import de.schildbach.pte.dto.NearbyStationsResult;
import de.schildbach.pte.dto.QueryConnectionsResult;
import de.schildbach.pte.dto.QueryDeparturesResult;
import de.schildbach.pte.dto.QueryDeparturesResult.Status;
import de.schildbach.pte.dto.Station;
import de.schildbach.pte.dto.StationDepartures;
import de.schildbach.pte.exception.SessionExpiredException;
import de.schildbach.pte.util.Color;
@ -129,7 +128,7 @@ public final class BvgProvider extends AbstractHafasProvider
if (stationId == null)
throw new IllegalArgumentException("stationId must be given");
final List<Station> stations = new ArrayList<Station>();
final List<Location> stations = new ArrayList<Location>();
final String uri = nearbyStationUri(stationId);
final CharSequence page = ParserUtils.scrape(uri);
@ -164,7 +163,7 @@ public final class BvgProvider extends AbstractHafasProvider
{
final int parsedId = Integer.parseInt(mFineLocation.group(1));
final String parsedName = ParserUtils.resolveEntities(mFineLocation.group(2));
final Station station = newStation(parsedId, parsedName, 0, 0);
final Location station = newStation(parsedId, parsedName, 0, 0);
if (!stations.contains(station))
stations.add(station);
}
@ -185,9 +184,9 @@ public final class BvgProvider extends AbstractHafasProvider
}
}
private Station newStation(final int id, final String parsedName, final int lat, final int lon)
private Location newStation(final int id, final String parsedName, final int lat, final int lon)
{
String place = null, name = null, longName = null;
String place = null, name = null;
if (parsedName.endsWith(" (Berlin)"))
{
@ -214,12 +213,8 @@ public final class BvgProvider extends AbstractHafasProvider
place = "Frankfurt (Oder)";
name = parsedName.substring(18);
}
else
{
longName = parsedName;
}
return new Station(id, place, name, longName, lat, lon);
return new Location(LocationType.STATION, id, lat, lon, place, name);
}
public static final String STATION_URL_CONNECTION = "http://mobil.bvg.de/Fahrinfo/bin/query.bin/dox";