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

findCategory() returns List

Browse source
This commit is contained in:
misaochan 2016-01-06 18:50:46 +13:00
parent 4e5fb1b1ae
commit a13eb88cd3
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,11 +41,11 @@ public class CacheController {
quadTree.set(x, y, pointCatList); quadTree.set(x, y, pointCatList);
} }
public void findCategory() { public List findCategory() {
//TODO: Convert decLatitude and decLongitude to a range with proper formula, for testing just use 10 //TODO: Convert decLatitude and decLongitude to a range with proper formula, for testing just use 10
pointsFound = quadTree.searchWithin(x-10, y-10, x+10, y+10); pointsFound = quadTree.searchWithin(x-10, y-10, x+10, y+10);
ArrayList displayCatList = new ArrayList(); List displayCatList = new ArrayList();
Log.d("Cache", "Points found in quadtree: " + pointsFound); Log.d("Cache", "Points found in quadtree: " + pointsFound);
//TODO: Potentially flatten catList and iterate thru it to convert into unique Set? But currently just displays one point... //TODO: Potentially flatten catList and iterate thru it to convert into unique Set? But currently just displays one point...
@ -60,11 +60,12 @@ public class CacheController {
displayCatList.add(index, cat); displayCatList.add(index, cat);
index++; index++;
} }
Log.d("Cache", "Categories found in cache: " + displayCatList.toString()); Log.d("Cache", "Categories found in cache: " + displayCatList.toString());
} else { } else {
Log.d("Cache", "No categories found in cache"); Log.d("Cache", "No categories found in cache");
} }
return displayCatList;
}
} public
} }

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

@ -23,6 +23,7 @@ import fr.free.nrw.commons.modifications.ModificationsContentProvider;
import fr.free.nrw.commons.modifications.ModifierSequence; import fr.free.nrw.commons.modifications.ModifierSequence;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
public class ShareActivity public class ShareActivity
@ -202,7 +203,7 @@ public class ShareActivity
Log.d("Coords", "Decimal coords of image: " + decimalCoords); Log.d("Coords", "Decimal coords of image: " + decimalCoords);
cacheObj.cacheData.setQtPoint(decLongitude, decLatitude); cacheObj.cacheData.setQtPoint(decLongitude, decLatitude);
cacheObj.cacheData.findCategory(); List displayCatList = cacheObj.cacheData.findCategory();
//TODO: If categories found from cache in that area, skip API call and display those categories instead //TODO: If categories found from cache in that area, skip API call and display those categories instead