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

Improve type safety through the use of generics

Browse source
This commit is contained in:
veyndan 2017-03-31 22:15:56 +01:00
parent 16553cc5e1
commit d8b7d5b438
6 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,15 +14,15 @@ import fr.free.nrw.commons.upload.MwVolleyApi;
public class CacheController {
private double x, y;
private QuadTree quadTree;
private Point[] pointsFound;
private QuadTree<List<String>> quadTree;
private Point<List<String>>[] pointsFound;
private double xMinus, xPlus, yMinus, yPlus;
private static final String TAG = CacheController.class.getName();
private static final int EARTH_RADIUS = 6378137;
public CacheController() {
quadTree = new QuadTree(-180, -90, +180, +90);
quadTree = new QuadTree<>(-180, -90, +180, +90);
}
public void setQtPoint(double decLongitude, double decLatitude) {
@ -43,7 +43,7 @@ public class CacheController {
quadTree.set(x, y, pointCatList);
}
public List findCategory() {
public List<String> findCategory() {
//Convert decLatitude and decLongitude to a coordinate offset range
convertCoordRange();
pointsFound = quadTree.searchWithin(xMinus, yMinus, xPlus, yPlus);
@ -53,9 +53,9 @@ public class CacheController {
if (pointsFound.length != 0) {
Log.d(TAG, "Entering for loop");
for (Point point : pointsFound) {
for (Point<List<String>> point : pointsFound) {
Log.d(TAG, "Nearby point: " + point.toString());
displayCatList = (List<String>)point.getValue();
displayCatList = point.getValue();
Log.d(TAG, "Nearby cat: " + point.getValue());
}