Skip to content

Commit

Permalink
AbstractHafasClientInterfaceProvider: In jsonTripSearch() parse only …
Browse files Browse the repository at this point in the history 
…fares listed in 'ovwTrfRefL'.
  • Loading branch information
@schildbach
schildbach committed Jan 18, 2019
1 parent 176bce0 commit e307648
Show file tree
Hide file tree
Showing 5 changed files with 81 additions and 78 deletions.
96 changes: 55 additions & 41 deletions enabler/src/de/schildbach/pte/AbstractHafasClientInterfaceProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -727,42 +727,42 @@ protected final QueryTripsResult jsonTripSearch(Location from, @Nullable Locatio
legs.add(leg);
}

final List<Fare> fares;
final JSONObject trfRes = outCon.optJSONObject("trfRes");
final List<Fare> fares = new LinkedList<>();
if (trfRes != null) {
final JSONArray ovwTrfRefList = outCon.optJSONArray("ovwTrfRefL");
if (trfRes != null && ovwTrfRefList != null) {
fares = new LinkedList<>();
final JSONArray fareSetList = trfRes.getJSONArray("fareSetL");
for (int iFareSet = 0; iFareSet < fareSetList.length(); iFareSet++) {
final JSONObject fareSet = fareSetList.getJSONObject(iFareSet);
final String fareSetName = fareSet.optString("name", null);
final String fareSetDescription = fareSet.optString("desc", null);
if (fareSetName != null || fareSetDescription != null) {
final JSONArray fareList = fareSet.getJSONArray("fareL");
for (int iFare = 0; iFare < fareList.length(); iFare++) {
final JSONObject jsonFare = fareList.getJSONObject(iFare);
final String name = jsonFare.getString("name");
final JSONArray ticketList = jsonFare.optJSONArray("ticketL");
if (ticketList != null) {
for (int iTicket = 0; iTicket < ticketList.length(); iTicket++) {
final JSONObject jsonTicket = ticketList.getJSONObject(iTicket);
final String ticketName = jsonTicket.getString("name");
final Currency currency = Currency.getInstance(jsonTicket.getString("cur"));
final float price = jsonTicket.getInt("prc") / 100f;
final Fare fare = parseJsonTripFare(name, fareSetDescription, ticketName,
currency, price);
if (fare != null)
fares.add(fare);
}
} else {
final Currency currency = Currency.getInstance(jsonFare.getString("cur"));
final float price = jsonFare.getInt("prc") / 100f;
final Fare fare = parseJsonTripFare(fareSetName, fareSetDescription, name, currency,
price);
if (fare != null)
fares.add(fare);
}
}
for (int i = 0; i < ovwTrfRefList.length(); i++) {
final JSONObject ovwTrfRef = ovwTrfRefList.getJSONObject(i);
final String type = ovwTrfRef.getString("type");
final int fareSetX = ovwTrfRef.getInt("fareSetX");
final int fareX = ovwTrfRef.getInt("fareX");
final JSONObject jsonFareSet = fareSetList.getJSONObject(fareSetX);
final JSONObject jsonFare = jsonFareSet.getJSONArray("fareL").getJSONObject(fareX);
final String fareName = jsonFare.getString("name");
final Fare fare;
if (type.equals("T")) { // ticket
final int ticketX = ovwTrfRef.getInt("ticketX");
final JSONObject jsonTicket = jsonFare.getJSONArray("ticketL").getJSONObject(ticketX);
final String ticketName = jsonTicket.getString("name");
final Currency currency = Currency.getInstance(jsonTicket.getString("cur"));
final float price = jsonTicket.getInt("prc") / 100f;
fare = new Fare(normalizeFareName(fareName) + '\n' + ticketName,
normalizeFareType(ticketName), currency, price, null, null);
} else if (type.equals("F")) { // fare
final Currency currency = Currency.getInstance(jsonFare.getString("cur"));
final float price = jsonFare.getInt("prc") / 100f;
fare = new Fare(normalizeFareName(fareName), normalizeFareType(fareName), currency, price,
null, null);
} else {
throw new IllegalArgumentException("cannot handle type: " + type);
}
if (!hideFare(fare))
fares.add(fare);
}
} else {
fares = null;
}

final Trip trip = new Trip(null, tripFrom, tripTo, legs, fares, null, null);
Expand All @@ -777,15 +777,29 @@ protected final QueryTripsResult jsonTripSearch(Location from, @Nullable Locatio
}
}

protected Fare parseJsonTripFare(final @Nullable String fareSetName, final @Nullable String fareSetDescription,
final String name, final Currency currency, final float price) {
if (name.endsWith("- Jahreskarte") || name.endsWith("- Monatskarte"))
return null;
if (name.startsWith("Vollpreis - "))
return new Fare(fareSetName, Fare.Type.ADULT, currency, price, name.substring(12), null);
if (name.startsWith("Kind - "))
return new Fare(fareSetName, Fare.Type.CHILD, currency, price, name.substring(7), null);
return null;
protected Fare.Type normalizeFareType(final String fareName) {
final String fareNameLc = fareName.toLowerCase(Locale.US);
if (fareNameLc.contains("erwachsene") || fareNameLc.contains("adult"))
return Fare.Type.ADULT;
if (fareNameLc.contains("kind") || fareNameLc.contains("child") || fareNameLc.contains("kids"))
return Fare.Type.CHILD;
if (fareNameLc.contains("ermäßigung"))
return Fare.Type.CHILD;
if (fareNameLc.contains("schüler") || fareNameLc.contains("azubi"))
return Fare.Type.STUDENT;
if (fareNameLc.contains("fahrrad"))
return Fare.Type.BIKE;
if (fareNameLc.contains("senior"))
return Fare.Type.SENIOR;
return Fare.Type.ADULT;
}

protected String normalizeFareName(final String fareName) {
return fareName;
}

protected boolean hideFare(final Fare fare) {
return false;
}

private String wrapJsonApiRequest(final String meth, final String req, final boolean formatted) {
Expand Down
23 changes: 5 additions & 18 deletions enabler/src/de/schildbach/pte/BvgProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

package de.schildbach.pte;

import java.util.Currency;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Matcher;
Expand All @@ -27,7 +26,6 @@

import com.google.common.collect.Sets;

import de.schildbach.pte.dto.Fare;
import de.schildbach.pte.dto.Line;
import de.schildbach.pte.dto.Line.Attr;
import de.schildbach.pte.dto.Point;
Expand Down Expand Up @@ -108,6 +106,11 @@ protected String[] splitAddress(final String address) {
return super.splitStationName(address);
}

@Override
protected String normalizeFareName(final String fareName) {
return fareName.replaceAll("Tarifgebiet ", "");
}

@Override
protected Line newLine(final String id, final String operator, final Product product, final @Nullable String name,
final @Nullable String shortName, final @Nullable String number, final Style style) {
Expand Down Expand Up @@ -141,22 +144,6 @@ protected Line newLine(final String id, final String operator, final Product pro
return line;
}

@Override
protected Fare parseJsonTripFare(String fareSetName, final String fareSetDescription, final String name,
final Currency currency, final float price) {
if (!fareSetName.startsWith("Berlin Tarifgebiet ") || !fareSetName.endsWith(" Einzelfahrausweis"))
return null;
fareSetName = "Berlin " + fareSetName.substring(19, fareSetName.length() - 19);

if (name.equals("Regeltarif"))
return new Fare(fareSetName, Fare.Type.ADULT, currency, price, name, null);
if (name.equals("Ermäßigungstarif"))
return new Fare(fareSetName, Fare.Type.CHILD, currency, price, name, null);
if (name.equals("Fahrrad"))
return new Fare(fareSetName, Fare.Type.BIKE, currency, price, name, null);
return null;
}

private static final Map<String, Style> STYLES = new HashMap<>();

static {
Expand Down
19 changes: 0 additions & 19 deletions enabler/src/de/schildbach/pte/ShProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,10 @@

package de.schildbach.pte;

import java.util.Currency;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Matcher;

import javax.annotation.Nullable;

import de.schildbach.pte.dto.Fare;
import de.schildbach.pte.dto.Fare.Type;
import de.schildbach.pte.dto.Product;
import de.schildbach.pte.dto.Style;

Expand Down Expand Up @@ -79,20 +74,6 @@ protected String[] splitAddress(final String address) {
return super.splitStationName(address);
}

@Override
protected Fare parseJsonTripFare(final @Nullable String fareSetName, final @Nullable String fareSetDescription,
String name, final Currency currency, final float price) {
if (!"Normalpreis".equals(fareSetDescription) || !name.startsWith("Einzelfahrkarte "))
return null;
name = name.substring(16);
if (name.startsWith("Übergang"))
return null;
if (name.startsWith("Kind "))
return new Fare("SH-Tarif", Type.CHILD, currency, price, name.substring(5), null);
else
return new Fare("SH-Tarif", Type.ADULT, currency, price, name, null);
}

protected static final Map<String, Style> STYLES = new HashMap<>();

static {
Expand Down
5 changes: 5 additions & 0 deletions enabler/src/de/schildbach/pte/VbbProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@ protected String[] splitAddress(final String address) {
return super.splitStationName(address);
}

@Override
protected String normalizeFareName(final String fareName) {
return fareName.replaceAll("Tarifgebiet ", "");
}

@Override
public Set<Product> defaultProducts() {
return ALL_EXCEPT_HIGHSPEED_AND_ONDEMAND;
Expand Down
16 changes: 16 additions & 0 deletions enabler/src/de/schildbach/pte/VbnProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package de.schildbach.pte;

import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
Expand All @@ -26,6 +27,7 @@

import com.google.common.collect.Sets;

import de.schildbach.pte.dto.Fare;
import de.schildbach.pte.dto.Line;
import de.schildbach.pte.dto.Line.Attr;
import de.schildbach.pte.dto.Product;
Expand Down Expand Up @@ -84,6 +86,20 @@ protected String[] splitAddress(final String address) {
return super.splitAddress(address);
}

@Override
protected boolean hideFare(Fare fare) {
final String fareNameLc = fare.network.toLowerCase(Locale.US);
if (fareNameLc.contains("2 adults"))
return true;
if (fareNameLc.contains("3 adults"))
return true;
if (fareNameLc.contains("4 adults"))
return true;
if (fareNameLc.contains("5 adults"))
return true;
return super.hideFare(fare);
}

@Override
public Set<Product> defaultProducts() {
return Product.ALL;
Expand Down

0 comments on commit e307648

Please sign in to comment.