Skip to content

Update Earth radius. #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
broady merged 2 commits into from
Aug 27, 2013
Merged

Update Earth radius. #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
137d49e
Update Earth radius.
Aug 22, 2013
af3480f
Revert null check in testComputeOffsetAndBackToOrigin.
Aug 27, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions library/src/com/google/maps/android/SphericalUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ private SphericalUtil() {}

/**
* The earth's radius, in meters.
* Mean radius as defined by IUGG.
*/
static final double EARTH_RADIUS = 6378137;
static final double EARTH_RADIUS = 6371009;

/**
* Returns the heading from one LatLng to another LatLng. Headings are
Expand Down Expand Up @@ -93,7 +94,8 @@ public static LatLng computeOffsetOrigin(LatLng to, double distance, double head
// There are two solutions for b. b = n2 * n4 +/- sqrt(), one solution results
// in the latitude outside the [-90, 90] range. We first try one solution and
// back off to the other if we are outside that range.
double discriminant = n2 * n2 * n1 * n1 + n1 * n1 * n1 * n1 - n1 * n1 * n4 * n4;
double n12 = n1 * n1;
double discriminant = n2 * n2 * n12 + n12 * n12 - n12 * n4 * n4;
if (discriminant < 0) {
// No real solution which would make sense in LatLng-space.
return null;
Expand Down
5 changes: 2 additions & 3 deletions library/tests/src/com/google/maps/android/SphericalUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,8 @@ public void testComputeOffsetAndBackToOrigin() {
start = SphericalUtil.computeOffsetOrigin(new LatLng(90, 0),
Math.PI * EARTH_RADIUS / 4, 0);
expectLatLngApproxEquals(
new LatLng(90, 0),
SphericalUtil.computeOffset(start, Math.PI * EARTH_RADIUS / 4, 0));

new LatLng(90, 0),
SphericalUtil.computeOffset(start, Math.PI * EARTH_RADIUS / 4, 0));
}

public void testInterpolate() {
Expand Down