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

AbstractEfaProvider: Rename parseJsonStop() to parseJsonPoint().

Browse source
This commit is contained in:
Andreas Schildbach 2018-12-06 16:45:30 +01:00
parent 5b662a0ba9
commit e5aa74254b
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -260,7 +260,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
final JSONObject points = stopFinder.optJSONObject("points"); final JSONObject points = stopFinder.optJSONObject("points");
if (points != null) { if (points != null) {
final JSONObject point = points.getJSONObject("point"); final JSONObject point = points.getJSONObject("point");
final SuggestedLocation location = parseJsonStop(point); final SuggestedLocation location = parseJsonPoint(point);
locations.add(location); locations.add(location);
} }
@ -269,7 +269,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
final int nPoints = pointsArray.length(); final int nPoints = pointsArray.length();
for (int i = 0; i < nPoints; i++) { for (int i = 0; i < nPoints; i++) {
final JSONObject point = pointsArray.optJSONObject(i); final JSONObject point = pointsArray.optJSONObject(i);
final SuggestedLocation location = parseJsonStop(point); final SuggestedLocation location = parseJsonPoint(point);
locations.add(location); locations.add(location);
} }
} }
@ -286,7 +286,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
final int nPoints = pointsArray.length(); final int nPoints = pointsArray.length();
for (int i = 0; i < nPoints; i++) { for (int i = 0; i < nPoints; i++) {
final JSONObject point = pointsArray.optJSONObject(i); final JSONObject point = pointsArray.optJSONObject(i);
final SuggestedLocation location = parseJsonStop(point); final SuggestedLocation location = parseJsonPoint(point);
locations.add(location); locations.add(location);
} }
} }
@ -310,16 +310,16 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
return null; return null;
} }
private SuggestedLocation parseJsonStop(final JSONObject stop) throws JSONException { private SuggestedLocation parseJsonPoint(final JSONObject point) throws JSONException {
String type = stop.getString("type"); String type = point.getString("type");
if ("any".equals(type)) if ("any".equals(type))
type = stop.getString("anyType"); type = point.getString("anyType");
final String stateless = stop.getString("stateless"); final String stateless = point.getString("stateless");
final String name = normalizeLocationName(stop.optString("name")); final String name = normalizeLocationName(point.optString("name"));
final String object = normalizeLocationName(stop.optString("object")); final String object = normalizeLocationName(point.optString("object"));
final String postcode = stop.optString("postcode"); final String postcode = point.optString("postcode");
final int quality = stop.getInt("quality"); final int quality = point.getInt("quality");
final JSONObject ref = stop.getJSONObject("ref"); final JSONObject ref = point.getJSONObject("ref");
final String id = ref.getString("id"); final String id = ref.getString("id");
String place = ref.getString("place"); String place = ref.getString("place");
if (place != null && place.length() == 0) if (place != null && place.length() == 0)