Skip to content

A fix for geodist hang #103

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
stolstov merged 2 commits into from
Jan 7, 2016
Merged

A fix for geodist hang #103

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
48cf546
fix geodist hang
stolstov Jan 6, 2016
df0ce3b
small change how point coords are passed
stolstov Jan 6, 2016
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
2 changes: 1 addition & 1 deletion src/main/java/com/esri/core/geometry/GeoDist.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ static public void geodesic_distance_ngs(double a, double e2, double lam1,
/* top of the long-line loop (kind = 1) */

q_continue_looping = true;
while (q_continue_looping == true) {
while (q_continue_looping && it < 100) {
it = it + 1;

if (kind == 1) {
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/com/esri/core/geometry/SpatialReferenceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.locks.ReentrantLock;

import java.lang.ref.*;

import com.esri.core.geometry.Envelope2D;
Expand Down Expand Up @@ -230,8 +229,8 @@ static double geodesicDistanceOnWGS84Impl(Point ptFrom, Point ptTo) {
double e2 = 0.0066943799901413165; // ellipticity for WGS_1984
double rpu = Math.PI / 180.0;
PeDouble answer = new PeDouble();
GeoDist.geodesic_distance_ngs(a, e2, ptFrom.getXY().x * rpu,
ptFrom.getXY().y * rpu, ptTo.getXY().x * rpu, ptTo.getXY().y
GeoDist.geodesic_distance_ngs(a, e2, ptFrom.getX() * rpu,
ptFrom.getY() * rpu, ptTo.getX() * rpu, ptTo.getY()
* rpu, answer, null, null);
return answer.val;
}
Expand Down
31 changes: 31 additions & 0 deletions src/test/java/com/esri/core/geometry/TestGeodetic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,37 @@ public void testRotationInvariance() {
}
}

@Test
public void testDistanceFailure() {
{
Point p1 = new Point(-60.668485, -31.996013333333334);
Point p2 = new Point(119.13731666666666, 32.251583333333336);
double d = GeometryEngine.geodesicDistanceOnWGS84(p1, p2);
assertTrue(Math.abs(d - 19973410.50579736) < 1e-13 * 19973410.50579736);
}

{
Point p1 = new Point(121.27343833333333, 27.467438333333334);
Point p2 = new Point(-58.55804833333333, -27.035613333333334);
double d = GeometryEngine.geodesicDistanceOnWGS84(p1, p2);
assertTrue(Math.abs(d - 19954707.428360686) < 1e-13 * 19954707.428360686);
}

{
Point p1 = new Point(-53.329865, -36.08110166666667);
Point p2 = new Point(126.52895166666667, 35.97385);
double d = GeometryEngine.geodesicDistanceOnWGS84(p1, p2);
assertTrue(Math.abs(d - 19990586.700431127) < 1e-13 * 19990586.700431127);
}

{
Point p1 = new Point(-4.7181166667, 36.1160166667);
Point p2 = new Point(175.248925, -35.7606716667);
double d = GeometryEngine.geodesicDistanceOnWGS84(p1, p2);
assertTrue(Math.abs(d - 19964450.206594173) < 1e-12 * 19964450.206594173);
}
}

@Test
public void testLengthAccurateCR191313() {
/*
Expand Down