--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java 2011/05/02 17:14:29 1423 +++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java 2011/05/02 17:19:30 1424 @@ -78,6 +78,7 @@ departureBean.stationName = station.getName(); + //TODO: FetchTraintype.Both should be removed some time after 0.9.5 release if (station.getRegional() != null && (type == FetchTrainType.REGIONAL||type == FetchTrainType.BOTH) ) { DepartureBean tempBean = lookupDepartures(station.getRegional(), TrainType.REGIONAL, arrival); departureBean.entries.addAll( tempBean.entries ); @@ -94,6 +95,7 @@ logger.info("No departures found for station " + stationID); } + //TODO: FetchTraintype.Both should be removed some time after 0.9.5 release if (type == FetchTrainType.BOTH) { //if we have both S-tog and regional order by departure/arrival time Collections.sort( departureBean.entries ); } @@ -241,7 +243,7 @@ stationcode = URLEncoder.encode(stationcode,"ISO-8859-1"); - //String uri = "http://trafikinfo.bane.dk/Trafikinformation/AfgangAnkomst/" + arrivalDeparture + "/" + stationcode + "/" + typeString + "/UdvidetVisning"; + String uri = "http://mobil.bane.dk/mobilStation.asp?artikelID=5332&stat_kode=" + stationcode + "&webprofil=" + typeString +"&beskrivelse=&mode=ankomstafgang&ankomstafgang=" + arrivalDeparture + "&gemstation=&fuldvisning=1"; logger.fine("URI: " + uri); JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), settings.getReplyTimeout() );