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

switch to new server

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@505 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-02-25 16:10:18 +00:00
parent ec46957bf9
commit 7952578dc7
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/de/schildbach/pte/NasaProvider.java
View file

@ -46,7 +46,7 @@ public class NasaProvider extends AbstractHafasProvider
{ {
public static final NetworkId NETWORK_ID = NetworkId.NASA; public static final NetworkId NETWORK_ID = NetworkId.NASA;
public static final String OLD_NETWORK_ID = "www.nasa.de"; public static final String OLD_NETWORK_ID = "www.nasa.de";
private static final String API_BASE = "http://www.nasa.de/delfi52/"; private static final String API_BASE = "http://reiseauskunft.insa.de/bin/";
private static final long PARSER_DAY_ROLLOVER_THRESHOLD_MS = 12 * 60 * 60 * 1000; private static final long PARSER_DAY_ROLLOVER_THRESHOLD_MS = 12 * 60 * 60 * 1000;
@ -125,9 +125,9 @@ public class NasaProvider extends AbstractHafasProvider
+ "(?:<td class=\"[\\w ]*prognosis[\\w ]*\">\n" // + "(?:<td class=\"[\\w ]*prognosis[\\w ]*\">\n" //
+ "(?:&nbsp;|<span class=\"rtLimit\\d\">(p&#252;nktlich|\\d{1,2}:\\d{2})</span>)\n</td>\n" // predictedTime + "(?:&nbsp;|<span class=\"rtLimit\\d\">(p&#252;nktlich|\\d{1,2}:\\d{2})</span>)\n</td>\n" // predictedTime
+ ")?.*?" // + ")?.*?" //
+ "<img src=\"/img52/(\\w+)_pic\\.gif\"[^>]*>\\s*(.*?)\\s*</.*?" // type, line + "<img src=\"/hafas-res/img/(\\w+)_pic\\.gif\"[^>]*>\\s*(.*?)\\s*</.*?" // type, line
+ "<span class=\"bold\">\n" // + "<span class=\"bold\">\n" //
+ "<a href=\"/delfi52/stboard\\.exe/dn\\?input=(\\d+)&[^>]*>" // destinationId + "<a href=\"/bin/stboard\\.exe/dn\\?input=(\\d+)&[^>]*>" // destinationId
+ "\\s*(.*?)\\s*</a>\n" // destination + "\\s*(.*?)\\s*</a>\n" // destination
+ "</span>.*?" // + "</span>.*?" //
+ "(?:<td class=\"center sepline top\">\n(" + ParserUtils.P_PLATFORM + ").*?)?" // position + "(?:<td class=\"center sepline top\">\n(" + ParserUtils.P_PLATFORM + ").*?)?" // position
@ -248,6 +248,8 @@ public class NasaProvider extends AbstractHafasProvider
if (ucType.equals("D")) // Rußland Schlafwagenzug if (ucType.equals("D")) // Rußland Schlafwagenzug
return 'I'; return 'I';
if (ucType.equals("ECW"))
return 'I';
if (ucType.equals("DPF")) // mit Dampflok bespannter Zug if (ucType.equals("DPF")) // mit Dampflok bespannter Zug
return 'R'; return 'R';