mirror of
https://gitlab.com/oeffi/public-transport-enabler.git
synced 2025-07-10 18:08:47 +00:00
Russia lines
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@894 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
parent
455ca30ea3
commit
be1ed2efe6
2 changed files with 4 additions and 7 deletions
|
@ -1879,8 +1879,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
|
||||||
protected static final Pattern P_NORMALIZE_LINE_AND_TYPE = Pattern.compile("([^#]*)#(.*)");
|
protected static final Pattern P_NORMALIZE_LINE_AND_TYPE = Pattern.compile("([^#]*)#(.*)");
|
||||||
private static final Pattern P_NORMALIZE_LINE_NUMBER = Pattern.compile("\\d{2,5}");
|
private static final Pattern P_NORMALIZE_LINE_NUMBER = Pattern.compile("\\d{2,5}");
|
||||||
|
|
||||||
// saved from RtProvider
|
protected static final Pattern P_LINE_RUSSIA = Pattern
|
||||||
// private static final Pattern P_NORMALIZE_LINE_RUSSIA = Pattern.compile("(\\d{3}(BJ|FJ|IJ|MJ|NJ|OJ|TJ|SZ))");
|
.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)
|
protected Line parseLineAndType(final String lineAndType)
|
||||||
{
|
{
|
||||||
|
@ -1896,9 +1896,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
|
||||||
return newLine("?");
|
return newLine("?");
|
||||||
if (P_NORMALIZE_LINE_NUMBER.matcher(number).matches())
|
if (P_NORMALIZE_LINE_NUMBER.matcher(number).matches())
|
||||||
return newLine("?" + number);
|
return newLine("?" + number);
|
||||||
// saved from RtProvider
|
if (P_LINE_RUSSIA.matcher(number).matches())
|
||||||
// if (P_NORMALIZE_LINE_RUSSIA.matcher(number).matches())
|
return newLine('R' + number);
|
||||||
// return 'R' + number;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -535,8 +535,6 @@ public final class BahnProvider extends AbstractHafasProvider
|
||||||
return 0;
|
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}");
|
private static final Pattern P_LINE_NUMBER = Pattern.compile("\\d{2,5}");
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue