diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java index 43bd8d49..9627b2a4 100644 --- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java @@ -89,7 +89,6 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider private String clientType; private Charset jsonGetStopsEncoding; private Charset jsonNearbyStationsEncoding; - private final Charset xmlMlcResEncoding; private boolean dominantPlanStopTime = false; private boolean canDoEquivs = true; private boolean useIso8601 = false; @@ -147,11 +146,11 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider public AbstractHafasProvider(final String stationBoardEndpoint, final String getStopEndpoint, final String queryEndpoint, final int numProductBits) { - this(stationBoardEndpoint, getStopEndpoint, queryEndpoint, numProductBits, ISO_8859_1, ISO_8859_1); + this(stationBoardEndpoint, getStopEndpoint, queryEndpoint, numProductBits, ISO_8859_1); } public AbstractHafasProvider(final String stationBoardEndpoint, final String getStopEndpoint, final String queryEndpoint, - final int numProductBits, final Charset jsonEncoding, final Charset xmlMlcResEncoding) + final int numProductBits, final Charset jsonEncoding) { this.stationBoardEndpoint = stationBoardEndpoint; this.getStopEndpoint = getStopEndpoint; @@ -159,7 +158,6 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider this.numProductBits = numProductBits; this.jsonGetStopsEncoding = jsonEncoding; this.jsonNearbyStationsEncoding = jsonEncoding; - this.xmlMlcResEncoding = xmlMlcResEncoding; } protected void setClientType(final String clientType) @@ -417,99 +415,6 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider } } - private static final Pattern P_XML_MLC_REQ_ID = Pattern.compile(".*?@L=0*(\\d+)@.*?"); - private static final Pattern P_XML_MLC_REQ_LONLAT = Pattern.compile(".*?@X=(-?\\d+)@Y=(-?\\d+)@.*?"); - - protected final List xmlMLcReq(final CharSequence constraint) throws IOException - { - final String mlcReq = ""; - final String request = wrapReqC(mlcReq, xmlMlcResEncoding); - - // ParserUtils.printXml(ParserUtils.scrape(queryEndpoint, request, xmlMlcResEncoding, null)); - - Reader reader = null; - - try - { - reader = new InputStreamReader(ParserUtils.scrapeInputStream(queryEndpoint, request, xmlMlcResEncoding, null, null, 3), xmlMlcResEncoding); - - final XmlPullParserFactory factory = XmlPullParserFactory.newInstance(System.getProperty(XmlPullParserFactory.PROPERTY_NAME), null); - final XmlPullParser pp = factory.newPullParser(); - pp.setInput(reader); - - final List results = new ArrayList(); - - XmlPullUtil.enter(pp, "ResC"); - XmlPullUtil.enter(pp, "MLcRes"); - - while (XmlPullUtil.test(pp, "MLc")) - { - final String t = XmlPullUtil.attr(pp, "t"); - final LocationType type; - if ("ST".equals(t)) - type = LocationType.STATION; - else if ("POI".equals(t)) - type = LocationType.POI; - else if ("ADR".equals(t)) - type = LocationType.ADDRESS; - else - throw new IllegalStateException("cannot handle: '" + t + "'"); - - final String id; - final String i = pp.getAttributeValue(null, "i"); - if (i != null) - { - final Matcher iMatcherId = P_XML_MLC_REQ_ID.matcher(i); - if (!iMatcherId.matches()) - throw new IllegalStateException("cannot parse id: '" + i + "'"); - id = iMatcherId.group(1); - } - else - { - id = null; - } - - final String name = XmlPullUtil.attr(pp, "n"); - final String[] placeAndName = splitPlaceAndName(name); - - final String r = pp.getAttributeValue(null, "r"); - final Matcher iMatcherLonLat = P_XML_MLC_REQ_LONLAT.matcher(i != null ? i : r); - final int lat; - final int lon; - if (iMatcherLonLat.matches()) - { - lon = Integer.parseInt(iMatcherLonLat.group(1)); - lat = Integer.parseInt(iMatcherLonLat.group(2)); - } - else - { - lat = 0; - lon = 0; - } - - final Location location = new Location(type, id, lat, lon, placeAndName[0], placeAndName[1]); - if (location.hasLocation()) - results.add(location); - - XmlPullUtil.next(pp); - } - - XmlPullUtil.exit(pp, "MLcRes"); - XmlPullUtil.exit(pp, "ResC"); - - return results; - } - catch (final XmlPullParserException x) - { - throw new RuntimeException(x); - } - finally - { - if (reader != null) - reader.close(); - } - } - protected StringBuilder xmlQueryDeparturesParameters(final String stationId) { final StringBuilder parameters = new StringBuilder(); diff --git a/enabler/src/de/schildbach/pte/InvgProvider.java b/enabler/src/de/schildbach/pte/InvgProvider.java index 5a170761..a72e6c70 100644 --- a/enabler/src/de/schildbach/pte/InvgProvider.java +++ b/enabler/src/de/schildbach/pte/InvgProvider.java @@ -59,7 +59,7 @@ public class InvgProvider extends AbstractHafasProvider public InvgProvider() { - super(API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", 10, UTF_8, UTF_8); + super(API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", 10, UTF_8); setStyles(STYLES); setExtXmlEndpoint(API_BASE + "extxml.exe"); diff --git a/enabler/src/de/schildbach/pte/JetProvider.java b/enabler/src/de/schildbach/pte/JetProvider.java index 6abd647a..0db30acf 100644 --- a/enabler/src/de/schildbach/pte/JetProvider.java +++ b/enabler/src/de/schildbach/pte/JetProvider.java @@ -40,7 +40,7 @@ public class JetProvider extends AbstractHafasProvider public JetProvider() { - super(API_BASE + "stboard.bin/yn", API_BASE + "ajax-getstop.bin/yn", API_BASE + "query.bin/yn", 4, UTF_8, null); + super(API_BASE + "stboard.bin/yn", API_BASE + "ajax-getstop.bin/yn", API_BASE + "query.bin/yn", 4, UTF_8); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/LuProvider.java b/enabler/src/de/schildbach/pte/LuProvider.java index cf7cb856..94a7ad8a 100644 --- a/enabler/src/de/schildbach/pte/LuProvider.java +++ b/enabler/src/de/schildbach/pte/LuProvider.java @@ -35,7 +35,7 @@ public class LuProvider extends AbstractHafasProvider public LuProvider() { - super(API_BASE + "stboard.exe/fn", API_BASE + "ajax-getstop.exe/fn", API_BASE + "query.exe/fn", 9, UTF_8, UTF_8); + super(API_BASE + "stboard.exe/fn", API_BASE + "ajax-getstop.exe/fn", API_BASE + "query.exe/fn", 9, UTF_8); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/NvvProvider.java b/enabler/src/de/schildbach/pte/NvvProvider.java index 9e10bae7..f4609bf0 100644 --- a/enabler/src/de/schildbach/pte/NvvProvider.java +++ b/enabler/src/de/schildbach/pte/NvvProvider.java @@ -36,7 +36,7 @@ public class NvvProvider extends AbstractHafasProvider public NvvProvider() { - super(API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", 12, UTF_8, null); + super(API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", 12, UTF_8); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/PlProvider.java b/enabler/src/de/schildbach/pte/PlProvider.java index 3037a444..b3851e8d 100644 --- a/enabler/src/de/schildbach/pte/PlProvider.java +++ b/enabler/src/de/schildbach/pte/PlProvider.java @@ -40,7 +40,7 @@ public class PlProvider extends AbstractHafasProvider public PlProvider() { - super(API_BASE + "stboard.exe/pn", API_BASE + "ajax-getstop.exe/pn", API_BASE + "query.exe/pn", 7, UTF_8, UTF_8); + super(API_BASE + "stboard.exe/pn", API_BASE + "ajax-getstop.exe/pn", API_BASE + "query.exe/pn", 7, UTF_8); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/RtProvider.java b/enabler/src/de/schildbach/pte/RtProvider.java index d3a08c50..bcd5a2cf 100644 --- a/enabler/src/de/schildbach/pte/RtProvider.java +++ b/enabler/src/de/schildbach/pte/RtProvider.java @@ -36,7 +36,7 @@ public class RtProvider extends AbstractHafasProvider public RtProvider() { - super(API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", 10, UTF_8, null); + super(API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", 10, UTF_8); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/SeProvider.java b/enabler/src/de/schildbach/pte/SeProvider.java index 9c3f2baf..750e12b6 100644 --- a/enabler/src/de/schildbach/pte/SeProvider.java +++ b/enabler/src/de/schildbach/pte/SeProvider.java @@ -42,7 +42,7 @@ public class SeProvider extends AbstractHafasProvider public SeProvider() { - super(API_BASE + "stboard.exe/sn", API_BASE + "ajax-getstop.exe/sny", API_BASE + "query.exe/sn", 14, UTF_8, null); + super(API_BASE + "stboard.exe/sn", API_BASE + "ajax-getstop.exe/sny", API_BASE + "query.exe/sn", 14, UTF_8); setClientType("ANDROID"); setCanDoEquivs(false); diff --git a/enabler/src/de/schildbach/pte/ShProvider.java b/enabler/src/de/schildbach/pte/ShProvider.java index db53772e..603c910e 100644 --- a/enabler/src/de/schildbach/pte/ShProvider.java +++ b/enabler/src/de/schildbach/pte/ShProvider.java @@ -51,7 +51,7 @@ public class ShProvider extends AbstractHafasProvider public ShProvider() { - super(API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", 10, UTF_8, UTF_8); + super(API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", 10, UTF_8); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/VbbProvider.java b/enabler/src/de/schildbach/pte/VbbProvider.java index 3c1cb4ff..6bd214c9 100644 --- a/enabler/src/de/schildbach/pte/VbbProvider.java +++ b/enabler/src/de/schildbach/pte/VbbProvider.java @@ -49,7 +49,7 @@ public class VbbProvider extends AbstractHafasProvider public VbbProvider() { - super(API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", 7, UTF_8, UTF_8); + super(API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", 7, UTF_8); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/ZvvProvider.java b/enabler/src/de/schildbach/pte/ZvvProvider.java index 19d72c86..90bba4fa 100644 --- a/enabler/src/de/schildbach/pte/ZvvProvider.java +++ b/enabler/src/de/schildbach/pte/ZvvProvider.java @@ -41,7 +41,7 @@ public class ZvvProvider extends AbstractHafasProvider public ZvvProvider() { - super(API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", 10, UTF_8, UTF_8); + super(API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", 10, UTF_8); setStyles(STYLES); }