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

Migrate from EnumSet<LocationType> in interfaces to just Set<LocationType>.

Browse source
This commit is contained in:
Andreas Schildbach 2018-12-23 14:08:40 +01:00
parent d84e0af608
commit fe5a2a8453
10 changed files with 26 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

9
enabler/src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -26,7 +26,6 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.Currency;
import java.util.Date;
import java.util.EnumSet;
import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.HashSet;
@ -444,7 +443,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
return result.get();
}
private void appendCoordRequestParameters(final HttpUrl.Builder url, final EnumSet<LocationType> types,
private void appendCoordRequestParameters(final HttpUrl.Builder url, final Set<LocationType> types,
final Point coord, final int maxDistance, final int maxLocations) {
appendCommonRequestParams(url, "XML");
url.addEncodedQueryParameter("coord", ParserUtils.urlEncode(String.format(Locale.ENGLISH, "%.7f:%.7f:%s",
@ -465,7 +464,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
}
}
protected NearbyLocationsResult xmlCoordRequest(final EnumSet<LocationType> types, final Point coord,
protected NearbyLocationsResult xmlCoordRequest(final Set<LocationType> types, final Point coord,
final int maxDistance, final int maxStations) throws IOException {
final HttpUrl.Builder url = coordEndpoint.newBuilder();
appendCoordRequestParameters(url, types, coord, maxDistance, maxStations);
@ -533,7 +532,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
return result.get();
}
protected NearbyLocationsResult mobileCoordRequest(final EnumSet<LocationType> types, final Point coord,
protected NearbyLocationsResult mobileCoordRequest(final Set<LocationType> types, final Point coord,
final int maxDistance, final int maxStations) throws IOException {
final HttpUrl.Builder url = coordEndpoint.newBuilder();
appendCoordRequestParameters(url, types, coord, maxDistance, maxStations);
@ -775,7 +774,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
}
@Override
public NearbyLocationsResult queryNearbyLocations(final EnumSet<LocationType> types, final Location location,
public NearbyLocationsResult queryNearbyLocations(final Set<LocationType> types, final Location location,
final int maxDistance, final int maxLocations) throws IOException {
if (location.hasCoord())
return xmlCoordRequest(types, location.coord, maxDistance, maxLocations);