From 025eba20f1283782bc6cab216dbc12e3edc69eef Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sun, 4 Nov 2018 22:19:32 +0100 Subject: [PATCH] NRI: Remove provider for Norway. --- enabler/src/de/schildbach/pte/NetworkId.java | 3 - .../src/de/schildbach/pte/NriProvider.java | 99 ------------------- .../pte/live/NriProviderLiveTest.java | 90 ----------------- 3 files changed, 192 deletions(-) delete mode 100644 enabler/src/de/schildbach/pte/NriProvider.java delete mode 100644 enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java diff --git a/enabler/src/de/schildbach/pte/NetworkId.java b/enabler/src/de/schildbach/pte/NetworkId.java index f39124b3..6ea51c04 100644 --- a/enabler/src/de/schildbach/pte/NetworkId.java +++ b/enabler/src/de/schildbach/pte/NetworkId.java @@ -51,9 +51,6 @@ public enum NetworkId { // Sweden SE, - // Norway - NRI, - // Finland HSL, diff --git a/enabler/src/de/schildbach/pte/NriProvider.java b/enabler/src/de/schildbach/pte/NriProvider.java deleted file mode 100644 index 555e25df..00000000 --- a/enabler/src/de/schildbach/pte/NriProvider.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright 2010-2015 the original author or authors. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package de.schildbach.pte; - -import java.util.Set; - -import com.google.common.base.Charsets; - -import de.schildbach.pte.dto.Product; - -import okhttp3.HttpUrl; - -/** - * @author Andreas Schildbach - */ -public class NriProvider extends AbstractHafasLegacyProvider { - private static final HttpUrl API_BASE = HttpUrl.parse("http://apiprod.reiseinfo.no/bin/"); - private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.REGIONAL_TRAIN, Product.BUS, - Product.TRAM, Product.SUBWAY, Product.FERRY, Product.FERRY, Product.FERRY }; - - public NriProvider() { - super(NetworkId.NRI, API_BASE, "on", PRODUCTS_MAP); - - setRequestUrlEncoding(Charsets.UTF_8); - } - - private static final String[] PLACES = { "Oslo", "Bergen" }; - - @Override - protected String[] splitStationName(final String name) { - for (final String place : PLACES) - if (name.startsWith(place + " ")) - return new String[] { place, name.substring(place.length() + 1) }; - - return super.splitStationName(name); - } - - @Override - public Set defaultProducts() { - return Product.ALL; - } - - @Override - protected Product normalizeType(final String type) { - final String ucType = type.toUpperCase(); - - if ("AIR".equals(ucType)) - return Product.HIGH_SPEED_TRAIN; - - if ("TRA".equals(ucType)) - return Product.REGIONAL_TRAIN; - if ("TRAIN".equals(ucType)) - return Product.REGIONAL_TRAIN; - if ("HEL".equals(ucType)) // Heli - return Product.REGIONAL_TRAIN; - - if ("U".equals(ucType)) - return Product.SUBWAY; - - if ("TRAM".equals(ucType)) - return Product.TRAM; - if ("MTR".equals(ucType)) - return Product.TRAM; - - if (ucType.startsWith("BUS")) - return Product.BUS; - - if ("EXP".equals(ucType)) - return Product.FERRY; - if ("EXP.BOAT".equals(ucType)) - return Product.FERRY; - if ("FERRY".equals(ucType)) - return Product.FERRY; - if ("FER".equals(ucType)) - return Product.FERRY; - if ("SHIP".equals(ucType)) - return Product.FERRY; - if ("SHI".equals(ucType)) - return Product.FERRY; - - // skip parsing of "common" lines - throw new IllegalStateException("cannot normalize type '" + type + "'"); - } -} diff --git a/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java deleted file mode 100644 index a1562a0e..00000000 --- a/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright 2010-2015 the original author or authors. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package de.schildbach.pte.live; - -import static org.junit.Assert.assertEquals; - -import java.util.Date; - -import org.junit.Test; - -import de.schildbach.pte.NetworkProvider.Accessibility; -import de.schildbach.pte.NetworkProvider.WalkSpeed; -import de.schildbach.pte.NriProvider; -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; -import de.schildbach.pte.dto.NearbyLocationsResult; -import de.schildbach.pte.dto.Product; -import de.schildbach.pte.dto.QueryDeparturesResult; -import de.schildbach.pte.dto.QueryTripsResult; -import de.schildbach.pte.dto.SuggestLocationsResult; - -/** - * @author Andreas Schildbach - */ -public class NriProviderLiveTest extends AbstractProviderLiveTest { - public NriProviderLiveTest() { - super(new NriProvider()); - } - - @Test - public void nearbyStations() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.STATION, "112270")); - print(result); - } - - @Test - public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(Location.coord(59911871, 10764999)); - print(result); - } - - @Test - public void queryDepartures() throws Exception { - final QueryDeparturesResult result = queryDepartures("6735", false); - print(result); - } - - @Test - public void queryDeparturesInvalidStation() throws Exception { - final QueryDeparturesResult result = queryDepartures("999999", false); - assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status); - } - - @Test - public void suggestLocations() throws Exception { - final SuggestLocationsResult result = suggestLocations("Oslo"); - print(result); - } - - @Test - public void suggestLocationsUmlaut() throws Exception { - final SuggestLocationsResult result = suggestLocations("Skøyen"); - print(result); - } - - @Test - 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); - } -}