Fix #396 - Re-enable Android Geocoder

It appears to have been working again for at least months (circa beginning 2015)
CUTR-at-USF · Jan 8, 2016 · 02d5d2c · 02d5d2c
1 parent d8c1252
commit 02d5d2c
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/...planner-android/src/main/java/edu/usf/cutr/opentripplanner/android/util/LocationUtil.java b/...planner-android/src/main/java/edu/usf/cutr/opentripplanner/android/util/LocationUtil.java
@@ -175,8 +175,7 @@ public static ArrayList<CustomAddress> processGeocoding(Context context, Server
             Geocoder gc = new Geocoder(context);
             try {
                 List<Address> androidTypeAddresses;
-                //TODO Temporary workaround while Google does not solve the problem with Android Geocoder, see issue #396
-                /*if (selectedServer != null) {
+                if (selectedServer != null) {
                     androidTypeAddresses = gc.getFromLocationName(address,
                             context.getResources().getInteger(R.integer.geocoder_max_results),
                             selectedServer.getLowerLeftLatitude(),
@@ -186,13 +185,6 @@ public static ArrayList<CustomAddress> processGeocoding(Context context, Server
                 } else {
                     androidTypeAddresses = gc.getFromLocationName(address,
                             context.getResources().getInteger(R.integer.geocoder_max_results));
-                }*/
-                if (geocodingForMarker){
-                    androidTypeAddresses = gc.getFromLocationName(address,
-                            context.getResources().getInteger(R.integer.geocoder_max_results));
-                }
-                else{
-                    androidTypeAddresses = new ArrayList<Address>();
                 }
                 for (Address androidTypeAddress : androidTypeAddresses){
                     addresses.add(new CustomAddress(androidTypeAddress));