mirror of
https://gitlab.com/oeffi/public-transport-enabler.git
synced 2025-07-14 00:30:31 +00:00
one more criterion for wheel chair accessible lines
This commit is contained in:
parent
aa4b1517f5
commit
699fa20344
1 changed files with 21 additions and 4 deletions
|
@ -2028,8 +2028,22 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
|
||||||
|
|
||||||
if (XmlPullUtil.test(pp, "itdRBLControlled"))
|
if (XmlPullUtil.test(pp, "itdRBLControlled"))
|
||||||
XmlPullUtil.next(pp);
|
XmlPullUtil.next(pp);
|
||||||
if (XmlPullUtil.test(pp, "itdInfoTextList"))
|
|
||||||
XmlPullUtil.next(pp);
|
boolean lowFloorVehicle = false;
|
||||||
|
if (XmlPullUtil.test(pp, "itdInfoTextList") && !pp.isEmptyElementTag())
|
||||||
|
{
|
||||||
|
XmlPullUtil.enter(pp, "itdInfoTextList");
|
||||||
|
while (XmlPullUtil.test(pp, "infoTextListElem"))
|
||||||
|
{
|
||||||
|
XmlPullUtil.enter(pp, "infoTextListElem");
|
||||||
|
final String text = pp.getText();
|
||||||
|
if ("Niederflurwagen soweit verfügbar".equals(text)) // KVV
|
||||||
|
lowFloorVehicle = true;
|
||||||
|
XmlPullUtil.exit(pp, "infoTextListElem");
|
||||||
|
}
|
||||||
|
XmlPullUtil.exit(pp, "itdInfoTextList");
|
||||||
|
}
|
||||||
|
|
||||||
if (XmlPullUtil.test(pp, "itdFootPathInfo"))
|
if (XmlPullUtil.test(pp, "itdFootPathInfo"))
|
||||||
XmlPullUtil.next(pp);
|
XmlPullUtil.next(pp);
|
||||||
if (XmlPullUtil.test(pp, "infoLink"))
|
if (XmlPullUtil.test(pp, "infoLink"))
|
||||||
|
@ -2091,7 +2105,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
|
||||||
if (XmlPullUtil.test(pp, "itdPathCoordinates"))
|
if (XmlPullUtil.test(pp, "itdPathCoordinates"))
|
||||||
path = processItdPathCoordinates(pp);
|
path = processItdPathCoordinates(pp);
|
||||||
|
|
||||||
final Set<Line.Attr> lineAttrs = new HashSet<Line.Attr>();
|
boolean wheelChairAccess = false;
|
||||||
if (XmlPullUtil.test(pp, "genAttrList"))
|
if (XmlPullUtil.test(pp, "genAttrList"))
|
||||||
{
|
{
|
||||||
XmlPullUtil.enter(pp, "genAttrList");
|
XmlPullUtil.enter(pp, "genAttrList");
|
||||||
|
@ -2109,7 +2123,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
|
||||||
// System.out.println("genAttrElem: name='" + name + "' value='" + value + "'");
|
// System.out.println("genAttrElem: name='" + name + "' value='" + value + "'");
|
||||||
|
|
||||||
if ("PlanWheelChairAccess".equals(name) && "1".equals(value))
|
if ("PlanWheelChairAccess".equals(name) && "1".equals(value))
|
||||||
lineAttrs.add(Line.Attr.WHEEL_CHAIR_ACCESS);
|
wheelChairAccess = true;
|
||||||
}
|
}
|
||||||
XmlPullUtil.exit(pp, "genAttrList");
|
XmlPullUtil.exit(pp, "genAttrList");
|
||||||
}
|
}
|
||||||
|
@ -2125,6 +2139,9 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
|
||||||
XmlPullUtil.exit(pp, "nextDeps");
|
XmlPullUtil.exit(pp, "nextDeps");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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(lineLabel), lineAttrs);
|
||||||
|
|
||||||
parts.add(new Connection.Trip(line, destination, departureTargetTime != null ? departureTargetTime : departureTime,
|
parts.add(new Connection.Trip(line, destination, departureTargetTime != null ? departureTargetTime : departureTime,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue