mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-19 08:49:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Lines.

Browse source
This commit is contained in:
Andreas Schildbach 2015-12-16 10:03:31 +01:00
parent 17e54c4d62
commit d6d3371de2
6 changed files with 48 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
enabler/src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -1104,7 +1104,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
return new Line(id, network, Product.HIGH_SPEED_TRAIN, "MT" + trainNum); return new Line(id, network, Product.HIGH_SPEED_TRAIN, "MT" + trainNum);
if (("TLK".equals(trainType) || "Tanie Linie Kolejowe".equals(trainName)) && trainNum != null) if (("TLK".equals(trainType) || "Tanie Linie Kolejowe".equals(trainName)) && trainNum != null)
return new Line(id, network, Product.HIGH_SPEED_TRAIN, "TLK" + trainNum); return new Line(id, network, Product.HIGH_SPEED_TRAIN, "TLK" + trainNum);
if ("DNZ".equals(trainType) && "Nacht-Schnellzug".equals(trainName) && trainNum != null) if ("DNZ".equals(trainType) && trainNum != null) // Nacht-Schnellzug
return new Line(id, network, Product.HIGH_SPEED_TRAIN, "DNZ" + trainNum); return new Line(id, network, Product.HIGH_SPEED_TRAIN, "DNZ" + trainNum);
if ("AVE".equals(trainType) && trainNum != null) // klimatisierter Hochgeschwindigkeitszug if ("AVE".equals(trainType) && trainNum != null) // klimatisierter Hochgeschwindigkeitszug
return new Line(id, network, Product.HIGH_SPEED_TRAIN, "DNZ" + trainNum); return new Line(id, network, Product.HIGH_SPEED_TRAIN, "DNZ" + trainNum);
@ -1294,6 +1294,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
return new Line(id, network, Product.REGIONAL_TRAIN, "BE" + trainNum); return new Line(id, network, Product.REGIONAL_TRAIN, "BE" + trainNum);
if ("erx".equals(trainType) || "erixx - Der Heidesprinter".equals(trainName)) if ("erx".equals(trainType) || "erixx - Der Heidesprinter".equals(trainName))
return new Line(id, network, Product.REGIONAL_TRAIN, "erx" + trainNum); return new Line(id, network, Product.REGIONAL_TRAIN, "erx" + trainNum);
if (("ERX".equals(trainType) || "Erixx".equals(trainName)) && trainNum != null)
return new Line(id, network, Product.REGIONAL_TRAIN, "ERX" + trainNum);
if ("SWEG-Zug".equals(trainName)) // Südwestdeutschen Verkehrs-Aktiengesellschaft if ("SWEG-Zug".equals(trainName)) // Südwestdeutschen Verkehrs-Aktiengesellschaft
return new Line(id, network, Product.REGIONAL_TRAIN, "SWEG" + trainNum); return new Line(id, network, Product.REGIONAL_TRAIN, "SWEG" + trainNum);
if ("SWEG-Zug".equals(longName)) if ("SWEG-Zug".equals(longName))
@ -1380,6 +1382,16 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
return new Line(id, network, Product.REGIONAL_TRAIN, "RR" + Strings.nullToEmpty(trainNum)); return new Line(id, network, Product.REGIONAL_TRAIN, "RR" + Strings.nullToEmpty(trainNum));
if (("TER".equals(trainType) || "Train Express Regional".equals(trainName)) && trainNum != null) if (("TER".equals(trainType) || "Train Express Regional".equals(trainName)) && trainNum != null)
return new Line(id, network, Product.REGIONAL_TRAIN, "TER" + trainNum); return new Line(id, network, Product.REGIONAL_TRAIN, "TER" + trainNum);
if (("ENO".equals(trainType) || "enno".equals(trainName)) && trainNum != null)
return new Line(id, network, Product.REGIONAL_TRAIN, "ENO" + trainNum);
if ("enno".equals(longName) && symbol == null)
return new Line(id, network, Product.REGIONAL_TRAIN, "enno");
if (("PLB".equals(trainType) || "Pinzgauer Lokalbahn".equals(trainName)) && trainNum != null)
return new Line(id, network, Product.REGIONAL_TRAIN, "PLB" + trainNum);
if (("NX".equals(trainType) || "National Express".equals(trainName)) && trainNum != null)
return new Line(id, network, Product.REGIONAL_TRAIN, "NX" + trainNum);
if (("SE".equals(trainType) || "ABELLIO Rail Mitteldeutschland GmbH".equals(trainName)) && trainNum != null)
return new Line(id, network, Product.REGIONAL_TRAIN, "SE" + trainNum);
if ("BSB-Zug".equals(trainName) && trainNum != null) // Breisgau-S-Bahn if ("BSB-Zug".equals(trainName) && trainNum != null) // Breisgau-S-Bahn
return new Line(id, network, Product.SUBURBAN_TRAIN, trainNum); return new Line(id, network, Product.SUBURBAN_TRAIN, trainNum);
@ -1409,6 +1421,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
return new Line(id, network, Product.BUS, "BR"); return new Line(id, network, Product.BUS, "BR");
if ("BR".equals(trainType) && trainName != null && trainName.startsWith("Bus")) // GB if ("BR".equals(trainType) && trainName != null && trainName.startsWith("Bus")) // GB
return new Line(id, network, Product.BUS, "BR" + trainNum); return new Line(id, network, Product.BUS, "BR" + trainNum);
if ("EXB".equals(trainType) && trainNum != null)
return new Line(id, network, Product.BUS, "EXB" + trainNum);
if ("GB".equals(trainType)) // Gondelbahn if ("GB".equals(trainType)) // Gondelbahn
return new Line(id, network, Product.CABLECAR, "GB" + trainNum); return new Line(id, network, Product.CABLECAR, "GB" + trainNum);

