As per commons-app#3026, migrated CategoryApi to retrofit

Author: ilgazer

app/src/main/java/fr/free/nrw/commons/category/CategoryClient.java

@@ -21,11 +21,11 @@
 @Singleton
 public class CategoryClient {
 
-    private final CategoryInterface CategoryInterface;
+    private final CategoryInterface categoryInterface;
 
     @Inject
     public CategoryClient(CategoryInterface CategoryInterface) {
-        this.CategoryInterface = CategoryInterface;
+        this.categoryInterface = CategoryInterface;
     }
 
     /**
@@ -37,7 +37,7 @@ public CategoryClient(CategoryInterface CategoryInterface) {
      * @return
      */
     public Observable<String> searchCategories(String filter, int itemLimit, int offset) {
-        return responseToCategoryName(CategoryInterface.searchCategories(filter, itemLimit, offset));
+        return responseToCategoryName(categoryInterface.searchCategories(filter, itemLimit, offset));
 
     }
 
@@ -62,7 +62,7 @@ public Observable<String> searchCategories(String filter, int itemLimit) {
      * @return
      */
     public Observable<String> searchCategoriesForPrefix(String prefix, int itemLimit, int offset) {
-        return responseToCategoryName(CategoryInterface.searchCategoriesForPrefix(prefix, itemLimit, offset));
+        return responseToCategoryName(categoryInterface.searchCategoriesForPrefix(prefix, itemLimit, offset));
     }
 
     /**
@@ -85,7 +85,7 @@ public Observable<String> searchCategoriesForPrefix(String prefix, int itemLimit
      * @return Observable emitting the categories returned. If our search yielded "Category:Test", "Test" is emitted.
      */
     public Observable<String> getSubCategoryList(String categoryName) {
-        return responseToCategoryName(CategoryInterface.getSubCategoryList(categoryName));
+        return responseToCategoryName(categoryInterface.getSubCategoryList(categoryName));
     }
 
     /**
@@ -97,7 +97,32 @@ public Observable<String> getSubCategoryList(String categoryName) {
      */
     @NonNull
     public Observable<String> getParentCategoryList(String categoryName) {
-        return responseToCategoryName(CategoryInterface.getParentCategoryList(categoryName));
+        return responseToCategoryName(categoryInterface.getParentCategoryList(categoryName));
+    }
+
+    @NonNull
+    public Observable<String> getGpsCategories(String coords) {
+        return categoryInterface.getGpsCategories(coords, 10000, coords, 20)
+                .flatMap(mwQueryResponse -> {
+                    MwQueryResult query;
+                    List<MwQueryPage> pages;
+                    if ((query = mwQueryResponse.query()) == null ||
+                            (pages = query.pages()) == null) {
+                        Timber.d("No files returned.");
+                        return Observable.empty();
+                    } else
+                        return Observable.fromIterable(pages);
+                })
+                .flatMap(page -> {
+                    if (page.categories() != null) {
+                        return Observable.fromIterable(page.categories());
+                    }
+                    Timber.d("No categories in file %s", page.title());
+                    return Observable.empty();
+                })
+                .map(MwQueryPage.Category::title)
+                .doOnEach(s -> Timber.d("Category returned: %s", s))
+                .map(cat -> cat.replace("Category:", ""));
     }
 
     /**

app/src/main/java/fr/free/nrw/commons/category/CategoryInterface.java

@@ -44,4 +44,20 @@ Observable<MwQueryResponse> searchCategoriesForPrefix(@Query("gacprefix") String
             + "&generator=categories&prop=info&gcllimit=500")
     Observable<MwQueryResponse> getParentCategoryList(@Query("titles") String categoryName);
 
+    /**
+     * @param searchCoords
+     * @param radius
+     * @param centerCoords
+     * @param limit
+     * @return
+     */
+    @GET("w/api.php?action=query&format=json&formatversion=2" +
+            "&generator=geosearch&ggsnamespace=6" +
+            "&prop=categories|coordinates|pageprops&clshow=!hidden" +
+            "&coprop=type|name|dim|country|region|globe" +
+            "&ggsprop=type|name|dim|country|region|globe&ggsprimary=all")
+    Observable<MwQueryResponse> getGpsCategories(@Query("ggscoord") String searchCoords,
+                                                 @Query("ggsradius") int radius,
+                                                 @Query("codistancefrompoint") String centerCoords,
+                                                 @Query("ggslimit") int limit);
 }