Skip to content

Commit 04ea683

Browse files
committed
Print radius with a limited number of digits + reduce debug output
1 parent a794485 commit 04ea683

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

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

+14-12
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
public class NearbyPlaces {
2626

2727
private static final int MIN_RESULTS = 40;
28-
private static final double INITIAL_RADIUS = 1.0;
29-
private static final double MAX_RADIUS = 300.0;
28+
private static final double INITIAL_RADIUS = 1.0; // in kilometer
29+
private static final double MAX_RADIUS = 300.0; // in kilometer
3030
private static final double RADIUS_MULTIPLIER = 1.618;
3131
private static final String WIKIDATA_QUERY_URL = "https://query.wikidata.org/sparql?query=${QUERY}";
3232
private static NearbyPlaces singleton;
@@ -69,16 +69,18 @@ private List<Place> getFromWikidataQuery(Context context,
6969
throws IOException {
7070
List<Place> places = new ArrayList<>();
7171

72-
String query = FileUtils.readFromFile(context, "queries/nearby_query.rq");
73-
74-
Timber.d(query);
75-
76-
query = query.replace("${RADIUS}", "" + radius)
77-
.replace("${LAT}", "" + String.format(Locale.ROOT, "%.3f", cur.latitude))
78-
.replace("${LONG}", "" + String.format(Locale.ROOT, "%.3f", cur.longitude))
79-
.replace("${LANG}", "" + lang);
80-
query = URLEncoder.encode(query, "utf-8").replace("+", "%20");
81-
String url = WIKIDATA_QUERY_URL.replace("${QUERY}", query);
72+
String query = FileUtils.readFromFile(context, "queries/nearby_query.rq")
73+
.replace("${RAD}", String.format(Locale.ROOT, "%.2f", radius))
74+
.replace("${LAT}", String.format(Locale.ROOT, "%.4f", cur.latitude))
75+
.replace("${LONG}", String.format(Locale.ROOT, "%.4f", cur.longitude))
76+
.replace("${LANG}", lang);
77+
Timber.v(query);
78+
79+
// format as a URL
80+
String url = WIKIDATA_QUERY_URL.replace(
81+
"${QUERY}",
82+
URLEncoder.encode(query, "utf-8").replace("+", "%20")
83+
);
8284
Timber.d(url);
8385
URLConnection conn = new URL(url).openConnection();
8486
conn.setRequestProperty("Accept", "text/tab-separated-values");

0 commit comments

Comments
 (0)