EFA, Hafas: 'Locomore' line.

This commit is contained in:
Andreas Schildbach 2016-12-20 19:49:45 +01:00
parent e2f39f2d8f
commit 1e6f55d6ba
2 changed files with 6 additions and 2 deletions

View file

@ -1019,6 +1019,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
return new Line(id, network, Product.HIGH_SPEED_TRAIN, "ARC" + trainNum); return new Line(id, network, Product.HIGH_SPEED_TRAIN, "ARC" + trainNum);
if ("HOT".equals(trainType) && trainNum != null) // Spanien, Nacht if ("HOT".equals(trainType) && trainNum != null) // Spanien, Nacht
return new Line(id, network, Product.HIGH_SPEED_TRAIN, "HOT" + trainNum); 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)) if ("IR".equals(trainType) || "Interregio".equals(trainName) || "InterRegio".equals(trainName))
return new Line(id, network, Product.REGIONAL_TRAIN, "IR" + trainNum); return new Line(id, network, Product.REGIONAL_TRAIN, "IR" + trainNum);

View file

@ -3295,8 +3295,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider {
return Product.HIGH_SPEED_TRAIN; return Product.HIGH_SPEED_TRAIN;
if ("HKX".equals(ucType)) // Hamburg-Koeln-Express if ("HKX".equals(ucType)) // Hamburg-Koeln-Express
return Product.HIGH_SPEED_TRAIN; return Product.HIGH_SPEED_TRAIN;
if ("UEX".equals(ucType)) // Slovenia if ("LOC".equals(ucType)) // Locomore
return Product.REGIONAL_TRAIN; return Product.HIGH_SPEED_TRAIN;
// Regional // Regional
if ("ZUG".equals(ucType)) // Generic Train if ("ZUG".equals(ucType)) // Generic Train
@ -3515,6 +3515,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider {
return Product.REGIONAL_TRAIN; return Product.REGIONAL_TRAIN;
if ("SE".equals(ucType)) // ABELLIO Rail Mitteldeutschland GmbH if ("SE".equals(ucType)) // ABELLIO Rail Mitteldeutschland GmbH
return Product.REGIONAL_TRAIN; return Product.REGIONAL_TRAIN;
if ("UEX".equals(ucType)) // Slovenia
return Product.REGIONAL_TRAIN;
// Suburban Trains // Suburban Trains
if (P_LINE_SBAHN.matcher(ucType).matches()) // Generic (Night) S-Bahn if (P_LINE_SBAHN.matcher(ucType).matches()) // Generic (Night) S-Bahn