From 03a3a387af10bc19148528dbf4dee5da62b0f3f4 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Sat, 17 Nov 2018 10:38:42 +0100
Subject: [PATCH] ZVV: Fix splitting of station names.

---
 enabler/src/de/schildbach/pte/ZvvProvider.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/enabler/src/de/schildbach/pte/ZvvProvider.java b/enabler/src/de/schildbach/pte/ZvvProvider.java
index 1b3d49cc..b7b84b07 100644
--- a/enabler/src/de/schildbach/pte/ZvvProvider.java
+++ b/enabler/src/de/schildbach/pte/ZvvProvider.java
@@ -63,13 +63,16 @@ public class ZvvProvider extends AbstractHafasClientInterfaceProvider {
             }
         }
 
+        for (final String place : PLACES) {
+            if (name.startsWith(place + " "))
+                return new String[] { place, name.substring(place.length() + 1) };
+            else if (name.startsWith(place + ", "))
+                return new String[] { place, name.substring(place.length() + 2) };
+        }
+
         final Matcher m = P_SPLIT_NAME_FIRST_COMMA.matcher(name);
         if (m.matches())
             return new String[] { m.group(1), m.group(2) };
-
-        for (final String place : PLACES)
-            if (name.startsWith(place + " ") || name.startsWith(place + ","))
-                return new String[] { place, name.substring(place.length() + 1) };
         return super.splitStationName(name);
     }