diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java index 90fdfc97..0b6ee6fe 100644 --- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java @@ -470,7 +470,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider else if ("poi".equals(ty)) type = LocationType.POI; else if ("loc".equals(ty)) - type = LocationType.ADDRESS; + type = LocationType.COORD; else if ("street".equals(ty)) type = LocationType.ADDRESS; else if ("singlehouse".equals(ty)) @@ -833,6 +833,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider final String buildingName = XmlPullUtil.optAttr(pp, "buildingName", null); final String buildingNumber = XmlPullUtil.optAttr(pp, "buildingNumber", null); final String postCode = XmlPullUtil.optAttr(pp, "postCode", null); + final String streetName = XmlPullUtil.optAttr(pp, "streetName", null); final Point coord = processCoordAttr(pp); final String nameElem = normalizeLocationName(XmlPullUtil.valueTag(pp, "odvNameElem")); @@ -844,42 +845,53 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider if ("stop".equals(type)) { locationType = LocationType.STATION; - place = locality; - name = objectName; + place = locality != null ? locality : defaultPlace; + name = objectName != null ? objectName : nameElem; } else if ("poi".equals(type)) { locationType = LocationType.POI; - place = locality; - name = objectName; + place = locality != null ? locality : defaultPlace; + name = objectName != null ? objectName : nameElem; } else if ("loc".equals(type)) { - return null; + if (coord != null) + { + locationType = LocationType.COORD; + place = null; + name = null; + } + else + { + locationType = LocationType.ADDRESS; + place = null; + name = locality; + } } else if ("address".equals(type) || "singlehouse".equals(type)) { locationType = LocationType.ADDRESS; - place = locality; + place = locality != null ? locality : defaultPlace; name = objectName + (buildingNumber != null ? " " + buildingNumber : ""); } else if ("street".equals(type) || "crossing".equals(type)) { locationType = LocationType.ADDRESS; - place = locality; - name = objectName; + place = locality != null ? locality : defaultPlace; + name = objectName != null ? objectName : nameElem; } else if ("postcode".equals(type)) { locationType = LocationType.ADDRESS; - place = locality; + place = locality != null ? locality : defaultPlace; name = postCode; } else if ("buildingname".equals(type)) { locationType = LocationType.ADDRESS; - place = locality; - name = buildingName; + place = locality != null ? locality : defaultPlace; + name = buildingName != null ? buildingName : streetName; } else if ("coord".equals(type)) { @@ -892,7 +904,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider throw new IllegalArgumentException("unknown type/anyType: " + type); } - return new Location(locationType, id, coord, place != null ? place : defaultPlace, name != null ? name : nameElem); + return new Location(locationType, id, coord, place, name); } private Location processItdOdvAssignedStop(final XmlPullParser pp) throws XmlPullParserException, IOException @@ -3271,7 +3283,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider private void appendLocation(final StringBuilder uri, final Location location, final String paramSuffix) { - if (location.type == LocationType.ADDRESS && location.hasLocation()) + if ((location.type == LocationType.ADDRESS || location.type == LocationType.COORD) && location.hasLocation()) { uri.append("&type_").append(paramSuffix).append("=coord"); uri.append("&name_").append(paramSuffix).append("=") @@ -3291,6 +3303,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider return "stop"; if (type == LocationType.ADDRESS) return "any"; // strange, matches with anyObjFilter + if (type == LocationType.COORD) + return "coord"; if (type == LocationType.POI) return "poi"; if (type == LocationType.ANY) diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java index fb2c7af8..a78c522b 100644 --- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java @@ -1316,6 +1316,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider else if (location.type == LocationType.ADDRESS && location.hasLocation()) return "
"; + else if (location.type == LocationType.COORD && location.hasLocation()) + return ""; else throw new IllegalArgumentException("cannot handle: " + location); } @@ -1354,7 +1356,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider return 1; if (type == LocationType.POI) return 4; - if (type == LocationType.ADDRESS && location.hasLocation()) + if (type == LocationType.COORD || (type == LocationType.ADDRESS && location.hasLocation())) return 16; if (type == LocationType.ADDRESS && location.name != null) return 2; diff --git a/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java b/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java index 87b8f6af..327fb018 100644 --- a/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java @@ -791,7 +791,7 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider // Build query uri depending of location type. final String queryUriType; - if (location.type == LocationType.ADDRESS || location.type == LocationType.ANY) + if (location.type == LocationType.COORD || location.type == LocationType.ADDRESS || location.type == LocationType.ANY) { if (!location.hasLocation()) { diff --git a/enabler/src/de/schildbach/pte/dto/Location.java b/enabler/src/de/schildbach/pte/dto/Location.java index 781837a4..e104a360 100644 --- a/enabler/src/de/schildbach/pte/dto/Location.java +++ b/enabler/src/de/schildbach/pte/dto/Location.java @@ -53,6 +53,11 @@ public final class Location implements Serializable checkArgument(id == null || id.length() > 0, "ID cannot be the empty string"); checkArgument(place == null || name != null, "place '%s' without name cannot exist", place); + if (type == LocationType.COORD) + { + checkArgument(hasLocation(), "coordinates missing"); + checkArgument(place == null && name == null, "coordinates cannot have place or name"); + } } public Location(final LocationType type, final String id, final Point coord, final String place, final String name) @@ -62,24 +67,12 @@ public final class Location implements Serializable public Location(final LocationType type, final String id, final String place, final String name) { - this.type = checkNotNull(type); - this.id = id; - this.lat = 0; - this.lon = 0; - this.place = place; - this.name = name; - - checkArgument(place == null || name != null, "place '%s' without name cannot exist", place); + this(type, id, 0, 0, place, name); } public Location(final LocationType type, final String id, final int lat, final int lon) { - this.type = checkNotNull(type); - this.id = id; - this.lat = lat; - this.lon = lon; - this.place = null; - this.name = null; + this(type, id, lat, lon, null, null); } public Location(final LocationType type, final String id, final Point coord) @@ -89,27 +82,17 @@ public final class Location implements Serializable public Location(final LocationType type, final String id) { - this.type = checkNotNull(type); - this.id = id; - this.lat = 0; - this.lon = 0; - this.place = null; - this.name = null; + this(type, id, null, null); } - public Location(final LocationType type, final int lat, final int lon) + public static Location coord(final int lat, final int lon) { - this.type = checkNotNull(type); - this.id = null; - this.lat = lat; - this.lon = lon; - this.place = null; - this.name = null; + return new Location(LocationType.COORD, null, lat, lon); } - public Location(final LocationType type, final Point coord) + public static Location coord(final Point coord) { - this(type, coord != null ? coord.lat : 0, coord != null ? coord.lon : 0); + return new Location(LocationType.COORD, null, coord.lat, coord.lon); } public final boolean hasId() @@ -135,7 +118,7 @@ public final class Location implements Serializable if (type == LocationType.POI) return true; - if (type == LocationType.ADDRESS) + if (type == LocationType.ADDRESS || type == LocationType.COORD) return hasLocation(); return false; @@ -196,7 +179,7 @@ public final class Location implements Serializable public String toString() { final ToStringHelper helper = MoreObjects.toStringHelper(this).addValue(type).addValue(id); - if (lat != 0 || lon != 0) + if (hasLocation()) helper.addValue(lat + "/" + lon); return helper.add("place", place).add("name", name).omitNullValues().toString(); } diff --git a/enabler/src/de/schildbach/pte/dto/LocationType.java b/enabler/src/de/schildbach/pte/dto/LocationType.java index 631cf7c3..d8308afb 100644 --- a/enabler/src/de/schildbach/pte/dto/LocationType.java +++ b/enabler/src/de/schildbach/pte/dto/LocationType.java @@ -22,5 +22,14 @@ package de.schildbach.pte.dto; */ public enum LocationType { - ANY, STATION, POI, ADDRESS + /** Location can represent any of the below. Mainly meant for user input. */ + ANY, + /** Location represents a station or stop. */ + STATION, + /** Location represents a point of interest. */ + POI, + /** Location represents a postal address. */ + ADDRESS, + /** Location represents a just a plain coordinate, e.g. acquired by GPS. */ + COORD } diff --git a/enabler/test/de/schildbach/pte/live/AbstractNavitiaProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AbstractNavitiaProviderLiveTest.java index e9c882c1..2b571752 100644 --- a/enabler/test/de/schildbach/pte/live/AbstractNavitiaProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/AbstractNavitiaProviderLiveTest.java @@ -52,8 +52,7 @@ public abstract class AbstractNavitiaProviderLiveTest extends AbstractProviderLi protected final void nearbyStationsAddress(final int lat, final int lon) throws IOException { - final NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.STATION), new Location(LocationType.ADDRESS, lat, lon), - 700, 10); + final NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.STATION), Location.coord(lat, lon), 700, 10); assertEquals(NearbyLocationsResult.Status.OK, result.status); print(result); } @@ -75,7 +74,7 @@ public abstract class AbstractNavitiaProviderLiveTest extends AbstractProviderLi protected final void nearbyStationsAny(final int lat, final int lon) throws IOException { - final NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.STATION), new Location(LocationType.ANY, lat, lon), 700, 10); + final NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.STATION), Location.coord(lat, lon), 700, 10); assertEquals(NearbyLocationsResult.Status.OK, result.status); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java index e8fc4e9d..f9164cc8 100644 --- a/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java @@ -53,7 +53,7 @@ public class AtcProviderLiveTest extends AbstractProviderLiveTest public void nearbyStationsByCoordinate() throws Exception { // TODO bad coordinate! - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 8168907, 10609969)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(8168907, 10609969)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java index 52d4bb3d..9457a71a 100644 --- a/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java @@ -55,7 +55,7 @@ public class AvvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48367233, 10894976)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(48367233, 10894976)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java index 9d96e7bf..36145c82 100644 --- a/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java @@ -57,15 +57,14 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 52525589, 13369548)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(52525589, 13369548)); print(result); } @Test public void nearbyPOIsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.POI), - new Location(LocationType.ADDRESS, 52525589, 13369548)); + final NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.POI), Location.coord(52525589, 13369548)); print(result); assertThat(result.locations, hasItem(new Location(LocationType.POI, "990416076", "Berlin", "Museum für Naturkunde"))); } @@ -112,7 +111,6 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest { final SuggestLocationsResult result = suggestLocations("München, Friedenstraße 2"); print(result); - assertEquals(LocationType.ADDRESS, result.getLocations().get(0).type); assertEquals("Friedenstraße 2", result.getLocations().get(0).name); } @@ -179,7 +177,6 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8010205", null, "Leipzig Hbf"), null, new Location( LocationType.STATION, "8010205", null, "Leipzig Hbf"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); print(result); - assertEquals(QueryTripsResult.Status.TOO_CLOSE, result.status); } @@ -189,7 +186,6 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8011160", null, "Berlin Hbf"), null, new Location( LocationType.STATION, "8010205", null, "Leipzig Hbf"), new Date(0), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); print(result); - assertEquals(QueryTripsResult.Status.INVALID_DATE, result.status); } } diff --git a/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java index 405eaf20..0058f6ca 100644 --- a/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java @@ -56,7 +56,7 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48135232, 11560650)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(48135232, 11560650)); print(result); assertTrue(result.locations.size() > 0); } @@ -64,8 +64,8 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyLocationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.STATION, LocationType.POI), new Location( - LocationType.ADDRESS, 48135232, 11560650)); + final NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.STATION, LocationType.POI), + Location.coord(48135232, 11560650)); print(result); assertTrue(result.locations.size() > 0); } @@ -140,8 +140,8 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest @Test public void tripBetweenCoordinates() throws Exception { - final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 48165238, 11577473), null, new Location( - LocationType.ADDRESS, null, 47987199, 11326532), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryTripsResult result = queryTrips(Location.coord(48165238, 11577473), null, Location.coord(47987199, 11326532), new Date(), true, + Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); print(laterResult); diff --git a/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java index f33318b3..a3afd870 100644 --- a/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java @@ -57,7 +57,7 @@ public class BsvagProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 52272065, 10524788)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(52272065, 10524788)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java index 466fc78b..556a7ad2 100644 --- a/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java @@ -55,7 +55,7 @@ public class BvbProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 47551466, 7585187)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(47551466, 7585187)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java index 64462b44..9ca51151 100644 --- a/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java @@ -57,7 +57,7 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 52486400, 13350744)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(52486400, 13350744)); print(result); } @@ -172,8 +172,8 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest @Test public void tripBetweenCoordinates() throws Exception { - final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 52501507, 13357026, null, null), null, new Location( - LocationType.ADDRESS, null, 52513639, 13568648, null, null), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryTripsResult result = queryTrips(Location.coord(52501507, 13357026), null, Location.coord(52513639, 13568648), new Date(), true, + Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); print(laterResult); @@ -193,10 +193,8 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest @Test public void viaTripBetweenCoordinates() throws Exception { - final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 52501507, 13357026, null, null), new Location( - LocationType.ADDRESS, null, 52479868, 13324247, null, null), - new Location(LocationType.ADDRESS, null, 52513639, 13568648, null, null), new Date(), true, Product.ALL, WalkSpeed.NORMAL, - Accessibility.NEUTRAL); + final QueryTripsResult result = queryTrips(Location.coord(52501507, 13357026), Location.coord(52479868, 13324247), + Location.coord(52513639, 13568648), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); print(laterResult); diff --git a/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java index b9e77d0f..98ffcd43 100644 --- a/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java @@ -55,7 +55,7 @@ public class DingProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48401092, 9992037)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(48401092, 9992037)); print(result); } @@ -114,4 +114,12 @@ public class DingProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); print(earlierResult); } + + @Test + public void tripAnyToAny() throws Exception + { + final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, null, null, "Hermaringen"), null, new Location(LocationType.ANY, + null, null, "Heidenheim"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + print(result); + } } diff --git a/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java index e2d2120a..f177636b 100644 --- a/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java @@ -54,7 +54,7 @@ public class DsbProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 55670305, 12554169)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(55670305, 12554169)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java index ebe638b4..b4786ded 100644 --- a/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java @@ -54,7 +54,7 @@ public class DubProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 25269008, 55312672)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(25269008, 55312672)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/EireannProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/EireannProviderLiveTest.java index ba17850c..fa94ae7a 100644 --- a/enabler/test/de/schildbach/pte/live/EireannProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/EireannProviderLiveTest.java @@ -54,7 +54,7 @@ public class EireannProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 53343993, -6267371)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(53343993, -6267371)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java index d4d86d16..3bb7d552 100644 --- a/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java @@ -55,7 +55,7 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 52379497, 9735832)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(52379497, 9735832)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java index 599c9928..8e3d6cb3 100644 --- a/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java @@ -54,7 +54,7 @@ public class InvgProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48744678, 11437941)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(48744678, 11437941)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java index 20df7e99..17c5fb3e 100644 --- a/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java @@ -55,7 +55,7 @@ public class IvbProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 47271228, 11402063)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(47271228, 11402063)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/JetProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/JetProviderLiveTest.java index 757b9a94..3b4082f7 100644 --- a/enabler/test/de/schildbach/pte/live/JetProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/JetProviderLiveTest.java @@ -54,7 +54,7 @@ public class JetProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 31769757, 35213506)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(31769757, 35213506)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java index 1c22c6ec..35dbeb24 100644 --- a/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java @@ -55,7 +55,7 @@ public class KvvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 49008184, 8400736)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(49008184, 8400736)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java index 411fa6e9..4c1ebfe9 100644 --- a/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java @@ -55,7 +55,7 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48305726, 14287863)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(48305726, 14287863)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java index a632684f..b05a2688 100644 --- a/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java @@ -54,7 +54,7 @@ public class LuProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 49610187, 6132746)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(49610187, 6132746)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/MerseyProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MerseyProviderLiveTest.java index 60d8702a..14989fbc 100644 --- a/enabler/test/de/schildbach/pte/live/MerseyProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/MerseyProviderLiveTest.java @@ -56,15 +56,15 @@ public class MerseyProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 53401112, -2958903)); + final NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.STATION), Location.coord(53401112, -2958903)); print(result); } @Test public void nearbyLocationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.STATION, LocationType.POI), new Location( - LocationType.ADDRESS, 53401112, -2958903)); + final NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.STATION, LocationType.POI), + Location.coord(53401112, -2958903)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java index b4dd163d..64500e5d 100644 --- a/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java @@ -55,7 +55,7 @@ public class MetProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, -37800941, 144966545)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(-37800941, 144966545)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java index 1377a4f3..8ab458a4 100644 --- a/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java @@ -57,7 +57,7 @@ public class MvgProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 51219852, 7639217)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(51219852, 7639217)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java index 47cdd4c3..09b07b83 100644 --- a/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java @@ -58,7 +58,7 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48135232, 11560650)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(48135232, 11560650)); print(result); assertTrue(result.locations.size() > 0); } @@ -66,8 +66,8 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyLocationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.STATION, LocationType.POI), new Location( - LocationType.ADDRESS, 48135232, 11560650)); + final NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.STATION, LocationType.POI), + Location.coord(48135232, 11560650)); print(result); assertTrue(result.locations.size() > 0); } @@ -148,8 +148,8 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest @Test public void tripBetweenCoordinates() throws Exception { - final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 48165238, 11577473), null, new Location( - LocationType.ADDRESS, null, 47987199, 11326532), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryTripsResult result = queryTrips(Location.coord(48165238, 11577473), null, Location.coord(47987199, 11326532), new Date(), true, + Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); print(laterResult); diff --git a/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java index 64a8842e..8426e3c9 100644 --- a/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java @@ -55,7 +55,7 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 51346546, 12383333)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(51346546, 12383333)); print(result); assertEquals(NearbyLocationsResult.Status.OK, result.status); diff --git a/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java index b213778b..4aef26aa 100644 --- a/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java @@ -54,7 +54,7 @@ public class NriProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 59911871, 10764999)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(59911871, 10764999)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java index 0d536762..28e205df 100644 --- a/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java @@ -53,7 +53,7 @@ public class NsProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 52377548, 4901218)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(52377548, 4901218)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java index c4e8a736..a41c7c95 100644 --- a/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java @@ -60,10 +60,10 @@ public class NvbwProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result1 = queryNearbyStations(new Location(LocationType.ADDRESS, 48778953, 9178963)); + final NearbyLocationsResult result1 = queryNearbyStations(Location.coord(48778953, 9178963)); print(result1); - final NearbyLocationsResult result2 = queryNearbyStations(new Location(LocationType.ADDRESS, 48493550, 9205656)); + final NearbyLocationsResult result2 = queryNearbyStations(Location.coord(48493550, 9205656)); print(result2); } diff --git a/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java index 7fc1ae86..83f09046 100644 --- a/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java @@ -56,14 +56,14 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 50108625, 8669604)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(50108625, 8669604)); print(result); } @Test public void nearbyStationsByCoordinateKassel() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 51318447, 9496250)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(51318447, 9496250)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java index fe56a57b..4d999e23 100644 --- a/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java @@ -56,7 +56,7 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48200239, 16370773)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(48200239, 16370773)); print(result); assertEquals(NearbyLocationsResult.Status.OK, result.status); diff --git a/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java index bf07b425..75b037bb 100644 --- a/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java @@ -54,7 +54,7 @@ public class PlProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 52227027, 20989795)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(52227027, 20989795)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/RsagProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/RsagProviderLiveTest.java index f4bb91eb..9f04d489 100644 --- a/enabler/test/de/schildbach/pte/live/RsagProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/RsagProviderLiveTest.java @@ -56,7 +56,7 @@ public class RsagProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 54078314, 12131715)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(54078314, 12131715)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java index cebe8dfe..7126b666 100644 --- a/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java @@ -54,7 +54,7 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 52525589, 13369548)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(52525589, 13369548)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java index dcf1fd05..bd1aacf3 100644 --- a/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java @@ -54,7 +54,7 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 52525589, 13369548)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(52525589, 13369548)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java index 889b7bfe..7bbb571f 100644 --- a/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java @@ -54,7 +54,7 @@ public class SeProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 57709311, 11988459)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(57709311, 11988459)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java index 4442e5b0..54509206 100644 --- a/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java @@ -54,7 +54,7 @@ public class SeptaProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 39954122, -75161705)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(39954122, -75161705)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java index a582a2ac..a2338fc8 100644 --- a/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java @@ -55,7 +55,7 @@ public class SfProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 37777811, -122419481)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(37777811, -122419481)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java index 82a8abb5..720880cc 100644 --- a/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java @@ -54,7 +54,7 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 50748017, 3407118)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(50748017, 3407118)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java index ee8bcbd9..feba89e5 100644 --- a/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java @@ -54,7 +54,7 @@ public class StockholmProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 59329897, 18072281)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(59329897, 18072281)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java index 9f004386..2dc7286d 100644 --- a/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java @@ -57,7 +57,7 @@ public class StvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 47072612, 15431814)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(47072612, 15431814)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java index 0c60144e..54125fa3 100644 --- a/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java @@ -57,7 +57,7 @@ public class SvvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 47809195, 13054919)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(47809195, 13054919)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java index 2f939897..4a91b71f 100644 --- a/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java @@ -55,7 +55,7 @@ public class SydneyProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, -32823911, 151462824)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(-32823911, 151462824)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/TfiProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TfiProviderLiveTest.java index afbecc89..1fb2c7b1 100644 --- a/enabler/test/de/schildbach/pte/live/TfiProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/TfiProviderLiveTest.java @@ -55,7 +55,7 @@ public class TfiProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 53348656, -6262221)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(53348656, -6262221)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java index c24de46d..e42cb8dc 100644 --- a/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java @@ -58,7 +58,7 @@ public class TlemProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 51507161, -0127144)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(51507161, -0127144)); print(result); } @@ -196,6 +196,16 @@ public class TlemProviderLiveTest extends AbstractProviderLiveTest print(result); } + @Test + public void tripFromAddress() throws Exception + { + final QueryTripsResult result = queryTrips( + new Location(LocationType.ADDRESS, "streetID:203417::31117006:-1", "London", "Kings Cross, London"), null, new Location( + LocationType.STATION, "1002070", 51508530, 46706, "Royal Albert", "Royal Albert"), new Date(), true, Product.ALL, + WalkSpeed.NORMAL, Accessibility.NEUTRAL); + print(result); + } + @Test public void tripPostcode() throws Exception { diff --git a/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java index e25f19a7..6f12ca4a 100644 --- a/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java @@ -57,7 +57,7 @@ public class VagfrProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48000295, 7854338)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(48000295, 7854338)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java index d8283846..82db4b30 100644 --- a/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java @@ -64,7 +64,7 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 52548505, 13388640)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(52548505, 13388640)); print(result); assertTrue(result.locations.size() > 0); } @@ -172,8 +172,8 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest @Test public void tripBetweenCoordinates() throws Exception { - final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 52501507, 13357026, null, null), null, new Location( - LocationType.ADDRESS, null, 52513639, 13568648, null, null), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryTripsResult result = queryTrips(Location.coord(52501507, 13357026), null, Location.coord(52513639, 13568648), new Date(), true, + Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); print(result); if (!result.context.canQueryLater()) @@ -186,10 +186,8 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest @Test public void viaTripBetweenCoordinates() throws Exception { - final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 52501507, 13357026, null, null), new Location( - LocationType.ADDRESS, null, 52479868, 13324247, null, null), - new Location(LocationType.ADDRESS, null, 52513639, 13568648, null, null), new Date(), true, Product.ALL, WalkSpeed.NORMAL, - Accessibility.NEUTRAL); + final QueryTripsResult result = queryTrips(Location.coord(52501507, 13357026), Location.coord(52479868, 13324247), + Location.coord(52513639, 13568648), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); print(result); if (!result.context.canQueryLater()) diff --git a/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java index b9ffae22..9061a33c 100644 --- a/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java @@ -55,7 +55,7 @@ public class VblProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 47049107, 8312502)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(47049107, 8312502)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java index 94a0478d..dd1eff08 100644 --- a/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java @@ -54,7 +54,7 @@ public class VbnProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 51318447, 9496250)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(51318447, 9496250)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java index 3659f8b5..ae2b5601 100644 --- a/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java @@ -52,7 +52,7 @@ public class VgnProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 49455472, 11079655)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(49455472, 11079655)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java index c5703b0f..aea404e1 100644 --- a/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java @@ -54,7 +54,7 @@ public class VgsProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 49234783, 6995687)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(49234783, 6995687)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java index ef767233..f8b4dfd4 100644 --- a/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java @@ -55,7 +55,7 @@ public class VmobilProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 47271228, 11402063)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(47271228, 11402063)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java index a0d971fb..7565e0dd 100644 --- a/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java @@ -55,7 +55,7 @@ public class VmsProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 50832754, 12918348)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(50832754, 12918348)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java index 5009372c..5f12ccd2 100644 --- a/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java @@ -55,7 +55,7 @@ public class VmvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 53637555, 11392593)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(53637555, 11392593)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java index 2bd9ec0c..b1be1e35 100644 --- a/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java @@ -57,7 +57,7 @@ public class VorProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48207355, 16370602)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(48207355, 16370602)); print(result); } @@ -137,8 +137,8 @@ public class VorProviderLiveTest extends AbstractProviderLiveTest @Test public void tripBetweenCoordinates() throws Exception { - final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 48180281, 16333551), null, new Location( - LocationType.ADDRESS, null, 48240452, 16444788), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryTripsResult result = queryTrips(Location.coord(48180281, 16333551), null, Location.coord(48240452, 16444788), new Date(), true, + Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); print(laterResult); diff --git a/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java index 1a2c5bcc..ad96bd37 100644 --- a/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java @@ -60,10 +60,10 @@ public class VrnProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result1 = queryNearbyStations(new Location(LocationType.ADDRESS, 49486561, 8477297)); + final NearbyLocationsResult result1 = queryNearbyStations(Location.coord(49486561, 8477297)); print(result1); - final NearbyLocationsResult result2 = queryNearbyStations(new Location(LocationType.ADDRESS, 49757571, 6639147)); + final NearbyLocationsResult result2 = queryNearbyStations(Location.coord(49757571, 6639147)); print(result2); } diff --git a/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java index 81fce8c6..76688f72 100644 --- a/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java @@ -57,10 +57,10 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 51218693, 6777785)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(51218693, 6777785)); print(result); - final NearbyLocationsResult result2 = queryNearbyStations(new Location(LocationType.ADDRESS, 51719648, 8754330)); + final NearbyLocationsResult result2 = queryNearbyStations(Location.coord(51719648, 8754330)); print(result2); } diff --git a/enabler/test/de/schildbach/pte/live/VrsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VrsProviderLiveTest.java index 7d3ce836..0fa8d781 100644 --- a/enabler/test/de/schildbach/pte/live/VrsProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VrsProviderLiveTest.java @@ -73,29 +73,27 @@ public class VrsProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ANY, 51218693, 6777785)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(51218693, 6777785)); print(result); - final NearbyLocationsResult result2 = queryNearbyStations(new Location(LocationType.ANY, 51719648, 8754330)); + final NearbyLocationsResult result2 = queryNearbyStations(Location.coord(51719648, 8754330)); print(result2); } @Test public void nearbyLocationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.STATION), - new Location(LocationType.ANY, 50732100, 7096820), 100, 1); + final NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.STATION), Location.coord(50732100, 7096820), 100, 1); print(result); - final NearbyLocationsResult result2 = queryNearbyLocations(EnumSet.of(LocationType.ADDRESS), - new Location(LocationType.ANY, 50732100, 7096820)); + final NearbyLocationsResult result2 = queryNearbyLocations(EnumSet.of(LocationType.ADDRESS), Location.coord(50732100, 7096820)); print(result2); - final NearbyLocationsResult result3 = queryNearbyLocations(EnumSet.of(LocationType.POI), new Location(LocationType.ANY, 50732100, 7096820)); + final NearbyLocationsResult result3 = queryNearbyLocations(EnumSet.of(LocationType.POI), Location.coord(50732100, 7096820)); print(result3); - final NearbyLocationsResult result4 = queryNearbyLocations(EnumSet.of(LocationType.ADDRESS, LocationType.STATION), new Location( - LocationType.ANY, 50732100, 7096820)); + final NearbyLocationsResult result4 = queryNearbyLocations(EnumSet.of(LocationType.ADDRESS, LocationType.STATION), + Location.coord(50732100, 7096820)); print(result4); } @@ -111,7 +109,7 @@ public class VrsProviderLiveTest extends AbstractProviderLiveTest { int lat = LAT_FROM + rand.nextInt(LAT_TO - LAT_FROM); int lon = LON_FROM + rand.nextInt(LON_TO - LON_FROM); - NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.ANY), new Location(LocationType.ANY, lat, lon)); + NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.ANY), Location.coord(lat, lon)); System.out.println(result); assertNotNull(result.locations); assertNotNull(result.locations.get(0)); @@ -121,23 +119,20 @@ public class VrsProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsWithLimits() throws Exception { - final NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.STATION), - new Location(LocationType.ANY, 50732100, 7096820), 0, 0); + final NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.STATION), Location.coord(50732100, 7096820), 0, 0); print(result); - final NearbyLocationsResult result2 = queryNearbyLocations(EnumSet.of(LocationType.STATION), - new Location(LocationType.ANY, 50732100, 7096820), 0, 50); + final NearbyLocationsResult result2 = queryNearbyLocations(EnumSet.of(LocationType.STATION), Location.coord(50732100, 7096820), 0, 50); print(result2); - final NearbyLocationsResult result3 = queryNearbyLocations(EnumSet.of(LocationType.STATION), - new Location(LocationType.ANY, 50732100, 7096820), 1000, 50); + final NearbyLocationsResult result3 = queryNearbyLocations(EnumSet.of(LocationType.STATION), Location.coord(50732100, 7096820), 1000, 50); print(result3); } @Test public void nearbyLocationsEmpty() throws Exception { - final NearbyLocationsResult result = queryNearbyLocations(EnumSet.allOf(LocationType.class), new Location(LocationType.ANY, 1, 0), 0, 0); + final NearbyLocationsResult result = queryNearbyLocations(EnumSet.allOf(LocationType.class), Location.coord(1, 0), 0, 0); print(result); assertEquals(0, result.locations.size()); } @@ -416,8 +411,8 @@ public class VrsProviderLiveTest extends AbstractProviderLiveTest @Test public void testTripByCoord() throws Exception { - final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, 50740530, 7129200), null, new Location(LocationType.ANY, 50933930, - 6932440), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryTripsResult result = queryTrips(Location.coord(50740530, 7129200), null, Location.coord(50933930, 6932440), new Date(), true, + Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); print(result); assertEquals(QueryTripsResult.Status.OK, result.status); assertTrue(result.trips.size() > 0); @@ -457,8 +452,8 @@ public class VrsProviderLiveTest extends AbstractProviderLiveTest int fromLon = lonFrom + rand.nextInt(lonTo - lonFrom); int toLat = latFrom + rand.nextInt(latTo - latFrom); int toLon = lonFrom + rand.nextInt(lonTo - lonFrom); - final QueryTripsResult result = queryTrips(new Location(LocationType.ANY, fromLat, fromLon), null, new Location(LocationType.ANY, - toLat, toLon), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryTripsResult result = queryTrips(Location.coord(fromLat, fromLon), null, Location.coord(toLat, toLon), new Date(), true, + Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println("# " + (i + 1)); if (result.status.equals(QueryTripsResult.Status.OK)) { @@ -527,7 +522,7 @@ public class VrsProviderLiveTest extends AbstractProviderLiveTest int lat = latFrom + rand.nextInt(latTo - latFrom); int lon = lonFrom + rand.nextInt(lonTo - lonFrom); System.out.println(i + " " + lat + " " + lon); - NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.STATION), new Location(LocationType.STATION, lat, lon), 0, 3); + NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.STATION), Location.coord(lat, lon), 0, 3); if (result.status == NearbyLocationsResult.Status.OK) { stations.addAll(result.locations); diff --git a/enabler/test/de/schildbach/pte/live/VsnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VsnProviderLiveTest.java index 1e0b2137..69de0ee2 100644 --- a/enabler/test/de/schildbach/pte/live/VsnProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VsnProviderLiveTest.java @@ -54,7 +54,7 @@ public class VsnProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 51536614, 9925673)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(51536614, 9925673)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java index ca0d6000..07c41a34 100644 --- a/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java @@ -55,7 +55,7 @@ public class VvmProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 49455472, 11079655)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(49455472, 11079655)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java index 13fb9deb..eaa31721 100644 --- a/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java @@ -57,7 +57,7 @@ public class VvoProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 51052467, 13733196)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(51052467, 13733196)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java index e5628ba8..d5171143 100644 --- a/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java @@ -57,7 +57,7 @@ public class VvsProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48775005, 9166517)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(48775005, 9166517)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java index 5ead626c..b2a73b10 100644 --- a/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java @@ -55,7 +55,7 @@ public class VvtProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 47271228, 11402063)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(47271228, 11402063)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java index 67026dc4..e6ff40a2 100644 --- a/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java @@ -55,7 +55,7 @@ public class VvvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 50776518, 12056032)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(50776518, 12056032)); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/WienProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/WienProviderLiveTest.java index 94d4eeec..5d7a512b 100644 --- a/enabler/test/de/schildbach/pte/live/WienProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/WienProviderLiveTest.java @@ -58,15 +58,15 @@ public class WienProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 48207355, 16370602)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(48207355, 16370602)); print(result); } @Test public void nearbyLocationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.STATION, LocationType.POI), new Location( - LocationType.ADDRESS, 48207355, 16370602)); + final NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.STATION, LocationType.POI), + Location.coord(48207355, 16370602)); print(result); assertTrue(result.locations.size() > 0); } @@ -136,8 +136,8 @@ public class WienProviderLiveTest extends AbstractProviderLiveTest @Test public void tripBetweenCoordinates() throws Exception { - final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 48180281, 16333551), null, new Location( - LocationType.ADDRESS, null, 48240452, 16444788), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryTripsResult result = queryTrips(Location.coord(48180281, 16333551), null, Location.coord(48240452, 16444788), new Date(), true, + Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); print(laterResult); diff --git a/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java index f229d473..215fc0ca 100644 --- a/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java @@ -54,7 +54,7 @@ public class ZvvProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 47378968, 8540534)); + final NearbyLocationsResult result = queryNearbyStations(Location.coord(47378968, 8540534)); print(result); } diff --git a/service/src/main/java/de/schildbach/pte/service/LocationController.java b/service/src/main/java/de/schildbach/pte/service/LocationController.java index 3dc73b48..dbeb0de1 100644 --- a/service/src/main/java/de/schildbach/pte/service/LocationController.java +++ b/service/src/main/java/de/schildbach/pte/service/LocationController.java @@ -51,7 +51,7 @@ public class LocationController @ResponseBody public NearbyLocationsResult nearby(@RequestParam("lat") final int lat, @RequestParam("lon") final int lon) throws IOException { - final Location location = new Location(LocationType.ANY, lat, lon); - return provider.queryNearbyLocations(EnumSet.of(LocationType.STATION, LocationType.POI), location, 5000, 100); + final Location coord = Location.coord(lat, lon); + return provider.queryNearbyLocations(EnumSet.of(LocationType.STATION, LocationType.POI), coord, 5000, 100); } }