From dafd2d1a45dffeec1e689d0ac7f4f1dc3efafb85 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Mon, 28 Feb 2011 10:15:43 +0000 Subject: [PATCH] stricter patterns git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@509 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/BvgProvider.java | 10 +++++----- test/de/schildbach/pte/live/BvgProviderLiveTest.java | 12 ++++++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/de/schildbach/pte/BvgProvider.java b/src/de/schildbach/pte/BvgProvider.java index e1f275f2..b31732ab 100644 --- a/src/de/schildbach/pte/BvgProvider.java +++ b/src/de/schildbach/pte/BvgProvider.java @@ -440,7 +440,7 @@ public final class BvgProvider extends AbstractHafasProvider private static final Pattern P_CONNECTION_DETAILS_HEAD = Pattern.compile(".*(?:Datum|Abfahrt): (\\d\\d\\.\\d\\d\\.\\d\\d).*", Pattern.DOTALL); private static final Pattern P_CONNECTION_DETAILS_COARSE = Pattern.compile("

\n(.+?)

", Pattern.DOTALL); - static final Pattern P_CONNECTION_DETAILS_FINE = Pattern.compile("(?:(?:\n)?" // departureId + static final Pattern P_CONNECTION_DETAILS_FINE = Pattern.compile("(?:(?:\n)?" // departureId + "(.+?)(?:\n)?)?.*?" // departure + "(?:" // + "ab (\\d+:\\d+)\n" // departureTime @@ -449,14 +449,14 @@ public final class BvgProvider extends AbstractHafasProvider + "Ri\\. (.*?)[\n\\.]*<.*?" // destination + "an (\\d+:\\d+)\n" // arrivalTime + "(Gl\\. \\d+)?.*?" // arrivalPosition - + "\n" // arrivalId - + "(.*?)" // arrival + + "\n" // arrivalId + + "([^<]*)" // arrival + "|" // + "(\\d+) Min\\.\n" // footway + "(?:Fussweg|Übergang)\n" // + "
\n" // - + "(?:\n" // arrivalId - + "(.*?)|([^<]*)|([^<]*)).*?" // arrival + + "(?:\n" // arrivalId + + "([^<]*)|([^<]*)|([^<]*)).*?" // arrival + ").*?", Pattern.DOTALL); @Override diff --git a/test/de/schildbach/pte/live/BvgProviderLiveTest.java b/test/de/schildbach/pte/live/BvgProviderLiveTest.java index ce7a0f1a..0f3b0b9a 100644 --- a/test/de/schildbach/pte/live/BvgProviderLiveTest.java +++ b/test/de/schildbach/pte/live/BvgProviderLiveTest.java @@ -81,4 +81,16 @@ public class BvgProviderLiveTest provider.getConnectionDetails(connection.link); System.out.println(moreResult); } + + @Test + public void connectionBetweenCoordinates() throws Exception + { + final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 52501507, 13357026), null, + new Location(LocationType.ADDRESS, 0, 52513639, 13568648), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + System.out.println(result); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + for (final Connection connection : result.connections) + provider.getConnectionDetails(connection.link); + System.out.println(moreResult); + } }