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

BVG: Fix IllegalArgumentException when suggesting locations.

Browse source
This commit is contained in:
Andreas Schildbach 2017-01-28 13:22:12 +01:00
parent bf510b516d
commit 9957626f8d
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
enabler/src/de/schildbach/pte/AbstractHafasProvider.java
View file

@ -18,7 +18,6 @@
package de.schildbach.pte; package de.schildbach.pte;
import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Preconditions.checkState;
import java.util.EnumSet; import java.util.EnumSet;
@ -110,8 +109,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider {
for (int i = productsMap.length - 1; i >= 0; i--) { for (int i = productsMap.length - 1; i >= 0; i--) {
final int v = 1 << i; final int v = 1 << i;
if (value >= v) { if (value >= v) {
final Product product = checkNotNull(productsMap[i], "unknown product " + i); if (productsMap[i] != null)
products.add(product); products.add(productsMap[i]);
value -= v; value -= v;
} }
} }

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

@ -41,7 +41,7 @@ import okhttp3.HttpUrl;
public final class BvgProvider extends AbstractHafasMobileProvider { public final class BvgProvider extends AbstractHafasMobileProvider {
private static final HttpUrl API_BASE = HttpUrl.parse("http://bvg-apps.hafas.de/bin/"); private static final HttpUrl API_BASE = HttpUrl.parse("http://bvg-apps.hafas.de/bin/");
private static final Product[] PRODUCTS_MAP = { Product.SUBURBAN_TRAIN, Product.SUBWAY, Product.TRAM, Product.BUS, private static final Product[] PRODUCTS_MAP = { Product.SUBURBAN_TRAIN, Product.SUBWAY, Product.TRAM, Product.BUS,
Product.FERRY, Product.HIGH_SPEED_TRAIN, Product.REGIONAL_TRAIN, Product.ON_DEMAND }; Product.FERRY, Product.HIGH_SPEED_TRAIN, Product.REGIONAL_TRAIN, Product.ON_DEMAND, null, null };
public BvgProvider(final String jsonApiAuthorization) { public BvgProvider(final String jsonApiAuthorization) {
super(NetworkId.BVG, API_BASE, PRODUCTS_MAP); super(NetworkId.BVG, API_BASE, PRODUCTS_MAP);