split more places

git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@465 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-01-29 01:11:35 +00:00
parent 37a93d92c3
commit c3dbd13f6f

View file

@ -71,13 +71,13 @@ public class RmvProvider extends AbstractHafasProvider
}
private static final String[] PLACES = { "Frankfurt (Main)", "Offenbach (Main)", "Mainz", "Wiesbaden", "Marburg", "Kassel", "Hanau", "Göttingen",
"Darmstadt", "Aschaffenburg" };
"Darmstadt", "Aschaffenburg", "Berlin" };
@Override
protected String[] splitNameAndPlace(final String name)
{
for (final String place : PLACES)
if (name.startsWith(place + " "))
if (name.startsWith(place + " ") || name.startsWith(place + "-"))
return new String[] { place, name.substring(place.length() + 1) };
return super.splitNameAndPlace(name);
@ -440,7 +440,7 @@ public class RmvProvider extends AbstractHafasProvider
+ "<p class=\"qs\">\n(.*?)</p>\n" // head
+ "(.*?)<p class=\"links\">.*?" // departures
+ "input=(\\d+).*?" // locationId
+ "|(Eingabe kann nicht interpretiert)" // messages
+ "|(Eingabe kann nicht interpretiert|Eingabe ist nicht eindeutig)" // messages
+ "|(Internal Error)" // messages
+ ").*?", Pattern.DOTALL);
private static final Pattern P_DEPARTURES_HEAD_FINE = Pattern.compile("" //