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

Parse itdCoordinateBaseElemList where itdCoordinateString is not available

Browse source
This commit is contained in:
Andreas Schildbach 2013-12-07 11:14:35 +01:00
parent 5f45e84a4b
commit 373c02546f
2 changed files with 47 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -105,6 +105,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
private boolean httpPost = false; private boolean httpPost = false;
private boolean useRouteIndexAsTripId = true; private boolean useRouteIndexAsTripId = true;
private boolean useLineRestriction = true; private boolean useLineRestriction = true;
private boolean useStringCoordListOutputFormat = true;
private float fareCorrectionFactor = 1f; private float fareCorrectionFactor = 1f;
private final XmlPullParserFactory parserFactory; private final XmlPullParserFactory parserFactory;
@ -213,6 +214,11 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
this.useLineRestriction = useLineRestriction; this.useLineRestriction = useLineRestriction;
} }
protected void setUseStringCoordListOutputFormat(final boolean useStringCoordListOutputFormat)
{
this.useStringCoordListOutputFormat = useStringCoordListOutputFormat;
}
protected void setCanAcceptPoiId(final boolean canAcceptPoiId) protected void setCanAcceptPoiId(final boolean canAcceptPoiId)
{ {
this.canAcceptPoiId = canAcceptPoiId; this.canAcceptPoiId = canAcceptPoiId;
@ -581,6 +587,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
final StringBuilder parameters = new StringBuilder(); final StringBuilder parameters = new StringBuilder();
appendCommonRequestParams(parameters, "XML"); appendCommonRequestParams(parameters, "XML");
parameters.append("&coord=").append(String.format(Locale.ENGLISH, "%2.6f:%2.6f:WGS84", latLonToDouble(lon), latLonToDouble(lat))); parameters.append("&coord=").append(String.format(Locale.ENGLISH, "%2.6f:%2.6f:WGS84", latLonToDouble(lon), latLonToDouble(lat)));
if (useStringCoordListOutputFormat)
parameters.append("&coordListOutputFormat=STRING"); parameters.append("&coordListOutputFormat=STRING");
parameters.append("&max=").append(maxStations != 0 ? maxStations : 50); parameters.append("&max=").append(maxStations != 0 ? maxStations : 50);
parameters.append("&inclFilter=1&radius_1=").append(maxDistance != 0 ? maxDistance : 1320); parameters.append("&inclFilter=1&radius_1=").append(maxDistance != 0 ? maxDistance : 1320);
@ -2096,8 +2103,9 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
return uri.toString(); return uri.toString();
} }
private static final void appendCommonXsltTripRequest2Params(final StringBuilder uri) private final void appendCommonXsltTripRequest2Params(final StringBuilder uri)
{ {
if (useStringCoordListOutputFormat)
uri.append("&coordListOutputFormat=STRING"); uri.append("&coordListOutputFormat=STRING");
uri.append("&calcNumberOfTrips=4"); uri.append("&calcNumberOfTrips=4");
} }
@ -3068,7 +3076,19 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
if (!"GEO_DECIMAL".equals(type)) if (!"GEO_DECIMAL".equals(type))
throw new IllegalStateException("unknown type: " + type); throw new IllegalStateException("unknown type: " + type);
final List<Point> path = processCoordinateStrings(pp, "itdCoordinateString"); final List<Point> path;
if (XmlPullUtil.test(pp, "itdCoordinateString"))
{
path = processCoordinateStrings(pp, "itdCoordinateString");
}
else if (XmlPullUtil.test(pp, "itdCoordinateBaseElemList"))
{
path = processCoordinateBaseElems(pp);
}
else
{
throw new IllegalStateException(pp.getPositionDescription());
}
XmlPullUtil.exit(pp, "itdPathCoordinates"); XmlPullUtil.exit(pp, "itdPathCoordinates");
@ -3086,6 +3106,28 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
return path; return path;
} }
private List<Point> processCoordinateBaseElems(final XmlPullParser pp) throws XmlPullParserException, IOException
{
final List<Point> path = new LinkedList<Point>();
XmlPullUtil.enter(pp, "itdCoordinateBaseElemList");
while (XmlPullUtil.test(pp, "itdCoordinateBaseElem"))
{
XmlPullUtil.enter(pp, "itdCoordinateBaseElem");
final int lon = Math.round(Float.parseFloat(requireValueTag(pp, "x")));
final int lat = Math.round(Float.parseFloat(requireValueTag(pp, "y")));
path.add(new Point(lat, lon));
XmlPullUtil.exit(pp, "itdCoordinateBaseElem");
}
XmlPullUtil.exit(pp, "itdCoordinateBaseElemList");
return path;
}
private Point coordStrToPoint(final String coordStr) private Point coordStrToPoint(final String coordStr)
{ {
if (coordStr == null) if (coordStr == null)

1
enabler/src/de/schildbach/pte/VvoProvider.java
View file

@ -41,6 +41,7 @@ public class VvoProvider extends AbstractEfaProvider
super(apiBase); super(apiBase);
setUseRealtime(false); setUseRealtime(false);
setUseStringCoordListOutputFormat(false);
setRequestUrlEncoding(UTF_8); setRequestUrlEncoding(UTF_8);
} }