[GRASS-SVN] r63727 - in grass/trunk: lib/gis vector/v.net.visibility

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-12-24 06:24:37 -0800 (Wed, 24 Dec 2014)
New Revision: 63727

Modified:
   grass/trunk/lib/gis/renamed_options
   grass/trunk/vector/v.net.visibility/main.c
   grass/trunk/vector/v.net.visibility/v.net.visibility.html
Log:
v.net.visibility: coordinate -> coordinates and vis -> visibility (#2409)


Modified: grass/trunk/lib/gis/renamed_options
===================================================================
--- grass/trunk/lib/gis/renamed_options	2014-12-24 14:17:53 UTC (rev 63726)
+++ grass/trunk/lib/gis/renamed_options	2014-12-24 14:24:37 UTC (rev 63727)
@@ -530,6 +530,9 @@
 v.net.timetable|ncolumn:node_column
 v.net.timetable|afcolumn:arc_column
 v.net.timetable|abcolumn:arc_backward_column
+# v.net.visibility
+v.net.visibility|coordinate|coordinates
+v.net.visibility|vis|visibility
 # v.outlier
 v.outlier|soe:ew_step
 v.outlier|son:ns_step

Modified: grass/trunk/vector/v.net.visibility/main.c
===================================================================
--- grass/trunk/vector/v.net.visibility/main.c	2014-12-24 14:17:53 UTC (rev 63726)
+++ grass/trunk/vector/v.net.visibility/main.c	2014-12-24 14:24:37 UTC (rev 63727)
@@ -52,18 +52,12 @@
     input = G_define_standard_option(G_OPT_V_INPUT);
     output = G_define_standard_option(G_OPT_V_OUTPUT);
 
-    coor = G_define_option();
-    coor->key = "coordinate";
-    coor->key_desc = "x,y";
-    coor->type = TYPE_STRING;
-    coor->required = NO;
-    coor->multiple = YES;
-    coor->description = _("One or more coordinates");
-
-    ovis = G_define_option();
-    ovis->key = "vis";
-    ovis->type = TYPE_STRING;
+    coor = G_define_standard_option(G_OPT_M_COORDS);
+    
+    ovis = G_define_standard_option(G_OPT_V_MAP);
+    ovis->key = "visibility";
     ovis->required = NO;
+    ovis->label = _("Name of input vector map containing visable points");
     ovis->description = _("Add points after computing the visibility graph");
 
     /* options and flags parser */

Modified: grass/trunk/vector/v.net.visibility/v.net.visibility.html
===================================================================
--- grass/trunk/vector/v.net.visibility/v.net.visibility.html	2014-12-24 14:17:53 UTC (rev 63726)
+++ grass/trunk/vector/v.net.visibility/v.net.visibility.html	2014-12-24 14:24:37 UTC (rev 63727)
@@ -36,22 +36,22 @@
 The resulting map containing the visibility graph is given in the output map.
 <p>
 If you need to add additional points to compute a shortest path 
-between them afterwards you can use the <em>coordinate</em> parameter, e.g.:
+between them afterwards you can use the <em>coordinates</em> parameter, e.g.:
 <div class="code"><pre>
-coordinate=25556200,6686400,25556400,6686600
+coordinates=25556200,6686400,25556400,6686600
 </pre></div>
 where 25556200,6686400 are the coordinate of the first point and 
 25556400,6686600 are the coordinates of the second point. Of course 
 you can give as many points as you need. They will be added to the 
 visibility graph and edges from them will be computed. You can 
 always add those points after computing the visibility graph. Simply 
-use the <em>vis</em> parameter. The input will be the original 
+use the <em>visibility</em> parameter. The input will be the original 
 vector map, the vis will be the computed visibility graph and the 
 output the new visibility graph which will be the vis + the new 
 points given with coordinate (edges will be computed as well).
 <div class="code"><pre>
-v.net.visibility input=map vis=vis_map output=new_vis_map \
-      coordinate=25556200,6686400,25556400,6686600
+v.net.visibility input=map visibility=vis_map output=new_vis_map \
+      coordinates=25556200,6686400,25556400,6686600
 </pre></div>
 
 <h2>EXAMPLES</h2>
@@ -85,7 +85,7 @@
 An example on how to use the coordinate parameter. This will compute the
 visibility graph of the vector map lines with the point 2555678,6686343:
 <div class="code"><pre>
-v.net.visibility input=lines output=graph coordinate=2555678,6686343
+v.net.visibility input=lines output=graph coordinates=2555678,6686343
 d.vect graph
 d.vect lines col=red
 </pre></div>
@@ -102,8 +102,8 @@
 d.mon wx0
 d.vect areas_7_11_25
 v.net.visibility input=zipcodes_wake output=graph
-v.net.visibility input=zipcodes_wake vis=graph output=new_graph \
-      coordinate=669547.97,208348.20
+v.net.visibility input=zipcodes_wake visibility=graph output=new_graph \
+      coordinates=669547.97,208348.20
 d.erase
 d.vect areas_7_11_25
 echo "symbol basic/star 20 669547.97 208348.20 black red" | d.graph -m