From e78e6bdf73fa9a690b919f04cccc689d40adc7df Mon Sep 17 00:00:00 2001 From: Chimo Date: Mon, 8 Feb 2016 19:26:21 -0500 Subject: [PATCH] Add Ontario (Canada) provider. --- enabler/src/de/schildbach/pte/NetworkId.java | 3 + .../de/schildbach/pte/OntarioProvider.java | 46 ++++++++++++ .../pte/live/OntarioProviderLiveTest.java | 75 +++++++++++++++++++ 3 files changed, 124 insertions(+) create mode 100644 enabler/src/de/schildbach/pte/OntarioProvider.java create mode 100644 enabler/test/de/schildbach/pte/live/OntarioProviderLiveTest.java diff --git a/enabler/src/de/schildbach/pte/NetworkId.java b/enabler/src/de/schildbach/pte/NetworkId.java index abb4e60b..98f5a7e5 100644 --- a/enabler/src/de/schildbach/pte/NetworkId.java +++ b/enabler/src/de/schildbach/pte/NetworkId.java @@ -76,6 +76,9 @@ public enum NetworkId // United States SF, SEPTA, + // Canada + ONTARIO, + // Australia SYDNEY, MET } diff --git a/enabler/src/de/schildbach/pte/OntarioProvider.java b/enabler/src/de/schildbach/pte/OntarioProvider.java new file mode 100644 index 00000000..2a9165b5 --- /dev/null +++ b/enabler/src/de/schildbach/pte/OntarioProvider.java @@ -0,0 +1,46 @@ +/* + * Copyright 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; + +/** + * @author Stephane Berube + */ +public class OntarioProvider extends AbstractNavitiaProvider +{ + private static String API_REGION = "ca-on"; + + public OntarioProvider(final String apiBase, final String authorization) + { + super(NetworkId.ONTARIO, apiBase, authorization); + + setTimeZone("America/Toronto"); + } + + public OntarioProvider(final String authorization) + { + super(NetworkId.ONTARIO, authorization); + + setTimeZone("America/Toronto"); + } + + @Override + public String region() + { + return API_REGION; + } +} diff --git a/enabler/test/de/schildbach/pte/live/OntarioProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/OntarioProviderLiveTest.java new file mode 100644 index 00000000..9f5a9203 --- /dev/null +++ b/enabler/test/de/schildbach/pte/live/OntarioProviderLiveTest.java @@ -0,0 +1,75 @@ +/* + * 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 org.junit.Test; + +import de.schildbach.pte.OntarioProvider; +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.SuggestLocationsResult; + +/** + * @author Stephane Berube + */ +public class OntarioProviderLiveTest extends AbstractNavitiaProviderLiveTest +{ + public OntarioProviderLiveTest() + { + super(new OntarioProvider(secretProperty("navitia.authorization"))); + } + + @Test + public void nearbyStations() throws Exception + { + final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.STATION, "OAW:SP:CH240")); + print(result); + } + + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyLocationsResult result = queryNearbyStations(Location.coord(45416667, -75683333)); + print(result); + } + + @Test + public void queryDepartures() throws Exception + { + final QueryDeparturesResult result = queryDepartures("OAW:SP:CH240", false); + print(result); + } + + @Test + public void queryDeparturesInvalidStation() throws Exception + { + final QueryDeparturesResult result = queryDepartures("OAW:SP:CHxxx", false); + assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status); + } + + @Test + public void suggestLocations() throws Exception + { + final SuggestLocationsResult result = suggestLocations("Airport"); + print(result); + } +}