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

Line: Add a name to Line and use it with Navitia providers

Browse source 
Also add network to Navitia providers and take text color into account.

Due to a bug uncovered by adding the network to the line,
the code to retrieve departures had to be simplified.
It now does not do an extra network request to get the line destination.
This commit is contained in:
Torsten Grote 2016-03-10 22:10:33 -03:00 • committed by Andreas Schildbach
parent 2adf627e51
commit bc5cf15893
2 changed files with 59 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

111
enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java
View file

@ -71,6 +71,7 @@ import de.schildbach.pte.util.ParserUtils;
/**
* @author Antonio El Khoury
* @author Andreas Schildbach
* @author Torsten Grote
*/
public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
{
@ -157,9 +158,16 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
protected Style getLineStyle(final Product product, final String code, final String color)
{
if (color != null)
return getLineStyle(product, code, color, null);
}
protected Style getLineStyle(final Product product, final String code, final String backgroundColor, final String foregroundColor)
{
if (backgroundColor != null)
{
return new Style(Shape.RECT, Style.parseColor(color), computeForegroundColor(color));
if (foregroundColor == null)
return new Style(Shape.RECT, Style.parseColor(backgroundColor), computeForegroundColor(backgroundColor));
return new Style(Shape.RECT, Style.parseColor(backgroundColor), Style.parseColor(foregroundColor));
}
else
{
@ -468,11 +476,13 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
final Product product = parseLineProductFromMode(modeId);
final JSONObject displayInfo = section.getJSONObject("display_informations");
final String network = Strings.emptyToNull(displayInfo.optString("network"));
final String code = displayInfo.getString("code");
final String color = Strings.emptyToNull(displayInfo.getString("color"));
final String name = Strings.emptyToNull(displayInfo.optString("headsign"));
final Style lineStyle = getLineStyle(product, code, color != null ? "#" + color : null);
return new Line(lineId, null, product, code, lineStyle);
return new Line(lineId, network, product, code, name, lineStyle);
}
catch (final JSONException jsonExc)
{
@ -653,11 +663,17 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
try
{
final String lineId = jsonLine.getString("id");
String network = null;
if (jsonLine.has("network"))
network = Strings.emptyToNull(jsonLine.getJSONObject("network").optString("name"));
final Product product = parseLineProduct(jsonLine);
final String code = jsonLine.getString("code");
final String name = Strings.emptyToNull(jsonLine.optString("name"));
final String color = Strings.emptyToNull(jsonLine.getString("color"));
final Style lineStyle = getLineStyle(product, code, color != null ? "#" + color : null);
return new Line(lineId, null, product, code, lineStyle);
final String textColor = Strings.emptyToNull(jsonLine.optString("text_color"));
final Style lineStyle = getLineStyle(product, code, color != null ? "#" + color : null, textColor != null ? "#" + textColor : null);
return new Line(lineId, network, product, code, name, lineStyle);
}
catch (final JSONException jsonExc)
{
@ -752,17 +768,13 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
}
}
private LineDestination parseLineDestination(final JSONObject route) throws IOException
private LineDestination getStationLine(final Line line, final JSONObject jsonDeparture) throws IOException
{
try
{
// Build line.
final JSONObject jsonLine = route.getJSONObject("line");
final Line line = parseLine(jsonLine);
// Build line destination.
final JSONObject route = jsonDeparture.getJSONObject("route");
final JSONObject direction = route.getJSONObject("direction");
Location destination = parseLocation(direction);
final Location destination = parseLocation(direction);
return new LineDestination(line, destination);
}
@ -772,33 +784,6 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
}
}
private List<LineDestination> getStationLines(final String stopPointId) throws IOException
{
final String uri = uri() + "stop_points/" + ParserUtils.urlEncode(stopPointId) + "/routes?depth=2";
final CharSequence page = httpClient.get(uri);
try
{
final JSONObject head = new JSONObject(page.toString());
final JSONArray routes = head.getJSONArray("routes");
final List<LineDestination> lineDestinations = new LinkedList<LineDestination>();
for (int i = 0; i < routes.length(); ++i)
{
final JSONObject route = routes.getJSONObject(i);
final LineDestination lineDestination = parseLineDestination(route);
lineDestinations.add(lineDestination);
}
return lineDestinations;
}
catch (final JSONException jsonExc)
{
throw new ParserException(jsonExc);
}
}
private String getStopAreaId(final String stopPointId) throws IOException
{
final String uri = uri() + "stop_points/" + ParserUtils.urlEncode(stopPointId) + "?depth=1";
@ -968,24 +953,6 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
{
final JSONObject jsonDeparture = departures.getJSONObject(i);
final JSONObject stopPoint = jsonDeparture.getJSONObject("stop_point");
final Location location = parsePlace(stopPoint, PlaceType.STOP_POINT);
// If stop point has already been added, retrieve it
// from result, otherwise add it and add station
// lines.
StationDepartures stationDepartures = result.findStationDepartures(location.id);
if (stationDepartures == null)
{
stationDepartures = new StationDepartures(location, new LinkedList<Departure>(), new LinkedList<LineDestination>());
result.stationDepartures.add(stationDepartures);
final List<LineDestination> lineDestinations = getStationLines(location.id);
for (LineDestination lineDestination : lineDestinations)
checkNotNull(stationDepartures.lines).add(lineDestination);
}
// Build departure date.
final JSONObject stopDateTime = jsonDeparture.getJSONObject("stop_date_time");
final String departureDateTime = stopDateTime.getString("departure_date_time");
@ -995,10 +962,23 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
final JSONObject route = jsonDeparture.getJSONObject("route");
final JSONObject jsonLine = route.getJSONObject("line");
final Line line = parseLine(jsonLine);
final LineDestination lineDestination = findLineDestination(stationDepartures.lines, line);
Location destination = null;
if (lineDestination != null)
destination = lineDestination.destination;
final JSONObject stopPoint = jsonDeparture.getJSONObject("stop_point");
final Location location = parsePlace(stopPoint, PlaceType.STOP_POINT);
// If stop point has already been added, retrieve it from result,
// otherwise add it and add station lines.
StationDepartures stationDepartures = result.findStationDepartures(location.id);
if (stationDepartures == null)
{
stationDepartures = new StationDepartures(location, new LinkedList<Departure>(), new LinkedList<LineDestination>());
result.stationDepartures.add(stationDepartures);
}
final LineDestination lineDestination = getStationLine(line, jsonDeparture);
final List<LineDestination> lines = stationDepartures.lines;
if (lines != null && !lines.contains(lineDestination))
lines.add(lineDestination);
final Location destination = lineDestination.destination;
// Add departure to list.
final Departure departure = new Departure(plannedTime, null, line, null, destination, null, null);
@ -1035,15 +1015,6 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
}
}
private LineDestination findLineDestination(final List<LineDestination> lineDestinations, final Line line)
{
for (final LineDestination lineDestination : lineDestinations)
if (lineDestination.line.equals(line))
return lineDestination;
return null;
}
public SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException
{
final String nameCstr = constraint.toString();

22
enabler/src/de/schildbach/pte/dto/Line.java
View file

@ -43,6 +43,7 @@ public final class Line implements Serializable, Comparable<Line>
public final @Nullable String network;
public final @Nullable Product product;
public final @Nullable String label;
public final @Nullable String name;
public final @Nullable Style style;
public final @Nullable Set<Attr> attrs;
public final @Nullable String message;
@ -54,31 +55,43 @@ public final class Line implements Serializable, Comparable<Line>
public Line(final String id, final String network, final Product product, final String label)
{
this(id, network, product, label, null, null, null);
this(id, network, product, label, null, null, null, null);
}
public Line(final String id, final String network, final Product product, final String label, final Style style)
{
this(id, network, product, label, style, null, null);
this(id, network, product, label, null, style, null, null);
}
public Line(final String id, final String network, final Product product, final String label, final String name, final Style style)
{
this(id, network, product, label, name, style, null, null);
}
public Line(final String id, final String network, final Product product, final String label, final Style style, final String message)
{
this(id, network, product, label, style, null, message);
this(id, network, product, label, null, style, null, message);
}
public Line(final String id, final String network, final Product product, final String label, final Style style, final Set<Attr> attrs)
{
this(id, network, product, label, style, attrs, null);
this(id, network, product, label, null, style, attrs, null);
}
public Line(final String id, final String network, final Product product, final String label, final Style style, final Set<Attr> attrs,
final String message)
{
this(id, network, product, label, null, style, attrs, message);
}
public Line(final String id, final String network, final Product product, final String label, final String name, final Style style,
final Set<Attr> attrs, final String message)
{
this.id = id;
this.network = network;
this.product = product;
this.label = label;
this.name = name;
this.style = style;
this.attrs = attrs;
this.message = message;
@ -126,6 +139,7 @@ public final class Line implements Serializable, Comparable<Line>
.addValue(network) //
.addValue(product) //
.addValue(label) //
.addValue(name) //
.toString();
}