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

AbstractEfaProvider: Handle mot 10 or larger according to spec sent by KVV.

Browse source
This commit is contained in:
Andreas Schildbach 2021-08-11 16:37:30 +02:00
parent 20392732fa
commit 58c95a77ae
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -1405,15 +1405,16 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
return new Line(id, network, Product.SUBWAY, name); return new Line(id, network, Product.SUBWAY, name);
} else if ("3".equals(mot) || "4".equals(mot)) { } else if ("3".equals(mot) || "4".equals(mot)) {
return new Line(id, network, Product.TRAM, name); return new Line(id, network, Product.TRAM, name);
} else if ("5".equals(mot) || "6".equals(mot) || "7".equals(mot) || "10".equals(mot)) { } else if ("5".equals(mot) || "6".equals(mot) || "7".equals(mot)) {
if ("Schienenersatzverkehr".equals(name)) if ("Schienenersatzverkehr".equals(name))
return new Line(id, network, Product.BUS, "SEV"); return new Line(id, network, Product.BUS, "SEV");
else
return new Line(id, network, Product.BUS, name); return new Line(id, network, Product.BUS, name);
} else if ("8".equals(mot)) { } else if ("8".equals(mot)) {
return new Line(id, network, Product.CABLECAR, name); return new Line(id, network, Product.CABLECAR, name);
} else if ("9".equals(mot)) { } else if ("9".equals(mot)) {
return new Line(id, network, Product.FERRY, name); return new Line(id, network, Product.FERRY, name);
} else if ("10".equals(mot)) {
return new Line(id, network, Product.ON_DEMAND, name);
} else if ("11".equals(mot)) { } else if ("11".equals(mot)) {
return new Line(id, network, null, ParserUtils.firstNotEmpty(symbol, name)); return new Line(id, network, null, ParserUtils.firstNotEmpty(symbol, name));
} else if ("12".equals(mot)) { } else if ("12".equals(mot)) {
@ -1424,15 +1425,21 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
return new Line(id, network, Product.BUS, "SEV"); return new Line(id, network, Product.BUS, "SEV");
if (trainNum != null) if (trainNum != null)
return new Line(id, network, Product.REGIONAL_TRAIN, Strings.nullToEmpty(trainType) + trainNum); return new Line(id, network, Product.REGIONAL_TRAIN, Strings.nullToEmpty(trainType) + trainNum);
return new Line(id, network, Product.REGIONAL_TRAIN, name);
} else if ("14".equals(mot) || "15".equals(mot) || "16".equals(mot)) { } else if ("14".equals(mot) || "15".equals(mot) || "16".equals(mot)) {
if (trainType != null || trainNum != null) if (trainType != null || trainNum != null)
return new Line(id, network, Product.HIGH_SPEED_TRAIN, Strings.nullToEmpty(trainType) + Strings.nullToEmpty(trainNum)); return new Line(id, network, Product.HIGH_SPEED_TRAIN, Strings.nullToEmpty(trainType) + Strings.nullToEmpty(trainNum));
} else if ("17".equals(mot)) { return new Line(id, network, Product.HIGH_SPEED_TRAIN, name);
} else if ("17".equals(mot)) { // Schienenersatzverkehr
if (trainNum == null && trainName != null && trainName.startsWith("Schienenersatz")) if (trainNum == null && trainName != null && trainName.startsWith("Schienenersatz"))
return new Line(id, network, Product.BUS, "SEV"); return new Line(id, network, Product.BUS, "SEV");
} else if ("19".equals(mot)) { return new Line(id, network, Product.BUS, name);
} else if ("18".equals(mot)) { // Zug-Shuttle
return new Line(id, network, Product.REGIONAL_TRAIN, name);
} else if ("19".equals(mot)) { // Bürgerbus
if (("Bürgerbus".equals(trainName) || "BürgerBus".equals(trainName) || "Kleinbus".equals(trainName)) && symbol != null) if (("Bürgerbus".equals(trainName) || "BürgerBus".equals(trainName) || "Kleinbus".equals(trainName)) && symbol != null)
return new Line(id, network, Product.BUS, symbol); return new Line(id, network, Product.BUS, symbol);
return new Line(id, network, Product.BUS, name);
} }
throw new IllegalStateException( throw new IllegalStateException(
@ -2026,7 +2033,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
.addEncodedQueryParameter("inclMOT_16", "on"); .addEncodedQueryParameter("inclMOT_16", "on");
if (p == Product.REGIONAL_TRAIN) if (p == Product.REGIONAL_TRAIN)
url.addEncodedQueryParameter("inclMOT_13", "on"); url.addEncodedQueryParameter("inclMOT_13", "on").addEncodedQueryParameter("inclMOT_18", "on");
if (p == Product.SUBURBAN_TRAIN) if (p == Product.SUBURBAN_TRAIN)
url.addEncodedQueryParameter("inclMOT_1", "on"); url.addEncodedQueryParameter("inclMOT_1", "on");
@ -2039,7 +2046,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
if (p == Product.BUS) if (p == Product.BUS)
url.addEncodedQueryParameter("inclMOT_5", "on").addEncodedQueryParameter("inclMOT_6", "on") url.addEncodedQueryParameter("inclMOT_5", "on").addEncodedQueryParameter("inclMOT_6", "on")
.addEncodedQueryParameter("inclMOT_7", "on"); .addEncodedQueryParameter("inclMOT_7", "on").addEncodedQueryParameter("inclMOT_17", "on")
.addEncodedQueryParameter("inclMOT_19", "on");
if (p == Product.ON_DEMAND) if (p == Product.ON_DEMAND)
url.addEncodedQueryParameter("inclMOT_10", "on"); url.addEncodedQueryParameter("inclMOT_10", "on");