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

Correct some fares by a factor

Browse source
This commit is contained in:
Andreas Schildbach 2013-08-09 16:15:43 +02:00
parent 2efd86ebf8
commit 65127104d2
3 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -104,6 +104,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
private boolean suppressPositions = false;
private boolean useRouteIndexAsTripId = true;
private boolean useLineRestriction = true;
private float fareCorrectionFactor = 1f;
private final XmlPullParserFactory parserFactory;
@ -165,6 +166,11 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
this.coordEndpoint = coordEndpoint;
}
protected void setAdditionalQueryParameter(final String additionalQueryParameter)
{
this.additionalQueryParameter = additionalQueryParameter;
}
protected void setRequestUrlEncoding(final Charset requestUrlEncoding)
{
this.requestUrlEncoding = requestUrlEncoding;
@ -216,9 +222,9 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
this.needsSpEncId = needsSpEncId;
}
protected void setAdditionalQueryParameter(final String additionalQueryParameter)
protected void setFareCorrectionFactor(final float fareCorrectionFactor)
{
this.additionalQueryParameter = additionalQueryParameter;
this.fareCorrectionFactor = fareCorrectionFactor;
}
protected TimeZone timeZone()
@ -2702,11 +2708,11 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
final String levelAdult = XmlPullUtil.optAttr(pp, "levelAdult", null);
final String levelChild = XmlPullUtil.optAttr(pp, "levelChild", null);
if (fareAdult != null)
fares.add(new Fare(net, Type.ADULT, currency, Float.parseFloat(fareAdult), levelAdult != null ? null : unitName,
levelAdult != null ? levelAdult : unitsAdult));
fares.add(new Fare(net, Type.ADULT, currency, Float.parseFloat(fareAdult) * fareCorrectionFactor,
levelAdult != null ? null : unitName, levelAdult != null ? levelAdult : unitsAdult));
if (fareChild != null)
fares.add(new Fare(net, Type.CHILD, currency, Float.parseFloat(fareChild), levelChild != null ? null : unitName,
levelChild != null ? levelChild : unitsChild));
fares.add(new Fare(net, Type.CHILD, currency, Float.parseFloat(fareChild) * fareCorrectionFactor,
levelChild != null ? null : unitName, levelChild != null ? levelChild : unitsChild));
if (!pp.isEmptyElementTag())
{
@ -3090,7 +3096,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
}
else if (key.equals("PRICE"))
{
fare = Float.parseFloat(value) * (currency.getCurrencyCode().equals("USD") ? 0.01f : 1);
fare = Float.parseFloat(value) * fareCorrectionFactor;
}
XmlPullUtil.exit(pp, "itdGenericTicket");

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

@ -37,6 +37,7 @@ public class DubProvider extends AbstractEfaProvider
super(API_BASE);
setUseRouteIndexAsTripId(false);
setFareCorrectionFactor(0.01f);
}
public NetworkId id()

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

@ -36,6 +36,7 @@ public class SfProvider extends AbstractEfaProvider
super(API_BASE);
setUseRouteIndexAsTripId(false);
setFareCorrectionFactor(0.01f);
}
public NetworkId id()