From e1bf4a309b9e0e6361a15302d8428806a42e08cd Mon Sep 17 00:00:00 2001 From: togamid Date: Sat, 1 Feb 2020 23:04:56 +0100 Subject: [PATCH 1/3] These trains are InterCities as shown correctly if using the DB data. These trains aren't shown at all on the official VGN website. --- src/de/schildbach/pte/VgnProvider.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/de/schildbach/pte/VgnProvider.java b/src/de/schildbach/pte/VgnProvider.java index cd86ebc99..9be6ac1e6 100644 --- a/src/de/schildbach/pte/VgnProvider.java +++ b/src/de/schildbach/pte/VgnProvider.java @@ -50,11 +50,11 @@ protected Line parseLine(final @Nullable String id, final @Nullable String netwo final @Nullable String trainType, final @Nullable String trainNum, final @Nullable String trainName) { if ("0".equals(mot)) { if ("R5(z)".equals(trainNum)) - return new Line(id, network, Product.REGIONAL_TRAIN, "R5(z)"); + return new Line(id, network, Product.HIGH_SPEED_TRAIN, "R5(z)"); if ("R7(z)".equals(trainNum)) - return new Line(id, network, Product.REGIONAL_TRAIN, "R7(z)"); + return new Line(id, network, Product.HIGH_SPEED_TRAIN, "R7(z)"); if ("R8(z)".equals(trainNum)) - return new Line(id, network, Product.REGIONAL_TRAIN, "R8(z)"); + return new Line(id, network, Product.HIGH_SPEED_TRAIN, "R8(z)"); } return super.parseLine(id, network, mot, symbol, name, longName, trainType, trainNum, trainName); From 69aeddd3bd7260043c668a7877009399dd409a8b Mon Sep 17 00:00:00 2001 From: togamid <54776413+togamid@users.noreply.github.com> Date: Sat, 1 Feb 2020 23:10:52 +0100 Subject: [PATCH 2/3] Corrects train type for InterCities These trains are InterCities as shown correctly when using DB as a data provider. They aren't shown at all at the official VGN website. --- src/de/schildbach/pte/VgnProvider.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/de/schildbach/pte/VgnProvider.java b/src/de/schildbach/pte/VgnProvider.java index cd86ebc99..9be6ac1e6 100644 --- a/src/de/schildbach/pte/VgnProvider.java +++ b/src/de/schildbach/pte/VgnProvider.java @@ -50,11 +50,11 @@ protected Line parseLine(final @Nullable String id, final @Nullable String netwo final @Nullable String trainType, final @Nullable String trainNum, final @Nullable String trainName) { if ("0".equals(mot)) { if ("R5(z)".equals(trainNum)) - return new Line(id, network, Product.REGIONAL_TRAIN, "R5(z)"); + return new Line(id, network, Product.HIGH_SPEED_TRAIN, "R5(z)"); if ("R7(z)".equals(trainNum)) - return new Line(id, network, Product.REGIONAL_TRAIN, "R7(z)"); + return new Line(id, network, Product.HIGH_SPEED_TRAIN, "R7(z)"); if ("R8(z)".equals(trainNum)) - return new Line(id, network, Product.REGIONAL_TRAIN, "R8(z)"); + return new Line(id, network, Product.HIGH_SPEED_TRAIN, "R8(z)"); } return super.parseLine(id, network, mot, symbol, name, longName, trainType, trainNum, trainName); From 1eb2f5d52ed80badda61b1991b6c8da6549c5216 Mon Sep 17 00:00:00 2001 From: togamid Date: Sun, 2 Feb 2020 12:07:04 +0100 Subject: [PATCH 3/3] Fix Product for "Anrufsammeltaxi" and similar products to on demand. --- src/de/schildbach/pte/AbstractEfaProvider.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java index 8947b2565..627cbd424 100644 --- a/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/src/de/schildbach/pte/AbstractEfaProvider.java @@ -882,7 +882,7 @@ protected Line parseLine(final @Nullable String id, final @Nullable String netwo if (trainName.equals("Nachtbus")) return new Line(id, network, Product.BUS, str); if (trainName.equals("Anrufsammeltaxi")) - return new Line(id, network, Product.BUS, str); + return new Line(id, network, Product.ON_DEMAND, str); if (trainName.equals("Ersatzverkehr")) return new Line(id, network, Product.BUS, str); if (trainName.equals("Vienna Airport Lines")) @@ -1358,7 +1358,7 @@ protected Line parseLine(final @Nullable String id, final @Nullable String netwo return new Line(id, network, Product.SUBWAY, name); } else if ("3".equals(mot) || "4".equals(mot)) { 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)) return new Line(id, network, Product.BUS, "SEV"); else @@ -1367,6 +1367,8 @@ protected Line parseLine(final @Nullable String id, final @Nullable String netwo return new Line(id, network, Product.CABLECAR, name); } else if ("9".equals(mot)) { 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)) { return new Line(id, network, null, ParserUtils.firstNotEmpty(symbol, name)); } else if ("13".equals(mot)) {