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

Russia lines

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@894 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2012-01-21 17:39:54 +00:00
parent 455ca30ea3
commit be1ed2efe6
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/de/schildbach/pte/AbstractHafasProvider.java
View file

@ -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
{

2
src/de/schildbach/pte/BahnProvider.java
View file

@ -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