8
enabler/src/de/schildbach/pte/AbstractHafasProvider.java
View file

@ -3457,6 +3457,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
return Product.REGIONAL_TRAIN; return Product.REGIONAL_TRAIN;
if ("SP".equals(ucType)) // Spěšný vlak, Czech Republic if ("SP".equals(ucType)) // Spěšný vlak, Czech Republic
return Product.REGIONAL_TRAIN; return Product.REGIONAL_TRAIN;
if ("RX".equals(ucType)) // Express, Czech Republic
return Product.REGIONAL_TRAIN;
if ("EZ".equals(ucType)) // ÖBB ErlebnisBahn if ("EZ".equals(ucType)) // ÖBB ErlebnisBahn
return Product.REGIONAL_TRAIN; return Product.REGIONAL_TRAIN;
if ("ARZ".equals(ucType)) // Auto-Reisezug Brig - Iselle di Trasquera if ("ARZ".equals(ucType)) // Auto-Reisezug Brig - Iselle di Trasquera
@ -3639,6 +3641,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
return Product.REGIONAL_TRAIN; return Product.REGIONAL_TRAIN;
if ("GW".equals(ucType)) // gwtr.cz if ("GW".equals(ucType)) // gwtr.cz
return Product.REGIONAL_TRAIN; return Product.REGIONAL_TRAIN;
if ("SE".equals(ucType)) // ABELLIO Rail Mitteldeutschland GmbH
return Product.REGIONAL_TRAIN;
// Suburban Trains // Suburban Trains
if (P_LINE_SBAHN.matcher(ucType).matches()) // Generic (Night) S-Bahn if (P_LINE_SBAHN.matcher(ucType).matches()) // Generic (Night) S-Bahn
@ -3735,7 +3739,9 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
return Product.FERRY; return Product.FERRY;
if ("SCH".equals(ucType)) // Schiff if ("SCH".equals(ucType)) // Schiff
return Product.FERRY; return Product.FERRY;
if ("AS".equals(ucType)) // SyltShuttle, eigentlich Autoreisezug if ("AS".equals(ucType)) // SyltShuttle
return Product.FERRY;
if ("AZS".equals(ucType)) // Autozug Sylt Shuttle
return Product.FERRY; return Product.FERRY;
if ("KAT".equals(ucType)) // Katamaran, e.g. Friedrichshafen - Konstanz if ("KAT".equals(ucType)) // Katamaran, e.g. Friedrichshafen - Konstanz
return Product.FERRY; return Product.FERRY;

4
enabler/src/de/schildbach/pte/GvhProvider.java
View file

@ -59,6 +59,10 @@ public class GvhProvider extends AbstractEfaProvider
{ {
if ("S4".equals(trainNum)) if ("S4".equals(trainNum))
return new Line(id, network, Product.SUBURBAN_TRAIN, "S4"); return new Line(id, network, Product.SUBURBAN_TRAIN, "S4");
if ("Bus".equals(longName) && symbol == null)
return new Line(id, network, Product.BUS, longName);
if (longName != null && longName.startsWith("Bus ") && name != null)
return new Line(id, network, Product.BUS, name);
} }
return super.parseLine(id, network, mot, symbol, name, longName, trainType, trainNum, trainName); return super.parseLine(id, network, mot, symbol, name, longName, trainType, trainNum, trainName);

