Changeset 66459

Timestamp:

Oct 9, 2015, 4:51:11 PM (9 years ago)

Author:

wenzeslaus

Message:

vlib: add 2D version of point in box function

Include also ctypes-based test and documentation of both the 2D and the original 3D version.

The 2D version has suffix _2d. There are some functions in the lib already which are using this style.
The 3D version has same name for compatibility reasons. There are some other functions which are just 2D
these might need _3d versions one day.

Alternative or an additional solution would be one function which would either use additional variable
like with_z or it would accept coordinates as pointers so that z could be NULL pointer.
This could make some caller code shorter.

Location:

grass/trunk/lib/vector/Vlib

Files:

• box.c (modified) (3 diffs)
• testsuite (added)
• testsuite/test_vlib_box.py (added)

grass/trunk/lib/vector/Vlib/box.c

@@ -6 +6 @@
    Higher level functions for reading/writing/manipulating vectors.
 
-   (C) 2001-2009 by the GRASS Development Team
+   (C) 2001-2015 by the GRASS Development Team
 
    This program is free software under the 
@@ -21 +21 @@
 
 /*!
-   \brief Tests for point in box
-
-   \param x,y,z coordinates
-   \param Box boundary box
-
-   \return 1 point is in box
-   \return 0 point is not in box
+    \brief Tests if point is in 3D box
+
+    This function considers 3D point and 3D bounding box.
+
+    \par Example
+
+    \verbatim
+    struct bound_box bbox;
+    bbox.N = 135;
+    bbox.S = 125;
+    bbox.E = 220;
+    bbox.W = 215;
+    bbox.T = 340;
+    bbox.B = 330;
+    Vect_point_in_box(217, 130, 335, &bbox);
+    \endverbatim
+
+    \param x coordinate (W-E direction)
+    \param y coordinate (S-N direction)
+    \param z coordinate (B-T direction)
+    \param Box boundary box
+
+    \returns 1 if point is in box
+    \returns 0 if point is not in box
  */
 int Vect_point_in_box(double x, double y, double z, const struct bound_box *Box)
@@ -35 +52 @@
             y >= Box->S && y <= Box->N && 
             z >= Box->B && z <= Box->T);
+}
+
+/*!
+    \brief Tests if point is in 2D box
+
+    Only x and y are tested. Top and bottom of the bounding box are ignored.
+
+    \param x coordinate (W-E direction)
+    \param y coordinate (S-N direction)
+    \param Box boundary box (only W, E, S, N are used)
+
+    \returns 1 if point is in box
+    \returns 0 if point is not in box
+ */
+int Vect_point_in_box_2d(double x, double y, const struct bound_box *Box)
+{
+
+    return (x >= Box->W && x <= Box->E &&
+            y >= Box->S && y <= Box->N);
 }