mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-19 16:59: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

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

@ -37,7 +37,6 @@ import de.schildbach.pte.dto.LocationType;
import de.schildbach.pte.dto.NearbyStationsResult;
import de.schildbach.pte.dto.QueryConnectionsResult;
import de.schildbach.pte.dto.QueryDeparturesResult;
import de.schildbach.pte.dto.Station;
import de.schildbach.pte.dto.StationDepartures;
import de.schildbach.pte.exception.SessionExpiredException;
import de.schildbach.pte.util.ParserUtils;
@ -83,7 +82,7 @@ public final class BahnProvider extends AbstractHafasProvider
public NearbyStationsResult nearbyStations(final String stationId, final int lat, final int lon, final int maxDistance, final int maxStations)
throws IOException
{
final List<Station> stations = new ArrayList<Station>();
final List<Location> stations = new ArrayList<Location>();
if (lat == 0 && lon == 0)
{
@ -96,7 +95,7 @@ public final class BahnProvider extends AbstractHafasProvider
final int sId = Integer.parseInt(m.group(1));
final String sName = ParserUtils.resolveEntities(m.group(2).trim());
final Station station = new Station(sId, null, sName, null, 0, 0);
final Location station = new Location(LocationType.STATION, sId, null, sName);
stations.add(station);
}
}
@ -115,7 +114,7 @@ public final class BahnProvider extends AbstractHafasProvider
final int sLat = Integer.parseInt(m.group(2));
final String sName = ParserUtils.resolveEntities(m.group(5).trim());
final Station station = new Station(sId, null, sName, null, sLat, sLon);
final Location station = new Location(LocationType.STATION, sId, sLat, sLon, null, sName);
stations.add(station);
}
}