Normalize station ids when passing them to Hafas or EFA APIs.

This commit is contained in:
Andreas Schildbach 2014-06-14 19:57:58 +02:00
parent c4ebd7fbc7
commit 751338cbe1
14 changed files with 44 additions and 27 deletions

View file

@ -934,7 +934,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
{
final StringBuilder parameters = new StringBuilder();
appendCommonRequestParams(parameters, "XML");
parameters.append("&type_dm=stop&name_dm=").append(stationId);
parameters.append("&type_dm=stop&name_dm=").append(normalizeStationId(stationId));
parameters.append("&itOptionsActive=1");
parameters.append("&ptOptionsActive=1");
parameters.append("&useProxFootSearch=1");
@ -1449,7 +1449,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
final StringBuilder parameters = new StringBuilder();
appendCommonRequestParams(parameters, "XML");
parameters.append("&type_dm=stop");
parameters.append("&name_dm=").append(stationId);
parameters.append("&name_dm=").append(normalizeStationId(stationId));
if (useRealtime)
parameters.append("&useRealtime=1");
parameters.append("&mode=direct");
@ -3275,7 +3275,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
if (canAcceptPoiId && location.type == LocationType.POI && location.hasId())
{
uri.append("&type_").append(paramSuffix).append("=poiID");
uri.append("&name_").append(paramSuffix).append("=").append(location.id);
uri.append("&name_").append(paramSuffix).append("=").append(normalizeStationId(location.id));
}
else if ((location.type == LocationType.POI || location.type == LocationType.ADDRESS) && location.hasLocation())
{