diff --git a/enabler/src/de/schildbach/pte/AvvProvider.java b/enabler/src/de/schildbach/pte/AvvProvider.java index 6069ff47..4508c5b9 100644 --- a/enabler/src/de/schildbach/pte/AvvProvider.java +++ b/enabler/src/de/schildbach/pte/AvvProvider.java @@ -23,7 +23,6 @@ package de.schildbach.pte; public class AvvProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.AVV; - public static final String OLD_NETWORK_ID = "efa.avv-augsburg.de"; private final static String API_BASE = "http://efa.avv-augsburg.de/avv/"; public AvvProvider() diff --git a/enabler/src/de/schildbach/pte/BahnProvider.java b/enabler/src/de/schildbach/pte/BahnProvider.java index 7b845917..a74aa620 100644 --- a/enabler/src/de/schildbach/pte/BahnProvider.java +++ b/enabler/src/de/schildbach/pte/BahnProvider.java @@ -45,7 +45,6 @@ import de.schildbach.pte.util.ParserUtils; public final class BahnProvider extends AbstractHafasProvider { public static final NetworkId NETWORK_ID = NetworkId.DB; - public static final String OLD_NETWORK_ID = "mobile.bahn.de"; private static final String API_BASE = "http://mobile.bahn.de/bin/mobil/"; public BahnProvider() diff --git a/enabler/src/de/schildbach/pte/BsvagProvider.java b/enabler/src/de/schildbach/pte/BsvagProvider.java index 2f8323ac..b8e42554 100644 --- a/enabler/src/de/schildbach/pte/BsvagProvider.java +++ b/enabler/src/de/schildbach/pte/BsvagProvider.java @@ -29,7 +29,6 @@ import de.schildbach.pte.dto.LocationType; public class BsvagProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.BSVAG; - public static final String OLD_NETWORK_ID = "212.68.73.240"; private final static String API_BASE = "http://212.68.73.240/bsvag/"; public BsvagProvider() diff --git a/enabler/src/de/schildbach/pte/BvbProvider.java b/enabler/src/de/schildbach/pte/BvbProvider.java index 7f2b9cac..3d09a343 100644 --- a/enabler/src/de/schildbach/pte/BvbProvider.java +++ b/enabler/src/de/schildbach/pte/BvbProvider.java @@ -29,7 +29,6 @@ import de.schildbach.pte.dto.LocationType; public class BvbProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.BVB; - public static final String OLD_NETWORK_ID = "www.efa-bvb.ch"; private final static String API_BASE = "http://www.efa-bvb.ch/bvb/"; public BvbProvider() diff --git a/enabler/src/de/schildbach/pte/BvgProvider.java b/enabler/src/de/schildbach/pte/BvgProvider.java index 56a25e8e..e3ac1a43 100644 --- a/enabler/src/de/schildbach/pte/BvgProvider.java +++ b/enabler/src/de/schildbach/pte/BvgProvider.java @@ -58,13 +58,11 @@ import de.schildbach.pte.util.ParserUtils; public final class BvgProvider extends AbstractHafasProvider { public static final NetworkId NETWORK_ID = NetworkId.BVG; - public static final String OLD_NETWORK_ID = "mobil.bvg.de"; - - private static final long PARSER_DAY_ROLLOVER_THRESHOLD_MS = 12 * 60 * 60 * 1000; - private static final String BASE_URL = "http://mobil.bvg.de"; private static final String API_BASE = BASE_URL + "/Fahrinfo/bin/"; + private static final long PARSER_DAY_ROLLOVER_THRESHOLD_MS = 12 * 60 * 60 * 1000; + private final String additionalQueryParameter; public BvgProvider(final String additionalQueryParameter) diff --git a/enabler/src/de/schildbach/pte/DingProvider.java b/enabler/src/de/schildbach/pte/DingProvider.java index 44645c39..30ed5a28 100644 --- a/enabler/src/de/schildbach/pte/DingProvider.java +++ b/enabler/src/de/schildbach/pte/DingProvider.java @@ -23,7 +23,6 @@ package de.schildbach.pte; public class DingProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.DING; - public static final String OLD_NETWORK_ID = "www.ding-ulm.de"; private final static String API_BASE = "http://www.ding-ulm.de/ding2/"; // http://www.ding.eu/swu public DingProvider() diff --git a/enabler/src/de/schildbach/pte/DubProvider.java b/enabler/src/de/schildbach/pte/DubProvider.java index fced9501..9db22be0 100644 --- a/enabler/src/de/schildbach/pte/DubProvider.java +++ b/enabler/src/de/schildbach/pte/DubProvider.java @@ -30,7 +30,6 @@ import de.schildbach.pte.dto.LocationType; public class DubProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.DUB; - public static final String OLD_NETWORK_ID = "wojhati.rta.ae"; private final static String API_BASE = "http://wojhati.rta.ae/dub/"; public DubProvider() diff --git a/enabler/src/de/schildbach/pte/GvhProvider.java b/enabler/src/de/schildbach/pte/GvhProvider.java index b37c77ba..16448c63 100644 --- a/enabler/src/de/schildbach/pte/GvhProvider.java +++ b/enabler/src/de/schildbach/pte/GvhProvider.java @@ -28,7 +28,6 @@ import de.schildbach.pte.dto.Style; public class GvhProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.GVH; - public static final String OLD_NETWORK_ID = "mobil.gvh.de"; private static final String API_BASE = "http://mobil.efa.de/mobile3/"; public GvhProvider(final String additionalQueryParameter) diff --git a/enabler/src/de/schildbach/pte/IvbProvider.java b/enabler/src/de/schildbach/pte/IvbProvider.java index 7159dc06..8de495da 100644 --- a/enabler/src/de/schildbach/pte/IvbProvider.java +++ b/enabler/src/de/schildbach/pte/IvbProvider.java @@ -23,7 +23,6 @@ package de.schildbach.pte; public class IvbProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.IVB; - public static final String OLD_NETWORK_ID = "efa.ivb.at"; private final static String API_BASE = "http://efa.ivb.at/ivb/"; public IvbProvider() diff --git a/enabler/src/de/schildbach/pte/KvvProvider.java b/enabler/src/de/schildbach/pte/KvvProvider.java index 84735829..43ddc65b 100644 --- a/enabler/src/de/schildbach/pte/KvvProvider.java +++ b/enabler/src/de/schildbach/pte/KvvProvider.java @@ -29,7 +29,6 @@ import de.schildbach.pte.dto.Style.Shape; public class KvvProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.KVV; - public static final String OLD_NETWORK_ID = "213.144.24.66"; private final static String API_BASE = "http://213.144.24.66/kvv/"; // http://213.144.24.66/kvv2/ public KvvProvider() diff --git a/enabler/src/de/schildbach/pte/LinzProvider.java b/enabler/src/de/schildbach/pte/LinzProvider.java index 3382a352..f5a22abc 100644 --- a/enabler/src/de/schildbach/pte/LinzProvider.java +++ b/enabler/src/de/schildbach/pte/LinzProvider.java @@ -23,7 +23,6 @@ package de.schildbach.pte; public class LinzProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.LINZ; - public static final String OLD_NETWORK_ID = "www.linzag.at"; public static final String API_BASE = "http://www.linzag.at/linz/"; // open data: http://www.linzag.at/static/ public LinzProvider() diff --git a/enabler/src/de/schildbach/pte/MariborProvider.java b/enabler/src/de/schildbach/pte/MariborProvider.java index 93436f05..ea465ad3 100644 --- a/enabler/src/de/schildbach/pte/MariborProvider.java +++ b/enabler/src/de/schildbach/pte/MariborProvider.java @@ -29,7 +29,6 @@ import de.schildbach.pte.dto.LocationType; public class MariborProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.MARIBOR; - public static final String OLD_NETWORK_ID = "164.8.32.183"; private final static String API_BASE = "http://164.8.32.183/slo/"; public MariborProvider() diff --git a/enabler/src/de/schildbach/pte/MvvProvider.java b/enabler/src/de/schildbach/pte/MvvProvider.java index 5ee3d335..c58ac696 100644 --- a/enabler/src/de/schildbach/pte/MvvProvider.java +++ b/enabler/src/de/schildbach/pte/MvvProvider.java @@ -29,7 +29,6 @@ import de.schildbach.pte.dto.Style; public class MvvProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.MVV; - public static final String OLD_NETWORK_ID = "efa.mvv-muenchen.de"; private static final String API_BASE = "http://efa.mvv-muenchen.de/mobile/"; public MvvProvider() diff --git a/enabler/src/de/schildbach/pte/NaldoProvider.java b/enabler/src/de/schildbach/pte/NaldoProvider.java index 4a5f03c2..ec32cecf 100644 --- a/enabler/src/de/schildbach/pte/NaldoProvider.java +++ b/enabler/src/de/schildbach/pte/NaldoProvider.java @@ -29,7 +29,6 @@ import de.schildbach.pte.dto.LocationType; public class NaldoProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.NALDO; - public static final String OLD_NETWORK_ID = "efa.naldo.de"; private final static String API_BASE = "http://efa.naldo.de/naldo/"; public NaldoProvider() diff --git a/enabler/src/de/schildbach/pte/NasaProvider.java b/enabler/src/de/schildbach/pte/NasaProvider.java index d4eb2bce..e7b60f5b 100644 --- a/enabler/src/de/schildbach/pte/NasaProvider.java +++ b/enabler/src/de/schildbach/pte/NasaProvider.java @@ -33,7 +33,6 @@ import de.schildbach.pte.dto.QueryDeparturesResult; public class NasaProvider extends AbstractHafasProvider { public static final NetworkId NETWORK_ID = NetworkId.NASA; - public static final String OLD_NETWORK_ID = "www.nasa.de"; private static final String API_BASE = "http://reiseauskunft.insa.de/bin/"; public NasaProvider() diff --git a/enabler/src/de/schildbach/pte/NsProvider.java b/enabler/src/de/schildbach/pte/NsProvider.java index d77ef093..8d6164a8 100644 --- a/enabler/src/de/schildbach/pte/NsProvider.java +++ b/enabler/src/de/schildbach/pte/NsProvider.java @@ -42,7 +42,6 @@ import de.schildbach.pte.util.ParserUtils; public class NsProvider extends AbstractHafasProvider { public static final NetworkId NETWORK_ID = NetworkId.NS; - public static final String OLD_NETWORK_ID = "hafas.bene-system.com"; private static final String API_URI = "http://hafas.bene-system.com/bin/extxml.exe"; // http://plannerint.b-rail.be/bin/extxml.exe private static final String API_BASE = "http://hari.b-rail.be/HAFAS/bin/"; // FIXME! diff --git a/enabler/src/de/schildbach/pte/OebbProvider.java b/enabler/src/de/schildbach/pte/OebbProvider.java index 7f5100c0..f4b87a1c 100644 --- a/enabler/src/de/schildbach/pte/OebbProvider.java +++ b/enabler/src/de/schildbach/pte/OebbProvider.java @@ -34,7 +34,6 @@ import de.schildbach.pte.util.ParserUtils; public class OebbProvider extends AbstractHafasProvider { public static final NetworkId NETWORK_ID = NetworkId.OEBB; - public static final String OLD_NETWORK_ID = "fahrplan.oebb.at"; private static final String API_BASE = "http://fahrplan.oebb.at/bin/"; private static final String URL_ENCODING = "ISO-8859-1"; diff --git a/enabler/src/de/schildbach/pte/RmvProvider.java b/enabler/src/de/schildbach/pte/RmvProvider.java index 5ecc28b7..cd4088c6 100644 --- a/enabler/src/de/schildbach/pte/RmvProvider.java +++ b/enabler/src/de/schildbach/pte/RmvProvider.java @@ -42,7 +42,6 @@ import de.schildbach.pte.util.ParserUtils; public class RmvProvider extends AbstractHafasProvider { public static final NetworkId NETWORK_ID = NetworkId.RMV; - public static final String OLD_NETWORK_ID = "mobil.rmv.de"; private static final String API_BASE = "http://www.rmv.de/auskunft/bin/jp/"; private static final long PARSER_DAY_ROLLOVER_THRESHOLD_MS = 12 * 60 * 60 * 1000; diff --git a/enabler/src/de/schildbach/pte/SbbProvider.java b/enabler/src/de/schildbach/pte/SbbProvider.java index 58378463..30f77746 100644 --- a/enabler/src/de/schildbach/pte/SbbProvider.java +++ b/enabler/src/de/schildbach/pte/SbbProvider.java @@ -32,7 +32,6 @@ import de.schildbach.pte.util.ParserUtils; public class SbbProvider extends AbstractHafasProvider { public static final NetworkId NETWORK_ID = NetworkId.SBB; - public static final String OLD_NETWORK_ID = "fahrplan.sbb.ch"; private static final String API_BASE = "http://fahrplan.sbb.ch/bin/"; private static final String API_URI = "http://fahrplan.sbb.ch/bin/extxml.exe"; // xmlfahrplan.sbb.ch diff --git a/enabler/src/de/schildbach/pte/SncbProvider.java b/enabler/src/de/schildbach/pte/SncbProvider.java index 6d1e68a4..75157501 100644 --- a/enabler/src/de/schildbach/pte/SncbProvider.java +++ b/enabler/src/de/schildbach/pte/SncbProvider.java @@ -32,7 +32,6 @@ import de.schildbach.pte.util.ParserUtils; public class SncbProvider extends AbstractHafasProvider { public static final NetworkId NETWORK_ID = NetworkId.SNCB; - public static final String OLD_NETWORK_ID = "hari.b-rail.be"; private static final String API_BASE = "http://hari.b-rail.be/Hafas/bin/"; private static final String API_URI = "http://hari.b-rail.be/Hafas/bin/extxml.exe"; diff --git a/enabler/src/de/schildbach/pte/StvProvider.java b/enabler/src/de/schildbach/pte/StvProvider.java index c9652b1e..89fe2035 100644 --- a/enabler/src/de/schildbach/pte/StvProvider.java +++ b/enabler/src/de/schildbach/pte/StvProvider.java @@ -29,7 +29,6 @@ import de.schildbach.pte.dto.LocationType; public class StvProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.STV; - public static final String OLD_NETWORK_ID = "fahrplan.verbundlinie.at"; private final static String API_BASE = "http://fahrplan.verbundlinie.at/stv/"; public StvProvider() diff --git a/enabler/src/de/schildbach/pte/SvvProvider.java b/enabler/src/de/schildbach/pte/SvvProvider.java index 7c82b2cb..a70fc6fd 100644 --- a/enabler/src/de/schildbach/pte/SvvProvider.java +++ b/enabler/src/de/schildbach/pte/SvvProvider.java @@ -29,7 +29,6 @@ import de.schildbach.pte.dto.LocationType; public class SvvProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.SVV; - public static final String OLD_NETWORK_ID = "efa.svv-info.at"; private final static String API_BASE = "http://efa.svv-info.at/svv/"; public SvvProvider() diff --git a/enabler/src/de/schildbach/pte/TflProvider.java b/enabler/src/de/schildbach/pte/TflProvider.java index 4798831e..7b432b32 100644 --- a/enabler/src/de/schildbach/pte/TflProvider.java +++ b/enabler/src/de/schildbach/pte/TflProvider.java @@ -29,7 +29,6 @@ import de.schildbach.pte.dto.Style; public class TflProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.TFL; - public static final String OLD_NETWORK_ID = "journeyplanner.tfl.gov.uk"; private static final String API_BASE = "http://journeyplanner.tfl.gov.uk/user/"; public TflProvider() diff --git a/enabler/src/de/schildbach/pte/TleaProvider.java b/enabler/src/de/schildbach/pte/TleaProvider.java index 5ee8df7b..64a3b6bd 100644 --- a/enabler/src/de/schildbach/pte/TleaProvider.java +++ b/enabler/src/de/schildbach/pte/TleaProvider.java @@ -30,7 +30,6 @@ import de.schildbach.pte.dto.LocationType; public class TleaProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.TLEA; - public static final String OLD_NETWORK_ID = "www.travelineeastanglia.org.uk"; private final static String API_BASE = "http://www.travelineeastanglia.org.uk/ea/"; public TleaProvider() diff --git a/enabler/src/de/schildbach/pte/TlemProvider.java b/enabler/src/de/schildbach/pte/TlemProvider.java index b61c0427..d1cfc3d2 100644 --- a/enabler/src/de/schildbach/pte/TlemProvider.java +++ b/enabler/src/de/schildbach/pte/TlemProvider.java @@ -30,7 +30,6 @@ import de.schildbach.pte.dto.LocationType; public class TlemProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.TLEM; - public static final String OLD_NETWORK_ID = "www.travelineeastmidlands.co.uk"; private final static String API_BASE = "http://www.travelineeastmidlands.co.uk/em/"; public TlemProvider() diff --git a/enabler/src/de/schildbach/pte/TlseProvider.java b/enabler/src/de/schildbach/pte/TlseProvider.java index d4a80aac..7611ad93 100644 --- a/enabler/src/de/schildbach/pte/TlseProvider.java +++ b/enabler/src/de/schildbach/pte/TlseProvider.java @@ -30,7 +30,6 @@ import de.schildbach.pte.dto.LocationType; public class TlseProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.TLSE; - public static final String OLD_NETWORK_ID = "www.travelinesoutheast.org.uk"; private final static String API_BASE = "http://www.travelinesoutheast.org.uk/se/"; public TlseProvider() diff --git a/enabler/src/de/schildbach/pte/VgsProvider.java b/enabler/src/de/schildbach/pte/VgsProvider.java index fedf8c57..45214429 100644 --- a/enabler/src/de/schildbach/pte/VgsProvider.java +++ b/enabler/src/de/schildbach/pte/VgsProvider.java @@ -42,7 +42,6 @@ import de.schildbach.pte.util.ParserUtils; */ public class VgsProvider extends AbstractHafasProvider { - public static final String OLD_NETWORK_ID = "www.vgs-online.de"; private static final String API_BASE = "http://www.vgs-online.de/cgi-bin/"; // "http://www.saarfahrplan.de/cgi-bin/"; private static final long PARSER_DAY_ROLLOVER_THRESHOLD_MS = 12 * 60 * 60 * 1000; diff --git a/enabler/src/de/schildbach/pte/VmsProvider.java b/enabler/src/de/schildbach/pte/VmsProvider.java index 891e9b4a..44fd1c94 100644 --- a/enabler/src/de/schildbach/pte/VmsProvider.java +++ b/enabler/src/de/schildbach/pte/VmsProvider.java @@ -29,7 +29,6 @@ import de.schildbach.pte.dto.LocationType; public class VmsProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.VMS; - public static final String OLD_NETWORK_ID = "www.vms-aktuell.de"; private static final String API_BASE = "http://www.vms-aktuell.de/vms/"; public VmsProvider() diff --git a/enabler/src/de/schildbach/pte/VmvProvider.java b/enabler/src/de/schildbach/pte/VmvProvider.java index 888d5580..f0920397 100644 --- a/enabler/src/de/schildbach/pte/VmvProvider.java +++ b/enabler/src/de/schildbach/pte/VmvProvider.java @@ -29,7 +29,6 @@ import de.schildbach.pte.dto.LocationType; public class VmvProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.VMV; - public static final String OLD_NETWORK_ID = "80.146.180.107"; private static final String API_BASE = "http://80.146.180.107/delfi/"; // http://80.146.180.107/vmv/ public VmvProvider() diff --git a/enabler/src/de/schildbach/pte/VorProvider.java b/enabler/src/de/schildbach/pte/VorProvider.java index 65b3bfd8..139b708c 100644 --- a/enabler/src/de/schildbach/pte/VorProvider.java +++ b/enabler/src/de/schildbach/pte/VorProvider.java @@ -23,7 +23,6 @@ package de.schildbach.pte; public class VorProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.VOR; - public static final String OLD_NETWORK_ID = "efa.vor.at"; private final static String API_BASE = "http://efa.vor.at/wvb/"; public VorProvider() diff --git a/enabler/src/de/schildbach/pte/VrnProvider.java b/enabler/src/de/schildbach/pte/VrnProvider.java index 6119fff0..3c7ea922 100644 --- a/enabler/src/de/schildbach/pte/VrnProvider.java +++ b/enabler/src/de/schildbach/pte/VrnProvider.java @@ -23,7 +23,6 @@ package de.schildbach.pte; public class VrnProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.VRN; - public static final String OLD_NETWORK_ID = "fahrplanauskunft.vrn.de"; private static final String API_BASE = "http://fahrplanauskunft.vrn.de/vrn_mobile/"; public VrnProvider() diff --git a/enabler/src/de/schildbach/pte/VrrProvider.java b/enabler/src/de/schildbach/pte/VrrProvider.java index 30023817..c313475b 100644 --- a/enabler/src/de/schildbach/pte/VrrProvider.java +++ b/enabler/src/de/schildbach/pte/VrrProvider.java @@ -32,7 +32,6 @@ import de.schildbach.pte.dto.Style; public class VrrProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.VRR; - public static final String OLD_NETWORK_ID = "efa3.vrr.de"; private static final String API_BASE = "http://app.vrr.de/standard/"; public VrrProvider() diff --git a/enabler/src/de/schildbach/pte/VvoProvider.java b/enabler/src/de/schildbach/pte/VvoProvider.java index a90ba34e..b75e1b4b 100644 --- a/enabler/src/de/schildbach/pte/VvoProvider.java +++ b/enabler/src/de/schildbach/pte/VvoProvider.java @@ -29,7 +29,6 @@ import de.schildbach.pte.dto.LocationType; public class VvoProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.VVO; - public static final String OLD_NETWORK_ID = "efa.vvo-online.de"; private final static String API_BASE = "http://efa.vvo-online.de:8080/dvb/"; public VvoProvider() diff --git a/enabler/src/de/schildbach/pte/VvsProvider.java b/enabler/src/de/schildbach/pte/VvsProvider.java index 62752b22..938721e0 100644 --- a/enabler/src/de/schildbach/pte/VvsProvider.java +++ b/enabler/src/de/schildbach/pte/VvsProvider.java @@ -25,7 +25,6 @@ import de.schildbach.pte.dto.Point; public class VvsProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.VVS; - public static final String OLD_NETWORK_ID = "mobil.vvs.de"; private static final String API_BASE = "http://mobil.vvs.de/mobile/"; // http://www2.vvs.de/vvs/ public VvsProvider()