v.info/v.proj: fix printing UTM zone (#892) (#977)

* v.info: fix printing UTM zone (#892)

print UTM zone <X> according to hemisphere as <X>N or <X>S

* v.info / v.proj

fix UTM zone info reporting of vector maps

Author: metzm

lib/vector/Vlib/header.c

@@ -479,7 +479,11 @@ int Vect_set_zone(struct Map_info *Map, int zone)
  */
 int Vect_get_zone(const struct Map_info *Map)
 {
-    return Map->head.plani_zone;
+    /* return Map->head.plani_zone; */
+
+    /* use utm zone of current location,
+     * a vector in a given location can not be in a different CRS */
+    return G_zone();
 }
 
 /*!

vector/v.info/print.c

@@ -21,6 +21,23 @@ void format_double(double value, char *buf)
     G_trim_decimal(buf);
 }
 
+/* convert UTM zone number X to XN or XS */
+static char *format_zone(int zone_num)
+{
+    char *zone_str = NULL;
+
+    if (zone_num < -60 || zone_num > 60)
+	G_asprintf(&zone_str, _("%s"), "invalid");
+    else if (zone_num == 0)
+	G_asprintf(&zone_str, _("%s"), "unspecified");
+    else if (zone_num < 0)
+	G_asprintf(&zone_str, "%dS", -zone_num);
+    else
+	G_asprintf(&zone_str, "%dN", zone_num);
+
+    return zone_str;
+}
+
 void print_region(const struct Map_info *Map)
 {
     char tmp1[1024], tmp2[1024];
@@ -492,18 +509,14 @@ void print_info(const struct Map_info *Map)
     /* Vect_get_proj_name() and _zone() are typically unset?! */
     if (G_projection() == PROJECTION_UTM) {
         int utm_zone;
+	char *utm_zone_str;
 
         utm_zone = Vect_get_zone(Map);
-        if (utm_zone < 0 || utm_zone > 60)
-            strcpy(tmp1, _("invalid"));
-        else if (utm_zone == 0)
-            strcpy(tmp1, _("unspecified"));
-        else
-            sprintf(tmp1, "%d", utm_zone);
+	utm_zone_str = format_zone(utm_zone);
 
         sprintf(line, "  %s: %s (%s %s)",
                 _("Projection"), Vect_get_proj_name(Map),
-                _("zone"), tmp1);
+                _("zone"), utm_zone_str);
     }
     else
         sprintf(line, "  %s: %s",

vector/v.proj/main.c

@@ -36,7 +36,6 @@ int main(int argc, char *argv[])
 {
     int i, type, stat;
     int day, yr, Out_proj;
-    int out_zone = 0;
     int overwrite;		/* overwrite output map */
     const char *mapset;
     const char *omap_name, *map_name, *iset_name, *iloc_name;
@@ -408,8 +407,7 @@ int main(int argc, char *argv[])
     Vect_hist_copy(&Map, &Out_Map);
     Vect_hist_command(&Out_Map);
 
-    out_zone = info_out.zone;
-    Vect_set_zone(&Out_Map, out_zone);
+    Vect_set_zone(&Out_Map, G_zone());
 
     /* Read and write header info */
     sprintf(date, "%s", G_date());