From e6078baf79210418d5396dda8886fe1fc12563f0 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Sat, 21 Jan 2012 10:53:06 +0000 Subject: [PATCH] use JSON stopfinder for San Francisco git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@881 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/AbstractEfaProvider.java | 6 ++++-- src/de/schildbach/pte/SfProvider.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java index f0065f26..a9d28f38 100644 --- a/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/src/de/schildbach/pte/AbstractEfaProvider.java @@ -159,7 +159,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider String type = stop.getString("type"); if ("any".equals(type)) type = stop.getString("anyType"); - final String name = stop.getString("object"); + final String name = normalizeLocationName(stop.getString("object")); final JSONObject ref = stop.getJSONObject("ref"); String place = ref.getString("place"); if (place != null && place.length() == 0) @@ -183,8 +183,10 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider results.add(new Location(LocationType.STATION, stop.getInt("stateless"), lat, lon, place, name)); else if ("poi".equals(type)) results.add(new Location(LocationType.POI, 0, lat, lon, place, name)); + else if ("crossing".equals(type)) + results.add(new Location(LocationType.ADDRESS, 0, lat, lon, place, name)); else if ("street".equals(type) || "address".equals(type) || "singlehouse".equals(type)) - results.add(new Location(LocationType.ADDRESS, 0, lat, lon, place, stop.getString("name"))); + results.add(new Location(LocationType.ADDRESS, 0, lat, lon, place, normalizeLocationName(stop.getString("name")))); else throw new IllegalArgumentException("unknown type: " + type + " on " + uri); } diff --git a/src/de/schildbach/pte/SfProvider.java b/src/de/schildbach/pte/SfProvider.java index 9f029a6f..20830ece 100644 --- a/src/de/schildbach/pte/SfProvider.java +++ b/src/de/schildbach/pte/SfProvider.java @@ -73,7 +73,7 @@ public class SfProvider extends AbstractEfaProvider @Override public List autocompleteStations(final CharSequence constraint) throws IOException { - return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); + return jsonStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); } @Override