From 1e6f55d6ba9e7028c0efaaa18487adaf3554f76a Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 20 Dec 2016 19:49:45 +0100 Subject: [PATCH] EFA, Hafas: 'Locomore' line. --- enabler/src/de/schildbach/pte/AbstractEfaProvider.java | 2 ++ enabler/src/de/schildbach/pte/AbstractHafasProvider.java | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java index 3c149e66..d5b2e177 100644 --- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java @@ -1019,6 +1019,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { return new Line(id, network, Product.HIGH_SPEED_TRAIN, "ARC" + trainNum); if ("HOT".equals(trainType) && trainNum != null) // Spanien, Nacht return new Line(id, network, Product.HIGH_SPEED_TRAIN, "HOT" + trainNum); + if ("Locomore".equals(longName)) + return new Line(id, network, Product.HIGH_SPEED_TRAIN, "LOC" + Strings.nullToEmpty(trainNum)); if ("IR".equals(trainType) || "Interregio".equals(trainName) || "InterRegio".equals(trainName)) return new Line(id, network, Product.REGIONAL_TRAIN, "IR" + trainNum); diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java index 53d71ce5..fa3e6ca0 100644 --- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java @@ -3295,8 +3295,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider { return Product.HIGH_SPEED_TRAIN; if ("HKX".equals(ucType)) // Hamburg-Koeln-Express return Product.HIGH_SPEED_TRAIN; - if ("UEX".equals(ucType)) // Slovenia - return Product.REGIONAL_TRAIN; + if ("LOC".equals(ucType)) // Locomore + return Product.HIGH_SPEED_TRAIN; // Regional if ("ZUG".equals(ucType)) // Generic Train @@ -3515,6 +3515,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider { return Product.REGIONAL_TRAIN; if ("SE".equals(ucType)) // ABELLIO Rail Mitteldeutschland GmbH return Product.REGIONAL_TRAIN; + if ("UEX".equals(ucType)) // Slovenia + return Product.REGIONAL_TRAIN; // Suburban Trains if (P_LINE_SBAHN.matcher(ucType).matches()) // Generic (Night) S-Bahn