From d0ef68a849ac90a9680bbf358a687d81181d4e98 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Tue, 27 Sep 2011 06:27:10 +0000 Subject: [PATCH] make spEncId optional git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@795 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/AbstractEfaProvider.java | 13 +++++++++++-- src/de/schildbach/pte/VrrProvider.java | 2 +- src/de/schildbach/pte/VvmProvider.java | 2 +- .../schildbach/pte/live/AtcProviderLiveTest.java | 10 +++++++++- .../schildbach/pte/live/AvvProviderLiveTest.java | 8 ++++++++ .../pte/live/BayernProviderLiveTest.java | 8 ++++++++ .../schildbach/pte/live/BsagProviderLiveTest.java | 10 ++++++++++ .../schildbach/pte/live/BsvagProviderLiveTest.java | 8 ++++++++ .../schildbach/pte/live/BvbProviderLiveTest.java | 9 +++++++++ .../schildbach/pte/live/GvhProviderLiveTest.java | 8 ++++++++ .../schildbach/pte/live/KvvProviderLiveTest.java | 8 ++++++++ .../schildbach/pte/live/LinzProviderLiveTest.java | 9 +++++++++ .../schildbach/pte/live/MvgProviderLiveTest.java | 8 ++++++++ .../schildbach/pte/live/MvvProviderLiveTest.java | 8 ++++++++ .../schildbach/pte/live/NaldoProviderLiveTest.java | 8 ++++++++ .../schildbach/pte/live/NvbwProviderLiveTest.java | 8 ++++++++ .../schildbach/pte/live/StvProviderLiveTest.java | 14 +++++++++++--- .../pte/live/VmobilProviderLiveTest.java | 8 ++++++++ .../schildbach/pte/live/VorProviderLiveTest.java | 8 ++++++++ .../schildbach/pte/live/VrnProviderLiveTest.java | 10 +++++++++- .../schildbach/pte/live/VrrProviderLiveTest.java | 8 ++++++++ .../schildbach/pte/live/VvmProviderLiveTest.java | 12 ++++++++++-- .../schildbach/pte/live/VvsProviderLiveTest.java | 10 +++++++++- 23 files changed, 185 insertions(+), 12 deletions(-) diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java index b0d978bf..e770d4e9 100644 --- a/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/src/de/schildbach/pte/AbstractEfaProvider.java @@ -71,6 +71,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider private final String apiBase; private final String additionalQueryParameter; private final boolean canAcceptPoiID; + private final boolean needsSpEncId; private final XmlPullParserFactory parserFactory; public AbstractEfaProvider() @@ -84,6 +85,11 @@ public abstract class AbstractEfaProvider implements NetworkProvider } public AbstractEfaProvider(final String apiBase, final String additionalQueryParameter, final boolean canAcceptPoiID) + { + this(apiBase, additionalQueryParameter, false, false); + } + + public AbstractEfaProvider(final String apiBase, final String additionalQueryParameter, final boolean canAcceptPoiID, final boolean needsSpEncId) { try { @@ -97,6 +103,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider this.apiBase = apiBase; this.additionalQueryParameter = additionalQueryParameter; this.canAcceptPoiID = canAcceptPoiID; + this.needsSpEncId = needsSpEncId; } protected TimeZone timeZone() @@ -121,8 +128,10 @@ public abstract class AbstractEfaProvider implements NetworkProvider appendLocation(uri, constraint, "sf"); if (constraint.type == LocationType.ANY) { - uri.append("&SpEncId=0"); - uri.append("&anyObjFilter_sf=126"); // 1=place 2=stop 4=street 8=address 16=crossing 32=poi 64=postcode + if (needsSpEncId) + uri.append("&SpEncId=0"); + // 1=place 2=stop 4=street 8=address 16=crossing 32=poi 64=postcode + uri.append("&anyObjFilter_sf=").append(2 + 4 + 8 + 16 + 32 + 64); uri.append("&reducedAnyPostcodeObjFilter_sf=64&reducedAnyTooManyObjFilter_sf=2"); uri.append("&useHouseNumberList=true®ionID_sf=1"); } diff --git a/src/de/schildbach/pte/VrrProvider.java b/src/de/schildbach/pte/VrrProvider.java index 8545cf7a..d45c5d6b 100644 --- a/src/de/schildbach/pte/VrrProvider.java +++ b/src/de/schildbach/pte/VrrProvider.java @@ -37,7 +37,7 @@ public class VrrProvider extends AbstractEfaProvider public VrrProvider() { - super(API_BASE, null, false); + super(API_BASE, null, false, true); } public NetworkId id() diff --git a/src/de/schildbach/pte/VvmProvider.java b/src/de/schildbach/pte/VvmProvider.java index fcf33e7e..16a22de6 100644 --- a/src/de/schildbach/pte/VvmProvider.java +++ b/src/de/schildbach/pte/VvmProvider.java @@ -33,7 +33,7 @@ public class VvmProvider extends AbstractEfaProvider public VvmProvider() { - super(API_BASE, null); + super(API_BASE, null, false, true); } public NetworkId id() diff --git a/test/de/schildbach/pte/live/AtcProviderLiveTest.java b/test/de/schildbach/pte/live/AtcProviderLiveTest.java index f98cd922..f37fb9e7 100644 --- a/test/de/schildbach/pte/live/AtcProviderLiveTest.java +++ b/test/de/schildbach/pte/live/AtcProviderLiveTest.java @@ -71,6 +71,14 @@ public class AtcProviderLiveTest list(autocompletes); } + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grünwink"); + + list(autocompletes); + } + private void list(final List autocompletes) { System.out.print(autocompletes.size() + " "); @@ -78,7 +86,7 @@ public class AtcProviderLiveTest System.out.print(autocomplete.toDebugString() + " "); System.out.println(); } - + @Test public void shortConnection() throws Exception { diff --git a/test/de/schildbach/pte/live/AvvProviderLiveTest.java b/test/de/schildbach/pte/live/AvvProviderLiveTest.java index 3b8ae775..b32bdc3c 100644 --- a/test/de/schildbach/pte/live/AvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/AvvProviderLiveTest.java @@ -70,6 +70,14 @@ public class AvvProviderLiveTest list(autocompletes); } + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grünwink"); + + list(autocompletes); + } + private void list(final List autocompletes) { System.out.print(autocompletes.size() + " "); diff --git a/test/de/schildbach/pte/live/BayernProviderLiveTest.java b/test/de/schildbach/pte/live/BayernProviderLiveTest.java index 44c3f5f2..784a2eb6 100644 --- a/test/de/schildbach/pte/live/BayernProviderLiveTest.java +++ b/test/de/schildbach/pte/live/BayernProviderLiveTest.java @@ -69,6 +69,14 @@ public class BayernProviderLiveTest list(autocompletes); } + + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grün"); + + list(autocompletes); + } private void list(final List autocompletes) { diff --git a/test/de/schildbach/pte/live/BsagProviderLiveTest.java b/test/de/schildbach/pte/live/BsagProviderLiveTest.java index 872ffd61..ba34adc8 100644 --- a/test/de/schildbach/pte/live/BsagProviderLiveTest.java +++ b/test/de/schildbach/pte/live/BsagProviderLiveTest.java @@ -60,6 +60,16 @@ public class BsagProviderLiveTest list(autocompletes); } + + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grünwink"); + + list(autocompletes); + } + + private void list(final List autocompletes) { diff --git a/test/de/schildbach/pte/live/BsvagProviderLiveTest.java b/test/de/schildbach/pte/live/BsvagProviderLiveTest.java index d95db4b0..d321d95c 100644 --- a/test/de/schildbach/pte/live/BsvagProviderLiveTest.java +++ b/test/de/schildbach/pte/live/BsvagProviderLiveTest.java @@ -61,6 +61,14 @@ public class BsvagProviderLiveTest list(autocompletes); } + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grün"); + + list(autocompletes); + } + private void list(final List autocompletes) { System.out.print(autocompletes.size() + " "); diff --git a/test/de/schildbach/pte/live/BvbProviderLiveTest.java b/test/de/schildbach/pte/live/BvbProviderLiveTest.java index aa488b8c..58c1e62c 100644 --- a/test/de/schildbach/pte/live/BvbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/BvbProviderLiveTest.java @@ -69,6 +69,15 @@ public class BvbProviderLiveTest list(autocompletes); } + + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grün"); + + list(autocompletes); + } + private void list(final List autocompletes) { diff --git a/test/de/schildbach/pte/live/GvhProviderLiveTest.java b/test/de/schildbach/pte/live/GvhProviderLiveTest.java index add43fb0..d37871f0 100644 --- a/test/de/schildbach/pte/live/GvhProviderLiveTest.java +++ b/test/de/schildbach/pte/live/GvhProviderLiveTest.java @@ -70,6 +70,14 @@ public class GvhProviderLiveTest list(autocompletes); } + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grün"); + + list(autocompletes); + } + @Test public void autocompleteIdentified() throws Exception { diff --git a/test/de/schildbach/pte/live/KvvProviderLiveTest.java b/test/de/schildbach/pte/live/KvvProviderLiveTest.java index 52b14c83..639b2f81 100644 --- a/test/de/schildbach/pte/live/KvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/KvvProviderLiveTest.java @@ -70,6 +70,14 @@ public class KvvProviderLiveTest list(autocompletes); } + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grünwink"); + + list(autocompletes); + } + private void list(final List autocompletes) { System.out.print(autocompletes.size() + " "); diff --git a/test/de/schildbach/pte/live/LinzProviderLiveTest.java b/test/de/schildbach/pte/live/LinzProviderLiveTest.java index 783a30b9..8d9270b3 100644 --- a/test/de/schildbach/pte/live/LinzProviderLiveTest.java +++ b/test/de/schildbach/pte/live/LinzProviderLiveTest.java @@ -68,6 +68,15 @@ public class LinzProviderLiveTest list(autocompletes); } + + + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grün"); + + list(autocompletes); + } @Test public void autocompleteIdentified() throws Exception diff --git a/test/de/schildbach/pte/live/MvgProviderLiveTest.java b/test/de/schildbach/pte/live/MvgProviderLiveTest.java index 56aeb0fb..3e0afacc 100644 --- a/test/de/schildbach/pte/live/MvgProviderLiveTest.java +++ b/test/de/schildbach/pte/live/MvgProviderLiveTest.java @@ -70,6 +70,14 @@ public class MvgProviderLiveTest list(autocompletes); } + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grün"); + + list(autocompletes); + } + private void list(final List autocompletes) { System.out.print(autocompletes.size() + " "); diff --git a/test/de/schildbach/pte/live/MvvProviderLiveTest.java b/test/de/schildbach/pte/live/MvvProviderLiveTest.java index 1848a358..2e73c66e 100644 --- a/test/de/schildbach/pte/live/MvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/MvvProviderLiveTest.java @@ -70,6 +70,14 @@ public class MvvProviderLiveTest list(autocompletes); } + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grün"); + + list(autocompletes); + } + private void list(final List autocompletes) { System.out.print(autocompletes.size() + " "); diff --git a/test/de/schildbach/pte/live/NaldoProviderLiveTest.java b/test/de/schildbach/pte/live/NaldoProviderLiveTest.java index d3f8e683..090d30d6 100644 --- a/test/de/schildbach/pte/live/NaldoProviderLiveTest.java +++ b/test/de/schildbach/pte/live/NaldoProviderLiveTest.java @@ -69,6 +69,14 @@ public class NaldoProviderLiveTest list(autocompletes); } + + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grünwink"); + + list(autocompletes); + } private void list(final List autocompletes) { diff --git a/test/de/schildbach/pte/live/NvbwProviderLiveTest.java b/test/de/schildbach/pte/live/NvbwProviderLiveTest.java index 164f6539..436eb6ce 100644 --- a/test/de/schildbach/pte/live/NvbwProviderLiveTest.java +++ b/test/de/schildbach/pte/live/NvbwProviderLiveTest.java @@ -70,6 +70,14 @@ public class NvbwProviderLiveTest list(autocompletes); } + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grün"); + + list(autocompletes); + } + private void list(final List autocompletes) { System.out.print(autocompletes.size() + " "); diff --git a/test/de/schildbach/pte/live/StvProviderLiveTest.java b/test/de/schildbach/pte/live/StvProviderLiveTest.java index 850e1f17..5677a7ea 100644 --- a/test/de/schildbach/pte/live/StvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/StvProviderLiveTest.java @@ -70,6 +70,14 @@ public class StvProviderLiveTest list(autocompletes); } + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grün"); + + list(autocompletes); + } + private void list(final List autocompletes) { System.out.print(autocompletes.size() + " "); @@ -77,12 +85,12 @@ public class StvProviderLiveTest System.out.print(autocomplete.toDebugString() + " "); System.out.println(); } - + @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), - null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); + final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, + new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL); System.out.println(result); final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/VmobilProviderLiveTest.java b/test/de/schildbach/pte/live/VmobilProviderLiveTest.java index d6015cfe..4d90efcb 100644 --- a/test/de/schildbach/pte/live/VmobilProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VmobilProviderLiveTest.java @@ -70,6 +70,14 @@ public class VmobilProviderLiveTest list(autocompletes); } + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grün"); + + list(autocompletes); + } + private void list(final List autocompletes) { System.out.print(autocompletes.size() + " "); diff --git a/test/de/schildbach/pte/live/VorProviderLiveTest.java b/test/de/schildbach/pte/live/VorProviderLiveTest.java index 378533f8..751b7583 100644 --- a/test/de/schildbach/pte/live/VorProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VorProviderLiveTest.java @@ -70,6 +70,14 @@ public class VorProviderLiveTest list(autocompletes); } + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grün"); + + list(autocompletes); + } + private void list(final List autocompletes) { System.out.print(autocompletes.size() + " "); diff --git a/test/de/schildbach/pte/live/VrnProviderLiveTest.java b/test/de/schildbach/pte/live/VrnProviderLiveTest.java index 71b6aeb6..ed4dcc50 100644 --- a/test/de/schildbach/pte/live/VrnProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VrnProviderLiveTest.java @@ -62,6 +62,14 @@ public class VrnProviderLiveTest System.out.println(result.stationDepartures); } + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grün"); + + list(autocompletes); + } + @Test public void autocompleteIncomplete() throws Exception { @@ -101,7 +109,7 @@ public class VrnProviderLiveTest System.out.print(autocomplete.toDebugString() + " "); System.out.println(); } - + @Test public void shortConnection() throws Exception { diff --git a/test/de/schildbach/pte/live/VrrProviderLiveTest.java b/test/de/schildbach/pte/live/VrrProviderLiveTest.java index b8244ebb..bafba78d 100644 --- a/test/de/schildbach/pte/live/VrrProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VrrProviderLiveTest.java @@ -70,6 +70,14 @@ public class VrrProviderLiveTest list(autocompletes); } + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grün"); + + list(autocompletes); + } + @Test public void autocompleteIdentified() throws Exception { diff --git a/test/de/schildbach/pte/live/VvmProviderLiveTest.java b/test/de/schildbach/pte/live/VvmProviderLiveTest.java index d91f9507..b39d246c 100644 --- a/test/de/schildbach/pte/live/VvmProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VvmProviderLiveTest.java @@ -22,8 +22,8 @@ import java.util.List; import org.junit.Test; -import de.schildbach.pte.VvmProvider; import de.schildbach.pte.NetworkProvider.WalkSpeed; +import de.schildbach.pte.VvmProvider; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -70,6 +70,14 @@ public class VvmProviderLiveTest list(autocompletes); } + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grün"); + + list(autocompletes); + } + private void list(final List autocompletes) { System.out.print(autocompletes.size() + " "); @@ -77,7 +85,7 @@ public class VvmProviderLiveTest System.out.print(autocomplete.toDebugString() + " "); System.out.println(); } - + @Test public void shortConnection() throws Exception { diff --git a/test/de/schildbach/pte/live/VvsProviderLiveTest.java b/test/de/schildbach/pte/live/VvsProviderLiveTest.java index 815dc66a..3970f92a 100644 --- a/test/de/schildbach/pte/live/VvsProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VvsProviderLiveTest.java @@ -70,6 +70,14 @@ public class VvsProviderLiveTest list(autocompletes); } + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grün"); + + list(autocompletes); + } + private void list(final List autocompletes) { System.out.print(autocompletes.size() + " "); @@ -77,7 +85,7 @@ public class VvsProviderLiveTest System.out.print(autocomplete.toDebugString() + " "); System.out.println(); } - + @Test public void shortConnection() throws Exception {