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

ParserUtils: add helper method to parse currency code

Browse source
This commit is contained in:
Andreas Schildbach 2021-10-17 22:14:42 +02:00
parent de2a0a614f
commit fca02d58b3
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -3014,7 +3014,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
return Currency.getInstance("USD"); return Currency.getInstance("USD");
if (currencyStr.equals("Dirham")) if (currencyStr.equals("Dirham"))
return Currency.getInstance("AED"); return Currency.getInstance("AED");
return Currency.getInstance(currencyStr); return ParserUtils.getCurrency(currencyStr);
} }
private static final Pattern P_POSITION = Pattern.compile( private static final Pattern P_POSITION = Pattern.compile(

2
src/de/schildbach/pte/AbstractHafasClientInterfaceProvider.java
View file

@ -785,7 +785,7 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas
} else if (type.equals("F")) { // fare } else if (type.equals("F")) { // fare
final String currencyStr = jsonFare.optString("cur"); final String currencyStr = jsonFare.optString("cur");
if (currencyStr != null) { if (currencyStr != null) {
final Currency currency = Currency.getInstance(currencyStr); final Currency currency = ParserUtils.getCurrency(currencyStr);
final float price = jsonFare.getInt("prc") / 100f; final float price = jsonFare.getInt("prc") / 100f;
fare = new Fare(normalizeFareName(fareName), normalizeFareType(fareName), currency, fare = new Fare(normalizeFareName(fareName), normalizeFareType(fareName), currency,
price, null, null); price, null, null);

8
src/de/schildbach/pte/util/ParserUtils.java
View file

@ -303,4 +303,12 @@ public final class ParserUtils {
return null; return null;
} }
public static Currency getCurrency(final String code) {
try {
return Currency.getInstance(code);
} catch (final IllegalArgumentException x) {
throw new RuntimeException("unknown ISO 4217 code: " + code);
}
}
} }