From 5c2b555d0dcf34820a3c06c486bd27b414b4744b Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sun, 13 Oct 2013 10:53:30 +0200 Subject: [PATCH] Extract JSON nearby stations parameters to method --- .../de/schildbach/pte/AbstractHafasProvider.java | 16 ++++++++++++++++ enabler/src/de/schildbach/pte/BahnProvider.java | 9 +-------- .../src/de/schildbach/pte/EireannProvider.java | 8 +------- enabler/src/de/schildbach/pte/LuProvider.java | 8 +------- enabler/src/de/schildbach/pte/NasaProvider.java | 9 +-------- enabler/src/de/schildbach/pte/NriProvider.java | 8 +------- enabler/src/de/schildbach/pte/NvvProvider.java | 9 +-------- enabler/src/de/schildbach/pte/OebbProvider.java | 8 +------- enabler/src/de/schildbach/pte/PlProvider.java | 8 +------- enabler/src/de/schildbach/pte/RtProvider.java | 8 +------- enabler/src/de/schildbach/pte/SbbProvider.java | 8 +------- enabler/src/de/schildbach/pte/SeProvider.java | 8 +------- enabler/src/de/schildbach/pte/SncbProvider.java | 9 +-------- .../src/de/schildbach/pte/StockholmProvider.java | 8 +------- enabler/src/de/schildbach/pte/VbbProvider.java | 8 +------- enabler/src/de/schildbach/pte/VbnProvider.java | 8 +------- enabler/src/de/schildbach/pte/VgsProvider.java | 8 +------- enabler/src/de/schildbach/pte/ZvvProvider.java | 8 +------- 18 files changed, 33 insertions(+), 123 deletions(-) diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java index c4fac618..0739e210 100644 --- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java @@ -2361,6 +2361,22 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider return new NearbyStationsResult(null, stations); } + protected final StringBuilder jsonNearbyStationsParameters(final Location location, final int maxDistance, final int maxStations) + { + final StringBuilder parameters = new StringBuilder(); + + parameters.append('y'); + parameters.append("?performLocating=2&tpl=stop2json"); + parameters.append("&look_maxno=").append(maxStations != 0 ? maxStations : 200); + parameters.append("&look_maxdist=").append(maxDistance != 0 ? maxDistance : 5000); + parameters.append("&look_stopclass=").append(allProductsInt()); + parameters.append("&look_nv=get_stopweight|yes"); + parameters.append("&look_x=").append(location.lon); + parameters.append("&look_y=").append(location.lat); + + return parameters; + } + protected final NearbyStationsResult jsonNearbyStations(final String uri) throws IOException { final CharSequence page = ParserUtils.scrape(uri, null, jsonNearbyStationsEncoding, null); diff --git a/enabler/src/de/schildbach/pte/BahnProvider.java b/enabler/src/de/schildbach/pte/BahnProvider.java index 2b3b9e94..95b4e693 100644 --- a/enabler/src/de/schildbach/pte/BahnProvider.java +++ b/enabler/src/de/schildbach/pte/BahnProvider.java @@ -144,14 +144,7 @@ public final class BahnProvider extends AbstractHafasProvider if (location.hasLocation()) { final StringBuilder uri = new StringBuilder(queryEndpoint); - uri.append('y'); - uri.append("?performLocating=2&tpl=stop2json"); - uri.append("&look_maxno=").append(maxStations != 0 ? maxStations : 200); - uri.append("&look_maxdist=").append(maxDistance != 0 ? maxDistance : 5000); - uri.append("&look_stopclass=").append(allProductsInt()); - uri.append("&look_nv=get_stopweight|yes"); - uri.append("&look_x=").append(location.lon); - uri.append("&look_y=").append(location.lat); + uri.append(jsonNearbyStationsParameters(location, maxDistance, maxStations)); return jsonNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/EireannProvider.java b/enabler/src/de/schildbach/pte/EireannProvider.java index ed08cfc1..fbbb11af 100644 --- a/enabler/src/de/schildbach/pte/EireannProvider.java +++ b/enabler/src/de/schildbach/pte/EireannProvider.java @@ -100,13 +100,7 @@ public class EireannProvider extends AbstractHafasProvider if (location.hasLocation()) { final StringBuilder uri = new StringBuilder(queryEndpoint); - uri.append('y'); - uri.append("?performLocating=2&tpl=stop2json"); - uri.append("&look_maxno=").append(maxStations != 0 ? maxStations : 200); - uri.append("&look_maxdist=").append(maxDistance != 0 ? maxDistance : 5000); - uri.append("&look_stopclass=").append(allProductsInt()); - uri.append("&look_x=").append(location.lon); - uri.append("&look_y=").append(location.lat); + uri.append(jsonNearbyStationsParameters(location, maxDistance, maxStations)); return jsonNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/LuProvider.java b/enabler/src/de/schildbach/pte/LuProvider.java index f25cd6e6..e4c8544b 100644 --- a/enabler/src/de/schildbach/pte/LuProvider.java +++ b/enabler/src/de/schildbach/pte/LuProvider.java @@ -120,13 +120,7 @@ public class LuProvider extends AbstractHafasProvider if (location.hasLocation()) { final StringBuilder uri = new StringBuilder(queryEndpoint); - uri.append('y'); - uri.append("?performLocating=2&tpl=stop2json"); - uri.append("&look_maxno=").append(maxStations != 0 ? maxStations : 200); - uri.append("&look_maxdist=").append(maxDistance != 0 ? maxDistance : 5000); - uri.append("&look_stopclass=").append(allProductsInt()); - uri.append("&look_x=").append(location.lon); - uri.append("&look_y=").append(location.lat); + uri.append(jsonNearbyStationsParameters(location, maxDistance, maxStations)); return jsonNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/NasaProvider.java b/enabler/src/de/schildbach/pte/NasaProvider.java index f1b15b0d..2cc3b662 100644 --- a/enabler/src/de/schildbach/pte/NasaProvider.java +++ b/enabler/src/de/schildbach/pte/NasaProvider.java @@ -139,14 +139,7 @@ public class NasaProvider extends AbstractHafasProvider if (location.hasLocation()) { final StringBuilder uri = new StringBuilder(queryEndpoint); - uri.append('y'); - uri.append("?performLocating=2&tpl=stop2json"); - uri.append("&look_maxno=").append(maxStations != 0 ? maxStations : 200); - uri.append("&look_maxdist=").append(maxDistance != 0 ? maxDistance : 5000); - uri.append("&look_stopclass=").append(allProductsInt()); - uri.append("&look_nv=get_stopweight|yes"); - uri.append("&look_x=").append(location.lon); - uri.append("&look_y=").append(location.lat); + uri.append(jsonNearbyStationsParameters(location, maxDistance, maxStations)); return jsonNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/NriProvider.java b/enabler/src/de/schildbach/pte/NriProvider.java index 0b44051a..87bf2234 100644 --- a/enabler/src/de/schildbach/pte/NriProvider.java +++ b/enabler/src/de/schildbach/pte/NriProvider.java @@ -134,13 +134,7 @@ public class NriProvider extends AbstractHafasProvider if (location.hasLocation()) { final StringBuilder uri = new StringBuilder(queryEndpoint); - uri.append('y'); - uri.append("?performLocating=2&tpl=stop2json"); - uri.append("&look_maxno=").append(maxStations != 0 ? maxStations : 150); - uri.append("&look_maxdist=").append(maxDistance != 0 ? maxDistance : 5000); - uri.append("&look_stopclass=").append(allProductsInt()); - uri.append("&look_x=").append(location.lon); - uri.append("&look_y=").append(location.lat); + uri.append(jsonNearbyStationsParameters(location, maxDistance, maxStations)); return jsonNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/NvvProvider.java b/enabler/src/de/schildbach/pte/NvvProvider.java index aa5979ca..dc99d088 100644 --- a/enabler/src/de/schildbach/pte/NvvProvider.java +++ b/enabler/src/de/schildbach/pte/NvvProvider.java @@ -160,14 +160,7 @@ public class NvvProvider extends AbstractHafasProvider if (location.hasLocation()) { final StringBuilder uri = new StringBuilder(queryEndpoint); - uri.append('y'); - uri.append("?performLocating=2&tpl=stop2json"); - uri.append("&look_maxno=").append(maxStations != 0 ? maxStations : 200); - uri.append("&look_maxdist=").append(maxDistance != 0 ? maxDistance : 5000); - uri.append("&look_stopclass=").append(allProductsInt()); - uri.append("&look_nv=get_stopweight|yes"); - uri.append("&look_x=").append(location.lon); - uri.append("&look_y=").append(location.lat); + uri.append(jsonNearbyStationsParameters(location, maxDistance, maxStations)); return jsonNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/OebbProvider.java b/enabler/src/de/schildbach/pte/OebbProvider.java index 0a5a0734..9ff9fa39 100644 --- a/enabler/src/de/schildbach/pte/OebbProvider.java +++ b/enabler/src/de/schildbach/pte/OebbProvider.java @@ -149,13 +149,7 @@ public class OebbProvider extends AbstractHafasProvider if (location.hasLocation()) { final StringBuilder uri = new StringBuilder(queryEndpoint); - uri.append('y'); - uri.append("?performLocating=2&tpl=stop2json"); - uri.append("&look_maxno=").append(maxStations != 0 ? maxStations : 200); - uri.append("&look_maxdist=").append(maxDistance != 0 ? maxDistance : 5000); - uri.append("&look_stopclass=").append(allProductsInt()); - uri.append("&look_x=").append(location.lon); - uri.append("&look_y=").append(location.lat); + uri.append(jsonNearbyStationsParameters(location, maxDistance, maxStations)); return jsonNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/PlProvider.java b/enabler/src/de/schildbach/pte/PlProvider.java index 94f2004d..aefcb1ef 100644 --- a/enabler/src/de/schildbach/pte/PlProvider.java +++ b/enabler/src/de/schildbach/pte/PlProvider.java @@ -137,13 +137,7 @@ public class PlProvider extends AbstractHafasProvider if (location.hasLocation()) { final StringBuilder uri = new StringBuilder(queryEndpoint); - uri.append('y'); - uri.append("?performLocating=2&tpl=stop2json"); - uri.append("&look_maxno=").append(maxStations != 0 ? maxStations : 200); - uri.append("&look_maxdist=").append(maxDistance != 0 ? maxDistance : 5000); - uri.append("&look_stopclass=").append(allProductsInt()); - uri.append("&look_x=").append(location.lon); - uri.append("&look_y=").append(location.lat); + uri.append(jsonNearbyStationsParameters(location, maxDistance, maxStations)); return jsonNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/RtProvider.java b/enabler/src/de/schildbach/pte/RtProvider.java index 36bc1bf9..9b51e0ae 100644 --- a/enabler/src/de/schildbach/pte/RtProvider.java +++ b/enabler/src/de/schildbach/pte/RtProvider.java @@ -105,13 +105,7 @@ public class RtProvider extends AbstractHafasProvider if (location.hasLocation()) { final StringBuilder uri = new StringBuilder(queryEndpoint); - uri.append('y'); - uri.append("?performLocating=2&tpl=stop2json"); - uri.append("&look_maxno=").append(maxStations != 0 ? maxStations : 200); - uri.append("&look_maxdist=").append(maxDistance != 0 ? maxDistance : 5000); - uri.append("&look_stopclass=").append(allProductsInt()); - uri.append("&look_x=").append(location.lon); - uri.append("&look_y=").append(location.lat); + uri.append(jsonNearbyStationsParameters(location, maxDistance, maxStations)); return jsonNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/SbbProvider.java b/enabler/src/de/schildbach/pte/SbbProvider.java index ff409c4a..71b3825c 100644 --- a/enabler/src/de/schildbach/pte/SbbProvider.java +++ b/enabler/src/de/schildbach/pte/SbbProvider.java @@ -99,13 +99,7 @@ public class SbbProvider extends AbstractHafasProvider if (location.hasLocation()) { final StringBuilder uri = new StringBuilder(queryEndpoint); - uri.append('y'); - uri.append("?performLocating=2&tpl=stop2json"); - uri.append("&look_maxno=").append(maxStations != 0 ? maxStations : 200); - uri.append("&look_maxdist=").append(maxDistance != 0 ? maxDistance : 5000); - uri.append("&look_stopclass=").append(allProductsInt()); - uri.append("&look_x=").append(location.lon); - uri.append("&look_y=").append(location.lat); + uri.append(jsonNearbyStationsParameters(location, maxDistance, maxStations)); return jsonNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/SeProvider.java b/enabler/src/de/schildbach/pte/SeProvider.java index 2eb2692a..7a828260 100644 --- a/enabler/src/de/schildbach/pte/SeProvider.java +++ b/enabler/src/de/schildbach/pte/SeProvider.java @@ -159,13 +159,7 @@ public class SeProvider extends AbstractHafasProvider if (location.hasLocation()) { final StringBuilder uri = new StringBuilder(queryEndpoint); - uri.append('y'); - uri.append("?performLocating=2&tpl=stop2json"); - uri.append("&look_maxno=").append(maxStations != 0 ? maxStations : 150); - uri.append("&look_maxdist=").append(maxDistance != 0 ? maxDistance : 5000); - uri.append("&look_stopclass=").append(allProductsInt()); - uri.append("&look_x=").append(location.lon); - uri.append("&look_y=").append(location.lat); + uri.append(jsonNearbyStationsParameters(location, maxDistance, maxStations)); return jsonNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/SncbProvider.java b/enabler/src/de/schildbach/pte/SncbProvider.java index e810f342..e4289652 100644 --- a/enabler/src/de/schildbach/pte/SncbProvider.java +++ b/enabler/src/de/schildbach/pte/SncbProvider.java @@ -129,14 +129,7 @@ public class SncbProvider extends AbstractHafasProvider if (location.hasLocation()) { final StringBuilder uri = new StringBuilder(queryEndpoint); - uri.append('y'); - uri.append("?performLocating=2&tpl=stop2json"); - uri.append("&look_maxno=").append(maxStations != 0 ? maxStations : 200); - uri.append("&look_maxdist=").append(maxDistance != 0 ? maxDistance : 5000); - uri.append("&look_stopclass=").append(allProductsInt()); - uri.append("&look_nv=get_stopweight|yes"); - uri.append("&look_x=").append(location.lon); - uri.append("&look_y=").append(location.lat); + uri.append(jsonNearbyStationsParameters(location, maxDistance, maxStations)); return jsonNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/StockholmProvider.java b/enabler/src/de/schildbach/pte/StockholmProvider.java index 1e9da7d8..b877051b 100644 --- a/enabler/src/de/schildbach/pte/StockholmProvider.java +++ b/enabler/src/de/schildbach/pte/StockholmProvider.java @@ -145,13 +145,7 @@ public class StockholmProvider extends AbstractHafasProvider if (location.hasLocation()) { final StringBuilder uri = new StringBuilder(queryEndpoint); - uri.append('y'); - uri.append("?performLocating=2&tpl=stop2json"); - uri.append("&look_maxno=").append(maxStations != 0 ? maxStations : 200); - uri.append("&look_maxdist=").append(maxDistance != 0 ? maxDistance : 5000); - uri.append("&look_stopclass=").append(allProductsInt()); - uri.append("&look_x=").append(location.lon); - uri.append("&look_y=").append(location.lat); + uri.append(jsonNearbyStationsParameters(location, maxDistance, maxStations)); return jsonNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/VbbProvider.java b/enabler/src/de/schildbach/pte/VbbProvider.java index 9103783d..2b07ed08 100644 --- a/enabler/src/de/schildbach/pte/VbbProvider.java +++ b/enabler/src/de/schildbach/pte/VbbProvider.java @@ -141,13 +141,7 @@ public class VbbProvider extends AbstractHafasProvider if (location.hasLocation()) { final StringBuilder uri = new StringBuilder(queryEndpoint); - uri.append('y'); - uri.append("?performLocating=2&tpl=stop2json"); - uri.append("&look_maxno=").append(maxStations != 0 ? maxStations : 200); - uri.append("&look_maxdist=").append(maxDistance != 0 ? maxDistance : 5000); - uri.append("&look_stopclass=").append(allProductsInt()); - uri.append("&look_x=").append(location.lon); - uri.append("&look_y=").append(location.lat); + uri.append(jsonNearbyStationsParameters(location, maxDistance, maxStations)); return jsonNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/VbnProvider.java b/enabler/src/de/schildbach/pte/VbnProvider.java index 5a14e630..7c897c2a 100644 --- a/enabler/src/de/schildbach/pte/VbnProvider.java +++ b/enabler/src/de/schildbach/pte/VbnProvider.java @@ -124,13 +124,7 @@ public class VbnProvider extends AbstractHafasProvider if (location.hasLocation()) { final StringBuilder uri = new StringBuilder(queryEndpoint); - uri.append('y'); - uri.append("?performLocating=2&tpl=stop2json"); - uri.append("&look_maxno=").append(maxStations != 0 ? maxStations : 200); - uri.append("&look_maxdist=").append(maxDistance != 0 ? maxDistance : 5000); - uri.append("&look_stopclass=").append(allProductsInt()); - uri.append("&look_x=").append(location.lon); - uri.append("&look_y=").append(location.lat); + uri.append(jsonNearbyStationsParameters(location, maxDistance, maxStations)); return jsonNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/VgsProvider.java b/enabler/src/de/schildbach/pte/VgsProvider.java index 1b621a51..5ca6a18a 100644 --- a/enabler/src/de/schildbach/pte/VgsProvider.java +++ b/enabler/src/de/schildbach/pte/VgsProvider.java @@ -125,13 +125,7 @@ public class VgsProvider extends AbstractHafasProvider if (location.hasLocation()) { final StringBuilder uri = new StringBuilder(queryEndpoint); - uri.append('y'); - uri.append("?performLocating=2&tpl=stop2json"); - uri.append("&look_maxno=").append(maxStations != 0 ? maxStations : 200); - uri.append("&look_maxdist=").append(maxDistance != 0 ? maxDistance : 5000); - uri.append("&look_stopclass=").append(allProductsInt()); - uri.append("&look_x=").append(location.lon); - uri.append("&look_y=").append(location.lat); + uri.append(jsonNearbyStationsParameters(location, maxDistance, maxStations)); return jsonNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/ZvvProvider.java b/enabler/src/de/schildbach/pte/ZvvProvider.java index 1c5cde6b..99785e48 100644 --- a/enabler/src/de/schildbach/pte/ZvvProvider.java +++ b/enabler/src/de/schildbach/pte/ZvvProvider.java @@ -167,13 +167,7 @@ public class ZvvProvider extends AbstractHafasProvider if (location.hasLocation()) { final StringBuilder uri = new StringBuilder(queryEndpoint); - uri.append('y'); - uri.append("?performLocating=2&tpl=stop2json"); - uri.append("&look_maxno=").append(maxStations != 0 ? maxStations : 150); - uri.append("&look_maxdist=").append(maxDistance != 0 ? maxDistance : 5000); - uri.append("&look_stopclass=").append(allProductsInt()); - uri.append("&look_x=").append(location.lon); - uri.append("&look_y=").append(location.lat); + uri.append(jsonNearbyStationsParameters(location, maxDistance, maxStations)); return jsonNearbyStations(uri.toString()); }