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

Navitia: Handle empty or non-present color attributes, use the product default colors in these cases.

Browse source
This commit is contained in:
Andreas Schildbach 2016-03-09 13:34:26 +01:00
parent 14f02607f1
commit ab4650586a
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -158,7 +158,16 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
protected Style getLineStyle(final Product product, final String code, final String color) protected Style getLineStyle(final Product product, final String code, final String color)
{ {
return new Style(Shape.RECT, Style.parseColor(color), computeForegroundColor(color)); if (color != null)
{
return new Style(Shape.RECT, Style.parseColor(color), computeForegroundColor(color));
}
else
{
final Style defaultStyle = Standard.STYLES.get(product);
return new Style(Shape.RECT, defaultStyle.backgroundColor, defaultStyle.backgroundColor2, defaultStyle.foregroundColor,
defaultStyle.borderColor);
}
} }
private String uri() private String uri()
@ -411,9 +420,8 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
final Product product = parseLineProductFromMode(modeId); final Product product = parseLineProductFromMode(modeId);
final JSONObject displayInfo = section.getJSONObject("display_informations"); final JSONObject displayInfo = section.getJSONObject("display_informations");
final String code = displayInfo.getString("code"); final String code = displayInfo.getString("code");
final String colorHex = displayInfo.getString("color"); final String color = Strings.emptyToNull(displayInfo.getString("color"));
final String color = colorHex.equals("000000") ? "#FFFFFF" : "#" + colorHex; final Style lineStyle = getLineStyle(product, code, color != null ? "#" + color : null);
final Style lineStyle = getLineStyle(product, code, color);
return new Line(lineId, null, product, code, lineStyle); return new Line(lineId, null, product, code, lineStyle);
} }
@ -598,8 +606,8 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
final String lineId = jsonLine.getString("id"); final String lineId = jsonLine.getString("id");
final Product product = parseLineProduct(jsonLine); final Product product = parseLineProduct(jsonLine);
final String code = jsonLine.getString("code"); final String code = jsonLine.getString("code");
final String color = "#" + jsonLine.getString("color"); final String color = Strings.emptyToNull(jsonLine.getString("color"));
final Style lineStyle = getLineStyle(product, code, color); final Style lineStyle = getLineStyle(product, code, color != null ? "#" + color : null);
return new Line(lineId, null, product, code, lineStyle); return new Line(lineId, null, product, code, lineStyle);
} }
catch (final JSONException jsonExc) catch (final JSONException jsonExc)