Changeset 66460

Timestamp:

Oct 9, 2015, 5:02:55 PM (9 years ago)

Author:

wenzeslaus

Message:

v.distance: use bbox in 2D and 3D accordingly (see #2734)

Check if we are considering z and use appropriate point in box function. This should
fix #2734 where point inside an area is classified as outsie of that area when point
3D but the area is 2D. The expected behavior is reduction to 2D.

The test works with this commit but its 3D part fails with code prior to this commit.

This commit depens on r66459 which adds Vect_point_in_box_2d() function.

Location:

grass/trunk/vector/v.distance

Files:

• distance.c (modified) (2 diffs)
• main.c (modified) (1 diff)
• testsuite (added)
• testsuite/test_areas_points.py (added)

grass/trunk/vector/v.distance/distance.c

@@ -290 +290 @@
     all_outside_inner = 1;
 
+    int in_box;
     for (i = 0; i < Points->n_points; i++) {
-        if (Vect_point_in_box(Points->x[i], Points->y[i],
-                              Points->z[i], abox)) {
+        if (with_z)
+            in_box = Vect_point_in_box(Points->x[i], Points->y[i],
+                                       Points->z[i], abox);
+        else
+            in_box = Vect_point_in_box_2d(Points->x[i], Points->y[i], abox);
+        if (in_box) {
 
             int poly;
@@ -324 +329 @@
 
                 for (j = 0; j < nisles; j++) {
-                    if (Vect_point_in_box(Points->x[i], Points->y[i], Points->z[i], 
-                                          &ibox[j])) {
+                    if (with_z)
+                        in_box = Vect_point_in_box(Points->x[i], Points->y[i],
+                                                   Points->z[i], &ibox[j]);
+                    else
+                        in_box = Vect_point_in_box_2d(Points->x[i],
+                                                      Points->y[i], &ibox[j]);
+                    if (in_box) {
 
                         poly = Vect_point_in_poly(Points->x[i], Points->y[i], iPoints[j]);

grass/trunk/vector/v.distance/main.c

@@ -14 +14 @@
  * PURPOSE:      Calculates distance from a point to nearest feature in vector layer. 
  *               
- * COPYRIGHT:    (C) 2002-2012 by the GRASS Development Team
+ * COPYRIGHT:    (C) 2002-2015 by the GRASS Development Team
  *
  *               This program is free software under the