output correct precision for different projection types (bugs https://trac.osgeo.org/grass/ticket/654 and https://trac.osgeo.org/grass/ticket/335; merge from devbr6)

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

general/g.region/printwindow.c

@@ -23,7 +23,7 @@ void print_window(struct Cell_head *window, int print_flag)
     double longitude, latitude;
 
     if (print_flag & PRINT_SH)
-	x = -1;
+	x = G_projection() == PROJECTION_LL ? -1 : 0;
     else
 	x = window->proj;
 

lib/gis/wind_format.c

@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <grass/gis.h>
 
-static void format_double(double, char *);
+static void format_double(double, char *, int);
 
 /*!
  * \brief Northing to ASCII.
@@ -24,14 +24,16 @@ static void format_double(double, char *);
  *
  * \param north northing
  * \param[out] buf buffer to hold formatted string
- * \param projection projection code
+ * \param projection projection code, or -1 to force full precision FP
  */
 void G_format_northing(double north, char *buf, int projection)
 {
     if (projection == PROJECTION_LL)
 	G_lat_format(north, buf);
+    else if (projection == -1)
+	format_double(north, buf, TRUE);
     else
-	format_double(north, buf);
+	format_double(north, buf, FALSE);
 }
 
 /*!
@@ -42,14 +44,16 @@ void G_format_northing(double north, char *buf, int projection)
  *
  * \param east easting
  * \param[out] buf buffer to hold formatted string
- * \param projection projection code
+ * \param projection projection code, or -1 to force full precision FP
  */
 void G_format_easting(double east, char *buf, int projection)
 {
     if (projection == PROJECTION_LL)
 	G_lon_format(east, buf);
+    else if (projection == -1)
+	format_double(east, buf, TRUE);
     else
-	format_double(east, buf);
+	format_double(east, buf, FALSE);
 }
 
 /*!
@@ -60,25 +64,30 @@ void G_format_easting(double east, char *buf, int projection)
  *
  * \param resolution resolution value
  * \param[out] buf buffer to hold formatted string
- * \param projection projection code
+ * \param projection projection code, or -1 to force full precision FP
  */
 void G_format_resolution(double res, char *buf, int projection)
 {
     if (projection == PROJECTION_LL)
 	G_llres_format(res, buf);
+    else if (projection == -1)
+	format_double(res, buf, TRUE);
     else
-	format_double(res, buf);
+	format_double(res, buf, FALSE);
 }
 
-static void format_double(double value, char *buf)
+/*
+ * 'full_prec' is boolean, FALSE uses %.8f,  TRUE uses %.15g
+ * The reason to have this is that for lat/lon "%.8f" is not
+ * enough to preserve fidelity once converted back into D:M:S,
+ * which leads to rounding errors, especially for resolution.
+ */
+static void format_double(double value, char *buf, int full_prec)
 {
-    /* if the programmer has lied to G_format_resolution() about the
-        projection type in order to get FP values for lat/lon coords,
-        "%.8f" is not enough to preserve fidelity once converted
-        back into D:M:S, which leads to rounding errors. */
-    if (G_projection() == PROJECTION_LL)
+    if (full_prec)
 	sprintf(buf, "%.15g", value);
     else
 	sprintf(buf, "%.8f", value);
+
     G_trim_decimal(buf);
 }

raster/r.distance/report.c

@@ -59,13 +59,17 @@ void report(struct Parms *parms)
 	    fprintf(stdout, "%s%s", fs, temp);
 
 	    /* print coordinates of the closest pair */
-	    G_format_easting(east1, temp, -1);
+	    G_format_easting(east1, temp,
+			     G_projection() == PROJECTION_LL ? -1 : 0);
 	    fprintf(stdout, "%s%s", fs, temp);
-	    G_format_northing(north1, temp, -1);
+	    G_format_northing(north1, temp,
+			      G_projection() == PROJECTION_LL ? -1 : 0);
 	    fprintf(stdout, "%s%s", fs, temp);
-	    G_format_easting(east2, temp, -1);
+	    G_format_easting(east2, temp,
+			     G_projection() == PROJECTION_LL ? -1 : 0);
 	    fprintf(stdout, "%s%s", fs, temp);
-	    G_format_northing(north2, temp, -1);
+	    G_format_northing(north2, temp,
+			      G_projection() == PROJECTION_LL ? -1 : 0);
 	    fprintf(stdout, "%s%s", fs, temp);
 
 	    /* print category labels */

raster/r.out.ascii/formspecific.c

@@ -142,12 +142,16 @@ int writeGSheader(FILE * fp, const char *name)
     fprintf(fp, "%d %d\n", region.cols, region.rows);
 
     /* Projection set to -1 to force floating point output */
-    G_format_easting(region.west + region.ew_res / 2., fromc, -1);
-    G_format_easting(region.east - region.ew_res / 2., toc, -1);
+    G_format_easting(region.west + region.ew_res / 2., fromc,
+		     G_projection() == PROJECTION_LL ? -1 : 0);
+    G_format_easting(region.east - region.ew_res / 2., toc,
+		     G_projection() == PROJECTION_LL ? -1 : 0);
     fprintf(fp, "%s %s\n", fromc, toc);
 
-    G_format_northing(region.south + region.ns_res / 2., fromc, -1);
-    G_format_northing(region.north - region.ns_res / 2., toc, -1);
+    G_format_northing(region.south + region.ns_res / 2., fromc,
+		      G_projection() == PROJECTION_LL ? -1 : 0);
+    G_format_northing(region.north - region.ns_res / 2., toc,
+		      G_projection() == PROJECTION_LL ? -1 : 0);
     fprintf(fp, "%s %s\n", fromc, toc);
 
     G_get_fp_range_min_max(&range, &Z_MIN, &Z_MAX);

raster/r.stats/raw_stats.c

@@ -44,7 +44,8 @@ int raw_stats(int fd[], int with_coordinates, int with_xy, int with_labels)
 	}
 
 	if (with_coordinates)
-	    G_format_northing(G_row_to_northing(row + .5, &window), nbuf, -1);
+	    G_format_northing(G_row_to_northing(row + .5, &window), nbuf, 
+			      G_projection() == PROJECTION_LL ? -1 : 0);
 
 	for (col = 0; col < ncols; col++) {
 	    if (no_nulls || no_nulls_all) {
@@ -69,7 +70,7 @@ int raw_stats(int fd[], int with_coordinates, int with_xy, int with_labels)
 	    }
 	    if (with_coordinates) {
 		G_format_easting(G_col_to_easting(col + .5, &window), ebuf,
-				 -1);
+				 G_projection() == PROJECTION_LL ? -1 : 0);
 		fprintf(stdout, "%s%s%s%s", ebuf, fs, nbuf, fs);
 	    }
 	    if (with_xy)

sites/s.out.ascii/main.c

@@ -115,9 +115,12 @@ int main(int argc, char *argv[])
     while (G_site_get(fd, site) == 0) {
 	if (all || G_site_in_region(site, &window)) {
 	    if (!full) {
-		G_format_easting(site->east, ebuf, -1);
-		G_format_northing(site->north, nbuf, -1);
+		G_format_easting(site->east, ebuf,
+				 G_projection() == PROJECTION_LL ? -1 : 0);
+		G_format_northing(site->north, nbuf,
+				  G_projection() == PROJECTION_LL ? -1 : 0);
 		fprintf(stdout, "%s%s%s", ebuf, fs, nbuf);
+
 		for (n = 0; n < site->dim_alloc; ++n) {
 		    sprintf(nbuf, "%.8f", site->dim[n]);
 		    G_trim_decimal(nbuf);