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

Trying to put category number check in onResponse()

Browse source
This commit is contained in:
misaochan 2016-01-02 18:09:17 +13:00
parent 00c3c97f74
commit 30b86a0cde
2 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,13 +29,15 @@ public class MwVolleyApi {
private static RequestQueue REQUEST_QUEUE; private static RequestQueue REQUEST_QUEUE;
private static final Gson GSON = new GsonBuilder().create(); private static final Gson GSON = new GsonBuilder().create();
private Context context; private Context context;
private String coords;
protected static Set<String> categorySet; protected static Set<String> categorySet;
private static final String MWURL = "https://commons.wikimedia.org/"; private static final String MWURL = "https://commons.wikimedia.org/";
public MwVolleyApi(Context context) { public MwVolleyApi(Context context, String coords) {
this.context = context; this.context = context;
this.coords = coords;
categorySet = new HashSet<String>(); categorySet = new HashSet<String>();
} }
@ -44,7 +46,7 @@ public class MwVolleyApi {
* 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& * 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&
* generator=geosearch&redirects=&ggscoord=38.11386944444445|13.356263888888888&ggsradius=100&ggslimit=10&ggsnamespace=6&ggsprop=type|name|dim|country|region|globe&ggsprimary=all&formatversion=2 * generator=geosearch&redirects=&ggscoord=38.11386944444445|13.356263888888888&ggsradius=100&ggslimit=10&ggsnamespace=6&ggsprop=type|name|dim|country|region|globe&ggsprimary=all&formatversion=2
*/ */
private String buildUrl (String coords, int ggsradius){ private static String buildUrl (int ggsradius){
Uri.Builder builder = Uri.parse(MWURL).buildUpon(); Uri.Builder builder = Uri.parse(MWURL).buildUpon();
@ -85,22 +87,13 @@ public class MwVolleyApi {
return REQUEST_QUEUE; return REQUEST_QUEUE;
} }
public void request(String coords) { public void request() {
//If <10 categories found, repeat API call with incremented radius //If <10 categories found, repeat API call with incremented radius
for (int radius=100; radius<=10000; radius=radius*10) { JsonRequest<QueryResponse> request = new QueryRequest(apiUrl, new LogResponseListener<QueryResponse>(), new LogResponseErrorListener());
String apiUrl = buildUrl(coords, radius); getQueue().add(request);
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 static class LogResponseListener<T> implements Response.Listener<T> { private static class LogResponseListener<T> implements Response.Listener<T> {
@ -110,6 +103,19 @@ public class MwVolleyApi {
public void onResponse(T response) { public void onResponse(T response) {
Log.d(TAG, response.toString()); Log.d(TAG, response.toString());
Log.d("Repeat", "categorySet contains: " + categorySet.toString()); Log.d("Repeat", "categorySet contains: " + categorySet.toString());
for (int radius=100; radius<=10000; radius=radius*10) {
String apiUrl = buildUrl(radius);
Log.d("Repeat", "URL: " + apiUrl);
Log.d("Repeat", "Repeating API call with radius " + Integer.toString(radius));
//request();
JsonRequest<QueryResponse> request = new QueryRequest(apiUrl, new LogResponseListener<QueryResponse>(), new LogResponseErrorListener());
getQueue().add(request);
if (categorySet.size()>=10) {
break;
}
} }
} }

2
commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
View file

@ -187,7 +187,7 @@ public class ShareActivity
if (coords != null) { if (coords != null) {
Log.d("Image", "Coords of image: " + coords); Log.d("Image", "Coords of image: " + coords);
MwVolleyApi apiCall = new MwVolleyApi(this); MwVolleyApi apiCall = new MwVolleyApi(this, coords);
//asynchronous calls to MediaWiki Commons API to match image coords with nearby Commons categories //asynchronous calls to MediaWiki Commons API to match image coords with nearby Commons categories
apiCall.request(coords); apiCall.request(coords);