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

Remove support for additional query parameter for BVG.

Browse source
This commit is contained in:
Andreas Schildbach 2014-09-04 23:58:29 +02:00
parent b7b5b2a29b
commit 4893474968
2 changed files with 2 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
enabler/src/de/schildbach/pte/BvgProvider.java
View file

@ -56,17 +56,13 @@ public final class BvgProvider extends AbstractHafasProvider
private static final long PARSER_DAY_ROLLOVER_THRESHOLD_MS = 12 * 60 * 60 * 1000; private static final long PARSER_DAY_ROLLOVER_THRESHOLD_MS = 12 * 60 * 60 * 1000;
private final String additionalQueryParameter; public BvgProvider()
public BvgProvider(final String additionalQueryParameter)
{ {
super(API_BASE + "stboard.bin/dn", API_BASE + "ajax-getstop.bin/dny", API_BASE + "query.bin/dn", 8, UTF_8); super(API_BASE + "stboard.bin/dn", API_BASE + "ajax-getstop.bin/dny", API_BASE + "query.bin/dn", 8, UTF_8);
setJsonGetStopsUseWeight(false); setJsonGetStopsUseWeight(false);
setStationBoardCanDoEquivs(false); setStationBoardCanDoEquivs(false);
setStyles(STYLES); setStyles(STYLES);
this.additionalQueryParameter = additionalQueryParameter;
} }
public NetworkId id() public NetworkId id()
@ -252,8 +248,6 @@ public final class BvgProvider extends AbstractHafasProvider
final StringBuilder uri = new StringBuilder(); final StringBuilder uri = new StringBuilder();
uri.append(DEPARTURE_URL_LIVE); uri.append(DEPARTURE_URL_LIVE);
uri.append("input=").append(normalizeStationId(stationId)); uri.append("input=").append(normalizeStationId(stationId));
if (additionalQueryParameter != null)
uri.append('&').append(additionalQueryParameter);
return uri.toString(); return uri.toString();
} }
@ -267,8 +261,6 @@ public final class BvgProvider extends AbstractHafasProvider
if (time != null) if (time != null)
appendDateTimeParameters(uri, time, "date", "time"); appendDateTimeParameters(uri, time, "date", "time");
uri.append("&maxJourneys=").append(maxDepartures != 0 ? maxDepartures : DEFAULT_MAX_DEPARTURES); uri.append("&maxJourneys=").append(maxDepartures != 0 ? maxDepartures : DEFAULT_MAX_DEPARTURES);
if (additionalQueryParameter != null)
uri.append('&').append(additionalQueryParameter);
return uri.toString(); return uri.toString();
} }
@ -506,15 +498,6 @@ public final class BvgProvider extends AbstractHafasProvider
return Integer.parseInt(id) >= 1000000; return Integer.parseInt(id) >= 1000000;
} }
@Override
protected void appendCommonQueryTripsBinaryParameters(final StringBuilder uri)
{
super.appendCommonQueryTripsBinaryParameters(uri);
if (additionalQueryParameter != null)
uri.append('&').append(additionalQueryParameter);
}
private static final Pattern P_NORMALIZE_LINE_NAME_TRAM = Pattern.compile("(?:tra|tram)\\s+(.*)", Pattern.CASE_INSENSITIVE); private static final Pattern P_NORMALIZE_LINE_NAME_TRAM = Pattern.compile("(?:tra|tram)\\s+(.*)", Pattern.CASE_INSENSITIVE);
@Override @Override

2
enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java
View file

@ -42,7 +42,7 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest
{ {
public BvgProviderLiveTest() public BvgProviderLiveTest()
{ {
super(new BvgProvider(null)); super(new BvgProvider());
} }
@Test @Test