1 files changed, 28 insertions, 4 deletions

diff --git a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
index 309969e..fcc81e0 100644
--- a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
+++ b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
@@ -1,12 +1,12 @@
 package cgeo.geocaching.connector.oc;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.DataStore;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.Image;
 import cgeo.geocaching.LogEntry;
 import cgeo.geocaching.R;
 import cgeo.geocaching.Waypoint;
-import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.connector.ConnectorFactory;
 import cgeo.geocaching.connector.IConnector;
 import cgeo.geocaching.connector.LogResult;
@@ -81,7 +81,6 @@ final class OkapiClient {
     private static final String CACHE_LATEST_LOGS = "latest_logs";
     private static final String CACHE_IMAGE_URL = "url";
     private static final String CACHE_IMAGE_CAPTION = "caption";
-    private static final String CACHE_IMAGE_IS_SPOILER = "is_spoiler";
     private static final String CACHE_IMAGES = "images";
     private static final String CACHE_HINT = "hint";
     private static final String CACHE_DESCRIPTION = "description";
@@ -116,8 +115,9 @@ final class OkapiClient {
     private static final String SERVICE_CACHE_ADDITIONAL_CURRENT_FIELDS = "gc_code|attribution_note";
     private static final String SERVICE_CACHE_ADDITIONAL_L3_FIELDS = "is_watched|my_notes";
 
-    private static final String METHOD_SEARCH_NEAREST = "services/caches/search/nearest";
+    private static final String METHOD_SEARCH_ALL = "services/caches/search/all";
     private static final String METHOD_SEARCH_BBOX = "services/caches/search/bbox";
+    private static final String METHOD_SEARCH_NEAREST = "services/caches/search/nearest";
     private static final String METHOD_RETRIEVE_CACHES = "services/caches/geocaches";
 
     public static Geocache getCache(final String geoCode) {
@@ -152,6 +152,27 @@ final class OkapiClient {
         return requestCaches(connector, params, valueMap);
     }
 
+    public static List<Geocache> getCachesNamed(final Geopoint center, final String namePart, final OCApiConnector connector) {
+        final Map<String, String> valueMap = new LinkedHashMap<String, String>();
+        final Parameters params;
+
+        // search around current position, if there is a position
+        if (center != null) {
+            final String centerString = GeopointFormatter.format(GeopointFormatter.Format.LAT_DECDEGREE_RAW, center) + SEPARATOR + GeopointFormatter.format(GeopointFormatter.Format.LON_DECDEGREE_RAW, center);
+            params = new Parameters("search_method", METHOD_SEARCH_NEAREST);
+            valueMap.put("center", centerString);
+            valueMap.put("limit", "20");
+        }
+        else {
+            params = new Parameters("search_method", METHOD_SEARCH_ALL);
+            valueMap.put("limit", "20");
+        }
+
+        // full wildcard search, maybe we need to change this after some testing and evaluation
+        valueMap.put("name", "*" + namePart + "*");
+        return requestCaches(connector, params, valueMap);
+    }
+
     private static List<Geocache> requestCaches(final OCApiConnector connector, final Parameters params, final Map<String, String> valueMap) {
         addFilterParams(valueMap, connector);
         params.add("search_params", new JSONObject(valueMap).toString());
@@ -166,7 +187,9 @@ final class OkapiClient {
         return parseCaches(data);
     }
 
-    // Assumes level 3 OAuth
+    /**
+     * Assumes level 3 OAuth.
+     */
     public static List<Geocache> getCachesBBox(final Viewport viewport, final OCApiConnector connector) {
 
         if (viewport.getLatitudeSpan() == 0 || viewport.getLongitudeSpan() == 0) {
@@ -318,6 +341,7 @@ final class OkapiClient {
                     final JSONObject imageResponse = images.getJSONObject(i);
                     final String title = imageResponse.getString(CACHE_IMAGE_CAPTION);
                     final String url = absoluteUrl(imageResponse.getString(CACHE_IMAGE_URL), cache.getGeocode());
+                    // all images are added as spoiler images, although OKAPI has spoiler and non spoiler images
                     cache.addSpoiler(new Image(url, title));
                 }
             }