22
enabler/src/de/schildbach/pte/SfProvider.java
View file

@ -78,25 +78,29 @@ public class SfProvider extends AbstractEfaProvider
{ {
if ("0".equals(mot)) if ("0".equals(mot))
{ {
if (("XAA".equals(symbol) || "Daly City / Fremont".equals(symbol)) && "Daly City / Fremont".equals(name)) if (("XAA".equals(symbol) || "Daly City / Fremont".equals(symbol)) && ("DALY/FREMONT".equals(name) || "Daly City / Fremont".equals(name)))
return new Line(id, network, Product.REGIONAL_TRAIN, "DALY/FRMT"); return new Line(id, network, Product.REGIONAL_TRAIN, "DALY/FRMT");
if (("FRE".equals(symbol) || "Fremont / Daly City".equals(symbol)) && "Fremont / Daly City".equals(name)) if (("FRE".equals(symbol) || "Fremont / Daly City".equals(symbol)) && ("FREMONT/DALY".equals(name) || "Fremont / Daly City".equals(name)))
return new Line(id, network, Product.REGIONAL_TRAIN, "FRMT/DALY"); return new Line(id, network, Product.REGIONAL_TRAIN, "FRMT/DALY");
if (("XAC".equals(symbol) || "Fremont / Richmond".equals(symbol)) && "Fremont / Richmond".equals(name)) if (("XAC".equals(symbol) || "Fremont / Richmond".equals(symbol)) && "Fremont / Richmond".equals(name))
return new Line(id, network, Product.REGIONAL_TRAIN, "FRMT/RICH"); return new Line(id, network, Product.REGIONAL_TRAIN, "FRMT/RICH");
if (("XAD".equals(symbol) || "Richmond / Fremont".equals(symbol)) && "Richmond / Fremont".equals(name)) if (("XAD".equals(symbol) || "Richmond / Fremont".equals(symbol)) && "Richmond / Fremont".equals(name))
return new Line(id, network, Product.REGIONAL_TRAIN, "RICH/FRMT"); return new Line(id, network, Product.REGIONAL_TRAIN, "RICH/FRMT");
if (("XAE".equals(symbol) || "Pittsburg Bay Point / SFO".equals(symbol)) && "Pittsburg Bay Point / SFO".equals(name)) if (("XAE".equals(symbol) || "Pittsburg Bay Point / SFO".equals(symbol))
&& ("BAY PT/SFIA".equals(name) || "Pittsburg Bay Point / SFO".equals(name)))
return new Line(id, network, Product.REGIONAL_TRAIN, "PITT/SFIA"); return new Line(id, network, Product.REGIONAL_TRAIN, "PITT/SFIA");
if (("SFI".equals(symbol) || "SFO / Pittsburg Bay Point".equals(symbol)) && "SFO / Pittsburg Bay Point".equals(name)) if (("SFI".equals(symbol) || "SFO / Pittsburg Bay Point".equals(symbol))
&& ("SFIA/BAY PT".equals(name) || "SFO / Pittsburg Bay Point".equals(name)))
return new Line(id, network, Product.REGIONAL_TRAIN, "SFIA/PITT"); return new Line(id, network, Product.REGIONAL_TRAIN, "SFIA/PITT");
if (("XAF".equals(symbol) || "Millbrae / Richmond".equals(symbol)) && "Millbrae / Richmond".equals(name)) if (("XAF".equals(symbol) || "Millbrae / Richmond".equals(symbol)) && ("MILL/RICH".equals(name) || "Millbrae / Richmond".equals(name)))
return new Line(id, network, Product.REGIONAL_TRAIN, "MLBR/RICH"); return new Line(id, network, Product.REGIONAL_TRAIN, "MLBR/RICH");
if (("XAG".equals(symbol) || "Richmond / Millbrae".equals(symbol)) && "Richmond / Millbrae".equals(name)) if (("XAG".equals(symbol) || "Richmond / Millbrae".equals(symbol)) && ("RICH/MILL".equals(name) || "Richmond / Millbrae".equals(name)))
return new Line(id, network, Product.REGIONAL_TRAIN, "RICH/MLBR"); return new Line(id, network, Product.REGIONAL_TRAIN, "RICH/MLBR");
if (("XAH".equals(symbol) || "Daly City / Dublin Pleasanton".equals(symbol)) && "Daly City / Dublin Pleasanton".equals(name)) if (("XAH".equals(symbol) || "Daly City / Dublin Pleasanton".equals(symbol))
&& ("DALY/DUBLIN".equals(name) || "Daly City / Dublin Pleasanton".equals(name)))
return new Line(id, network, Product.REGIONAL_TRAIN, "DALY/DUBL"); return new Line(id, network, Product.REGIONAL_TRAIN, "DALY/DUBL");
if (("XAI".equals(symbol) || "Dublin Pleasanton / Daly City".equals(symbol)) && "Dublin Pleasanton / Daly City".equals(name)) if (("XAI".equals(symbol) || "Dublin Pleasanton / Daly City".equals(symbol))
&& ("DUBLIN/DALY".equals(name) || "Dublin Pleasanton / Daly City".equals(name)))
return new Line(id, network, Product.REGIONAL_TRAIN, "DUBL/DALY"); return new Line(id, network, Product.REGIONAL_TRAIN, "DUBL/DALY");
if ("LOC".equals(symbol) && "LOCAL".equals(name)) if ("LOC".equals(symbol) && "LOCAL".equals(name))
@ -108,6 +112,8 @@ public class SfProvider extends AbstractEfaProvider
if ("Muni Rail".equals(trainName) && symbol != null) // Muni if ("Muni Rail".equals(trainName) && symbol != null) // Muni
return new Line(id, network, Product.TRAM, symbol); return new Line(id, network, Product.TRAM, symbol);
if (trainType == null && "E".equals(trainNum)) // Muni Rail E
return new Line(id, network, Product.TRAM, "E");
if (trainType == null && "F".equals(trainNum)) // Muni Historic Streetcar if (trainType == null && "F".equals(trainNum)) // Muni Historic Streetcar
return new Line(id, network, Product.TRAM, "F"); return new Line(id, network, Product.TRAM, "F");
if (trainType == null && "J".equals(trainNum)) // Muni Metro if (trainType == null && "J".equals(trainNum)) // Muni Metro

6
enabler/src/de/schildbach/pte/VmsProvider.java
View file

@ -72,6 +72,12 @@ public class VmsProvider extends AbstractEfaProvider
return new Line(id, network, Product.REGIONAL_TRAIN, "M"); return new Line(id, network, Product.REGIONAL_TRAIN, "M");
if ("CityBahn".equals(trainName) && trainNum == null) if ("CityBahn".equals(trainName) && trainNum == null)
return new Line(id, network, Product.REGIONAL_TRAIN, "CB"); return new Line(id, network, Product.REGIONAL_TRAIN, "CB");
if ("CityBahn".equals(longName) && "C11".equals(symbol))
return new Line(id, network, Product.REGIONAL_TRAIN, symbol);
if (trainType == null && ("C11".equals(trainNum) || "C13".equals(trainNum) || "C14".equals(trainNum) || "C15".equals(trainNum)))
return new Line(id, network, Product.REGIONAL_TRAIN, trainNum);
if ("Zug".equals(longName) && ("C11".equals(symbol) || "C13".equals(symbol) || "C14".equals(symbol) || "C15".equals(symbol)))
return new Line(id, network, Product.REGIONAL_TRAIN, symbol);
if ("RE 3".equals(symbol) && "Zug".equals(longName)) if ("RE 3".equals(symbol) && "Zug".equals(longName))
return new Line(id, network, Product.REGIONAL_TRAIN, "RE3"); return new Line(id, network, Product.REGIONAL_TRAIN, "RE3");

2
enabler/src/de/schildbach/pte/VrrProvider.java
View file

@ -90,6 +90,8 @@ public class VrrProvider extends AbstractEfaProvider
return new Line(id, network, Product.REGIONAL_TRAIN, symbol); return new Line(id, network, Product.REGIONAL_TRAIN, symbol);
if ("NordWestBahn".equals(trainName) && symbol != null) if ("NordWestBahn".equals(trainName) && symbol != null)
return new Line(id, network, Product.REGIONAL_TRAIN, symbol); return new Line(id, network, Product.REGIONAL_TRAIN, symbol);
if ("RE6a".equals(trainNum) && trainType == null && trainName == null)
return new Line(id, network, Product.REGIONAL_TRAIN, trainNum);
if (trainType == null && "SEV7".equals(trainNum)) if (trainType == null && "SEV7".equals(trainNum))
return new Line(id, network, Product.BUS, trainNum); return new Line(id, network, Product.BUS, trainNum);