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

VRS: Use patterns for parsing positions from departures.

Browse source
This commit is contained in:
Andreas Schildbach 2016-11-08 10:35:14 +01:00
parent a844c5bc56
commit 7d131a57f2
1 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,6 +46,8 @@ import javax.annotation.Nullable;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.base.Charsets; import com.google.common.base.Charsets;
import com.google.common.base.Strings; import com.google.common.base.Strings;
@ -79,6 +81,9 @@ import okhttp3.HttpUrl;
* @author Michael Dyrna * @author Michael Dyrna
*/ */
public class VrsProvider extends AbstractNetworkProvider { public class VrsProvider extends AbstractNetworkProvider {
private static final Logger log = LoggerFactory.getLogger(VrsProvider.class);
@SuppressWarnings("serial") @SuppressWarnings("serial")
private static class Context implements QueryTripsContext { private static class Context implements QueryTripsContext {
private boolean canQueryLater = true; private boolean canQueryLater = true;
@ -150,17 +155,19 @@ public class VrsProvider extends AbstractNetworkProvider {
protected static final String SERVER_PRODUCT = "vrs"; protected static final String SERVER_PRODUCT = "vrs";
@SuppressWarnings("serial") @SuppressWarnings("serial")
protected static final List<Pattern> nameWithPositionPatterns = new ArrayList<Pattern>() { protected static final List<Pattern> NAME_WITH_POSITION_PATTERNS = new ArrayList<Pattern>() {
{ {
// Bonn Hauptbahnhof (ZOB) - Bussteig F2 // Bonn Hauptbahnhof (ZOB) - Bussteig F2
// Beuel Bf - D // Beuel Bf - D
add(Pattern.compile("(.*) - (.*)")); add(Pattern.compile("(.*) - (.*)"));
// Breslauer Platz/Hbf (U) Gleis 2 // Breslauer Platz/Hbf (U) Gleis 2
add(Pattern.compile("(.*) Gleis (.*)")); add(Pattern.compile("(.*) Gleis (.*)"));
// Bonn Hauptbahnhof (Stadtbahn) (Bahnsteig H)
add(Pattern.compile("(.*) \\(Bahnsteig ([^)]*)\\)"));
// Düren Bf (Bussteig D/E) // Düren Bf (Bussteig D/E)
add(Pattern.compile("(.*) \\(Bussteig (.*)\\)")); add(Pattern.compile("(.*) \\(Bussteig ([^)]*)\\)"));
// Venloer Str./Gürtel (Gleis 1) // Venloer Str./Gürtel (Gleis 1)
add(Pattern.compile("(.*) \\(Gleis (.*)\\)")); add(Pattern.compile("(?:(.*) )?\\(Gleis ([^)]*)\\)"));
// Aachen alle Buslinien // Aachen alle Buslinien
add(Pattern.compile("(.*) \\(H\\.(\\d+).*\\)")); add(Pattern.compile("(.*) \\(H\\.(\\d+).*\\)"));
// Neumarkt Bussteig B // Neumarkt Bussteig B
@ -475,12 +482,16 @@ public class VrsProvider extends AbstractNetworkProvider {
Position position = null; Position position = null;
final JSONObject post = event.optJSONObject("post"); final JSONObject post = event.optJSONObject("post");
if (post != null) { if (post != null) {
final String positionStr = post.getString("name"); final String postName = post.getString("name");
// examples for post: for (Pattern pattern : NAME_WITH_POSITION_PATTERNS) {
// (U) Gleis 2 Matcher matcher = pattern.matcher(postName);
// Bonn Hauptbahnhof (ZOB) - Bussteig C4 if (matcher.matches()) {
// A position = new Position(matcher.group(2));
position = new Position(positionStr.substring(positionStr.lastIndexOf(' ') + 1)); break;
}
}
if (position == null)
log.info("Could not extract position from '{}'", postName);
} }
final Location destination = new Location(LocationType.STATION, null /* id */, null /* place */, final Location destination = new Location(LocationType.STATION, null /* id */, null /* place */,
lineObj.getString("direction")); lineObj.getString("direction"));
@ -1065,7 +1076,7 @@ public class VrsProvider extends AbstractNetworkProvider {
locationType = LocationType.STATION; locationType = LocationType.STATION;
id = location.getString("id"); id = location.getString("id");
name = location.getString("name"); name = location.getString("name");
for (Pattern pattern : nameWithPositionPatterns) { for (Pattern pattern : NAME_WITH_POSITION_PATTERNS) {
Matcher matcher = pattern.matcher(name); Matcher matcher = pattern.matcher(name);
if (matcher.matches()) { if (matcher.matches()) {
name = matcher.group(1); name = matcher.group(1);