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

Negentwee: Support querying for trips with coordinate locations.

Browse source
This commit is contained in:
full-duplex 2018-09-18 00:27:04 +02:00 • committed by Andreas Schildbach
parent 7763182bec
commit e10de06c13
2 changed files with 33 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

31
enabler/src/de/schildbach/pte/NegentweeProvider.java
View file

@ -319,6 +319,16 @@ public class NegentweeProvider extends AbstractNetworkProvider {
return null;
}
private String locationToQueryParameterString(Location loc) {
if (loc.hasId()) {
return loc.id;
} else if (loc.hasLocation()) {
return loc.getLatAsDouble() + "," + loc.getLonAsDouble();
} else {
return null;
}
}
// Including these type names will cause the locations API to fail, skip them
private static final ImmutableSet<String> DISALLOWED_TYPE_NAMES = ImmutableSet.of("latlong", "streetrange");
@ -837,24 +847,27 @@ public class NegentweeProvider extends AbstractNetworkProvider {
public QueryTripsResult queryTrips(Location from, @Nullable Location via, Location to, Date date, boolean dep,
@Nullable Set<Product> products, @Nullable Optimize optimize, @Nullable WalkSpeed walkSpeed,
@Nullable Accessibility accessibility, @Nullable Set<Option> options) throws IOException {
if (!from.hasId())
if (!(from.hasId() || from.hasLocation()))
return ambiguousQueryTrips(from, via, to);
if (!to.hasId())
if (!(to.hasId() || to.hasLocation()))
return ambiguousQueryTrips(from, via, to);
// Default query options
List<QueryParameter> queryParameters = new ArrayList<>(Arrays.asList(new QueryParameter("from", from.id),
new QueryParameter("to", to.id), new QueryParameter("searchType", dep ? "departure" : "arrival"),
new QueryParameter("dateTime", new SimpleDateFormat("yyyy-MM-dd'T'HHmm").format(date.getTime())),
new QueryParameter("sequence", "1"), new QueryParameter("realtime", "true"),
new QueryParameter("before", "1"), new QueryParameter("after", "5")));
List<QueryParameter> queryParameters = new ArrayList<>(
Arrays.asList(new QueryParameter("from", locationToQueryParameterString(from)),
new QueryParameter("to", locationToQueryParameterString(to)),
new QueryParameter("searchType", dep ? "departure" : "arrival"),
new QueryParameter("dateTime",
new SimpleDateFormat("yyyy-MM-dd'T'HHmm").format(date.getTime())),
new QueryParameter("sequence", "1"), new QueryParameter("realtime", "true"),
new QueryParameter("before", "1"), new QueryParameter("after", "5")));
if (via != null) {
if (!via.hasId())
if (!(via.hasId() || via.hasLocation()))
return ambiguousQueryTrips(from, via, to);
queryParameters.add(new QueryParameter("via", via.id));
queryParameters.add(new QueryParameter("via", locationToQueryParameterString(via)));
}
if (walkSpeed != null && walkSpeed == WalkSpeed.SLOW) {

11
enabler/test/de/schildbach/pte/live/NegentweeProviderLiveTest.java
View file

@ -30,6 +30,7 @@ import de.schildbach.pte.NetworkProvider;
import de.schildbach.pte.dto.Location;
import de.schildbach.pte.dto.LocationType;
import de.schildbach.pte.dto.NearbyLocationsResult;
import de.schildbach.pte.dto.Point;
import de.schildbach.pte.dto.QueryDeparturesResult;
import de.schildbach.pte.dto.QueryTripsResult;
import de.schildbach.pte.dto.SuggestLocationsResult;
@ -167,4 +168,14 @@ public class NegentweeProviderLiveTest extends AbstractProviderLiveTest {
print(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
}
@Test
public void coordinatesTrip() throws Exception {
final QueryTripsResult result = queryTrips(new Location(LocationType.COORD, null, new Point(51677273, 4437548)),
new Location(LocationType.COORD, null, new Point(52162772, 4583171)),
new Location(LocationType.COORD, null, new Point(53347140, 6720583)), new Date(), true, null,
NetworkProvider.WalkSpeed.FAST, NetworkProvider.Accessibility.NEUTRAL);
print(result);
assertEquals(QueryTripsResult.Status.OK, result.status);
}
}