chteufleur
/
MyTrackingDog
1
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

Fix cast problem in distance calculation.

This commit is contained in:
Chteufleur 2018-08-18 10:30:27 +02:00
parent 91efe32482
commit f15b01abcd
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/fr/chteufleur/mytrackingdog/MainActivity.java
View File

@ -76,7 +76,7 @@ public class MainActivity extends AppCompatActivity implements IOrientationConsu
private TextView textViewCurrentLocation; private TextView textViewCurrentLocation;
private MyLocation lastLocation = null; private MyLocation lastLocation = null;
private int distance = 0; private float distance = 0;
@RequiresApi(api = Build.VERSION_CODES.M) @RequiresApi(api = Build.VERSION_CODES.M)
protected void checkPermissions() { protected void checkPermissions() {
@ -505,7 +505,7 @@ public class MainActivity extends AppCompatActivity implements IOrientationConsu
} }
private void updateDistance() { private void updateDistance() {
this.textViewCurrentLocation.setText(String.format("Distance: %,dm", distance)); this.textViewCurrentLocation.setText(String.format("Distance: %,dm", ((int) distance)));
this.textViewCurrentLocation.setVisibility(View.VISIBLE); this.textViewCurrentLocation.setVisibility(View.VISIBLE);
} }
} }

5
app/src/main/java/fr/chteufleur/mytrackingdog/models/beans/MyLocation.java
View File

@ -75,7 +75,7 @@ public class MyLocation {
return this.bearing; return this.bearing;
} }
public int distanceTo(MyLocation loc) { public float distanceTo(MyLocation loc) {
double earthRadius = 6371000; //meters double earthRadius = 6371000; //meters
double dLat = Math.toRadians(loc.latitude-latitude); double dLat = Math.toRadians(loc.latitude-latitude);
double dLng = Math.toRadians(loc.longitude-longitude); double dLng = Math.toRadians(loc.longitude-longitude);
@ -83,9 +83,8 @@ public class MyLocation {
Math.cos(Math.toRadians(latitude)) * Math.cos(Math.toRadians(loc.latitude)) * Math.cos(Math.toRadians(latitude)) * Math.cos(Math.toRadians(loc.latitude)) *
Math.sin(dLng/2) * Math.sin(dLng/2); Math.sin(dLng/2) * Math.sin(dLng/2);
double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a)); double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a));
float dist = (float) (earthRadius * c);
return (int) dist; return (float) (earthRadius * c);
} }