Merge develop into master #1

Merged
SemvdH merged 297 commits from develop into main 2021-01-06 22:20:51 +00:00
Showing only changes of commit c778ab2de8 - Show all commits

View File

@@ -139,18 +139,18 @@ public class Location implements Parcelable {
double c = 2 * Math.asin(Math.sqrt(a));
double distance;
// Radius of earth in kilometers. Use 3956
// for miles
// if(miles) {
// double r = 3956;
// distance = c * r;
// }
// else {
double r = 6371;
distance = c * r;
distance *= 1000;
// }
// calculate the result
double distance = c * r;
distance *= 1000;
return Math.floor(distance);
}