mirror of
https://gitlab.com/oeffi/public-transport-enabler.git
synced 2025-07-07 01:48:48 +00:00
TFI: remove provider for Ireland
This commit is contained in:
parent
f1e64b9c2f
commit
4c43334fa8
3 changed files with 1 additions and 168 deletions
|
@ -64,7 +64,7 @@ public enum NetworkId {
|
||||||
TLEM, MERSEY,
|
TLEM, MERSEY,
|
||||||
|
|
||||||
// Ireland
|
// Ireland
|
||||||
TFI, EIREANN,
|
EIREANN,
|
||||||
|
|
||||||
// Poland
|
// Poland
|
||||||
PL, PLNAVITIA,
|
PL, PLNAVITIA,
|
||||||
|
|
|
@ -1,65 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright 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 javax.annotation.Nullable;
|
|
||||||
|
|
||||||
import com.google.common.base.Strings;
|
|
||||||
|
|
||||||
import de.schildbach.pte.dto.Line;
|
|
||||||
import de.schildbach.pte.dto.Product;
|
|
||||||
|
|
||||||
import okhttp3.HttpUrl;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author Andreas Schildbach
|
|
||||||
*/
|
|
||||||
public class TfiProvider extends AbstractEfaProvider {
|
|
||||||
private static final HttpUrl API_BASE = HttpUrl.parse("https://www.journeyplanner.transportforireland.ie/nta/");
|
|
||||||
// https://www.journeyplanner.transportforireland.ie/ultraLite/
|
|
||||||
|
|
||||||
public TfiProvider() {
|
|
||||||
super(NetworkId.TFI, API_BASE);
|
|
||||||
setLanguage("en");
|
|
||||||
setTimeZone("Europe/London");
|
|
||||||
setSessionCookieName("NSC_ttm_kqmboofs-usbotqpsu");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Set<Product> defaultProducts() {
|
|
||||||
return Product.ALL;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected Line parseLine(final @Nullable String id, final @Nullable String network, final @Nullable String mot,
|
|
||||||
final @Nullable String symbol, final @Nullable String name, final @Nullable String longName,
|
|
||||||
final @Nullable String trainType, final @Nullable String trainNum, final @Nullable String trainName) {
|
|
||||||
if ("0".equals(mot)) {
|
|
||||||
if ("DART".equals(name))
|
|
||||||
return new Line(id, network, Product.SUBURBAN_TRAIN, "DART");
|
|
||||||
if ("Rail".equals(trainName))
|
|
||||||
return new Line(id, network, Product.REGIONAL_TRAIN, "Rail" + Strings.nullToEmpty(trainNum));
|
|
||||||
if ("Train".equals(name) && "Train".equals(symbol))
|
|
||||||
return new Line(id, network, null, "Train");
|
|
||||||
}
|
|
||||||
|
|
||||||
return super.parseLine(id, network, mot, symbol, name, longName, trainType, trainNum, trainName);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,102 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright 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 static org.junit.Assert.assertTrue;
|
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
import org.junit.Test;
|
|
||||||
|
|
||||||
import de.schildbach.pte.TfiProvider;
|
|
||||||
import de.schildbach.pte.dto.Location;
|
|
||||||
import de.schildbach.pte.dto.LocationType;
|
|
||||||
import de.schildbach.pte.dto.NearbyLocationsResult;
|
|
||||||
import de.schildbach.pte.dto.QueryDeparturesResult;
|
|
||||||
import de.schildbach.pte.dto.QueryTripsResult;
|
|
||||||
import de.schildbach.pte.dto.SuggestLocationsResult;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author Andreas Schildbach
|
|
||||||
*/
|
|
||||||
public class TfiProviderLiveTest extends AbstractProviderLiveTest {
|
|
||||||
public TfiProviderLiveTest() {
|
|
||||||
super(new TfiProvider());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void nearbyStations() throws Exception {
|
|
||||||
final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.STATION, "51013670"));
|
|
||||||
print(result);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void nearbyStationsByCoordinate() throws Exception {
|
|
||||||
final NearbyLocationsResult result = queryNearbyStations(Location.coord(53348656, -6262221));
|
|
||||||
print(result);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void queryDepartures() throws Exception {
|
|
||||||
final QueryDeparturesResult result = queryDepartures("51013670", 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 suggestLocationsIncomplete() throws Exception {
|
|
||||||
final SuggestLocationsResult result = suggestLocations("Lower O'Connell Street");
|
|
||||||
print(result);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void shortTrip() throws Exception {
|
|
||||||
final QueryTripsResult result = queryTrips(
|
|
||||||
new Location(LocationType.STATION, "51013670", "Dublin City South",
|
|
||||||
"O'Connell Bridge (on Lower O'Connell Street)"),
|
|
||||||
null, new Location(LocationType.STATION, "51005661", "Dublin City South", "Dublin (Baggot Street)"),
|
|
||||||
new Date(), true, null);
|
|
||||||
print(result);
|
|
||||||
assertEquals(QueryTripsResult.Status.OK, result.status);
|
|
||||||
assertTrue(result.trips.size() > 0);
|
|
||||||
|
|
||||||
if (!result.context.canQueryLater())
|
|
||||||
return;
|
|
||||||
|
|
||||||
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
|
|
||||||
print(laterResult);
|
|
||||||
|
|
||||||
if (!laterResult.context.canQueryLater())
|
|
||||||
return;
|
|
||||||
|
|
||||||
final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true);
|
|
||||||
print(later2Result);
|
|
||||||
|
|
||||||
if (!later2Result.context.canQueryEarlier())
|
|
||||||
return;
|
|
||||||
|
|
||||||
final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false);
|
|
||||||
print(earlierResult);
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Add table
Add a link
Reference in a new issue