self-hosted/postgis
self-hosted/postgis
1
0
Fork 0
mirror of https://git.osgeo.org/gitea/postgis/postgis synced 2024-10-23 16:42:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

#2351, st_distance between geographies wrong

Browse source 
git-svn-id: http://svn.osgeo.org/postgis/trunk@11535 b70326c6-7e19-0410-871a-916f4a2858ee
This commit is contained in:
Paul Ramsey 2013-06-07 17:39:43 +00:00
parent e388dfa7c8
commit 47ea3400cc
4 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -205,6 +205,7 @@ PostGIS 2.1.0
- #2307, ST_MakeValid outputs invalid geometries
- #2309, Remove confusing INFO message when trying to get SRS info
- #2348, Provide raster upgrade path for 2.0 to 2.1
- #2351, st_distance between geographies wrong
PostGIS 2.0.3
2013/03/01

17
liblwgeom/cunit/cu_geodetic.c
View file

@ -702,6 +702,15 @@ static void test_edge_distance_to_point(void)
CU_ASSERT_DOUBLE_EQUAL(closest.lat, 0.0, 0.00001);
CU_ASSERT_DOUBLE_EQUAL(closest.lon, 0.0, 0.00001);
/* Ticket #2351 */
edge_set(149.386990599235, -26.3567415843982, 149.386990599247, -26.3567415843965, &e);
point_set(149.386990599235, -26.3567415843982, &g);
d = edge_distance_to_point(&e, &g, &closest);
CU_ASSERT_DOUBLE_EQUAL(d, 0.0, 0.00001);
// printf("CLOSE POINT(%g %g)\n", closest.lon, closest.lat);
// printf(" ORIG POINT(%g %g)\n", g.lon, g.lat);
CU_ASSERT_DOUBLE_EQUAL(g.lat, closest.lat, 0.00001);
CU_ASSERT_DOUBLE_EQUAL(g.lon, closest.lon, 0.00001);
}
static void test_edge_distance_to_edge(void)
@ -1178,6 +1187,14 @@ static void test_lwgeom_distance_sphere(void)
lwgeom_free(lwg1);
lwgeom_free(lwg2);
/* Ticket #2351 */
lwg1 = lwgeom_from_wkt("LINESTRING(149.386990599235 -26.3567415843982,149.386990599247 -26.3567415843965)", LW_PARSER_CHECK_NONE);
lwg2 = lwgeom_from_wkt("POINT(149.386990599235 -26.3567415843982)", LW_PARSER_CHECK_NONE);
d = lwgeom_distance_spheroid(lwg1, lwg2, &s, 0.0);
CU_ASSERT_DOUBLE_EQUAL(d, 0.0, 0.00001);
lwgeom_free(lwg1);
lwgeom_free(lwg2);
}
static void test_spheroid_distance(void)

19
liblwgeom/cunit/cu_tree.c
View file

@ -264,6 +264,25 @@ static void test_tree_circ_distance(void)
lwgeom_free(lwg1);
lwgeom_free(lwg2);
CU_ASSERT_DOUBLE_EQUAL(d1, d2, 0.00001);
/* Ticket #2351 */
lwg1 = lwgeom_from_wkt("LINESTRING(149.386990599235 -26.3567415843982,149.386990599247 -26.3567415843965)", LW_PARSER_CHECK_NONE);
lwg2 = lwgeom_from_wkt("POINT(149.386990599235 -26.3567415843982)", LW_PARSER_CHECK_NONE);
c1 = lwgeom_calculate_circ_tree(lwg1);
c2 = lwgeom_calculate_circ_tree(lwg2);
d1 = circ_tree_distance_tree(c1, c2, &s, threshold);
d2 = lwgeom_distance_spheroid(lwg1, lwg2, &s, threshold);
// printf("d1 = %g d2 = %g\n", d1 * WGS84_RADIUS, d2 * WGS84_RADIUS);
// printf("line\n");
// circ_tree_print(c1, 0);
// printf("point\n");
// circ_tree_print(c2, 0);
circ_tree_free(c1);
circ_tree_free(c2);
lwgeom_free(lwg1);
lwgeom_free(lwg2);
CU_ASSERT_DOUBLE_EQUAL(d1, d2, 0.0000001);
}

3
liblwgeom/lwgeodetic.c
View file

@ -1170,7 +1170,10 @@ double edge_distance_to_point(const GEOGRAPHIC_EDGE *e, const GEOGRAPHIC_POINT *
/* Zero length edge, */
if ( geographic_point_equals(&(e->start), &(e->end)) )
{
*closest = e->start;
return sphere_distance(&(e->start), gp);
}
robust_cross_product(&(e->start), &(e->end), &n);
normalize(&n);