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

refactor pte to use int,int for coordinates

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@219 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-10-02 14:51:43 +00:00
parent 135b07f59e
commit 9af8c00ede
17 changed files with 69 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -87,14 +87,14 @@ public class RmvProvider implements NetworkProvider
+ "&REQMapRoute0\\.Location0\\.X=(-?\\d+)&REQMapRoute0\\.Location0\\.Y=(-?\\d+)" //
+ "&REQMapRoute0\\.Location0\\.Name=(.*?)\">.*?", Pattern.DOTALL);
public List<Station> nearbyStations(final String stationId, final double lat, final double lon, final int maxDistance, final int maxStations)
public List<Station> 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>();
if (lat != 0 || lon != 0)
{
final String url = "http://www.rmv.de/auskunft/bin/jp/stboard.exe/dox?input=" + lat + "%20" + lon;
final String url = "http://www.rmv.de/auskunft/bin/jp/stboard.exe/dox?input=" + latLonToDouble(lat) + "%20" + latLonToDouble(lon);
final CharSequence page = ParserUtils.scrape(url);
final Matcher m = P_NEARBY_STATIONS.matcher(page);
@ -121,8 +121,8 @@ public class RmvProvider implements NetworkProvider
if (mFine.matches())
{
final int parsedId = Integer.parseInt(mFine.group(1));
final double parsedLon = latLonToDouble(Integer.parseInt(mFine.group(2)));
final double parsedLat = latLonToDouble(Integer.parseInt(mFine.group(3)));
final int parsedLon = Integer.parseInt(mFine.group(2));
final int parsedLat = Integer.parseInt(mFine.group(3));
final String parsedName = ParserUtils.resolveEntities(mFine.group(4));
final Station station = new Station(parsedId, parsedName, parsedLat, parsedLon, 0, null, null);
@ -158,8 +158,8 @@ public class RmvProvider implements NetworkProvider
final Matcher m = P_STATION_LOCATION.matcher(page);
if (m.find())
{
final double lon = latLonToDouble(Integer.parseInt(m.group(1)));
final double lat = latLonToDouble(Integer.parseInt(m.group(2)));
final int lon = Integer.parseInt(m.group(1));
final int lat = Integer.parseInt(m.group(2));
final String name = ParserUtils.resolveEntities(m.group(3));
return new StationLocationResult(lat, lon, name);