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

Disambiguate line styles for Bonn

Browse source
This commit is contained in:
Andreas Schildbach 2013-10-10 17:02:31 +02:00
parent 4a5e8094bd
commit 929fe43823
8 changed files with 102 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1763,8 +1763,9 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
trainNum = null;
}
final String network = lineId.substring(0, lineId.indexOf(':'));
final String lineLabel = parseLine(productType, symbol, symbol, null, trainType, trainNum, productName);
line = new Line(lineId, lineLabel, lineStyle(lineLabel));
line = new Line(lineId, lineLabel, lineStyle(network, lineLabel));
}
XmlPullUtil.exit(pp, "m");
@ -1941,6 +1942,10 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
XmlPullUtil.next(pp);
}
}
XmlPullUtil.require(pp, "motDivaParams");
final String divaNetwork = XmlPullUtil.attr(pp, "network");
XmlPullUtil.exit(pp, "itdServingLine");
final String trainType = ParserUtils.firstNotEmpty(slTrainType, itdTrainType);
@ -1948,7 +1953,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
final String label = parseLine(slMotType, slSymbol, slNumber, slNumber, trainType, slTrainNum, trainName);
return new Line(slStateless, label, lineStyle(label), itdMessage);
return new Line(slStateless, label, lineStyle(divaNetwork, label), itdMessage);
}
private static final Pattern P_STATION_NAME_WHITESPACE = Pattern.compile("\\s+");
@ -2682,7 +2687,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
final Set<Line.Attr> lineAttrs = new HashSet<Line.Attr>();
if (wheelChairAccess || lowFloorVehicle)
lineAttrs.add(Line.Attr.WHEEL_CHAIR_ACCESS);
final Line line = new Line(lineId, lineLabel, lineStyle(lineLabel), lineAttrs);
final Line line = new Line(lineId, lineLabel, lineStyle(divaNetwork, lineLabel), lineAttrs);
final Stop departure = new Stop(departureLocation, true, departureTargetTime != null ? departureTargetTime : departureTime,
departureTime != null ? departureTime : null, departurePosition, null);