From aa5bb112086e1f32fb688aea9ac1723dd9341fec Mon Sep 17 00:00:00 2001
From: "andreas.schildbach"
 <andreas.schildbach@0924bc21-9374-b0fa-ee44-9ff1593b38f0>
Date: Sun, 10 Oct 2010 17:05:34 +0000
Subject: [PATCH] workaround for verbose S-Bahn names

git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@274 0924bc21-9374-b0fa-ee44-9ff1593b38f0
---
 src/de/schildbach/pte/AbstractEfaProvider.java | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java
index 6311f7af..e2651498 100644
--- a/src/de/schildbach/pte/AbstractEfaProvider.java
+++ b/src/de/schildbach/pte/AbstractEfaProvider.java
@@ -302,6 +302,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider
 	private static final Pattern P_LINE_OE = Pattern.compile("OE\\d+");
 	private static final Pattern P_LINE_R = Pattern.compile("R\\d+(/R\\d+|\\(z\\))?");
 	private static final Pattern P_LINE_U = Pattern.compile("U\\d+");
+	private static final Pattern P_LINE_S = Pattern.compile("^(?:%)?(S\\d+)");
 	private static final Pattern P_LINE_NUMBER = Pattern.compile("\\d+");
 
 	protected String parseLine(final String mot, final String name, final String longName)
@@ -532,18 +533,31 @@ public abstract class AbstractEfaProvider implements NetworkProvider
 
 			throw new IllegalArgumentException("cannot normalize: long '" + longName + "' type '" + type + "'");
 		}
+
 		if (t == 1)
-			return 'S' + name;
+		{
+			final Matcher m = P_LINE_S.matcher(name);
+			if (m.find())
+				return 'S' + m.group(1);
+			else
+				return 'S' + name;
+		}
+
 		if (t == 2)
 			return 'U' + name;
+
 		if (t == 3 || t == 4)
 			return 'T' + name;
+
 		if (t == 5 || t == 6 || t == 7 || t == 10)
 			return 'B' + name;
+
 		if (t == 8)
 			return 'C' + name;
+
 		if (t == 9)
 			return 'F' + name;
+
 		if (t == 11 || t == -1)
 			return '?' + name;