Lines.

enabler/src/de/schildbach/pte/AbstractEfaProvider.java

@@ -1097,7 +1097,9 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 				return "IEN" + trainNum;
 			if ("IC".equals(trainType) || "InterCity".equals(trainName))
 				return "IIC" + trainNum;
-			if ("ICE".equals(trainType) || "Intercity-Express".equals(trainName))
+			if ("InterCity".equals(longName))
+				return "IIC";
+			if (("ICE".equals(trainType) || "ICE".equals(trainName) || "Intercity-Express".equals(trainName)) && trainNum != null)
 				return "IICE" + trainNum;
 			if ("X".equals(trainType) || "InterConnex".equals(trainName))
 				return "IX" + trainNum;
@@ -1190,8 +1192,12 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 				return "RHEX" + trainNum;
 			if ("EB".equals(trainType) || "Erfurter Bahn".equals(trainName))
 				return "REB" + trainNum;
+			if ("Erfurter Bahn".equals(longName))
+				return "REB";
 			if ("EBx".equals(trainType) || "Erfurter Bahn Express".equals(trainName))
 				return "REBx" + trainNum;
+			if ("Erfurter Bahn Express".equals(longName))
+				return "REBx";
 			if ("MRB".equals(trainType) || "Mitteldeutsche Regiobahn".equals(trainName))
 				return "RMRB" + trainNum;
 			if ("ABR".equals(trainType) || "ABELLIO Rail NRW GmbH".equals(trainName))
@@ -1244,6 +1250,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 				return "REX" + trainNum;
 			if ("ME".equals(trainType) || "metronom".equals(trainName))
 				return "RME" + trainNum;
+			if ("metronom".equals(longName))
+				return "RME";
 			if ("MEr".equals(trainType))
 				return "RMEr" + trainNum;
 			if ("AKN".equals(trainType) || "AKN Eisenbahn AG".equals(trainName))

enabler/src/de/schildbach/pte/AbstractHafasProvider.java

@@ -2396,6 +2396,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 			return 'I';
 		if ("ICN".equals(ucType)) // Intercity-Neigezug, Schweiz
 			return 'I';
+		if ("ICD".equals(ucType)) // Intercity direkt Amsterdam-Breda
+			return 'I';
 		if ("CNL".equals(ucType)) // CityNightLine
 			return 'I';
 		if ("OEC".equals(ucType)) // ÖBB-EuroCity

enabler/src/de/schildbach/pte/GvhProvider.java

@@ -77,6 +77,8 @@ public class GvhProvider extends AbstractEfaProvider
 				return "UU2";
 			if ("U3".equals(symbol))
 				return "UU3";
+			if ("U4".equals(symbol))
+				return "UU4";
 		}
 
 		return super.parseLine(mot, symbol, name, longName, trainType, trainNum, trainName);

enabler/src/de/schildbach/pte/LuProvider.java

@@ -182,6 +182,8 @@ public class LuProvider extends AbstractHafasProvider
 			return 'B';
 		if ("DIFFBUS".equals(ucType))
 			return 'B';
+		if ("NAVETTE".equals(ucType))
+			return 'B';
 
 		final char t = super.normalizeType(type);
 		if (t != 0)

enabler/src/de/schildbach/pte/MvvProvider.java

@@ -66,8 +66,6 @@ public class MvvProvider extends AbstractEfaProvider
 		{
 			if ("Mittelrheinbahn (trans regio)".equals(trainName))
 				return "RMiRhBa";
-			if ("Erfurter Bahn Express".equals(longName))
-				return "REBx";
 			if ("Süd-Thüringen-Bahn".equals(longName))
 				return "RSTB";
 			if ("agilis".equals(longName))

enabler/src/de/schildbach/pte/RtProvider.java

@@ -140,9 +140,6 @@ public class RtProvider extends AbstractHafasProvider
 	{
 		final String ucType = type.toUpperCase();
 
-		if ("ICD".equals(ucType)) // Intercity direkt Amsterdam-Breda
-			return 'I';
-
 		if ("E".equals(ucType)) // Romania, Croatia
 			return 'R';
 		if ("N".equals(ucType)) // Frankreich, Tours

enabler/src/de/schildbach/pte/TflProvider.java

@@ -117,6 +117,8 @@ public class TflProvider extends AbstractEfaProvider
 
 			else if ("London Overground".equals(trainName) || "=LO".equals(trainType))
 				return "SLO" + trainNum;
+			else if ("LO".equals(trainNum) && trainType == null && trainName == null)
+				return "SLO";
 
 			else if ("Underground".equals(trainName) && trainType == null && name != null)
 				return "U" + name;

enabler/src/de/schildbach/pte/VmsProvider.java

@@ -50,6 +50,23 @@ public class VmsProvider extends AbstractEfaProvider
 		return false;
 	}
 
+	@Override
+	protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
+			final String trainNum, final String trainName)
+	{
+		if ("0".equals(mot))
+		{
+			if ("Ilztalbahn".equals(trainName) && trainNum == null)
+				return "RITB";
+			if ("Meridian".equals(trainName) && trainNum == null)
+				return "RM";
+			if ("CityBahn".equals(trainName) && trainNum == null)
+				return "RCB";
+		}
+
+		return super.parseLine(mot, symbol, name, longName, trainType, trainNum, trainName);
+	}
+
 	@Override
 	public List<Location> autocompleteStations(final CharSequence constraint) throws IOException
 	{

enabler/src/de/schildbach/pte/VvoProvider.java

@@ -59,10 +59,10 @@ public class VvoProvider extends AbstractEfaProvider
 	{
 		if ("0".equals(mot))
 		{
-			if ("Erfurter Bahn".equals(longName))
-				return "REB";
 			if ("Ostdeutsche Eisenbahn GmbH".equals(longName))
 				return "ROE";
+			if ("Meridian".equals(longName))
+				return "RM";
 		}
 
 		return super.parseLine(mot, symbol, name, longName, trainType, trainNum, trainName);