Browse Source

v.distance: always sort results for -a

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@52069 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 13 years ago
parent
commit
68f5a74ad5
1 changed files with 5 additions and 1 deletions
  1. 5 1
      vector/v.distance/main.c

+ 5 - 1
vector/v.distance/main.c

@@ -915,6 +915,8 @@ int main(int argc, char *argv[])
     /* Update database / print to stdout / create output map */
     if (flag.print->answer) {	/* print header */
 	fprintf(stdout, "from_cat");
+	if (do_all)
+	    fprintf(stdout, "|to_cat");
 	i = 0;
 	while (Upload[i].upload != END) {
 	    fprintf(stdout, "|%s", Upload[i].column);
@@ -972,7 +974,7 @@ int main(int argc, char *argv[])
     if (!do_all) {
 	count = nfcats;
     }
-    else if (print_as_matrix) {
+    else {
 	qsort((void *)Near, count, sizeof(NEAR), cmp_near_to);
     }
 
@@ -1055,6 +1057,8 @@ int main(int argc, char *argv[])
 	    }
 	    else {
 		fprintf(stdout, "%d", Near[i].from_cat);
+		if (do_all)
+		    fprintf(stdout, "|%d", Near[i].to_cat);
 		print_upload(Near, Upload, i, &cvarr, catval);
 		fprintf(stdout, "\n");
 	    }