sem/Next-Location
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Merge develop into master #1

Merged
SemvdH merged 297 commits from develop into main 2021-01-06 22:20:51 +00:00
Conversation 6 Commits 297 Files Changed 143 +4 -4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c778ab2de8 - Show all commits

8
app/src/main/java/com/a1/nextlocation/data/Location.java
View File

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