mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-29 13:53:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rearranged some classes

Browse source
This commit is contained in:
misaochan 2016-01-02 16:22:39 +13:00
parent b1cf1b92d7
commit 7c85dd391d
1 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

74
commons/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java
View file

@ -39,30 +39,6 @@ public class MwVolleyApi {
categorySet = new HashSet<String>();
}
//To get the list of categories for display
public static List<String> getGpsCat() {
List<String> list = new ArrayList<String>(categorySet);
return list;
}
public void request(String coords) {
//If <10 categories found, repeat API call with incremented radius
for (int radius=100; radius<=10000; radius=radius*10) {
String apiUrl = buildUrl(coords, radius);
Log.d("Repeat", "URL: " + apiUrl);
JsonRequest<QueryResponse> request = new QueryRequest(apiUrl,
new LogResponseListener<QueryResponse>(), new LogResponseErrorListener());
getQueue().add(request);
Log.d("Repeat", "Repeating API call with radius " + Integer.toString(radius));
if (categorySet.size()>=10) {
break;
}
}
}
/**
* Builds URL with image coords for MediaWiki API calls
* Example URL: https://commons.wikimedia.org/w/api.php?action=query&prop=categories|coordinates|pageprops&format=json&clshow=!hidden&coprop=type|name|dim|country|region|globe&codistancefrompoint=38.11386944444445|13.356263888888888&
@ -92,6 +68,42 @@ public class MwVolleyApi {
return builder.toString();
}
//To get the list of categories for display
public static List<String> getGpsCat() {
List<String> list = new ArrayList<String>(categorySet);
return list;
}
public static class GpsCatExists {
private static boolean gpsCatExists;
public static void setGpsCatExists(boolean gpsCat) {
gpsCatExists = gpsCat;
}
public static boolean getGpsCatExists() {
return gpsCatExists;
}
}
public void request(String coords) {
//If <10 categories found, repeat API call with incremented radius
for (int radius=100; radius<=10000; radius=radius*10) {
String apiUrl = buildUrl(coords, radius);
Log.d("Repeat", "URL: " + apiUrl);
JsonRequest<QueryResponse> request = new QueryRequest(apiUrl,
new LogResponseListener<QueryResponse>(), new LogResponseErrorListener());
getQueue().add(request);
Log.d("Repeat", "Repeating API call with radius " + Integer.toString(radius));
if (categorySet.size()>=10) {
break;
}
}
}
private synchronized RequestQueue getQueue() {
return getQueue(context);
}
@ -150,18 +162,6 @@ public class MwVolleyApi {
}
}
public static class GpsCatExists {
private static boolean gpsCatExists;
public static void setGpsCatExists(boolean gpsCat) {
gpsCatExists = gpsCat;
}
public static boolean getGpsCatExists() {
return gpsCatExists;
}
}
private static class QueryResponse {
private Query query = new Query();
@ -234,7 +234,7 @@ public class MwVolleyApi {
}
}
private static class Category {
private static class Category {
private String title;
@Override