mirror of
https://gitlab.com/oeffi/public-transport-enabler.git
synced 2025-07-13 16:20:34 +00:00
VMOBIL: Ressurect and switch to JSON API.
This commit is contained in:
Andreas Schildbach
parent
a59d696a42
commit
fca9fa0c11
3 changed files with 333 additions and 1 deletions
|
|
@ -28,7 +28,7 @@ public enum NetworkId {
|
||||||
DB, BVG, VBB, NVV, BAYERN, MVV, INVG, AVV, VGN, VVM, VMV, HVV, SH, GVH, BSVAG, VBN, NASA, VVO, VMS, VGS, VRR, VRS, MVG, NPH, VRN, VVS, DING, KVV, VAGFR, NVBW, VVV,
|
DB, BVG, VBB, NVV, BAYERN, MVV, INVG, AVV, VGN, VVM, VMV, HVV, SH, GVH, BSVAG, VBN, NASA, VVO, VMS, VGS, VRR, VRS, MVG, NPH, VRN, VVS, DING, KVV, VAGFR, NVBW, VVV,
|
||||||
|
|
||||||
// Austria
|
// Austria
|
||||||
OEBB, VAO, VOR, WIEN, LINZ, VVT, IVB, STV,
|
OEBB, VAO, VOR, WIEN, LINZ, VVT, IVB, STV, VMOBIL,
|
||||||
|
|
||||||
// Switzerland
|
// Switzerland
|
||||||
SBB, BVB, VBL, ZVV,
|
SBB, BVB, VBL, ZVV,
|
||||||
|
|
|
||||||
126
enabler/src/de/schildbach/pte/VmobilProvider.java
Normal file
126
enabler/src/de/schildbach/pte/VmobilProvider.java
Normal file
|
|
@ -0,0 +1,126 @@
|
||||||
|
/*
|
||||||
|
* 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 <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package de.schildbach.pte;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.EnumSet;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.regex.Matcher;
|
||||||
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
|
import com.google.common.base.Charsets;
|
||||||
|
|
||||||
|
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.QueryTripsContext;
|
||||||
|
import de.schildbach.pte.dto.QueryTripsResult;
|
||||||
|
import de.schildbach.pte.dto.SuggestLocationsResult;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Andreas Schildbach
|
||||||
|
*/
|
||||||
|
public class VmobilProvider extends AbstractHafasProvider {
|
||||||
|
private static final String API_BASE = "http://fahrplan.vmobil.at/bin/";
|
||||||
|
private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.SUBURBAN_TRAIN, Product.SUBWAY,
|
||||||
|
null, Product.TRAM, Product.REGIONAL_TRAIN, Product.BUS, Product.BUS, Product.TRAM, Product.FERRY,
|
||||||
|
Product.ON_DEMAND, Product.BUS, Product.REGIONAL_TRAIN, null, null, null };
|
||||||
|
|
||||||
|
public VmobilProvider(final String jsonApiAuthorization) {
|
||||||
|
super(NetworkId.VMOBIL, API_BASE, "dn", PRODUCTS_MAP);
|
||||||
|
|
||||||
|
setJsonApiVersion("1.11");
|
||||||
|
setJsonApiClient("{\"id\":\"VAO\",\"l\":\"vs_vvv\",\"type\":\"AND\"}");
|
||||||
|
setJsonApiAuthorization(jsonApiAuthorization);
|
||||||
|
setJsonNearbyLocationsEncoding(Charsets.UTF_8);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Set<Product> defaultProducts() {
|
||||||
|
return Product.ALL;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final Pattern P_SPLIT_NAME_ONE_COMMA = Pattern.compile("([^,]*), ([^,]{3,64})");
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected String[] splitStationName(final String name) {
|
||||||
|
final Matcher m = P_SPLIT_NAME_ONE_COMMA.matcher(name);
|
||||||
|
if (m.matches())
|
||||||
|
return new String[] { m.group(2), m.group(1) };
|
||||||
|
|
||||||
|
return super.splitStationName(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected String[] splitPOI(final String poi) {
|
||||||
|
final Matcher m = P_SPLIT_NAME_ONE_COMMA.matcher(poi);
|
||||||
|
if (m.matches())
|
||||||
|
return new String[] { m.group(2), m.group(1) };
|
||||||
|
|
||||||
|
return super.splitPOI(poi);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected String[] splitAddress(final String address) {
|
||||||
|
final Matcher m = P_SPLIT_NAME_FIRST_COMMA.matcher(address);
|
||||||
|
if (m.matches())
|
||||||
|
return new String[] { m.group(1), m.group(2) };
|
||||||
|
|
||||||
|
return super.splitAddress(address);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public NearbyLocationsResult queryNearbyLocations(final EnumSet<LocationType> types, final Location location,
|
||||||
|
final int maxDistance, final int maxLocations) throws IOException {
|
||||||
|
if (location.hasLocation())
|
||||||
|
return jsonLocGeoPos(types, location.lat, location.lon);
|
||||||
|
else
|
||||||
|
throw new IllegalArgumentException("cannot handle: " + location);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public QueryDeparturesResult queryDepartures(final String stationId, final @Nullable Date time,
|
||||||
|
final int maxDepartures, final boolean equivs) throws IOException {
|
||||||
|
return jsonStationBoard(stationId, time, maxDepartures, equivs);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException {
|
||||||
|
return jsonLocMatch(constraint);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public QueryTripsResult queryTrips(final Location from, final @Nullable Location via, final Location to,
|
||||||
|
final Date date, final boolean dep, final @Nullable Set<Product> products,
|
||||||
|
final @Nullable Optimize optimize, final @Nullable WalkSpeed walkSpeed,
|
||||||
|
final @Nullable Accessibility accessibility, final @Nullable Set<Option> options) throws IOException {
|
||||||
|
return jsonTripSearch(from, via, to, date, dep, products, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public QueryTripsResult queryMoreTrips(final QueryTripsContext context, final boolean later) throws IOException {
|
||||||
|
final JsonContext jsonContext = (JsonContext) context;
|
||||||
|
return jsonTripSearch(jsonContext.from, jsonContext.via, jsonContext.to, jsonContext.date, jsonContext.dep,
|
||||||
|
jsonContext.products, later ? jsonContext.laterContext : jsonContext.earlierContext);
|
||||||
|
}
|
||||||
|
}
|
||||||
206
enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java
Normal file
206
enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java
Normal file
|
|
@ -0,0 +1,206 @@
|
||||||
|
/*
|
||||||
|
* 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 <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package de.schildbach.pte.live;
|
||||||
|
|
||||||
|
import static org.hamcrest.CoreMatchers.hasItem;
|
||||||
|
import static org.junit.Assert.assertEquals;
|
||||||
|
import static org.junit.Assert.assertThat;
|
||||||
|
import static org.junit.Assert.assertTrue;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import de.schildbach.pte.NetworkProvider.Accessibility;
|
||||||
|
import de.schildbach.pte.NetworkProvider.WalkSpeed;
|
||||||
|
import de.schildbach.pte.VmobilProvider;
|
||||||
|
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 VmobilProviderLiveTest extends AbstractProviderLiveTest {
|
||||||
|
public VmobilProviderLiveTest() {
|
||||||
|
super(new VmobilProvider(secretProperty("vmobil.json_api_authorization")));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void nearbyStations() throws Exception {
|
||||||
|
final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.STATION, "490132007"));
|
||||||
|
print(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void nearbyStationsByCoordinate() throws Exception {
|
||||||
|
final NearbyLocationsResult result = queryNearbyStations(Location.coord(48207355, 16370602));
|
||||||
|
print(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void nearbyStationsByCoordinateSalzburg() throws Exception {
|
||||||
|
final NearbyLocationsResult result = queryNearbyStations(Location.coord(47809195, 13054919));
|
||||||
|
print(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void queryDepartures() throws Exception {
|
||||||
|
final QueryDeparturesResult result = queryDepartures("480082200", 0, false);
|
||||||
|
print(result);
|
||||||
|
assertEquals(QueryDeparturesResult.Status.OK, result.status);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void queryDeparturesSalzburg() throws Exception {
|
||||||
|
final QueryDeparturesResult result = queryDepartures("455000200", false);
|
||||||
|
print(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void queryDeparturesInvalidStation() throws Exception {
|
||||||
|
final QueryDeparturesResult result = queryDepartures("999999", 0, false);
|
||||||
|
assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void suggestLocations() throws Exception {
|
||||||
|
final SuggestLocationsResult result = suggestLocations("Feldkirch");
|
||||||
|
print(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void suggestLocationsAddress() throws Exception {
|
||||||
|
final SuggestLocationsResult result = suggestLocations("Mutterstraße 4, 6800 Feldkirch");
|
||||||
|
print(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void suggestLocationsEncoding() throws Exception {
|
||||||
|
final SuggestLocationsResult result = suggestLocations("Wien Schönbrunn");
|
||||||
|
assertEquals("Wien Schönbrunn", result.getLocations().get(0).name);
|
||||||
|
print(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void suggestLocationsCoverage() throws Exception {
|
||||||
|
final SuggestLocationsResult feldkirchResult = suggestLocations("Feldkirch Bahnhof");
|
||||||
|
print(feldkirchResult);
|
||||||
|
assertThat(feldkirchResult.getLocations(), hasItem(new Location(LocationType.STATION, "480081700")));
|
||||||
|
|
||||||
|
final SuggestLocationsResult strasswalchenResult = suggestLocations("Straßwalchen West");
|
||||||
|
print(strasswalchenResult);
|
||||||
|
assertThat(strasswalchenResult.getLocations(), hasItem(new Location(LocationType.STATION, "455648300")));
|
||||||
|
|
||||||
|
final SuggestLocationsResult schwarzachResult = suggestLocations("Schwarzach Abtsdorf");
|
||||||
|
print(schwarzachResult);
|
||||||
|
assertThat(schwarzachResult.getLocations(), hasItem(new Location(LocationType.STATION, "455661400")));
|
||||||
|
|
||||||
|
final SuggestLocationsResult trimmelkamResult = suggestLocations("Trimmelkam");
|
||||||
|
print(trimmelkamResult);
|
||||||
|
assertThat(trimmelkamResult.getLocations(), hasItem(new Location(LocationType.STATION, "900016933")));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void shortTripFeldkirch() throws Exception {
|
||||||
|
final QueryTripsResult result = queryTrips(
|
||||||
|
new Location(LocationType.STATION, "480082200", null, "Feldkirch Katzenturm"), null,
|
||||||
|
new Location(LocationType.STATION, "480081700", null, "Feldkirch Bahnhof"), new Date(), true,
|
||||||
|
Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
|
||||||
|
print(result);
|
||||||
|
|
||||||
|
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
|
||||||
|
print(laterResult);
|
||||||
|
|
||||||
|
final QueryTripsResult laterResult2 = queryMoreTrips(laterResult.context, true);
|
||||||
|
print(laterResult2);
|
||||||
|
|
||||||
|
final QueryTripsResult earlierResult = queryMoreTrips(result.context, false);
|
||||||
|
print(earlierResult);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void shortTripWien() throws Exception {
|
||||||
|
final QueryTripsResult result = queryTrips(
|
||||||
|
new Location(LocationType.STATION, "490132000", null, "Wien Stephansplatz"), null,
|
||||||
|
new Location(LocationType.STATION, "490024500", null, "Wien Stubentor"), new Date(), true, Product.ALL,
|
||||||
|
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
|
||||||
|
print(result);
|
||||||
|
|
||||||
|
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
|
||||||
|
print(laterResult);
|
||||||
|
|
||||||
|
final QueryTripsResult laterResult2 = queryMoreTrips(laterResult.context, true);
|
||||||
|
print(laterResult2);
|
||||||
|
|
||||||
|
final QueryTripsResult earlierResult = queryMoreTrips(result.context, false);
|
||||||
|
print(earlierResult);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void shortTripSalzburg() throws Exception {
|
||||||
|
final QueryTripsResult result = queryTrips(
|
||||||
|
new Location(LocationType.STATION, "455000900", 47808976, 13056409, "Salzburg", "Vogelweiderstraße"),
|
||||||
|
null, new Location(LocationType.STATION, "455084400", 47811556, 13050278, "Salzburg", "Merianstraße"),
|
||||||
|
new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void tripAddressToStation() throws Exception {
|
||||||
|
final QueryTripsResult result = queryTrips(
|
||||||
|
new Location(LocationType.ADDRESS,
|
||||||
|
"A=2@O=6800 Feldkirch, Kapfweg 6@X=9585539@Y=47239257@U=103@L=980092305@B=1@p=1437727591@",
|
||||||
|
"6800 Feldkirch", "Kapfweg 6"),
|
||||||
|
null, new Location(LocationType.STATION, "480081700", null, "Feldkirch Bahnhof"), new Date(), true,
|
||||||
|
Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
|
||||||
|
print(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void tripCoordinateToStation() throws Exception {
|
||||||
|
final QueryTripsResult result = queryTrips(Location.coord(47238096, 9585581), null,
|
||||||
|
new Location(LocationType.STATION, "480081700", null, "Feldkirch Bahnhof"), new Date(), true,
|
||||||
|
Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
|
||||||
|
print(result);
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue