From a2b5775b8fc7fe8c361ee1c692bbcad4799bda50 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Tue, 21 Jun 2011 07:25:23 +0000 Subject: [PATCH] more lines git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@711 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/AbstractHafasProvider.java | 2 ++ src/de/schildbach/pte/NriProvider.java | 4 ++++ src/de/schildbach/pte/NsProvider.java | 3 --- src/de/schildbach/pte/OebbProvider.java | 2 -- src/de/schildbach/pte/PlProvider.java | 2 -- src/de/schildbach/pte/RmvProvider.java | 3 +++ src/de/schildbach/pte/RtProvider.java | 5 +++++ src/de/schildbach/pte/ShProvider.java | 2 ++ src/de/schildbach/pte/SncbProvider.java | 4 +--- src/de/schildbach/pte/VgsProvider.java | 12 ++++-------- 10 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/de/schildbach/pte/AbstractHafasProvider.java b/src/de/schildbach/pte/AbstractHafasProvider.java index 23cfec1e..40657498 100644 --- a/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/src/de/schildbach/pte/AbstractHafasProvider.java @@ -1379,6 +1379,8 @@ public abstract class AbstractHafasProvider implements NetworkProvider return 'I'; if ("TLK".equals(ucType)) // Tanie Linie Kolejowe, Polen return 'I'; + if ("INT".equals(ucType)) // Zürich-Brüssel - Budapest-Istanbul + return 'I'; // Regional if ("ZUG".equals(ucType)) // Generic Train diff --git a/src/de/schildbach/pte/NriProvider.java b/src/de/schildbach/pte/NriProvider.java index 5f698efc..acd0e2af 100644 --- a/src/de/schildbach/pte/NriProvider.java +++ b/src/de/schildbach/pte/NriProvider.java @@ -190,6 +190,10 @@ public class NriProvider extends AbstractHafasProvider if ("EXP".equals(ucType)) return 'F'; + if ("EXP.BOAT".equals(ucType)) + return 'F'; + if ("FERRY".equals(ucType)) + return 'F'; if ("FER".equals(ucType)) return 'F'; if ("SHIP".equals(ucType)) diff --git a/src/de/schildbach/pte/NsProvider.java b/src/de/schildbach/pte/NsProvider.java index 2777dfb9..4f309273 100644 --- a/src/de/schildbach/pte/NsProvider.java +++ b/src/de/schildbach/pte/NsProvider.java @@ -207,9 +207,6 @@ public class NsProvider extends AbstractHafasProvider { final String ucType = type.toUpperCase(); - if (ucType.equals("INT")) // Zürich-Brüssel - return 'I'; - if (ucType.equals("L")) return 'R'; if (ucType.equals("CR")) diff --git a/src/de/schildbach/pte/OebbProvider.java b/src/de/schildbach/pte/OebbProvider.java index 12051ceb..58a0eb8b 100644 --- a/src/de/schildbach/pte/OebbProvider.java +++ b/src/de/schildbach/pte/OebbProvider.java @@ -535,8 +535,6 @@ public class OebbProvider extends AbstractHafasProvider { final String ucType = type.toUpperCase(); - if (ucType.equals("INT")) // Rußland, Connections only? - return 'I'; if (ucType.equals("RR")) // Finnland, Connections only? return 'I'; if (ucType.equals("EE")) // Rumänien, Connections only? diff --git a/src/de/schildbach/pte/PlProvider.java b/src/de/schildbach/pte/PlProvider.java index 1ab9a994..8930f330 100644 --- a/src/de/schildbach/pte/PlProvider.java +++ b/src/de/schildbach/pte/PlProvider.java @@ -183,8 +183,6 @@ public class PlProvider extends AbstractHafasProvider return 'R'; if ("N".equals(ucType)) // St. Pierre des Corps - Tours return 'R'; - // if ("INT".equals(ucType)) // Rußland - // return 'R'; if ("METRO".equals(ucType)) return 'U'; diff --git a/src/de/schildbach/pte/RmvProvider.java b/src/de/schildbach/pte/RmvProvider.java index 1d3a2b53..a25b17ce 100644 --- a/src/de/schildbach/pte/RmvProvider.java +++ b/src/de/schildbach/pte/RmvProvider.java @@ -393,6 +393,9 @@ public class RmvProvider extends AbstractHafasProvider if ("U-BAHN".equals(ucType)) return 'U'; + if ("LTAXI".equals(ucType)) + return 'B'; + final char t = super.normalizeType(type); if (t != 0) return t; diff --git a/src/de/schildbach/pte/RtProvider.java b/src/de/schildbach/pte/RtProvider.java index c73fdb16..d6b78f64 100644 --- a/src/de/schildbach/pte/RtProvider.java +++ b/src/de/schildbach/pte/RtProvider.java @@ -211,6 +211,11 @@ public class RtProvider extends AbstractHafasProvider if (t != 0) return t; + if (ucType.equals("X70")) + return '?'; + if (ucType.equals("T84")) + return '?'; + return 0; } } diff --git a/src/de/schildbach/pte/ShProvider.java b/src/de/schildbach/pte/ShProvider.java index 9359b28d..e94ea3d5 100644 --- a/src/de/schildbach/pte/ShProvider.java +++ b/src/de/schildbach/pte/ShProvider.java @@ -297,6 +297,8 @@ public class ShProvider extends AbstractHafasProvider return 'B'; if ("KB1".equals(ucType)) return 'B'; + if ("KLB".equals(ucType)) + return 'B'; final char t = super.normalizeType(type); if (t != 0) diff --git a/src/de/schildbach/pte/SncbProvider.java b/src/de/schildbach/pte/SncbProvider.java index 9aef4be9..cbb5e6bc 100644 --- a/src/de/schildbach/pte/SncbProvider.java +++ b/src/de/schildbach/pte/SncbProvider.java @@ -74,7 +74,7 @@ public class SncbProvider extends AbstractHafasProvider productBits.setCharAt(0, '1'); // Hochgeschwindigkeitszug productBits.setCharAt(2, '1'); // IC/IR/P/ICT } - else if (product == 'R'||product == 'S') + else if (product == 'R' || product == 'S') { productBits.setCharAt(6, '1'); // Zug } @@ -244,8 +244,6 @@ public class SncbProvider extends AbstractHafasProvider { final String ucType = type.toUpperCase(); - if ("INT".equals(ucType)) // Zürich-Brüssel - return 'I'; if (ucType.startsWith("IC ")) return 'I'; if ("THALYS".equals(ucType)) // Thalys diff --git a/src/de/schildbach/pte/VgsProvider.java b/src/de/schildbach/pte/VgsProvider.java index 06a88a53..f5252547 100644 --- a/src/de/schildbach/pte/VgsProvider.java +++ b/src/de/schildbach/pte/VgsProvider.java @@ -64,7 +64,7 @@ public class VgsProvider extends AbstractHafasProvider return false; } - + @Override protected void setProductBits(final StringBuilder productBits, final char product) { @@ -112,7 +112,6 @@ public class VgsProvider extends AbstractHafasProvider } } - public NearbyStationsResult queryNearbyStations(final Location location, final int maxDistance, final int maxStations) throws IOException { final StringBuilder uri = new StringBuilder(API_BASE); @@ -313,9 +312,6 @@ public class VgsProvider extends AbstractHafasProvider { final String ucType = type.toUpperCase(); - if (ucType.equals("INT")) // Zürich-Brüssel - return 'I'; - if (ucType.equals("E")) // Stadtbahn Karlsruhe: S4/S31/xxxxx return 'S'; @@ -324,13 +320,13 @@ public class VgsProvider extends AbstractHafasProvider if (ucType.equals("BOV")) return 'B'; - if (ucType.equals("T84")) // U.K. - return '?'; - final char t = super.normalizeType(type); if (t != 0) return t; + if (ucType.equals("T84")) // U.K. + return '?'; + return 0; } }