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

Flattened category list found in cache

Browse source
This commit is contained in:
misaochan 2016-01-07 16:56:31 +13:00
parent 46af717e40
commit d2f765daec
3 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
commons/src/main/java/fr/free/nrw/commons/caching/CacheController.java
View file

@ -38,14 +38,15 @@ public class CacheController {
quadTree.set(x, y, pointCatList); quadTree.set(x, y, pointCatList);
} }
public List findCategory() { public ArrayList findCategory() {
//Convert decLatitude and decLongitude to a coordinate offset range //Convert decLatitude and decLongitude to a coordinate offset range
convertCoordRange(); convertCoordRange();
pointsFound = quadTree.searchWithin(xMinus, yMinus, xPlus, yPlus); pointsFound = quadTree.searchWithin(xMinus, yMinus, xPlus, yPlus);
List displayCatList = new ArrayList(); ArrayList displayCatList = new ArrayList();
Log.d("Cache", "Points found in quadtree: " + pointsFound); Log.d("Cache", "Points found in quadtree: " + pointsFound);
ArrayList<String> flatCatList = null;
//TODO: Make this return a proper flat array //TODO: Make this return a proper flat array
if (pointsFound.length != 0) { if (pointsFound.length != 0) {
@ -58,13 +59,17 @@ public class CacheController {
displayCatList.add(index, cat); displayCatList.add(index, cat);
index++; index++;
} }
Log.d("Cache", "Categories found in cache: " + displayCatList.toString()); //FIXME: temporary, can't figure out why for loop always only accesses 1 point
flatCatList = ((ArrayList<String>)displayCatList.get(0));
Log.d("Cache", "Categories found in cache: " + flatCatList.toString());
} else { } else {
Log.d("Cache", "No categories found in cache"); Log.d("Cache", "No categories found in cache");
} }
return displayCatList; return flatCatList;
} }
public void convertCoordRange() { public void convertCoordRange() {
//Position, decimal degrees //Position, decimal degrees
double lat = y; double lat = y;

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

@ -51,6 +51,7 @@ public class MwVolleyApi {
public static void setGpsCat(List cachedList) { public static void setGpsCat(List cachedList) {
categoryList = new ArrayList<String>(cachedList); categoryList = new ArrayList<String>(cachedList);
Log.d("Cache", "Setting GPS cats from cache: " + categoryList.toString());
} }

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

@ -213,9 +213,9 @@ public class ShareActivity
//if no categories found in cache, call MW API to match image coords with nearby Commons categories //if no categories found in cache, call MW API to match image coords with nearby Commons categories
if (displayCatList.size() == 0) { if (displayCatList.size() == 0) {
apiCall.request(decimalCoords); apiCall.request(decimalCoords);
Log.d("Cache", "displayCatList size 0, calling MWAPI"); Log.d("Cache", "displayCatList size 0, calling MWAPI" + displayCatList.toString());
} else { } else {
//TODO: Set categoryList in MwVolleyApi. Not filling up right. Maybe do global singleton for MwVolleyApi //TODO: Set categoryList in MwVolleyApi. Not filling up right. Maybe do global singleton for MwVolleyApi? Can't do that, we want new cats for each upload, so new instance of mwapi
MwVolleyApi.setGpsCat(displayCatList); MwVolleyApi.setGpsCat(displayCatList);
Log.d("Cache", "Cache found, setting categoryList in MwVolleyApi to " + displayCatList.toString()); Log.d("Cache", "Cache found, setting categoryList in MwVolleyApi to " + displayCatList.toString());
} }