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

Hafas: Improve on splitting place and name for lots of networks.

Browse source
This commit is contained in:
Andreas Schildbach 2014-12-16 13:04:04 +01:00
parent b596ba6f3a
commit 540535b7d5
24 changed files with 372 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

17
enabler/src/de/schildbach/pte/VbbProvider.java
View file

@ -116,10 +116,9 @@ public class VbbProvider extends AbstractHafasProvider
}
private static final Pattern P_SPLIT_NAME_PAREN = Pattern.compile("(.*?) \\((.{4,}?)\\)(?: \\((U|S|S\\+U)\\))?");
private static final Pattern P_SPLIT_NAME_COMMA = Pattern.compile("([^,]*), ([^,]*)");
@Override
protected String[] splitPlaceAndName(final String name)
protected String[] splitStationName(final String name)
{
final Matcher mParen = P_SPLIT_NAME_PAREN.matcher(name);
if (mParen.matches())
@ -128,11 +127,21 @@ public class VbbProvider extends AbstractHafasProvider
return new String[] { mParen.group(2), mParen.group(1) + (su != null ? " (" + su + ")" : "") };
}
final Matcher mComma = P_SPLIT_NAME_COMMA.matcher(name);
final Matcher mComma = P_SPLIT_NAME_FIRST_COMMA.matcher(name);
if (mComma.matches())
return new String[] { mComma.group(1), mComma.group(2) };
return super.splitPlaceAndName(name);
return super.splitStationName(name);
}
@Override
protected String[] splitAddress(final String address)
{
final Matcher mComma = P_SPLIT_NAME_FIRST_COMMA.matcher(address);
if (mComma.matches())
return new String[] { mComma.group(1), mComma.group(2) };
return super.splitStationName(address);
}
@Override