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

AbstractEfaProvider: Inline locationTypeValue() and locationValue() into appendLocationParams().

Browse source
This commit is contained in:
Andreas Schildbach 2018-12-31 19:05:52 +01:00
parent 5405280cab
commit 3a47ee4796
1 changed files with 13 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2973,44 +2973,28 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
}
private void appendLocationParams(final HttpUrl.Builder url, final Location location, final String paramSuffix) {
final String name = locationValue(location);
if ((location.type == LocationType.ADDRESS || location.type == LocationType.COORD) && location.hasCoord()) {
if (location.type == LocationType.STATION && location.hasId()) {
url.addEncodedQueryParameter("type_" + paramSuffix, "stop");
url.addEncodedQueryParameter("name_" + paramSuffix,
ParserUtils.urlEncode(normalizeStationId(location.id), requestUrlEncoding));
} else if (location.type == LocationType.POI && location.hasId()) {
url.addEncodedQueryParameter("type_" + paramSuffix, "poi");
url.addEncodedQueryParameter("name_" + paramSuffix, ParserUtils.urlEncode(location.id, requestUrlEncoding));
} else if ((location.type == LocationType.ADDRESS || location.type == LocationType.COORD)
&& location.hasCoord()) {
url.addEncodedQueryParameter("type_" + paramSuffix, "coord");
url.addEncodedQueryParameter("name_" + paramSuffix,
ParserUtils.urlEncode(String.format(Locale.ENGLISH, "%.7f:%.7f:%s", location.getLonAsDouble(),
location.getLatAsDouble(), COORD_FORMAT), requestUrlEncoding));
} else if (name != null) {
url.addEncodedQueryParameter("type_" + paramSuffix, locationTypeValue(location));
url.addEncodedQueryParameter("name_" + paramSuffix, ParserUtils.urlEncode(name, requestUrlEncoding));
} else if (location.name != null) {
url.addEncodedQueryParameter("type_" + paramSuffix, "any");
url.addEncodedQueryParameter("name_" + paramSuffix,
ParserUtils.urlEncode(location.name, requestUrlEncoding));
} else {
throw new IllegalArgumentException("cannot append location: " + location);
}
}
private static String locationTypeValue(final Location location) {
final LocationType type = location.type;
if (type == LocationType.STATION)
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)
return "any";
throw new IllegalArgumentException(type.toString());
}
private static @Nullable String locationValue(final Location location) {
if (location.type == LocationType.STATION && location.hasId())
return normalizeStationId(location.id);
else if (location.type == LocationType.POI && location.hasId())
return location.id;
else
return location.name;
}
private static final Map<WalkSpeed, String> WALKSPEED_MAP = new HashMap<>();
static {