From be1ed2efe646713edbde9b86c997f1f4dd3b1a1c Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Sat, 21 Jan 2012 17:39:54 +0000 Subject: [PATCH] Russia lines git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@894 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/AbstractHafasProvider.java | 9 ++++----- src/de/schildbach/pte/BahnProvider.java | 2 -- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/de/schildbach/pte/AbstractHafasProvider.java b/src/de/schildbach/pte/AbstractHafasProvider.java index 5cbb88a0..92d2f14a 100644 --- a/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/src/de/schildbach/pte/AbstractHafasProvider.java @@ -1879,8 +1879,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider protected static final Pattern P_NORMALIZE_LINE_AND_TYPE = Pattern.compile("([^#]*)#(.*)"); private static final Pattern P_NORMALIZE_LINE_NUMBER = Pattern.compile("\\d{2,5}"); - // saved from RtProvider - // private static final Pattern P_NORMALIZE_LINE_RUSSIA = Pattern.compile("(\\d{3}(BJ|FJ|IJ|MJ|NJ|OJ|TJ|SZ))"); + protected static final Pattern P_LINE_RUSSIA = Pattern + .compile("\\d{3}(?:AJ|BJ|DJ|FJ|GJ|IJ|KJ|LJ|NJ|MJ|OJ|RJ|SJ|TJ|UJ|VJ|ZJ|CH|KH|ZH|EI|JA|JI|MZ|SH|PC|Y)"); protected Line parseLineAndType(final String lineAndType) { @@ -1896,9 +1896,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider return newLine("?"); if (P_NORMALIZE_LINE_NUMBER.matcher(number).matches()) return newLine("?" + number); - // saved from RtProvider - // if (P_NORMALIZE_LINE_RUSSIA.matcher(number).matches()) - // return 'R' + number; + if (P_LINE_RUSSIA.matcher(number).matches()) + return newLine('R' + number); } else { diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java index 45f2c9f2..86a64684 100644 --- a/src/de/schildbach/pte/BahnProvider.java +++ b/src/de/schildbach/pte/BahnProvider.java @@ -535,8 +535,6 @@ public final class BahnProvider extends AbstractHafasProvider return 0; } - private static final Pattern P_LINE_RUSSIA = Pattern - .compile("\\d{3}(?:AJ|BJ|DJ|FJ|GJ|IJ|KJ|LJ|NJ|MJ|OJ|RJ|SJ|TJ|UJ|VJ|ZJ|CH|KH|ZH|EI|JA|JI|MZ|SH|PC|Y)"); private static final Pattern P_LINE_NUMBER = Pattern.compile("\\d{2,5}"); @Override