From 05ddaf8aababc54ea2db323ec271818b4dedb8c6 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Fri, 14 Dec 2018 18:58:35 +0100
Subject: [PATCH] Sydney: Ferry lines.

---
 .../src/de/schildbach/pte/SydneyProvider.java | 14 +++++++++++++
 .../pte/live/SydneyProviderLiveTest.java      | 20 ++++++++++++-------
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/enabler/src/de/schildbach/pte/SydneyProvider.java b/enabler/src/de/schildbach/pte/SydneyProvider.java
index d13ae1e2..90ea2395 100644
--- a/enabler/src/de/schildbach/pte/SydneyProvider.java
+++ b/enabler/src/de/schildbach/pte/SydneyProvider.java
@@ -150,6 +150,8 @@ public class SydneyProvider extends AbstractEfaProvider {
                 return new Line(id, network, Product.FERRY, "F6");
             if ("F7".equals(symbol) || "F7 Eastern Suburbs".equals(symbol))
                 return new Line(id, network, Product.FERRY, "F7");
+            if ("F8".equals(symbol) || "F8 Cockatoo Island".equals(symbol))
+                return new Line(id, network, Product.FERRY, "F8");
             if (("Private ferry servic".equals(trainName) || "Private ferry and fa".equals(trainName))
                     && symbol != null)
                 return new Line(id, network, Product.FERRY, symbol);
@@ -169,6 +171,18 @@ public class SydneyProvider extends AbstractEfaProvider {
                 return new Line(id, network, Product.FERRY, "CCGD");
             if ("CCWM".equals(symbol) || "Manly to Watsons Bay".equals(name))
                 return new Line(id, network, Product.FERRY, "CCWM");
+            if ("MDH".equals(symbol) || "MDH Manly to Darling Harbour Loop Ferry".equals(name))
+                return new Line(id, network, Product.FERRY, "MDH");
+            if ("CCGZ".equals(symbol) || "CCGZ Garden Island & Taronga Zoo Ferry".equals(name))
+                return new Line(id, network, Product.FERRY, "CCGZ");
+            if ("CCDH".equals(symbol) || "CCDH Circular Quay Luna Park Darling Harbour Ferry".equals(name))
+                return new Line(id, network, Product.FERRY, "CCDH");
+            if ("CCDM".equals(symbol) || "CCDM Manly Ferry".equals(name))
+                return new Line(id, network, Product.FERRY, "CCDM");
+            if ("CCSH".equals(symbol) || "CCSH Shark Island Ferry".equals(name))
+                return new Line(id, network, Product.FERRY, "CCSH");
+            if ("CCTZ".equals(symbol) || "CCTZ Taronga Zoo Ferry".equals(name))
+                return new Line(id, network, Product.FERRY, "CCTZ");
 
             throw new IllegalStateException("cannot normalize mot='" + mot + "' symbol='" + symbol + "' name='" + name
                     + "' long='" + longName + "' trainType='" + trainType + "' trainNum='" + trainNum + "' trainName='"
diff --git a/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java
index e9ba41ea..85be8a70 100644
--- a/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java
@@ -53,15 +53,21 @@ public class SydneyProviderLiveTest extends AbstractProviderLiveTest {
     }
 
     @Test
-    public void queryDepartures() throws Exception {
-        final QueryDeparturesResult resultTownHall = queryDepartures("10101101", false);
-        print(resultTownHall);
+    public void queryDeparturesTownHall() throws Exception {
+        final QueryDeparturesResult result = queryDepartures("10101101", false);
+        print(result);
+    }
 
-        final QueryDeparturesResult resultCircularQuay = queryDepartures("10101103", false);
-        print(resultCircularQuay);
+    @Test
+    public void queryDeparturesCircularQuay() throws Exception {
+        final QueryDeparturesResult result = queryDepartures("10101103", false);
+        print(result);
+    }
 
-        final QueryDeparturesResult resultConvention = queryDepartures("10101439", false);
-        print(resultConvention);
+    @Test
+    public void queryDeparturesConvention() throws Exception {
+        final QueryDeparturesResult result = queryDepartures("10101439", false);
+        print(result);
     }
 
     @Test