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

Force request radius to be no larger than MAX_RADIUS, thus always make request

Browse source
This commit is contained in:
Sergey Kozelko 2017-10-27 20:02:39 +03:00
parent dd4e7c3aa0
commit bd5b95040d
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java
View file

@ -29,6 +29,7 @@ public class NearbyPlaces {
private static final Uri WIKIDATA_QUERY_URL = Uri.parse("https://query.wikidata.org/sparql"); private static final Uri WIKIDATA_QUERY_URL = Uri.parse("https://query.wikidata.org/sparql");
private static final Uri WIKIDATA_QUERY_UI_URL = Uri.parse("https://query.wikidata.org/"); private static final Uri WIKIDATA_QUERY_UI_URL = Uri.parse("https://query.wikidata.org/");
private final String wikidataQuery; private final String wikidataQuery;
private double radius = INITIAL_RADIUS;
private List<Place> places; private List<Place> places;
public NearbyPlaces() { public NearbyPlaces() {
@ -42,11 +43,10 @@ public class NearbyPlaces {
List<Place> getFromWikidataQuery(LatLng curLatLng, String lang) { List<Place> getFromWikidataQuery(LatLng curLatLng, String lang) {
List<Place> places = Collections.emptyList(); List<Place> places = Collections.emptyList();
double radius = INITIAL_RADIUS;
try { try {
// increase the radius gradually to find a satisfactory number of nearby places // increase the radius gradually to find a satisfactory number of nearby places
while (radius < MAX_RADIUS) { while (radius <= MAX_RADIUS) {
places = getFromWikidataQuery(curLatLng, lang, radius); places = getFromWikidataQuery(curLatLng, lang, radius);
Timber.d("%d results at radius: %f", places.size(), radius); Timber.d("%d results at radius: %f", places.size(), radius);
if (places.size() >= MIN_RESULTS) { if (places.size() >= MIN_RESULTS) {
@ -60,7 +60,13 @@ public class NearbyPlaces {
// errors tend to be caused by too many results (and time out) // errors tend to be caused by too many results (and time out)
// try a small radius next time // try a small radius next time
Timber.d("back to initial radius: %f", radius); Timber.d("back to initial radius: %f", radius);
radius = INITIAL_RADIUS;
} }
// make sure we will be able to send at least one request next time
if (radius > MAX_RADIUS) {
radius = MAX_RADIUS;
}
return places; return places;
} }