give meaning to numbers associated with first/mid/last constants, now basically part of API

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@68470 15284696-431f-4ddb-bdfa-cd5b030d7da7

raster/r.in.lidar/local_proto.h

@@ -44,8 +44,8 @@
 
 #define LAS_ALL 0
 #define LAS_FIRST 1
-#define LAS_LAST 2
-#define LAS_MID 3
+#define LAS_MID 2
+#define LAS_LAST 3
 
 
 /* info.c */

raster3d/r3.in.lidar/filters.h

@@ -16,8 +16,8 @@
 
 #define LAS_ALL 0
 #define LAS_FIRST 1
-#define LAS_LAST 2
-#define LAS_MID 3
+#define LAS_MID 2
+#define LAS_LAST 3
 
 struct ReturnFilter
 {

vector/v.in.lidar/lidar.h

@@ -18,8 +18,8 @@
 
 #define LAS_ALL 0
 #define LAS_FIRST 1
-#define LAS_LAST 2
-#define LAS_MID 3
+#define LAS_MID 2
+#define LAS_LAST 3
 
 /*
  * ASPRS Standard LIDAR Point Classes

vector/v.out.lidar/main.c

@@ -28,8 +28,8 @@
 #include <liblas/capi/liblas.h>
 
 #define LAS_FIRST 1
-#define LAS_LAST 2
-#define LAS_MID 3
+#define LAS_MID 2
+#define LAS_LAST 3
 
 struct WriteContext
 {
@@ -392,16 +392,15 @@ static void write_point(struct WriteContext *context, int cat, double x,
     if (context->return_layer) {
         if (!Vect_cat_get(cats, context->return_layer, &cat))
             return;             /* TODO: is this an error? */
-        /* TODO: use LAS... as constants for numbers */
         if (cat == LAS_FIRST) {
-            LASPoint_SetReturnNumber(las_point, 1);
-            LASPoint_SetNumberOfReturns(las_point, 3);
+            LASPoint_SetReturnNumber(las_point, LAS_FIRST);
+            LASPoint_SetNumberOfReturns(las_point, LAS_FIRST);
         } else if (cat == LAS_LAST) {
-            LASPoint_SetReturnNumber(las_point, 3);
-            LASPoint_SetNumberOfReturns(las_point, 3);
+            LASPoint_SetReturnNumber(las_point, LAS_LAST);
+            LASPoint_SetNumberOfReturns(las_point, LAS_LAST);
         } else {
-            LASPoint_SetReturnNumber(las_point, 2);
-            LASPoint_SetNumberOfReturns(las_point, 3);
+            LASPoint_SetReturnNumber(las_point, LAS_MID);
+            LASPoint_SetNumberOfReturns(las_point, LAS_LAST);
         }
     }
     if (context->class_layer) {