mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-15 17:10:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

NRI: Remove provider for Norway.

Browse source
This commit is contained in:
Andreas Schildbach 2018-11-04 22:19:32 +01:00
parent a8ef6c365a
commit 025eba20f1
3 changed files with 0 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

3
enabler/src/de/schildbach/pte/NetworkId.java
View file

@ -51,9 +51,6 @@ public enum NetworkId {
// Sweden // Sweden
SE, SE,
// Norway
NRI,
// Finland // Finland
HSL, HSL,

99
enabler/src/de/schildbach/pte/NriProvider.java
View file

@ -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 <https://www.gnu.org/licenses/>.
*/
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<Product> 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 + "'");
}
}

90
enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java
View file

@ -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 <https://www.gnu.org/licenses/>.
*/
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);
}
}