From c1a309f938edc15fdca6e27018c929c1e7cc96be Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 3 Oct 2015 22:05:00 +0200 Subject: [PATCH] Hafas: Normalize product names received from JSON API. --- .../src/de/schildbach/pte/AbstractHafasProvider.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java index c1d26310..c3ac15a7 100644 --- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java @@ -1428,7 +1428,16 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider final int cls = prod.optInt("cls", -1); final Product product = cls != -1 ? intToProduct(cls) : null; final String name = prod.getString("name"); - final Line line = new Line(null, operator, product, name, lineStyle(operator, product, name)); + final String normalizedName; + if (product == Product.BUS && name.startsWith("Bus ")) + normalizedName = name.substring(4); + else if (product == Product.TRAM && name.startsWith("Tram ")) + normalizedName = name.substring(5); + else if (product == Product.SUBURBAN_TRAIN && name.startsWith("S ")) + normalizedName = "S" + name.substring(2); + else + normalizedName = name; + final Line line = new Line(null, operator, product, normalizedName, lineStyle(operator, product, normalizedName)); lines.add(line); }