From e10de06c13a6ff07b410b6f6ab93d6249b66ab86 Mon Sep 17 00:00:00 2001
From: full-duplex <full-duplex@users.noreply.github.com>
Date: Tue, 18 Sep 2018 00:27:04 +0200
Subject: [PATCH] Negentwee: Support querying for trips with coordinate
 locations.

---
 .../de/schildbach/pte/NegentweeProvider.java  | 31 +++++++++++++------
 .../pte/live/NegentweeProviderLiveTest.java   | 11 +++++++
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/enabler/src/de/schildbach/pte/NegentweeProvider.java b/enabler/src/de/schildbach/pte/NegentweeProvider.java
index a1251388..105b9175 100644
--- a/enabler/src/de/schildbach/pte/NegentweeProvider.java
+++ b/enabler/src/de/schildbach/pte/NegentweeProvider.java
@@ -319,6 +319,16 @@ public class NegentweeProvider extends AbstractNetworkProvider {
         return null;
     }
 
+    private String locationToQueryParameterString(Location loc) {
+        if (loc.hasId()) {
+            return loc.id;
+        } else if (loc.hasLocation()) {
+            return loc.getLatAsDouble() + "," + loc.getLonAsDouble();
+        } else {
+            return null;
+        }
+    }
+
     // Including these type names will cause the locations API to fail, skip them
     private static final ImmutableSet<String> DISALLOWED_TYPE_NAMES = ImmutableSet.of("latlong", "streetrange");
 
@@ -837,24 +847,27 @@ public class NegentweeProvider extends AbstractNetworkProvider {
     public QueryTripsResult queryTrips(Location from, @Nullable Location via, Location to, Date date, boolean dep,
             @Nullable Set<Product> products, @Nullable Optimize optimize, @Nullable WalkSpeed walkSpeed,
             @Nullable Accessibility accessibility, @Nullable Set<Option> options) throws IOException {
-        if (!from.hasId())
+        if (!(from.hasId() || from.hasLocation()))
             return ambiguousQueryTrips(from, via, to);
 
-        if (!to.hasId())
+        if (!(to.hasId() || to.hasLocation()))
             return ambiguousQueryTrips(from, via, to);
 
         // Default query options
-        List<QueryParameter> queryParameters = new ArrayList<>(Arrays.asList(new QueryParameter("from", from.id),
-                new QueryParameter("to", to.id), new QueryParameter("searchType", dep ? "departure" : "arrival"),
-                new QueryParameter("dateTime", new SimpleDateFormat("yyyy-MM-dd'T'HHmm").format(date.getTime())),
-                new QueryParameter("sequence", "1"), new QueryParameter("realtime", "true"),
-                new QueryParameter("before", "1"), new QueryParameter("after", "5")));
+        List<QueryParameter> queryParameters = new ArrayList<>(
+                Arrays.asList(new QueryParameter("from", locationToQueryParameterString(from)),
+                        new QueryParameter("to", locationToQueryParameterString(to)),
+                        new QueryParameter("searchType", dep ? "departure" : "arrival"),
+                        new QueryParameter("dateTime",
+                                new SimpleDateFormat("yyyy-MM-dd'T'HHmm").format(date.getTime())),
+                        new QueryParameter("sequence", "1"), new QueryParameter("realtime", "true"),
+                        new QueryParameter("before", "1"), new QueryParameter("after", "5")));
 
         if (via != null) {
-            if (!via.hasId())
+            if (!(via.hasId() || via.hasLocation()))
                 return ambiguousQueryTrips(from, via, to);
 
-            queryParameters.add(new QueryParameter("via", via.id));
+            queryParameters.add(new QueryParameter("via", locationToQueryParameterString(via)));
         }
 
         if (walkSpeed != null && walkSpeed == WalkSpeed.SLOW) {
diff --git a/enabler/test/de/schildbach/pte/live/NegentweeProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NegentweeProviderLiveTest.java
index bea501f1..e1a9465e 100644
--- a/enabler/test/de/schildbach/pte/live/NegentweeProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/NegentweeProviderLiveTest.java
@@ -30,6 +30,7 @@ import de.schildbach.pte.NetworkProvider;
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyLocationsResult;
+import de.schildbach.pte.dto.Point;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
 import de.schildbach.pte.dto.SuggestLocationsResult;
@@ -167,4 +168,14 @@ public class NegentweeProviderLiveTest extends AbstractProviderLiveTest {
         print(result);
         assertEquals(QueryTripsResult.Status.OK, result.status);
     }
+
+    @Test
+    public void coordinatesTrip() throws Exception {
+        final QueryTripsResult result = queryTrips(new Location(LocationType.COORD, null, new Point(51677273, 4437548)),
+                new Location(LocationType.COORD, null, new Point(52162772, 4583171)),
+                new Location(LocationType.COORD, null, new Point(53347140, 6720583)), new Date(), true, null,
+                NetworkProvider.WalkSpeed.FAST, NetworkProvider.Accessibility.NEUTRAL);
+        print(result);
+        assertEquals(QueryTripsResult.Status.OK, result.status);
+    }
 }