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

Merge Neckar-Alb-Donau into Baden-Württemberg, Constance & Basel.

Browse source
This commit is contained in:
Andreas Schildbach 2015-01-25 10:03:26 +01:00
parent 0eb20e5838
commit fbe53a1fbe
5 changed files with 54 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

52
enabler/src/de/schildbach/pte/NaldoProvider.java
View file

@ -1,52 +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 <http://www.gnu.org/licenses/>.
*/
package de.schildbach.pte;
/**
* @author Andreas Schildbach
*/
public class NaldoProvider extends AbstractEfaProvider
{
public static final NetworkId NETWORK_ID = NetworkId.NALDO;
private final static String API_BASE = "http://efa2.naldo.de/naldo/";
public NaldoProvider()
{
super(API_BASE);
setIncludeRegionId(false);
}
public NetworkId id()
{
return NETWORK_ID;
}
@Override
protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
final String trainNum, final String trainName)
{
if ("0".equals(mot))
{
if ("RR".equals(trainType))
return "RRR" + trainNum;
}
return super.parseLine(mot, symbol, name, longName, trainType, trainNum, trainName);
}
}

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

@ -26,7 +26,7 @@ public enum NetworkId
RT, RT,
// Germany // Germany
DB, BVG, VBB, NVV, BAYERN, MVV, INVG, AVV, VGN, VVM, VMV, RSAG, HVV, SH, GVH, VSN, BSVAG, VBN, NASA, VVO, VMS, VGS, VRR, VRS, MVG, NPH, VRN, VVS, NALDO, DING, KVV, VAGFR, NVBW, VVV, DB, BVG, VBB, NVV, BAYERN, MVV, INVG, AVV, VGN, VVM, VMV, RSAG, HVV, SH, GVH, VSN, BSVAG, VBN, NASA, VVO, VMS, VGS, VRR, VRS, MVG, NPH, VRN, VVS, DING, KVV, VAGFR, NVBW, VVV,
// Austria // Austria
OEBB, VOR, WIEN, LINZ, SVV, VVT, VMOBIL, IVB, STV, OEBB, VOR, WIEN, LINZ, SVV, VVT, VMOBIL, IVB, STV,

5
enabler/src/de/schildbach/pte/NvbwProvider.java
View file

@ -23,7 +23,10 @@ package de.schildbach.pte;
public class NvbwProvider extends AbstractEfaProvider public class NvbwProvider extends AbstractEfaProvider
{ {
public static final NetworkId NETWORK_ID = NetworkId.NVBW; public static final NetworkId NETWORK_ID = NetworkId.NVBW;
private final static String API_BASE = "http://www.efa-bw.de/nvbw/"; // http://www.efa-bw.de/android/ private final static String API_BASE = "http://www.efa-bw.de/nvbw/";
// http://www.efa-bw.de/android/
// http://efa2.naldo.de/naldo/
public NvbwProvider() public NvbwProvider()
{ {

123
enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java
View file

@ -1,123 +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 <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.NaldoProvider;
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.NearbyStationsResult;
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 NaldoProviderLiveTest extends AbstractProviderLiveTest
{
public NaldoProviderLiveTest()
{
super(new NaldoProvider());
}
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "53019174"));
print(result);
}
@Test
public void nearbyStationsByCoordinate() throws Exception
{
final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48493550, 9205656));
print(result);
}
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = queryDepartures("53019174", 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("Kurf");
print(result);
}
@Test
public void suggestLocationsWithUmlaut() throws Exception
{
final SuggestLocationsResult result = suggestLocations("grünwink");
print(result);
}
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8029333", 48492484, 9207456, "Reutlingen", "ZOB"), null,
new Location(LocationType.STATION, "8029109", 48496968, 9213320, "Reutlingen", "Bismarckstr."), 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);
}
}

58
enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java
View file

@ -50,40 +50,51 @@ public class NvbwProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void nearbyStations() throws Exception public void nearbyStations() throws Exception
{ {
final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "6900001")); final NearbyStationsResult result1 = queryNearbyStations(new Location(LocationType.STATION, "6900001"));
print(result1);
print(result); final NearbyStationsResult result2 = queryNearbyStations(new Location(LocationType.STATION, "53019174"));
print(result2);
} }
@Test @Test
public void nearbyStationsByCoordinate() throws Exception public void nearbyStationsByCoordinate() throws Exception
{ {
final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48778953, 9178963)); final NearbyStationsResult result1 = queryNearbyStations(new Location(LocationType.ADDRESS, 48778953, 9178963));
print(result1);
print(result); final NearbyStationsResult result2 = queryNearbyStations(new Location(LocationType.ADDRESS, 48493550, 9205656));
print(result2);
} }
@Test @Test
public void queryDepartures() throws Exception public void queryDepartures() throws Exception
{ {
final QueryDeparturesResult result = queryDepartures("6900001", false); final QueryDeparturesResult result1 = queryDepartures("6900001", false);
print(result1);
print(result); final QueryDeparturesResult result2 = queryDepartures("53019174", false);
print(result2);
}
@Test
public void queryDeparturesInvalidStation() throws Exception
{
final QueryDeparturesResult result = queryDepartures("999999", false);
assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
} }
@Test @Test
public void suggestLocationsIncomplete() throws Exception public void suggestLocationsIncomplete() throws Exception
{ {
final SuggestLocationsResult result = suggestLocations("Kur"); final SuggestLocationsResult result = suggestLocations("Kur");
print(result); print(result);
} }
@Test @Test
public void suggestLocationsWithUmlaut() throws Exception public void suggestLocationsWithUmlaut() throws Exception
{ {
final SuggestLocationsResult result = suggestLocations("grün"); final SuggestLocationsResult result = suggestLocations("grünwink");
print(result); print(result);
} }
@ -130,4 +141,33 @@ public class NvbwProviderLiveTest extends AbstractProviderLiveTest
final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false);
print(earlierResult); print(earlierResult);
} }
@Test
public void shortTripReutlingen() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8029333", 48492484, 9207456, "Reutlingen", "ZOB"), null,
new Location(LocationType.STATION, "8029109", 48496968, 9213320, "Reutlingen", "Bismarckstr."), 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);
}
} }