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

renamed ajaxGetStops() to jsonGetStops()

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@610 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-05-07 11:32:39 +00:00
parent dfb68c5e03
commit 1a3548f831
7 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/de/schildbach/pte/AbstractHafasProvider.java
View file

@ -63,23 +63,23 @@ public abstract class AbstractHafasProvider implements NetworkProvider
private final String apiUri;
private static final String prod = "hafas";
private final String accessId;
private final String ajaxGetStopsEncoding;
private final String mlcResEncoding;
private final String jsonGetStopsEncoding;
private final String xmlMlcResEncoding;
public AbstractHafasProvider(final String apiUri, final String accessId, final String ajaxGetStopsEncoding, final String mlcResEncoding)
public AbstractHafasProvider(final String apiUri, final String accessId, final String jsonGetStopsEncoding, final String xmlMlcResEncoding)
{
this.apiUri = apiUri;
this.accessId = accessId;
this.ajaxGetStopsEncoding = ajaxGetStopsEncoding;
this.mlcResEncoding = mlcResEncoding;
this.jsonGetStopsEncoding = jsonGetStopsEncoding;
this.xmlMlcResEncoding = xmlMlcResEncoding;
}
public AbstractHafasProvider(final String apiUri, final String accessId)
{
this.apiUri = apiUri;
this.accessId = accessId;
this.ajaxGetStopsEncoding = DEFAULT_ENCODING;
this.mlcResEncoding = DEFAULT_ENCODING;
this.jsonGetStopsEncoding = DEFAULT_ENCODING;
this.xmlMlcResEncoding = DEFAULT_ENCODING;
}
protected TimeZone timeZone()
@ -215,9 +215,9 @@ public abstract class AbstractHafasProvider implements NetworkProvider
private static final Pattern P_AJAX_GET_STOPS_JSON = Pattern.compile("SLs\\.sls\\s*=\\s*(.*?);\\s*SLs\\.showSuggestion\\(\\);", Pattern.DOTALL);
private static final Pattern P_AJAX_GET_STOPS_ID = Pattern.compile(".*?@L=(\\d+)@.*?");
protected final List<Location> ajaxGetStops(final String uri) throws IOException
protected final List<Location> jsonGetStops(final String uri) throws IOException
{
final CharSequence page = ParserUtils.scrape(uri, false, null, ajaxGetStopsEncoding, false);
final CharSequence page = ParserUtils.scrape(uri, false, null, jsonGetStopsEncoding, false);
final Matcher mJson = P_AJAX_GET_STOPS_JSON.matcher(page);
if (mJson.matches())
@ -299,7 +299,7 @@ public abstract class AbstractHafasProvider implements NetworkProvider
final XmlPullParserFactory factory = XmlPullParserFactory.newInstance(System.getProperty(XmlPullParserFactory.PROPERTY_NAME), null);
final XmlPullParser pp = factory.newPullParser();
pp.setInput(is, mlcResEncoding);
pp.setInput(is, xmlMlcResEncoding);
final List<Location> results = new ArrayList<Location>();

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

@ -70,7 +70,7 @@ public final class BahnProvider extends AbstractHafasProvider
{
final String uri = String.format(AUTOCOMPLETE_URI, ParserUtils.urlEncode(constraint.toString(), ENCODING));
return ajaxGetStops(uri);
return jsonGetStops(uri);
}
private final static Pattern P_NEARBY_STATIONS_BY_COORDINATE = Pattern

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

@ -61,7 +61,7 @@ public class DsbProvider extends AbstractHafasProvider
{
final String uri = String.format(AUTOCOMPLETE_URI, ParserUtils.urlEncode(constraint.toString(), ENCODING));
return ajaxGetStops(uri);
return jsonGetStops(uri);
}
@Override

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

@ -81,7 +81,7 @@ public class OebbProvider extends AbstractHafasProvider
{
final String uri = String.format(AUTOCOMPLETE_URI, ParserUtils.urlEncode(constraint.toString(), ENCODING));
return ajaxGetStops(uri);
return jsonGetStops(uri);
}
private final String NEARBY_URI = API_BASE + "stboard.exe/dn?distance=50&near=Suchen&input=%s";

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

@ -78,7 +78,7 @@ public class SeptaProvider extends AbstractHafasProvider
{
final String uri = String.format(AUTOCOMPLETE_URI, ParserUtils.urlEncode(constraint.toString(), ENCODING));
return ajaxGetStops(uri);
return jsonGetStops(uri);
}
@Override

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

@ -72,7 +72,7 @@ public class SncbProvider extends AbstractHafasProvider
{
final String uri = String.format(AUTOCOMPLETE_URI, ParserUtils.urlEncode(constraint.toString(), ENCODING));
return ajaxGetStops(uri);
return jsonGetStops(uri);
}
private final String NEARBY_URI = "http://hari.b-rail.be/HAFAS/bin/stboard.exe/en?input=%s&distance=50&near=Anzeigen";

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

@ -74,7 +74,7 @@ public class VgsProvider extends AbstractHafasProvider
{
final String uri = String.format(AUTOCOMPLETE_URI, ParserUtils.urlEncode(constraint.toString(), ENCODING));
return ajaxGetStops(uri);
return jsonGetStops(uri);
}
private final String NEARBY_URI = API_BASE