diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java index aab61d23..a06faa8c 100644 --- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java @@ -92,9 +92,10 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider private static final String REQC_PROD = "hafas"; protected static final int DEFAULT_MAX_DEPARTURES = 100; - protected final String stationBoardEndpoint; - protected final String getStopEndpoint; - protected final String queryEndpoint; + protected String stationBoardEndpoint; + protected String getStopEndpoint; + protected String queryEndpoint; + private @Nullable String extXmlEndpoint = null; private Product[] productsMap; private @Nullable String accessId = null; private @Nullable String clientType = "ANDROID"; @@ -103,7 +104,6 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider private Charset jsonNearbyLocationsEncoding = Charsets.ISO_8859_1; private boolean dominantPlanStopTime = false; private boolean useIso8601 = false; - private @Nullable String extXmlEndpoint = null; private boolean stationBoardHasStationTable = true; private boolean stationBoardHasLocation = false; private boolean stationBoardCanDoEquivs = true; @@ -162,17 +162,36 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider } } - public AbstractHafasProvider(final NetworkId network, final String stationBoardEndpoint, final String getStopEndpoint, final String queryEndpoint, - final Product[] productsMap) + public AbstractHafasProvider(final NetworkId network, final String apiBase, final String apiLanguage, final Product[] productsMap) { super(network); - this.stationBoardEndpoint = stationBoardEndpoint; - this.getStopEndpoint = getStopEndpoint; - this.queryEndpoint = queryEndpoint; + this.stationBoardEndpoint = apiBase + "stboard.exe/" + apiLanguage; + this.getStopEndpoint = apiBase + "ajax-getstop.exe/" + apiLanguage; + this.queryEndpoint = apiBase + "query.exe/" + apiLanguage; this.productsMap = productsMap; } + protected void setStationBoardEndpoint(final String stationBoardEndpoint) + { + this.stationBoardEndpoint = stationBoardEndpoint; + } + + protected void setGetStopEndpoint(final String getStopEndpoint) + { + this.getStopEndpoint = getStopEndpoint; + } + + protected void setQueryEndpoint(final String queryEndpoint) + { + this.queryEndpoint = queryEndpoint; + } + + protected void setExtXmlEndpoint(final String extXmlEndpoint) + { + this.extXmlEndpoint = extXmlEndpoint; + } + protected void setClientType(final String clientType) { this.clientType = clientType; @@ -208,11 +227,6 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider this.useIso8601 = useIso8601; } - protected void setExtXmlEndpoint(final String extXmlEndpoint) - { - this.extXmlEndpoint = extXmlEndpoint; - } - protected void setStationBoardHasStationTable(final boolean stationBoardHasStationTable) { this.stationBoardHasStationTable = stationBoardHasStationTable; diff --git a/enabler/src/de/schildbach/pte/BahnProvider.java b/enabler/src/de/schildbach/pte/BahnProvider.java index f6198571..48a9140a 100644 --- a/enabler/src/de/schildbach/pte/BahnProvider.java +++ b/enabler/src/de/schildbach/pte/BahnProvider.java @@ -29,15 +29,15 @@ import de.schildbach.pte.dto.Product; public final class BahnProvider extends AbstractHafasProvider { private static final String API_BASE = "http://reiseauskunft.bahn.de/bin/"; - private static final String API_BASE_STATION_BOARD = "http://mobile.bahn.de/bin/mobil/"; private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.HIGH_SPEED_TRAIN, Product.REGIONAL_TRAIN, Product.REGIONAL_TRAIN, Product.SUBURBAN_TRAIN, Product.BUS, Product.FERRY, Product.SUBWAY, Product.TRAM, Product.ON_DEMAND, null, null, null, null }; public BahnProvider() { - super(NetworkId.DB, API_BASE_STATION_BOARD + "bhftafel.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", PRODUCTS_MAP); + super(NetworkId.DB, API_BASE, "dn", PRODUCTS_MAP); + setStationBoardEndpoint("http://mobile.bahn.de/bin/mobil/bhftafel.exe/dn"); setStationBoardHasStationTable(false); setJsonGetStopsUseWeight(false); } diff --git a/enabler/src/de/schildbach/pte/BvgProvider.java b/enabler/src/de/schildbach/pte/BvgProvider.java index 4f7edfee..d7779f4b 100644 --- a/enabler/src/de/schildbach/pte/BvgProvider.java +++ b/enabler/src/de/schildbach/pte/BvgProvider.java @@ -38,14 +38,16 @@ import de.schildbach.pte.geo.Berlin; public final class BvgProvider extends AbstractHafasProvider { private static final String API_BASE = "https://fahrinfo.bvg.de/Fahrinfo/bin/"; - private static final String API_BASE_STATION_BOARD = "http://bvg.hafas.de/bin/"; private static final Product[] PRODUCTS_MAP = { Product.SUBURBAN_TRAIN, Product.SUBWAY, Product.TRAM, Product.BUS, Product.FERRY, Product.HIGH_SPEED_TRAIN, Product.REGIONAL_TRAIN, Product.ON_DEMAND }; public BvgProvider() { - super(NetworkId.BVG, API_BASE_STATION_BOARD + "stboard.exe/dn", API_BASE + "ajax-getstop.bin/dny", API_BASE + "query.bin/dn", PRODUCTS_MAP); + super(NetworkId.BVG, API_BASE, "dn", PRODUCTS_MAP); + setStationBoardEndpoint("http://bvg.hafas.de/bin/stboard.exe/dn"); + setGetStopEndpoint(API_BASE + "ajax-getstop.bin/dn"); + setQueryEndpoint(API_BASE + "query.bin/dn"); setJsonGetStopsUseWeight(false); setJsonGetStopsEncoding(Charsets.UTF_8); setJsonNearbyLocationsEncoding(Charsets.UTF_8); diff --git a/enabler/src/de/schildbach/pte/DsbProvider.java b/enabler/src/de/schildbach/pte/DsbProvider.java index 699278fd..7f6bb19a 100644 --- a/enabler/src/de/schildbach/pte/DsbProvider.java +++ b/enabler/src/de/schildbach/pte/DsbProvider.java @@ -36,7 +36,7 @@ public class DsbProvider extends AbstractHafasProvider public DsbProvider() { - super(NetworkId.DSB, API_BASE + "stboard.exe/mn", API_BASE + "ajax-getstop.exe/mn", API_BASE + "query.exe/dn", PRODUCTS_MAP); + super(NetworkId.DSB, API_BASE, "mn", PRODUCTS_MAP); setStationBoardHasStationTable(false); } diff --git a/enabler/src/de/schildbach/pte/EireannProvider.java b/enabler/src/de/schildbach/pte/EireannProvider.java index 68714fab..303248a3 100644 --- a/enabler/src/de/schildbach/pte/EireannProvider.java +++ b/enabler/src/de/schildbach/pte/EireannProvider.java @@ -43,7 +43,7 @@ public class EireannProvider extends AbstractHafasProvider public EireannProvider() { - super(NetworkId.EIREANN, API_BASE + "stboard.exe/en", API_BASE + "ajax-getstop.exe/en", API_BASE + "query.exe/en", PRODUCTS_MAP); + super(NetworkId.EIREANN, API_BASE, "en", PRODUCTS_MAP); setStationBoardHasStationTable(false); } diff --git a/enabler/src/de/schildbach/pte/InvgProvider.java b/enabler/src/de/schildbach/pte/InvgProvider.java index bf2a61ff..3f7db59a 100644 --- a/enabler/src/de/schildbach/pte/InvgProvider.java +++ b/enabler/src/de/schildbach/pte/InvgProvider.java @@ -66,7 +66,7 @@ public class InvgProvider extends AbstractHafasProvider public InvgProvider() { - super(NetworkId.INVG, API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", PRODUCTS_MAP); + super(NetworkId.INVG, API_BASE, "dn", PRODUCTS_MAP); setStationBoardCanDoEquivs(false); setJsonGetStopsEncoding(Charsets.UTF_8); diff --git a/enabler/src/de/schildbach/pte/JetProvider.java b/enabler/src/de/schildbach/pte/JetProvider.java index 4a0d2ccb..a29d22c1 100644 --- a/enabler/src/de/schildbach/pte/JetProvider.java +++ b/enabler/src/de/schildbach/pte/JetProvider.java @@ -42,7 +42,7 @@ public class JetProvider extends AbstractHafasProvider public JetProvider() { - super(NetworkId.JET, API_BASE + "stboard.bin/yn", API_BASE + "ajax-getstop.bin/yn", API_BASE + "query.bin/yn", PRODUCTS_MAP); + super(NetworkId.JET, API_BASE, "yn", PRODUCTS_MAP); setJsonGetStopsEncoding(Charsets.UTF_8); setJsonNearbyLocationsEncoding(Charsets.UTF_8); diff --git a/enabler/src/de/schildbach/pte/LuProvider.java b/enabler/src/de/schildbach/pte/LuProvider.java index be27ba7f..ebb043f2 100644 --- a/enabler/src/de/schildbach/pte/LuProvider.java +++ b/enabler/src/de/schildbach/pte/LuProvider.java @@ -34,7 +34,7 @@ public class LuProvider extends AbstractHafasProvider public LuProvider() { - super(NetworkId.LU, API_BASE + "stboard.exe/fn", API_BASE + "ajax-getstop.exe/fn", API_BASE + "query.exe/fn", PRODUCTS_MAP); + super(NetworkId.LU, API_BASE, "fn", PRODUCTS_MAP); setJsonGetStopsEncoding(Charsets.UTF_8); setJsonNearbyLocationsEncoding(Charsets.UTF_8); diff --git a/enabler/src/de/schildbach/pte/NasaProvider.java b/enabler/src/de/schildbach/pte/NasaProvider.java index f08fb586..e242fdf9 100644 --- a/enabler/src/de/schildbach/pte/NasaProvider.java +++ b/enabler/src/de/schildbach/pte/NasaProvider.java @@ -40,7 +40,7 @@ public class NasaProvider extends AbstractHafasProvider public NasaProvider() { - super(NetworkId.NASA, API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", PRODUCTS_MAP); + super(NetworkId.NASA, API_BASE, "dn", PRODUCTS_MAP); setJsonGetStopsEncoding(Charsets.UTF_8); setJsonNearbyLocationsEncoding(Charsets.UTF_8); diff --git a/enabler/src/de/schildbach/pte/NriProvider.java b/enabler/src/de/schildbach/pte/NriProvider.java index 61f3d010..86c7b0ff 100644 --- a/enabler/src/de/schildbach/pte/NriProvider.java +++ b/enabler/src/de/schildbach/pte/NriProvider.java @@ -41,7 +41,7 @@ public class NriProvider extends AbstractHafasProvider public NriProvider() { - super(NetworkId.NRI, API_BASE + "stboard.exe/on", API_BASE + "ajax-getstop.exe/ony", API_BASE + "query.exe/on", PRODUCTS_MAP); + super(NetworkId.NRI, API_BASE, "on", PRODUCTS_MAP); setJsonGetStopsEncoding(Charsets.UTF_8); } diff --git a/enabler/src/de/schildbach/pte/NsProvider.java b/enabler/src/de/schildbach/pte/NsProvider.java index 7de2e903..fe33e073 100644 --- a/enabler/src/de/schildbach/pte/NsProvider.java +++ b/enabler/src/de/schildbach/pte/NsProvider.java @@ -39,7 +39,7 @@ public class NsProvider extends AbstractHafasProvider public NsProvider() { - super(NetworkId.NS, API_BASE + "stboard.exe/nn", API_BASE + "ajax-getstop.exe/nny", API_BASE + "query.exe/nn", PRODUCTS_MAP); + super(NetworkId.NS, API_BASE, "nn", PRODUCTS_MAP); setHtmlNearbyStationsPattern(HTML_NEARBY_STATIONS_PATTERN); setStationBoardHasLocation(true); diff --git a/enabler/src/de/schildbach/pte/NvvProvider.java b/enabler/src/de/schildbach/pte/NvvProvider.java index 77ec541a..2fcc98ac 100644 --- a/enabler/src/de/schildbach/pte/NvvProvider.java +++ b/enabler/src/de/schildbach/pte/NvvProvider.java @@ -41,7 +41,7 @@ public class NvvProvider extends AbstractHafasProvider public NvvProvider() { - super(NetworkId.NVV, API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", PRODUCTS_MAP); + super(NetworkId.NVV, API_BASE, "dn", PRODUCTS_MAP); setJsonGetStopsEncoding(Charsets.UTF_8); setJsonNearbyLocationsEncoding(Charsets.UTF_8); diff --git a/enabler/src/de/schildbach/pte/OebbProvider.java b/enabler/src/de/schildbach/pte/OebbProvider.java index 8fb95c73..10f9065b 100644 --- a/enabler/src/de/schildbach/pte/OebbProvider.java +++ b/enabler/src/de/schildbach/pte/OebbProvider.java @@ -41,7 +41,7 @@ public class OebbProvider extends AbstractHafasProvider public OebbProvider() { - super(NetworkId.OEBB, API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dny", API_BASE + "query.exe/dn", PRODUCTS_MAP); + super(NetworkId.OEBB, API_BASE, "dn", PRODUCTS_MAP); setDominantPlanStopTime(true); setJsonGetStopsEncoding(Charsets.UTF_8); diff --git a/enabler/src/de/schildbach/pte/PlProvider.java b/enabler/src/de/schildbach/pte/PlProvider.java index 95ed61cd..e9df8a9d 100644 --- a/enabler/src/de/schildbach/pte/PlProvider.java +++ b/enabler/src/de/schildbach/pte/PlProvider.java @@ -35,7 +35,7 @@ public class PlProvider extends AbstractHafasProvider public PlProvider() { - super(NetworkId.PL, API_BASE + "stboard.exe/pn", API_BASE + "ajax-getstop.exe/pn", API_BASE + "query.exe/pn", PRODUCTS_MAP); + super(NetworkId.PL, API_BASE, "pn", PRODUCTS_MAP); setJsonGetStopsEncoding(Charsets.UTF_8); setJsonNearbyLocationsEncoding(Charsets.UTF_8); diff --git a/enabler/src/de/schildbach/pte/RsagProvider.java b/enabler/src/de/schildbach/pte/RsagProvider.java index 1090d656..a10b48f3 100644 --- a/enabler/src/de/schildbach/pte/RsagProvider.java +++ b/enabler/src/de/schildbach/pte/RsagProvider.java @@ -40,7 +40,7 @@ public class RsagProvider extends AbstractHafasProvider public RsagProvider() { - super(NetworkId.RSAG, API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", PRODUCTS_MAP); + super(NetworkId.RSAG, API_BASE, "dn", PRODUCTS_MAP); setJsonGetStopsEncoding(Charsets.UTF_8); setJsonNearbyLocationsEncoding(Charsets.UTF_8); diff --git a/enabler/src/de/schildbach/pte/RtProvider.java b/enabler/src/de/schildbach/pte/RtProvider.java index 27befaf3..1802ddce 100644 --- a/enabler/src/de/schildbach/pte/RtProvider.java +++ b/enabler/src/de/schildbach/pte/RtProvider.java @@ -35,7 +35,7 @@ public class RtProvider extends AbstractHafasProvider public RtProvider() { - super(NetworkId.RT, API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", PRODUCTS_MAP); + super(NetworkId.RT, API_BASE, "dn", PRODUCTS_MAP); setJsonGetStopsEncoding(Charsets.UTF_8); setJsonNearbyLocationsEncoding(Charsets.ISO_8859_1); diff --git a/enabler/src/de/schildbach/pte/SbbProvider.java b/enabler/src/de/schildbach/pte/SbbProvider.java index 4e7bdc7b..5209fe11 100644 --- a/enabler/src/de/schildbach/pte/SbbProvider.java +++ b/enabler/src/de/schildbach/pte/SbbProvider.java @@ -33,7 +33,7 @@ public class SbbProvider extends AbstractHafasProvider public SbbProvider() { - super(NetworkId.SBB, API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", PRODUCTS_MAP); + super(NetworkId.SBB, API_BASE, "dn", PRODUCTS_MAP); setStationBoardHasStationTable(false); } diff --git a/enabler/src/de/schildbach/pte/SeProvider.java b/enabler/src/de/schildbach/pte/SeProvider.java index 9f5bb0bf..17704a5f 100644 --- a/enabler/src/de/schildbach/pte/SeProvider.java +++ b/enabler/src/de/schildbach/pte/SeProvider.java @@ -40,7 +40,7 @@ public class SeProvider extends AbstractHafasProvider public SeProvider() { - super(NetworkId.SE, API_BASE + "stboard.exe/sn", API_BASE + "ajax-getstop.exe/sny", API_BASE + "query.exe/sn", PRODUCTS_MAP); + super(NetworkId.SE, API_BASE, "sn", PRODUCTS_MAP); setJsonGetStopsEncoding(Charsets.UTF_8); setJsonNearbyLocationsEncoding(Charsets.UTF_8); diff --git a/enabler/src/de/schildbach/pte/SeptaProvider.java b/enabler/src/de/schildbach/pte/SeptaProvider.java index d9974c63..e616013d 100644 --- a/enabler/src/de/schildbach/pte/SeptaProvider.java +++ b/enabler/src/de/schildbach/pte/SeptaProvider.java @@ -62,7 +62,7 @@ public class SeptaProvider extends AbstractHafasProvider public SeptaProvider() { - super(NetworkId.SEPTA, API_BASE + "stboard.exe/en", API_BASE + "ajax-getstop.exe/dny", API_BASE + "query.exe/en", PRODUCTS_MAP); + super(NetworkId.SEPTA, API_BASE, "en", PRODUCTS_MAP); setStationBoardCanDoEquivs(false); setTimeZone("EST"); diff --git a/enabler/src/de/schildbach/pte/ShProvider.java b/enabler/src/de/schildbach/pte/ShProvider.java index f9879135..93fd5da1 100644 --- a/enabler/src/de/schildbach/pte/ShProvider.java +++ b/enabler/src/de/schildbach/pte/ShProvider.java @@ -36,7 +36,7 @@ public class ShProvider extends AbstractHafasProvider public ShProvider() { - super(NetworkId.SH, API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", PRODUCTS_MAP); + super(NetworkId.SH, API_BASE, "dn", PRODUCTS_MAP); setJsonGetStopsEncoding(Charsets.UTF_8); setJsonNearbyLocationsEncoding(Charsets.UTF_8); diff --git a/enabler/src/de/schildbach/pte/SncbProvider.java b/enabler/src/de/schildbach/pte/SncbProvider.java index 821c876c..b9181d90 100644 --- a/enabler/src/de/schildbach/pte/SncbProvider.java +++ b/enabler/src/de/schildbach/pte/SncbProvider.java @@ -41,7 +41,7 @@ public class SncbProvider extends AbstractHafasProvider public SncbProvider() { - super(NetworkId.SNCB, API_BASE + "stboard.exe/nn", API_BASE + "ajax-getstop.exe/nny", API_BASE + "query.exe/nn", PRODUCTS_MAP); + super(NetworkId.SNCB, API_BASE, "nn", PRODUCTS_MAP); setJsonGetStopsEncoding(Charsets.UTF_8); setJsonNearbyLocationsEncoding(Charsets.UTF_8); diff --git a/enabler/src/de/schildbach/pte/StockholmProvider.java b/enabler/src/de/schildbach/pte/StockholmProvider.java index 58acdc72..f22bfd1a 100644 --- a/enabler/src/de/schildbach/pte/StockholmProvider.java +++ b/enabler/src/de/schildbach/pte/StockholmProvider.java @@ -37,7 +37,7 @@ public class StockholmProvider extends AbstractHafasProvider public StockholmProvider() { - super(NetworkId.STOCKHOLM, API_BASE + "stboard.exe/sn", API_BASE + "ajax-getstop.exe/sny", API_BASE + "query.exe/sn", PRODUCTS_MAP); + super(NetworkId.STOCKHOLM, API_BASE, "sn", PRODUCTS_MAP); setStyles(STYLES); setStationBoardHasStationTable(false); diff --git a/enabler/src/de/schildbach/pte/VbbProvider.java b/enabler/src/de/schildbach/pte/VbbProvider.java index 6e47685e..d0d24562 100644 --- a/enabler/src/de/schildbach/pte/VbbProvider.java +++ b/enabler/src/de/schildbach/pte/VbbProvider.java @@ -40,7 +40,7 @@ public class VbbProvider extends AbstractHafasProvider public VbbProvider() { - super(NetworkId.VBB, API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", PRODUCTS_MAP); + super(NetworkId.VBB, API_BASE, "dn", PRODUCTS_MAP); setJsonGetStopsUseWeight(false); setJsonGetStopsEncoding(Charsets.UTF_8); diff --git a/enabler/src/de/schildbach/pte/VbnProvider.java b/enabler/src/de/schildbach/pte/VbnProvider.java index 580be28d..82ef2a13 100644 --- a/enabler/src/de/schildbach/pte/VbnProvider.java +++ b/enabler/src/de/schildbach/pte/VbnProvider.java @@ -32,7 +32,7 @@ public class VbnProvider extends AbstractHafasProvider public VbnProvider() { - super(NetworkId.VBN, API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dny", API_BASE + "query.exe/dn", PRODUCTS_MAP); + super(NetworkId.VBN, API_BASE, "dn", PRODUCTS_MAP); setJsonGetStopsEncoding(Charsets.UTF_8); setJsonNearbyLocationsEncoding(Charsets.UTF_8); diff --git a/enabler/src/de/schildbach/pte/VgsProvider.java b/enabler/src/de/schildbach/pte/VgsProvider.java index 64b9e341..c98f1525 100644 --- a/enabler/src/de/schildbach/pte/VgsProvider.java +++ b/enabler/src/de/schildbach/pte/VgsProvider.java @@ -38,7 +38,7 @@ public class VgsProvider extends AbstractHafasProvider public VgsProvider() { - super(NetworkId.VGS, API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", PRODUCTS_MAP); + super(NetworkId.VGS, API_BASE, "dn", PRODUCTS_MAP); setStationBoardHasStationTable(false); } diff --git a/enabler/src/de/schildbach/pte/VsnProvider.java b/enabler/src/de/schildbach/pte/VsnProvider.java index d225fdd7..2eaadadf 100644 --- a/enabler/src/de/schildbach/pte/VsnProvider.java +++ b/enabler/src/de/schildbach/pte/VsnProvider.java @@ -38,7 +38,7 @@ public class VsnProvider extends AbstractHafasProvider public VsnProvider() { - super(NetworkId.VSN, API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", PRODUCTS_MAP); + super(NetworkId.VSN, API_BASE, "dn", PRODUCTS_MAP); setJsonGetStopsEncoding(Charsets.UTF_8); setJsonNearbyLocationsEncoding(Charsets.UTF_8); diff --git a/enabler/src/de/schildbach/pte/ZvvProvider.java b/enabler/src/de/schildbach/pte/ZvvProvider.java index de242076..252782b9 100644 --- a/enabler/src/de/schildbach/pte/ZvvProvider.java +++ b/enabler/src/de/schildbach/pte/ZvvProvider.java @@ -39,7 +39,7 @@ public class ZvvProvider extends AbstractHafasProvider public ZvvProvider() { - super(NetworkId.ZVV, API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", PRODUCTS_MAP); + super(NetworkId.ZVV, API_BASE, "dn", PRODUCTS_MAP); setJsonGetStopsEncoding(Charsets.UTF_8); setJsonNearbyLocationsEncoding(Charsets.UTF_8);