Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VVT: EFA-based provider #312

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/de/schildbach/pte/NetworkId.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public enum NetworkId {
DB, BVG, VBB, NVV, BAYERN, MVV, INVG, AVV, AVV_AUGSBURG, VGN, VVM, VMV, SH, GVH, BSVAG, VBN, NASA, VMT, VVO, VMS, VGS, VRR, VRS, AVV_AACHEN, MVG, VRN, VVS, DING, KVV, NVBW, VVV,

// Austria
OEBB, VAO, VOR, WIEN, OOEVV, LINZ, SVV, VVT, STV, VMOBIL,
OEBB, VAO, VOR, WIEN, OOEVV, LINZ, SVV, VVT, VVT_EFA, STV, VMOBIL,

// Czech Republic
CZECH_REPUBLIC,
Expand Down
33 changes: 33 additions & 0 deletions src/de/schildbach/pte/VvtEfaProvider.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* 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 <http://www.gnu.org/licenses/>.
*/

package de.schildbach.pte;

import okhttp3.HttpUrl;

/**
* @author Andreas Schildbach, Tobias Girstmair
*/
public class VvtEfaProvider extends AbstractEfaProvider {
private static final HttpUrl API_BASE = HttpUrl.parse("http://efa.vvt.at/vvtadr/");

public VvtEfaProvider() {
super(NetworkId.VVT_EFA, API_BASE);

setUseRouteIndexAsTripId(false);
}
}
103 changes: 103 additions & 0 deletions test/de/schildbach/pte/live/VvtEfaProviderLiveTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
/*
* 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 <http://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.VvtEfaProvider;
import de.schildbach.pte.NetworkProvider.Accessibility;
import de.schildbach.pte.NetworkProvider.WalkSpeed;
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, Tobias Girstmair
*/
public class VvtEfaProviderLiveTest extends AbstractProviderLiveTest {
public VvtEfaProviderLiveTest() {
super(new VvtEfaProvider());
}

@Test
public void nearbyStations() throws Exception {
final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.STATION, "60101187"));
print(result);
}

@Test
public void nearbyStationsByCoordinate() throws Exception {
final NearbyLocationsResult result = queryNearbyStations(Location.coord(47271228, 11402063));
print(result);
}

@Test
public void queryDepartures() throws Exception {
final QueryDeparturesResult result = queryDepartures("60101187", false);
print(result);
}

@Test
public void suggestLocationsIncomplete() throws Exception {
final SuggestLocationsResult result = suggestLocations("Kur");
print(result);
}

@Test
public void suggestLocationsWithUmlaut() throws Exception {
final SuggestLocationsResult result = suggestLocations("grün");
print(result);
}

@Test
public void shortTrip() throws Exception {
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "60166402", null, "Kochstraße"),
null, new Location(LocationType.STATION, "60161679", null, "Messe/Zeughaus"), 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);
}
}