From de6ae1a025d2fd3dff4adf7e1408359ffbbf0038 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Thu, 21 Jul 2016 21:28:27 +0200 Subject: [PATCH] Navitia: Handle physical mode OTHER. --- enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java b/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java index 0916a9c1..4d466f34 100644 --- a/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java @@ -97,7 +97,7 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider private enum PhysicalMode { - AIR, BOAT, BUS, BUSRAPIDTRANSIT, COACH, FERRY, FUNICULAR, LOCALTRAIN, LONGDISTANCETRAIN, METRO, RAPIDTRANSIT, SHUTTLE, TAXI, TRAIN, TRAMWAY + AIR, BOAT, BUS, BUSRAPIDTRANSIT, COACH, FERRY, FUNICULAR, LOCALTRAIN, LONGDISTANCETRAIN, METRO, RAPIDTRANSIT, SHUTTLE, TAXI, TRAIN, TRAMWAY, OTHER } @SuppressWarnings("serial") @@ -695,7 +695,7 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider } } - private Product parseLineProductFromMode(final String modeId) + private @Nullable Product parseLineProductFromMode(final String modeId) { final String modeType = modeId.replace("physical_mode:", ""); final PhysicalMode physicalMode = PhysicalMode.valueOf(modeType.toUpperCase()); @@ -722,6 +722,8 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider return Product.CABLECAR; case TAXI: return Product.ON_DEMAND; + case OTHER: + return null; default: throw new IllegalArgumentException("Unhandled place type: " + modeId); }