diff --git a/enabler/src/de/schildbach/pte/VrrProvider.java b/enabler/src/de/schildbach/pte/VrrProvider.java index 7268dcda..d3cc0e3e 100644 --- a/enabler/src/de/schildbach/pte/VrrProvider.java +++ b/enabler/src/de/schildbach/pte/VrrProvider.java @@ -17,13 +17,9 @@ package de.schildbach.pte; -import java.io.IOException; import java.util.HashMap; -import java.util.List; import java.util.Map; -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.Style; /** @@ -39,6 +35,7 @@ public class VrrProvider extends AbstractEfaProvider super(API_BASE); setUseRouteIndexAsTripId(false); + setIncludeRegionId(false); setNeedsSpEncId(true); setStyles(STYLES); } @@ -57,12 +54,6 @@ public class VrrProvider extends AbstractEfaProvider return false; } - @Override - public List autocompleteStations(final CharSequence constraint) throws IOException - { - return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); - } - @Override protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType, final String trainNum, final String trainName) diff --git a/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java index d6af6685..cb9c6988 100644 --- a/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java @@ -17,7 +17,9 @@ package de.schildbach.pte.live; +import static org.hamcrest.CoreMatchers.hasItem; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import java.util.Date; @@ -109,6 +111,30 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest print(autocompletes); } + @Test + public void autocompleteCoverage() throws Exception + { + final List cologneAutocompletes = provider.autocompleteStations("Köln Ebertplatz"); + print(cologneAutocompletes); + assertThat(cologneAutocompletes, hasItem(new Location(LocationType.STATION, 22000035))); + + final List dortmundAutocompletes = provider.autocompleteStations("Dortmund Zugstraße"); + print(dortmundAutocompletes); + assertThat(dortmundAutocompletes, hasItem(new Location(LocationType.STATION, 20000524))); + + final List duesseldorfAutocompletes = provider.autocompleteStations("Düsseldorf Sternstraße"); + print(duesseldorfAutocompletes); + assertThat(duesseldorfAutocompletes, hasItem(new Location(LocationType.STATION, 20018017))); + + final List muensterAutocompletes = provider.autocompleteStations("Münster Vennheideweg"); + print(muensterAutocompletes); + assertThat(muensterAutocompletes, hasItem(new Location(LocationType.STATION, 24047291))); + + final List aachenAutocompletes = provider.autocompleteStations("Aachen Elisenbrunnen"); + print(aachenAutocompletes); + assertThat(aachenAutocompletes, hasItem(new Location(LocationType.STATION, 21001029))); + } + @Test public void autocompleteCity() throws Exception {