mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-17 21:29:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Extract XML nearby stations parameters to method

Browse source
This commit is contained in:
Andreas Schildbach 2013-07-09 18:34:54 +02:00
parent 1e86a1507e
commit f65aa7ea57
13 changed files with 25 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

13
enabler/src/de/schildbach/pte/AbstractHafasProvider.java
View file

@ -2256,6 +2256,19 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
return m.group(1); return m.group(1);
} }
protected final StringBuilder xmlNearbyStationsParameters(final int stationId)
{
final StringBuilder parameters = new StringBuilder();
parameters.append("?productsFilter=").append(allProductsString());
parameters.append("&boardType=dep");
parameters.append("&input=").append(stationId);
parameters.append("&sTI=1&start=yes&hcount=0&L=vs_java3");
if (clientType != null)
parameters.append("&clientType=").append(ParserUtils.urlEncode(clientType));
return parameters;
}
private static final Pattern P_XML_NEARBY_STATIONS_COARSE = Pattern.compile("\\G<\\s*St\\s*(.*?)/?>(?:\n|\\z)", Pattern.DOTALL); private static final Pattern P_XML_NEARBY_STATIONS_COARSE = Pattern.compile("\\G<\\s*St\\s*(.*?)/?>(?:\n|\\z)", Pattern.DOTALL);
private static final Pattern P_XML_NEARBY_STATIONS_FINE = Pattern.compile("" // private static final Pattern P_XML_NEARBY_STATIONS_FINE = Pattern.compile("" //
+ "evaId=\"(\\d+)\"\\s*" // id + "evaId=\"(\\d+)\"\\s*" // id

6
enabler/src/de/schildbach/pte/DsbProvider.java
View file

@ -125,11 +125,7 @@ public class DsbProvider extends AbstractHafasProvider
else if (location.type == LocationType.STATION && location.hasId()) else if (location.type == LocationType.STATION && location.hasId())
{ {
final StringBuilder uri = new StringBuilder(stationBoardEndpoint); final StringBuilder uri = new StringBuilder(stationBoardEndpoint);
uri.append("?productsFilter=").append(allProductsString()); uri.append(xmlNearbyStationsParameters(location.id));
uri.append("&boardType=dep");
uri.append("&input=").append(location.id);
uri.append("&sTI=1&start=yes&hcount=0");
uri.append("&L=vs_java3");
return xmlNearbyStations(uri.toString()); return xmlNearbyStations(uri.toString());
} }

6
enabler/src/de/schildbach/pte/EireannProvider.java
View file

@ -113,11 +113,7 @@ public class EireannProvider extends AbstractHafasProvider
else if (location.type == LocationType.STATION && location.hasId()) else if (location.type == LocationType.STATION && location.hasId())
{ {
final StringBuilder uri = new StringBuilder(stationBoardEndpoint); final StringBuilder uri = new StringBuilder(stationBoardEndpoint);
uri.append("?productsFilter=").append(allProductsString()); uri.append(xmlNearbyStationsParameters(location.id));
uri.append("&boardType=dep");
uri.append("&input=").append(location.id);
uri.append("&sTI=1&start=yes&hcount=0");
uri.append("&L=vs_java3");
return xmlNearbyStations(uri.toString()); return xmlNearbyStations(uri.toString());
} }

5
enabler/src/de/schildbach/pte/LuProvider.java
View file

@ -133,10 +133,7 @@ public class LuProvider extends AbstractHafasProvider
else if (location.type == LocationType.STATION && location.hasId()) else if (location.type == LocationType.STATION && location.hasId())
{ {
final StringBuilder uri = new StringBuilder(stationBoardEndpoint); final StringBuilder uri = new StringBuilder(stationBoardEndpoint);
uri.append("?productsFilter=").append(allProductsString()); uri.append(xmlNearbyStationsParameters(location.id));
uri.append("&boardType=dep");
uri.append("&input=").append(location.id);
uri.append("&sTI=1&start=yes&hcount=0&L=vs_java3");
return xmlNearbyStations(uri.toString()); return xmlNearbyStations(uri.toString());
} }

6
enabler/src/de/schildbach/pte/NriProvider.java
View file

@ -147,11 +147,7 @@ public class NriProvider extends AbstractHafasProvider
else if (location.type == LocationType.STATION && location.hasId()) else if (location.type == LocationType.STATION && location.hasId())
{ {
final StringBuilder uri = new StringBuilder(stationBoardEndpoint); final StringBuilder uri = new StringBuilder(stationBoardEndpoint);
uri.append("?productsFilter=").append(allProductsString()); uri.append(xmlNearbyStationsParameters(location.id));
uri.append("&boardType=dep");
uri.append("&input=").append(location.id);
uri.append("&sTI=1&start=yes&hcount=0");
uri.append("&L=vs_java3");
return xmlNearbyStations(uri.toString()); return xmlNearbyStations(uri.toString());
} }

6
enabler/src/de/schildbach/pte/PlProvider.java
View file

@ -150,11 +150,7 @@ public class PlProvider extends AbstractHafasProvider
else if (location.type == LocationType.STATION && location.hasId()) else if (location.type == LocationType.STATION && location.hasId())
{ {
final StringBuilder uri = new StringBuilder(stationBoardEndpoint); final StringBuilder uri = new StringBuilder(stationBoardEndpoint);
uri.append("?productsFilter=").append(allProductsString()); uri.append(xmlNearbyStationsParameters(location.id));
uri.append("&boardType=dep");
uri.append("&input=").append(location.id);
uri.append("&sTI=1&start=yes&hcount=0");
uri.append("&L=vs_java3");
return xmlNearbyStations(uri.toString()); return xmlNearbyStations(uri.toString());
} }

6
enabler/src/de/schildbach/pte/RtProvider.java
View file

@ -118,11 +118,7 @@ public class RtProvider extends AbstractHafasProvider
else if (location.type == LocationType.STATION && location.hasId()) else if (location.type == LocationType.STATION && location.hasId())
{ {
final StringBuilder uri = new StringBuilder(stationBoardEndpoint); final StringBuilder uri = new StringBuilder(stationBoardEndpoint);
uri.append("?productsFilter=").append(allProductsString()); uri.append(xmlNearbyStationsParameters(location.id));
uri.append("&boardType=dep");
uri.append("&input=").append(location.id);
uri.append("&sTI=1&start=yes&hcount=0");
uri.append("&L=vs_java3");
return xmlNearbyStations(uri.toString()); return xmlNearbyStations(uri.toString());
} }

6
enabler/src/de/schildbach/pte/SbbProvider.java
View file

@ -112,11 +112,7 @@ public class SbbProvider extends AbstractHafasProvider
else if (location.type == LocationType.STATION && location.hasId()) else if (location.type == LocationType.STATION && location.hasId())
{ {
final StringBuilder uri = new StringBuilder(stationBoardEndpoint); final StringBuilder uri = new StringBuilder(stationBoardEndpoint);
uri.append("?productsFilter=").append(allProductsString()); uri.append(xmlNearbyStationsParameters(location.id));
uri.append("&boardType=dep");
uri.append("&input=").append(location.id);
uri.append("&sTI=1&start=yes&hcount=0");
uri.append("&L=vs_java3");
return xmlNearbyStations(uri.toString()); return xmlNearbyStations(uri.toString());
} }

5
enabler/src/de/schildbach/pte/SeProvider.java
View file

@ -167,10 +167,7 @@ public class SeProvider extends AbstractHafasProvider
else if (location.type == LocationType.STATION && location.hasId()) else if (location.type == LocationType.STATION && location.hasId())
{ {
final StringBuilder uri = new StringBuilder(stationBoardEndpoint); final StringBuilder uri = new StringBuilder(stationBoardEndpoint);
uri.append("?productsFilter=").append(allProductsString()); uri.append(xmlNearbyStationsParameters(location.id));
uri.append("&boardType=dep");
uri.append("&input=").append(location.id);
uri.append("&sTI=1&start=yes&hcount=0&L=vs_java3");
return xmlNearbyStations(uri.toString()); return xmlNearbyStations(uri.toString());
} }

5
enabler/src/de/schildbach/pte/StockholmProvider.java
View file

@ -156,10 +156,7 @@ public class StockholmProvider extends AbstractHafasProvider
else if (location.type == LocationType.STATION && location.hasId()) else if (location.type == LocationType.STATION && location.hasId())
{ {
final StringBuilder uri = new StringBuilder(stationBoardEndpoint); final StringBuilder uri = new StringBuilder(stationBoardEndpoint);
uri.append("?productsFilter=").append(allProductsString()); uri.append(xmlNearbyStationsParameters(location.id));
uri.append("&boardType=dep");
uri.append("&input=").append(location.id);
uri.append("&sTI=1&start=yes&hcount=0&L=vs_java3");
return xmlNearbyStations(uri.toString()); return xmlNearbyStations(uri.toString());
} }

6
enabler/src/de/schildbach/pte/VbbProvider.java
View file

@ -154,11 +154,7 @@ public class VbbProvider extends AbstractHafasProvider
else if (location.type == LocationType.STATION && location.hasId()) else if (location.type == LocationType.STATION && location.hasId())
{ {
final StringBuilder uri = new StringBuilder(stationBoardEndpoint); final StringBuilder uri = new StringBuilder(stationBoardEndpoint);
uri.append("?productsFilter=").append(allProductsString()); uri.append(xmlNearbyStationsParameters(location.id));
uri.append("&boardType=dep");
uri.append("&input=").append(location.id);
uri.append("&sTI=1&start=yes&hcount=0");
uri.append("&L=vs_java3");
return xmlNearbyStations(uri.toString()); return xmlNearbyStations(uri.toString());
} }

6
enabler/src/de/schildbach/pte/VbnProvider.java
View file

@ -117,11 +117,7 @@ public class VbnProvider extends AbstractHafasProvider
else if (location.type == LocationType.STATION && location.hasId()) else if (location.type == LocationType.STATION && location.hasId())
{ {
final StringBuilder uri = new StringBuilder(stationBoardEndpoint); final StringBuilder uri = new StringBuilder(stationBoardEndpoint);
uri.append("?productsFilter=").append(allProductsString()); uri.append(xmlNearbyStationsParameters(location.id));
uri.append("&boardType=dep");
uri.append("&input=").append(location.id);
uri.append("&sTI=1&start=yes&hcount=0");
uri.append("&L=vs_java3");
return xmlNearbyStations(uri.toString()); return xmlNearbyStations(uri.toString());
} }

6
enabler/src/de/schildbach/pte/ZvvProvider.java
View file

@ -178,11 +178,7 @@ public class ZvvProvider extends AbstractHafasProvider
else if (location.type == LocationType.STATION && location.hasId()) else if (location.type == LocationType.STATION && location.hasId())
{ {
final StringBuilder uri = new StringBuilder(stationBoardEndpoint); final StringBuilder uri = new StringBuilder(stationBoardEndpoint);
uri.append("?productsFilter=").append(allProductsString()); uri.append(xmlNearbyStationsParameters(location.id));
uri.append("&boardType=dep");
uri.append("&input=").append(location.id);
uri.append("&sTI=1&start=yes&hcount=0");
uri.append("&L=vs_java3");
return xmlNearbyStations(uri.toString()); return xmlNearbyStations(uri.toString());
} }