NVBW: 'IC' lines

This commit is contained in:
Andreas Schildbach 2022-09-07 17:28:12 +02:00
parent 8ca6f35208
commit 1d630f2fc2

View file

@ -47,6 +47,7 @@ public class NvbwProvider extends AbstractEfaProvider {
} }
private static final Pattern P_LINE_S_AVG_VBK = Pattern.compile("(S\\d+) \\((?:AVG|VBK)\\)"); private static final Pattern P_LINE_S_AVG_VBK = Pattern.compile("(S\\d+) \\((?:AVG|VBK)\\)");
private static final Pattern P_INTERCITY = Pattern.compile("IC\\d*");
private static final Pattern P_INTERREGIO = Pattern.compile("IR\\d*"); private static final Pattern P_INTERREGIO = Pattern.compile("IR\\d*");
@Override @Override
@ -58,8 +59,7 @@ public class NvbwProvider extends AbstractEfaProvider {
return new Line(id, network, Product.HIGH_SPEED_TRAIN, "ICE"); return new Line(id, network, Product.HIGH_SPEED_TRAIN, "ICE");
if ("InterCity".equals(trainName) && trainNum == null) if ("InterCity".equals(trainName) && trainNum == null)
return new Line(id, network, Product.HIGH_SPEED_TRAIN, "IC"); return new Line(id, network, Product.HIGH_SPEED_TRAIN, "IC");
if (("IC3".equals(trainNum) || "IC4".equals(trainNum) || "IC5".equals(trainNum) || "IC8".equals(trainNum)) if (trainType == null && P_INTERCITY.matcher(trainNum).matches())
&& trainType == null)
return new Line(id, network, Product.HIGH_SPEED_TRAIN, trainNum); return new Line(id, network, Product.HIGH_SPEED_TRAIN, trainNum);
if ("Fernreisezug externer EU".equals(trainName) && trainNum == null) if ("Fernreisezug externer EU".equals(trainName) && trainNum == null)
return new Line(id, network, Product.HIGH_SPEED_TRAIN, null); return new Line(id, network, Product.HIGH_SPEED_TRAIN, null);