mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-14 16:40:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hafas: Improve handling of station name suffixes.

Browse source
This commit is contained in:
Andreas Schildbach 2015-01-09 14:43:57 +01:00
parent 593e032df4
commit 0122de4bb5
5 changed files with 49 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
enabler/src/de/schildbach/pte/AbstractHafasProvider.java
View file

@ -248,6 +248,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
protected static final Pattern P_SPLIT_NAME_FIRST_COMMA = Pattern.compile("([^,]*), (.*)"); protected static final Pattern P_SPLIT_NAME_FIRST_COMMA = Pattern.compile("([^,]*), (.*)");
protected static final Pattern P_SPLIT_NAME_LAST_COMMA = Pattern.compile("(.*), ([^,]*)"); protected static final Pattern P_SPLIT_NAME_LAST_COMMA = Pattern.compile("(.*), ([^,]*)");
protected static final Pattern P_SPLIT_NAME_PAREN = Pattern.compile("(.*) \\((.{3,}?)\\)");
protected String[] splitStationName(final String name) protected String[] splitStationName(final String name)
{ {

31
enabler/src/de/schildbach/pte/BvgProvider.java
View file

@ -119,25 +119,42 @@ public final class BvgProvider extends AbstractHafasProvider
} }
} }
private static final Pattern P_SPLIT_NAME_PAREN = Pattern.compile("(.*?) +\\((.{4,}?)\\)(?: +\\((U|S|S\\+U)\\))?"); private static final Pattern P_SPLIT_NAME_SU = Pattern.compile("(.*?)(?:\\s+\\((S|U|S\\+U)\\))?");
private static final Pattern P_SPLIT_NAME_BUS = Pattern.compile("(.*?)(\\s+\\[[^\\]]+\\])?");
@Override @Override
protected String[] splitStationName(final String name) protected String[] splitStationName(String name)
{ {
final Matcher mSu = P_SPLIT_NAME_SU.matcher(name);
if (!mSu.matches())
throw new IllegalStateException(name);
name = mSu.group(1);
final String su = mSu.group(2);
final Matcher mBus = P_SPLIT_NAME_BUS.matcher(name);
if (!mBus.matches())
throw new IllegalStateException(name);
name = mBus.group(1);
final Matcher mParen = P_SPLIT_NAME_PAREN.matcher(name); final Matcher mParen = P_SPLIT_NAME_PAREN.matcher(name);
if (mParen.matches()) if (mParen.matches())
{ return new String[] { normalizePlace(mParen.group(2)), (su != null ? su + " " : "") + mParen.group(1) };
final String su = mParen.group(3);
return new String[] { mParen.group(2), mParen.group(1) + (su != null ? " (" + su + ")" : "") };
}
final Matcher mComma = P_SPLIT_NAME_FIRST_COMMA.matcher(name); final Matcher mComma = P_SPLIT_NAME_FIRST_COMMA.matcher(name);
if (mComma.matches()) if (mComma.matches())
return new String[] { mComma.group(1), mComma.group(2) }; return new String[] { normalizePlace(mComma.group(1)), mComma.group(2) };
return super.splitStationName(name); return super.splitStationName(name);
} }
private String normalizePlace(final String place)
{
if ("Bln".equals(place))
return "Berlin";
else
return place;
}
@Override @Override
protected String[] splitAddress(final String address) protected String[] splitAddress(final String address)
{ {

3
enabler/src/de/schildbach/pte/DsbProvider.java
View file

@ -19,7 +19,6 @@ package de.schildbach.pte;
import java.util.Collection; import java.util.Collection;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern;
import de.schildbach.pte.dto.Product; import de.schildbach.pte.dto.Product;
@ -122,8 +121,6 @@ public class DsbProvider extends AbstractHafasProvider
} }
} }
private static final Pattern P_SPLIT_NAME_PAREN = Pattern.compile("(.*) \\((.{4,}?)\\)");
@Override @Override
protected String[] splitStationName(final String name) protected String[] splitStationName(final String name)
{ {

3
enabler/src/de/schildbach/pte/StockholmProvider.java
View file

@ -20,7 +20,6 @@ package de.schildbach.pte;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern;
import de.schildbach.pte.dto.Line; import de.schildbach.pte.dto.Line;
import de.schildbach.pte.dto.Product; import de.schildbach.pte.dto.Product;
@ -112,8 +111,6 @@ public class StockholmProvider extends AbstractHafasProvider
} }
} }
private static final Pattern P_SPLIT_NAME_PAREN = Pattern.compile("(.*) \\((.{4,}?)\\)");
@Override @Override
protected String[] splitStationName(final String name) protected String[] splitStationName(final String name)
{ {

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

@ -115,25 +115,42 @@ 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_SU = Pattern.compile("(.*?)(?:\\s+\\((S|U|S\\+U)\\))?");
private static final Pattern P_SPLIT_NAME_BUS = Pattern.compile("(.*?)(\\s+\\[[^\\]]+\\])?");
@Override @Override
protected String[] splitStationName(final String name) protected String[] splitStationName(String name)
{ {
final Matcher mSu = P_SPLIT_NAME_SU.matcher(name);
if (!mSu.matches())
throw new IllegalStateException(name);
name = mSu.group(1);
final String su = mSu.group(2);
final Matcher mBus = P_SPLIT_NAME_BUS.matcher(name);
if (!mBus.matches())
throw new IllegalStateException(name);
name = mBus.group(1);
final Matcher mParen = P_SPLIT_NAME_PAREN.matcher(name); final Matcher mParen = P_SPLIT_NAME_PAREN.matcher(name);
if (mParen.matches()) if (mParen.matches())
{ return new String[] { normalizePlace(mParen.group(2)), (su != null ? su + " " : "") + mParen.group(1) };
final String su = mParen.group(3);
return new String[] { mParen.group(2), mParen.group(1) + (su != null ? " (" + su + ")" : "") };
}
final Matcher mComma = P_SPLIT_NAME_FIRST_COMMA.matcher(name); final Matcher mComma = P_SPLIT_NAME_FIRST_COMMA.matcher(name);
if (mComma.matches()) if (mComma.matches())
return new String[] { mComma.group(1), mComma.group(2) }; return new String[] { normalizePlace(mComma.group(1)), mComma.group(2) };
return super.splitStationName(name); return super.splitStationName(name);
} }
private String normalizePlace(final String place)
{
if ("Bln".equals(place))
return "Berlin";
else
return place;
}
@Override @Override
protected String[] splitAddress(final String address) protected String[] splitAddress(final String address)
{ {