From 3bc1faf533a443c9938d6bd88279d5af2459256b Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Wed, 31 May 2017 10:04:07 +0200
Subject: [PATCH] Migrate Norway to binary trips query.

---
 .../src/de/schildbach/pte/NriProvider.java    | 20 -------------------
 .../pte/live/NriProviderLiveTest.java         |  8 ++++----
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/enabler/src/de/schildbach/pte/NriProvider.java b/enabler/src/de/schildbach/pte/NriProvider.java
index de7e916c..c4004721 100644
--- a/enabler/src/de/schildbach/pte/NriProvider.java
+++ b/enabler/src/de/schildbach/pte/NriProvider.java
@@ -17,18 +17,11 @@
 
 package de.schildbach.pte;
 
-import java.io.IOException;
-import java.util.Date;
 import java.util.Set;
 
-import javax.annotation.Nullable;
-
 import com.google.common.base.Charsets;
 
-import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.Product;
-import de.schildbach.pte.dto.QueryTripsContext;
-import de.schildbach.pte.dto.QueryTripsResult;
 
 import okhttp3.HttpUrl;
 
@@ -62,19 +55,6 @@ public class NriProvider extends AbstractHafasLegacyProvider {
         return Product.ALL;
     }
 
-    @Override
-    public QueryTripsResult queryTrips(final Location from, final @Nullable Location via, final Location to,
-            final Date date, final boolean dep, final @Nullable Set<Product> products,
-            final @Nullable Optimize optimize, final @Nullable WalkSpeed walkSpeed,
-            final @Nullable Accessibility accessibility, final @Nullable Set<Option> options) throws IOException {
-        return queryTripsXml(from, via, to, date, dep, products, walkSpeed, accessibility, options);
-    }
-
-    @Override
-    public QueryTripsResult queryMoreTrips(final QueryTripsContext context, final boolean later) throws IOException {
-        return queryMoreTripsXml(context, later);
-    }
-
     @Override
     protected Product normalizeType(final String type) {
         final String ucType = type.toUpperCase();
diff --git a/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java
index 59f69465..6860d807 100644
--- a/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java
@@ -79,10 +79,10 @@ public class NriProviderLiveTest extends AbstractProviderLiveTest {
     }
 
     @Test
-    public void shortTrip() throws Exception {
-        final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8059", null, "Oslo"), null,
-                new Location(LocationType.STATION, "6642", null, "Bergen BGO"), new Date(), true, Product.ALL,
-                WalkSpeed.NORMAL, Accessibility.NEUTRAL);
+    public void trip() throws Exception {
+        final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "760000645", "Oslo", "sentrum"),
+                null, new Location(LocationType.STATION, "760009404", "Bergen", "sentrum"), new Date(), true,
+                Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
         print(result);
         final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
         print(laterResult);