diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java index 93b7637f..84eb1f0c 100644 --- a/src/de/schildbach/pte/BahnProvider.java +++ b/src/de/schildbach/pte/BahnProvider.java @@ -484,7 +484,7 @@ public final class BahnProvider implements NetworkProvider if (ParserUtils.timeDiff(parsed.getTime(), currentTime) < -PARSER_DAY_ROLLOVER_THRESHOLD_MS) parsed.add(Calendar.DAY_OF_MONTH, 1); - return new Departure(parsed.getTime(), line, line != null ? LINES.get(line.charAt(0)) : null, destination); + return new Departure(parsed.getTime(), line, line != null ? LINES.get(line.charAt(0)) : null, 0, destination); } private static final Pattern P_NORMALIZE_LINE_NUMBER = Pattern.compile("\\d{2,5}"); diff --git a/src/de/schildbach/pte/Departure.java b/src/de/schildbach/pte/Departure.java index 1e1fcbea..a7ce0e07 100644 --- a/src/de/schildbach/pte/Departure.java +++ b/src/de/schildbach/pte/Departure.java @@ -27,13 +27,15 @@ public final class Departure final public Date time; final public String line; final public int[] lineColors; + final public int destinationId; final public String destination; - public Departure(final Date time, final String line, final int[] lineColors, final String destination) + public Departure(final Date time, final String line, final int[] lineColors, final int destinationId, final String destination) { this.time = time; this.line = line; this.lineColors = lineColors; + this.destinationId = destinationId; this.destination = destination; } @@ -45,6 +47,8 @@ public final class Departure builder.append(","); builder.append(line != null ? line : "null"); builder.append(","); + builder.append(destinationId); + builder.append(","); builder.append(destination != null ? destination : "null"); builder.append(")"); return builder.toString(); @@ -66,6 +70,8 @@ public final class Departure return false; if (this.line != null && !this.line.equals(other.line)) return false; + if (this.destinationId != other.destinationId) + return false; if (!this.destination.equals(other.destination)) return false; return true; @@ -79,6 +85,8 @@ public final class Departure if (line != null) hashCode += line.hashCode(); hashCode *= 29; + hashCode += destinationId; + hashCode *= 29; hashCode += destination.hashCode(); return hashCode; } diff --git a/src/de/schildbach/pte/MvvProvider.java b/src/de/schildbach/pte/MvvProvider.java index 69ef65e6..62289ac5 100644 --- a/src/de/schildbach/pte/MvvProvider.java +++ b/src/de/schildbach/pte/MvvProvider.java @@ -522,7 +522,7 @@ public class MvvProvider implements NetworkProvider calendar.set(Calendar.MINUTE, Integer.parseInt(mDepFine.group(4))); final String normalizedLine = normalizeLine(mDepFine.group(5), mDepFine.group(6)); final String destination = normalizeStationName(mDepFine.group(7)); - final Departure departure = new Departure(calendar.getTime(), normalizedLine, LINES.get(normalizedLine), destination); + final Departure departure = new Departure(calendar.getTime(), normalizedLine, LINES.get(normalizedLine), 0, destination); departures.add(departure); } else diff --git a/src/de/schildbach/pte/RmvProvider.java b/src/de/schildbach/pte/RmvProvider.java index 5c99e213..202a14e0 100644 --- a/src/de/schildbach/pte/RmvProvider.java +++ b/src/de/schildbach/pte/RmvProvider.java @@ -480,7 +480,7 @@ public class RmvProvider implements NetworkProvider if (ParserUtils.timeDiff(parsed.getTime(), currentTime) < -PARSER_DAY_ROLLOVER_THRESHOLD_MS) parsed.add(Calendar.DAY_OF_MONTH, 1); - return new Departure(parsed.getTime(), line, line != null ? LINES.get(line.charAt(0)) : null, destination); + return new Departure(parsed.getTime(), line, line != null ? LINES.get(line.charAt(0)) : null, 0, destination); } private static final Pattern P_NORMALIZE_LINE = Pattern.compile("([A-Za-zÄÖÜäöüß]+)[\\s-]*(.*)"); diff --git a/src/de/schildbach/pte/SbbProvider.java b/src/de/schildbach/pte/SbbProvider.java index c5a458f2..b4866226 100644 --- a/src/de/schildbach/pte/SbbProvider.java +++ b/src/de/schildbach/pte/SbbProvider.java @@ -430,7 +430,7 @@ public class SbbProvider implements NetworkProvider if (ParserUtils.timeDiff(parsed.getTime(), currentTime) < -PARSER_DAY_ROLLOVER_THRESHOLD_MS) parsed.add(Calendar.DAY_OF_MONTH, 1); - return new Departure(parsed.getTime(), line, line != null ? LINES.get(line.charAt(0)) : null, destination); + return new Departure(parsed.getTime(), line, line != null ? LINES.get(line.charAt(0)) : null, 0, destination); } private static final Pattern P_NORMALIZE_LINE = Pattern.compile("([A-Za-zÄÖÜäöüß]+)[\\s-]*(.*)"); diff --git a/src/de/schildbach/pte/VbbProvider.java b/src/de/schildbach/pte/VbbProvider.java index e3847e01..bce2e345 100644 --- a/src/de/schildbach/pte/VbbProvider.java +++ b/src/de/schildbach/pte/VbbProvider.java @@ -451,15 +451,15 @@ public final class VbbProvider implements NetworkProvider return uri.toString(); } - private static final Pattern P_DEPARTURES_HEAD = Pattern.compile(".*(.*?).*Datum:(.*?)
.*", Pattern.DOTALL); + private static final Pattern P_DEPARTURES_HEAD = Pattern.compile(".*?(.*?).*?Datum:(.*?)
.*", Pattern.DOTALL); private static final Pattern P_DEPARTURES_COARSE = Pattern.compile( "\\s*((?:|).+?)\\s*", Pattern.DOTALL); private static final Pattern P_DEPARTURES_LIVE_FINE = Pattern.compile("\\s*(.*?)[\\s\\*]*\\s*" // + "\\s*(.*?)\\s*\\s*" // + ".*?\\s*(.*?)\\s*.*?", Pattern.DOTALL); - private static final Pattern P_DEPARTURES_PLAN_FINE = Pattern.compile("\\s*(.*?)[\\s\\*]*\\s*" // - + "\\s*\\s*(.*?)[\\s\\*]*.*?\\s*" // - + "\\s*\\s*(.*?)\\s*\\s*", Pattern.DOTALL); + private static final Pattern P_DEPARTURES_PLAN_FINE = Pattern.compile("(\\d{2}:\\d{2}).*?" // + + "\\s*(.*?)[\\s\\*]*.*?" // + + "\\s*(.*?)\\s*.*?", Pattern.DOTALL); private static final Pattern P_DEPARTURES_SERVICE_DOWN = Pattern.compile("Wartungsarbeiten"); private static final Pattern P_DEPARTURES_URI_STATION_ID = Pattern.compile("input=(\\d+)"); @@ -491,7 +491,27 @@ public final class VbbProvider implements NetworkProvider final Matcher mDepFine = (live ? P_DEPARTURES_LIVE_FINE : P_DEPARTURES_PLAN_FINE).matcher(mDepCoarse.group(1)); if (mDepFine.matches()) { - final Departure dep = parseDeparture(mDepFine, currentTime); + // time + final Calendar current = new GregorianCalendar(); + current.setTime(currentTime); + final Calendar parsed = new GregorianCalendar(); + parsed.setTime(ParserUtils.parseTime(mDepFine.group(1))); + parsed.set(Calendar.YEAR, current.get(Calendar.YEAR)); + parsed.set(Calendar.MONTH, current.get(Calendar.MONTH)); + parsed.set(Calendar.DAY_OF_MONTH, current.get(Calendar.DAY_OF_MONTH)); + if (ParserUtils.timeDiff(parsed.getTime(), currentTime) < -PARSER_DAY_ROLLOVER_THRESHOLD_MS) + parsed.add(Calendar.DAY_OF_MONTH, 1); + + // line + final String line = normalizeLine(ParserUtils.resolveEntities(mDepFine.group(2))); + + // destinationId + final int destinationId = !live ? Integer.parseInt(mDepFine.group(3)) : 0; + + // destination + final String destination = ParserUtils.resolveEntities(mDepFine.group(live ? 3 : 4)); + + final Departure dep = new Departure(parsed.getTime(), line, line != null ? LINES.get(line) : null, destinationId, destination); if (!departures.contains(dep)) departures.add(dep); } @@ -509,28 +529,6 @@ public final class VbbProvider implements NetworkProvider } } - private static Departure parseDeparture(final Matcher mDep, final Date currentTime) - { - // time - final Calendar current = new GregorianCalendar(); - current.setTime(currentTime); - final Calendar parsed = new GregorianCalendar(); - parsed.setTime(ParserUtils.parseTime(mDep.group(1))); - parsed.set(Calendar.YEAR, current.get(Calendar.YEAR)); - parsed.set(Calendar.MONTH, current.get(Calendar.MONTH)); - parsed.set(Calendar.DAY_OF_MONTH, current.get(Calendar.DAY_OF_MONTH)); - if (ParserUtils.timeDiff(parsed.getTime(), currentTime) < -PARSER_DAY_ROLLOVER_THRESHOLD_MS) - parsed.add(Calendar.DAY_OF_MONTH, 1); - - // line - final String line = normalizeLine(ParserUtils.resolveEntities(mDep.group(2))); - - // destination - final String destination = ParserUtils.resolveEntities(mDep.group(3)); - - return new Departure(parsed.getTime(), line, line != null ? LINES.get(line) : null, destination); - } - private static final Date parseDate(String str) { try