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

AbstractHafasProvider.intToProduct(): Don't throw 'ambiguous value' if values are in fact not ambiguous.

Browse source
This commit is contained in:
Andreas Schildbach 2018-11-15 13:06:57 +01:00
parent 435df616fd
commit 018d084b65
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -81,7 +81,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider {
protected final Product intToProduct(final int productInt) { protected final Product intToProduct(final int productInt) {
final int allProductsInt = allProductsInt(); final int allProductsInt = allProductsInt();
checkArgument(productInt < allProductsInt, "value " + productInt + " must be smaller than " + allProductsInt); checkArgument(productInt <= allProductsInt,
"value " + productInt + " cannot be greater than " + allProductsInt);
int value = productInt; int value = productInt;
Product product = null; Product product = null;
@ -89,10 +90,11 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider {
final int v = 1 << i; final int v = 1 << i;
if (value >= v) { if (value >= v) {
final Product p = productsMap[i]; final Product p = productsMap[i];
if (product == Product.ON_DEMAND && p == Product.BUS) if ((product == Product.ON_DEMAND && p == Product.BUS)
; // just ON_DEMAND || (product == Product.BUS && p == Product.ON_DEMAND))
else if (product != null) product = Product.ON_DEMAND;
throw new IllegalArgumentException("ambigous value: " + productInt); else if (product != null && p != product)
throw new IllegalArgumentException("ambiguous value: " + productInt);
else else
product = p; product = p;
value -= v; value -= v;