From 4730f1a48ec4e8dc84a4e0fd7ef0d41d0f564002 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Wed, 20 Jun 2012 16:04:49 +0200
Subject: [PATCH] overhauled Stockholm

---
 .../de/schildbach/pte/StockholmProvider.java  | 46 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/enabler/src/de/schildbach/pte/StockholmProvider.java b/enabler/src/de/schildbach/pte/StockholmProvider.java
index 75e88d18..d01d467d 100644
--- a/enabler/src/de/schildbach/pte/StockholmProvider.java
+++ b/enabler/src/de/schildbach/pte/StockholmProvider.java
@@ -22,6 +22,7 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import de.schildbach.pte.dto.Line;
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
@@ -38,7 +39,7 @@ public class StockholmProvider extends AbstractHafasProvider
 
 	public StockholmProvider()
 	{
-		super(API_BASE + "query.exe/sn", 7, null);
+		super(API_BASE + "query.exe/sn", 7, null, UTF_8, null);
 	}
 
 	public NetworkId id()
@@ -55,6 +56,25 @@ public class StockholmProvider extends AbstractHafasProvider
 		return false;
 	}
 
+	@Override
+	protected char intToProduct(final int value)
+	{
+		if (value == 1) // Pendeltåg
+			return 'S';
+		if (value == 2) // Tunnelbana
+			return 'U';
+		if (value == 4) // Lokaltåg
+			return 'R';
+		if (value == 8) // Buss
+			return 'B';
+		if (value == 16) // Flygbussar
+			return 'B';
+		if (value == 64) // Båt
+			return 'F';
+
+		throw new IllegalArgumentException("cannot handle: " + value);
+	}
+
 	@Override
 	protected void setProductBits(final StringBuilder productBits, final char product)
 	{
@@ -86,7 +106,7 @@ public class StockholmProvider extends AbstractHafasProvider
 		}
 		else if (product == 'F')
 		{
-			productBits.setCharAt(6, '1'); // Waxholmsbåtar
+			productBits.setCharAt(6, '1'); // Båt
 		}
 		else if (product == 'C')
 		{
@@ -166,6 +186,28 @@ public class StockholmProvider extends AbstractHafasProvider
 		return jsonGetStops(uri);
 	}
 
+	@Override
+	protected Line parseLineAndType(final String lineAndType)
+	{
+		final Matcher m = P_NORMALIZE_LINE.matcher(lineAndType);
+		if (m.matches())
+		{
+			final String type = m.group(1);
+			final String number = m.group(2).replaceAll("\\s+", " ");
+
+			if (type.length() > 0)
+			{
+				final char normalizedType = normalizeType(type);
+				if (normalizedType != 0)
+					return newLine(normalizedType + number);
+			}
+
+			throw new IllegalStateException("cannot normalize type " + type + " number " + number + " line#type " + lineAndType);
+		}
+
+		throw new IllegalStateException("cannot normalize line#type " + lineAndType);
+	}
+
 	@Override
 	protected char normalizeType(final String type)
 	{