Repair gie and cct after breakage due to proj_strtod update (#628)

* Repair gie and cct after breakage due to proj_strtod update

* Remove unused variables

3 files changed, 255 insertions, 214 deletions

diff --git a/src/cct.c b/src/cct.c
index 35d4ec3f..72d8c6cc 100644
--- a/src/cct.c
+++ b/src/cct.c
@@ -289,22 +289,32 @@ char *column (char *buf, int n) {
     return buf;
 }
 
+/* column to double */
+static double cold (char *args, int col) {
+    char *endp;
+    char *target;
+    double d;
+    target = column (args, col);
+    d = proj_strtod (target, &endp);
+    if (endp==target)
+        return HUGE_VAL;
+    return d;
+}
 
 PJ_COORD parse_input_line (char *buf, int *columns, double fixed_height, double fixed_time) {
     PJ_COORD err = proj_coord (HUGE_VAL, HUGE_VAL, HUGE_VAL, HUGE_VAL);
     PJ_COORD result = err;
     int prev_errno = errno;
-    char *endptr = 0;
     errno = 0;
 
     result.xyzt.z = fixed_height;
     result.xyzt.t = fixed_time;
-    result.xyzt.x = proj_strtod (column (buf, columns[0]), &endptr);
-    result.xyzt.y = proj_strtod (column (buf, columns[1]), &endptr);
+    result.xyzt.x = cold (buf, columns[0]);
+    result.xyzt.y = cold (buf, columns[1]);
     if (result.xyzt.z==HUGE_VAL)
-        result.xyzt.z = proj_strtod (column (buf, columns[2]), &endptr);
+        result.xyzt.z = cold (buf, columns[2]);
     if (result.xyzt.t==HUGE_VAL)
-        result.xyzt.t = proj_strtod (column (buf, columns[3]), &endptr);
+        result.xyzt.t = cold (buf, columns[3]);
 
     if (0!=errno)
         return err;
diff --git a/src/gie.c b/src/gie.c
index 33fc4d82..f0850b61 100644
--- a/src/gie.c
+++ b/src/gie.c
@@ -132,6 +132,7 @@ static int   get_inp (FILE *f, char *inp, int size);
 static int   get_cmnd (char *inp, char *cmnd, int len);
 static char *get_args (char *inp);
 static int   dispatch (char *cmnd, char *args);
+static char *column (char *buf, int n);
 
 
 
@@ -314,6 +315,52 @@ static int process_file (char *fname) {
 }
 
 
+/* return a pointer to the n'th column of buf */
+char *column (char *buf, int n) {
+    int i;
+    if (n <= 0)
+        return buf;
+    for (i = 0;  i < n;  i++) {
+        while (isspace(*buf))
+            buf++;
+        if (i == n - 1)
+            break;
+        while ((0 != *buf) && !isspace(*buf))
+            buf++;
+    }
+    return buf;
+}
+
+
+
+static double strtod_scaled (char *args, double default_scale) {
+    double s;
+    char *endp = args;
+    s = proj_strtod (args, &endp);
+    if (args==endp)
+        return HUGE_VAL;
+
+    endp = column (args, 2);
+
+    if (0==strcmp(endp, "km"))
+        s *= 1000;
+    else if (0==strcmp(endp, "m"))
+        s *= 1;
+    else if (0==strcmp(endp, "dm"))
+        s /= 10;
+    else if (0==strcmp(endp, "cm"))
+        s /= 100;
+    else if (0==strcmp(endp, "mm"))
+        s /= 1000;
+    else if (0==strcmp(endp, "um"))
+        s /= 1e6;
+    else if (0==strcmp(endp, "nm"))
+        s /= 1e9;
+    else
+        s *= default_scale;
+    return s;
+}
+
 
 
 
@@ -334,31 +381,11 @@ static int banner (char *args) {
 
 
 static int tolerance (char *args) {
-    char *endp = args;
-    T.tolerance = proj_strtod (endp, &endp);
+    T.tolerance = strtod_scaled (args, 1);
     if (HUGE_VAL==T.tolerance) {
         T.tolerance = 0.0005;
         return 1;
     }
-    while (isspace (*endp))
-        endp++;
-
-    if (0==strcmp(endp, "km"))
-        T.tolerance *= 1000;
-    else if (0==strcmp(endp, "m"))
-        T.tolerance *= 1;
-    else if (0==strcmp(endp, "dm"))
-        T.tolerance /= 10;
-    else if (0==strcmp(endp, "cm"))
-        T.tolerance /= 100;
-    else if (0==strcmp(endp, "mm"))
-        T.tolerance /= 1000;
-    else if (0==strcmp(endp, "um"))
-        T.tolerance /= 1e6;
-    else if (0==strcmp(endp, "nm"))
-        T.tolerance /= 1e9;
-    else
-        T.tolerance /= 1000;  /* If no unit, assume mm */
     return 0;
 }
 
@@ -436,15 +463,17 @@ static PJ_COORD torad_if_needed (PJ *P, PJ_DIRECTION dir, PJ_COORD a) {
 
 static int accept (char *args) {
     int n, i;
-    char *endp = args;
+    char *endp, *prev = args;
     T.a = proj_coord (0,0,0,0);
     n = 4;
     for (i = 0; i < 4; i++) {
-        T.a.v[i] = proj_strtod (endp, &endp);
-        if (HUGE_VAL==T.a.v[i]) {
+        T.a.v[i] = proj_strtod (prev, &endp);
+        if (prev==endp) {
             n--;
             T.a.v[i] = 0;
+            break;
         }
+        prev = endp;
     }
     T.a = torad_if_needed (T.P, T.dir, T.a);
     if (T.verbosity > 3)
@@ -457,11 +486,11 @@ static int accept (char *args) {
 static int roundtrip (char *args) {
     int ntrips;
     double d, r, ans;
-    char *endp, *endq;
+    char *endp;
     ans = proj_strtod (args, &endp);
-    ntrips = (int) (ans==HUGE_VAL? 100: fabs(ans));
-    d = proj_strtod (endp, &endq);
-    d = (endp==endq)?  T.tolerance:  d / 1000;
+    ntrips = (int) (endp==args? 100: fabs(ans));
+    d = strtod_scaled (endp, 1);
+    d = d==HUGE_VAL?  T.tolerance:  d;
     r = proj_roundtrip (T.P, PJ_FWD, ntrips, T.a);
     if (r > d) {
         if (T.verbosity > -1) {
@@ -469,7 +498,7 @@ static int roundtrip (char *args) {
                 banner (T.operation);
             fprintf (T.fout, "%s", T.op_ko? "     -----\n": delim);
             fprintf (T.fout, "     FAILURE in %s(%d):\n", opt_strip_path (T.curr_file), (int) lineno);
-            fprintf (T.fout, "     roundtrip deivation: %.3f mm, expected: %.3f mm\n", 1000*r, 1000*d);
+            fprintf (T.fout, "     roundtrip deviation: %.3f mm, expected: %.3f mm\n", 1000*r, 1000*d);
         }
         T.op_ko++;
         T.total_ko++;
@@ -485,18 +514,20 @@ static int roundtrip (char *args) {
 static int expect (char *args) {
     double d;
     enum pj_io_units unit;
-    char *endp = args;
+    char *endp, *prev = args;
     int i;
 
     T.e     =  proj_coord (0,0,0,0);
     T.b     =  proj_coord (0,0,0,0);
     T.nargs = 4;
     for (i = 0; i < 4; i++) {
-        T.e.v[i] = proj_strtod (endp, &endp);
-        if (HUGE_VAL==T.e.v[i]) {
+        T.e.v[i] = proj_strtod (prev, &endp);
+        if (prev==endp) {
             T.nargs--;
             T.e.v[i] = 0;
+            break;
         }
+        prev = endp;
     }
     T.e = torad_if_needed (T.P, T.dir==PJ_FWD? PJ_INV:PJ_FWD, T.e);
 
@@ -525,8 +556,8 @@ static int expect (char *args) {
         d = proj_xyz_dist (T.b.xyz, T.e.xyz);
 
     if (d > T.tolerance) {
-        if (d > 10)
-            d = 9.999999;
+        if (d > 1e6)
+            d = 999999.999999;
         if (T.verbosity > -1) {
             if (0==T.op_ko && T.verbosity < 2)
                 banner (T.operation);
diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie
index 26998db6..0755ffb3 100644
--- a/test/gie/builtins.gie
+++ b/test/gie/builtins.gie
@@ -8,7 +8,7 @@ Albers Equal Area
 -------------------------------------------------------------------------------
 operation +proj=aea   +ellps=GRS80  +lat_1=0 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222571.608757106 110653.326743030
 accept  2 -1
@@ -31,7 +31,7 @@ expect  -0.001796630 -0.000904370
 -------------------------------------------------------------------------------
 operation +proj=aea   +R=6400000    +lat_1=0 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223334.085170885 111780.431884472
 accept  2 -1
@@ -61,7 +61,7 @@ Azimuthal Equidistant
 -------------------------------------------------------------------------------
 operation +proj=aeqd   +ellps=GRS80  +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222616.522190052 110596.996549550
 accept  2 -1
@@ -84,7 +84,7 @@ expect  -0.001796631 -0.000904369
 -------------------------------------------------------------------------------
 operation +proj=aeqd   +R=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223379.456047271 111723.757570854
 accept  2 -1
@@ -114,7 +114,7 @@ Airy
 -------------------------------------------------------------------------------
 operation +proj=airy   +a=6400000    +lat_1=0 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  189109.886908621 94583.752387504
 accept  2 -1
@@ -133,7 +133,7 @@ Aitoff
 -------------------------------------------------------------------------------
 operation +proj=aitoff   +R=6400000    +lat_1=0 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223379.458811696 111706.742883853
 accept  2 -1
@@ -162,7 +162,7 @@ Mod. Stereographic of Alaska
 -------------------------------------------------------------------------------
 operation +proj=alsk +ellps=clrk66
 -------------------------------------------------------------------------------
-tolerance 0.00001
+tolerance 0.00001 mm
 accept  -160.000000000 55.000000000
 expect  -513253.146950842 -968928.031867943
 accept  -160.000000000 70.000000000
@@ -185,7 +185,7 @@ expect  -144.758985461 60.202929201
 -------------------------------------------------------------------------------
 operation +proj=alsk +R=6370997
 -------------------------------------------------------------------------------
-tolerance 0.0001
+tolerance 0.0001 mm
 accept  -160.000000000 55.000000000
 expect  -511510.319410844 -967150.991676078
 accept  -160.000000000 70.000000000
@@ -214,7 +214,7 @@ Apian Globular I
 -------------------------------------------------------------------------------
 operation +proj=apian   +a=6400000    +lat_1=0 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223374.577355253 111701.072127637
 accept  2 -1
@@ -233,7 +233,7 @@ August Epicycloidal
 -------------------------------------------------------------------------------
 operation +proj=august   +a=6400000    +lat_1=0 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223404.978180972 111722.340289763
 accept  2 -1
@@ -252,7 +252,7 @@ Bacon Globular
 -------------------------------------------------------------------------------
 operation +proj=bacon   +a=6400000    +lat_1=0 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223334.132555965 175450.725922666
 accept  2 -1
@@ -271,7 +271,7 @@ Bipolar conic of western hemisphere
 -------------------------------------------------------------------------------
 operation +proj=bipc   +ellps=GRS80  +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  2452160.217725756 -14548450.759654747
 accept  2 -1
@@ -294,7 +294,7 @@ expect  -73.034496627 17.246832896
 -------------------------------------------------------------------------------
 operation +proj=bipc   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  2460565.740974965 -14598319.989330800
 accept  2 -1
@@ -323,7 +323,7 @@ Boggs Eumorphic
 -------------------------------------------------------------------------------
 operation +proj=boggs   +a=6400000    +lat_1=0 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  211949.700808182 117720.998305411
 accept  2 -1
@@ -343,7 +343,7 @@ Bonne (Werner lat_1=90)
 -------------------------------------------------------------------------------
 operation +proj=bonne   +ellps=GRS80  +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222605.296097157 55321.139565495
 accept  2 -1
@@ -366,7 +366,7 @@ expect  -0.001796698 0.499095631
 -------------------------------------------------------------------------------
 operation +proj=bonne   +R=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223368.115572528 55884.555246394
 accept  2 -1
@@ -395,7 +395,7 @@ Cal Coop Ocean Fish Invest Lines/Stations
 -------------------------------------------------------------------------------
 operation +proj=calcofi   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +no_defs
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  508.444872150 -1171.764860418
 accept  2 -1
@@ -418,7 +418,7 @@ expect  -62.486322854 87.980755945
 -------------------------------------------------------------------------------
 operation +proj=calcofi   +R=6400000    +lat_1=0.5 +lat_2=2 +no_defs
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  507.090507488 -1164.727375198
 accept  2 -1
@@ -447,7 +447,7 @@ Cassini
 -------------------------------------------------------------------------------
 operation +proj=cass   +ellps=GRS80  +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222605.285776991 110642.229253999
 accept  2 -1
@@ -470,7 +470,7 @@ expect  -0.001796631 -0.000904369
 -------------------------------------------------------------------------------
 operation +proj=cass   +R=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223368.105203484 111769.145040586
 accept  2 -1
@@ -499,7 +499,7 @@ Central Cylindrical
 -------------------------------------------------------------------------------
 operation +proj=cc   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223402.144255274 111712.415540593
 accept  2 -1
@@ -529,7 +529,7 @@ Equal Area Cylindrical
 -------------------------------------------------------------------------------
 operation +proj=cea   +ellps=GRS80  +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222638.981586547 110568.812396267
 accept  2 -1
@@ -552,7 +552,7 @@ expect  -0.001796631 -0.000904369
 -------------------------------------------------------------------------------
 operation +proj=cea   +R=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223402.144255274 111695.401198614
 accept  2 -1
@@ -582,7 +582,7 @@ Chamberlin Trimetric
 -------------------------------------------------------------------------------
 operation +proj=chamb   +R=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  -27864.779586801 -223364.324593274
 accept  2 -1
@@ -601,7 +601,7 @@ Collignon
 -------------------------------------------------------------------------------
 operation +proj=collg   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  249872.921577930 99423.174788460
 accept  2 -1
@@ -630,7 +630,7 @@ Compact Miller
 -------------------------------------------------------------------------------
 operation +proj=comill   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223402.144255274 110611.859089459
 accept  2 -1
@@ -659,7 +659,7 @@ Craster Parabolic (Putnins P4)
 -------------------------------------------------------------------------------
 operation +proj=crast   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  218280.142056781 114306.045604280
 accept  2 -1
@@ -688,7 +688,7 @@ Denoyer Semi-Elliptical
 -------------------------------------------------------------------------------
 operation +proj=denoy   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223377.422876954 111701.072127637
 accept  2 -1
@@ -707,7 +707,7 @@ Eckert I
 -------------------------------------------------------------------------------
 operation +proj=eck1   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  204680.888202951 102912.178426065
 accept  2 -1
@@ -736,7 +736,7 @@ Eckert II
 -------------------------------------------------------------------------------
 operation +proj=eck2   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  204472.870907960 121633.734975242
 accept  2 -1
@@ -765,7 +765,7 @@ Eckert III
 -------------------------------------------------------------------------------
 operation +proj=eck3   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  188652.015721538 94328.919337031
 accept  2 -1
@@ -794,7 +794,7 @@ Eckert IV
 -------------------------------------------------------------------------------
 operation +proj=eck4   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  188646.389356416 132268.540174065
 accept  2 -1
@@ -823,7 +823,7 @@ Eckert V
 -------------------------------------------------------------------------------
 operation +proj=eck5   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  197031.392134061 98523.198847227
 accept  2 -1
@@ -852,7 +852,7 @@ Eckert VI
 -------------------------------------------------------------------------------
 operation +proj=eck6   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  197021.605628992 126640.420733174
 accept  2 -1
@@ -882,7 +882,7 @@ Equidistant Cylindrical (Plate Caree)
 -------------------------------------------------------------------------------
 operation +proj=eqc   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223402.144255274 111701.072127637
 accept  2 -1
@@ -912,7 +912,7 @@ Equidistant Conic
 -------------------------------------------------------------------------------
 operation +proj=eqdc   +ellps=GRS80  +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222588.440269286 110659.134907347
 accept  2 -1
@@ -935,7 +935,7 @@ expect  -0.001796358 -0.000904370
 -------------------------------------------------------------------------------
 operation +proj=eqdc   +R=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223351.088175114 111786.108747174
 accept  2 -1
@@ -965,7 +965,7 @@ Euler
 -------------------------------------------------------------------------------
 operation +proj=euler   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222597.634659108 111404.240549919
 accept  2 -1
@@ -988,7 +988,7 @@ expect  -0.001796279 -0.000898316
 -------------------------------------------------------------------------------
 operation +proj=euler   +a=6400000    +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223360.655598694 111786.112389791
 accept  2 -1
@@ -1019,7 +1019,7 @@ lat_0=(0)
 -------------------------------------------------------------------------------
 operation +proj=etmerc   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5 +zone=30
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222650.796797586 110642.229411933
 accept  2 -1
@@ -1048,7 +1048,7 @@ Fahey
 -------------------------------------------------------------------------------
 operation +proj=fahey   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  182993.344649124 101603.193569884
 accept  2 -1
@@ -1077,7 +1077,7 @@ Foucaut
 -------------------------------------------------------------------------------
 operation +proj=fouc   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222588.120675892 111322.316700694
 accept  2 -1
@@ -1100,7 +1100,7 @@ expect  -0.001796631 -0.000898315
 -------------------------------------------------------------------------------
 operation +proj=fouc   +a=6400000    +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223351.109003414 111703.907721713
 accept  2 -1
@@ -1129,7 +1129,7 @@ Foucaut Sinusoidal
 -------------------------------------------------------------------------------
 operation +proj=fouc_s   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223402.144255274 111695.401198614
 accept  2 -1
@@ -1158,7 +1158,7 @@ Gall (Gall Stereographic)
 -------------------------------------------------------------------------------
 operation +proj=gall   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  157969.171134520 95345.249178386
 accept  2 -1
@@ -1187,7 +1187,7 @@ Geocentric
 -------------------------------------------------------------------------------
 operation +proj=geocent   +ellps=GRS80  +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222638.981586547 111319.490793274
 accept  2 -1
@@ -1210,7 +1210,7 @@ expect  -0.001796631 -0.000898315
 -------------------------------------------------------------------------------
 operation +proj=geocent   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 
 
 ===============================================================================
@@ -1222,7 +1222,7 @@ Geostationary Satellite View
 -------------------------------------------------------------------------------
 operation +proj=geos   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +h=35785831
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222527.070365800 110551.303413329
 accept  2 -1
@@ -1245,7 +1245,7 @@ expect  -0.001796631 -0.000904369
 -------------------------------------------------------------------------------
 operation +proj=geos   +R=6400000    +lat_1=0.5 +lat_2=2 +h=35785831
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223289.457635795 111677.657456537
 accept  2 -1
@@ -1274,7 +1274,7 @@ Ginsburg VIII (TsNIIGAiK)
 -------------------------------------------------------------------------------
 operation +proj=gins8   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  194350.250939590 111703.907635335
 accept  2 -1
@@ -1294,7 +1294,7 @@ General Sinusoidal Series
 -------------------------------------------------------------------------------
 operation +proj=gn_sinu   +a=6400000    +lat_1=0.5 +lat_2=2 +m=1 +n=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223385.132504696 111698.236447187
 accept  2 -1
@@ -1323,7 +1323,7 @@ Gnomonic
 -------------------------------------------------------------------------------
 operation +proj=gnom   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223492.924747185 111780.509206593
 accept  2 -1
@@ -1352,7 +1352,7 @@ Goode Homolosine
 -------------------------------------------------------------------------------
 operation +proj=goode   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223368.119026632 111701.072127637
 accept  2 -1
@@ -1381,7 +1381,7 @@ Mod. Stereographic of 48 U.S.
 -------------------------------------------------------------------------------
 operation +proj=gs48 +R=6370997
 -------------------------------------------------------------------------------
-tolerance 0.0001
+tolerance 0.0001 mm
 accept  -119.000000000 40.000000000
 expect  -1923908.446529346 355874.658944479
 accept  -70.000000000 64.000000000
@@ -1410,7 +1410,7 @@ Mod. Stereographic of 50 U.S.
 -------------------------------------------------------------------------------
 operation +proj=gs50 +ellps=clrk66
 -------------------------------------------------------------------------------
-tolerance 0.0001
+tolerance 0.0001 mm
 accept  -160.000000000 65.000000000
 expect  -1874628.537740233 2660907.942291015
 accept  -130.000000000 45.000000000
@@ -1433,7 +1433,7 @@ expect  -75.550660091 34.191114076
 -------------------------------------------------------------------------------
 operation +proj=gs50 +R=6370997
 -------------------------------------------------------------------------------
-tolerance 0.0001
+tolerance 0.0001 mm
 accept  -160.000000000 65.000000000
 expect  -1867268.253460009 2656506.230401823
 accept  -130.000000000 45.000000000
@@ -1463,7 +1463,7 @@ Hammer & Eckert-Greifendorff
 -------------------------------------------------------------------------------
 operation +proj=hammer   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223373.788703241 111703.907397767
 accept  2 -1
@@ -1492,7 +1492,7 @@ Hatano Asymmetrical Equal Area
 -------------------------------------------------------------------------------
 operation +proj=hatano   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  189878.878946528 131409.802440626
 accept  2 -1
@@ -1521,7 +1521,7 @@ HEALPix
 -------------------------------------------------------------------------------
 operation +proj=healpix   +ellps=GRS80  +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222390.103949239 130406.588664482
 accept  2 -1
@@ -1544,7 +1544,7 @@ expect  -0.001798641 -0.000766795
 -------------------------------------------------------------------------------
 operation +proj=healpix   +R=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223402.144255274 131588.044441999
 accept  2 -1
@@ -1574,7 +1574,7 @@ rHEALPix
 -------------------------------------------------------------------------------
 operation +proj=rhealpix   +ellps=GRS80  +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222390.103949239 130406.588664482
 accept  2 -1
@@ -1597,7 +1597,7 @@ expect  -0.001798641 -0.000766795
 -------------------------------------------------------------------------------
 operation +proj=rhealpix   +R=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223402.144255274 131588.044441999
 accept  2 -1
@@ -1626,7 +1626,7 @@ Interrupted Goode Homolosine
 -------------------------------------------------------------------------------
 operation +proj=igh   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223878.497456271 111701.072127637
 accept  2 -1
@@ -1656,7 +1656,7 @@ International Map of the World Polyconic
 -------------------------------------------------------------------------------
 operation +proj=imw_p   +ellps=GRS80  +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222588.441139376 55321.128653810
 accept  2 -1
@@ -1685,7 +1685,7 @@ Icosahedral Snyder Equal Area
 -------------------------------------------------------------------------------
 operation +proj=isea   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  -1097074.948022474 3442909.309037183
 accept  2 -1
@@ -1704,7 +1704,7 @@ Kavraisky V
 -------------------------------------------------------------------------------
 operation +proj=kav5   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  200360.905308829 123685.082476998
 accept  2 -1
@@ -1727,7 +1727,7 @@ expect  -0.001996259 -0.000808483
 -------------------------------------------------------------------------------
 operation +proj=kav5   +a=6400000    +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  201047.703110878 124109.050629171
 accept  2 -1
@@ -1756,7 +1756,7 @@ Kavraisky VII
 -------------------------------------------------------------------------------
 operation +proj=kav7   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  193462.974943729 111701.072127637
 accept  2 -1
@@ -1785,7 +1785,7 @@ Krovak
 -------------------------------------------------------------------------------
 operation +proj=krovak +ellps=GRS80  +no_defs
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  -3196535.232563641 -6617878.867551444
 accept  2 -1
@@ -1815,7 +1815,7 @@ Laborde
 -------------------------------------------------------------------------------
 operation +proj=labrd   +ellps=GRS80  +lon_0=0.5 +lat_0=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  166973.166090228 -110536.912730266
 accept  2 -1
@@ -1844,7 +1844,7 @@ Lambert Azimuthal Equal Area
 -------------------------------------------------------------------------------
 operation +proj=laea   +ellps=GRS80  +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222602.471450095 110589.827224410
 accept  2 -1
@@ -1867,7 +1867,7 @@ expect  -0.001796631 -0.000904369
 -------------------------------------------------------------------------------
 operation +proj=laea   +R=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223365.281370125 111716.668072916
 accept  2 -1
@@ -1897,7 +1897,7 @@ Lagrange
 -------------------------------------------------------------------------------
 operation +proj=lagrng   +a=6400000 +W=2   +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  111703.375917226 27929.831908033
 accept  2 -1
@@ -1916,7 +1916,7 @@ Larrivee
 -------------------------------------------------------------------------------
 operation +proj=larr   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223393.637624201 111707.215961256
 accept  2 -1
@@ -1935,7 +1935,7 @@ Laskowski
 -------------------------------------------------------------------------------
 operation +proj=lask   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  217928.275907355 112144.329220142
 accept  2 -1
@@ -1955,7 +1955,7 @@ Lambert Conformal Conic
 -------------------------------------------------------------------------------
 operation +proj=lcc   +ellps=GRS80  +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222588.439735968 110660.533870800
 accept  2 -1
@@ -1985,7 +1985,7 @@ Lambert Conformal Conic Alternative
 -------------------------------------------------------------------------------
 operation +proj=lcca   +ellps=GRS80  +lat_0=1 +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222605.285770237 67.806007272
 accept  2 -1
@@ -2015,7 +2015,7 @@ Lambert Equal Area Conic
 -------------------------------------------------------------------------------
 operation +proj=leac   +ellps=GRS80  +lat_1=0 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  220685.140542979 112983.500889396
 accept  2 -1
@@ -2038,7 +2038,7 @@ expect  -0.001796616 -0.000904387
 -------------------------------------------------------------------------------
 operation +proj=leac   +R=6400000    +lat_1=0 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  221432.868592852 114119.454526532
 accept  2 -1
@@ -2067,7 +2067,7 @@ Lee Oblated Stereographic
 -------------------------------------------------------------------------------
 operation +proj=lee_os   +R=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.0010
+tolerance 0.0010 mm
 accept  2 1
 expect  -25564478.952605054 154490848.828625500
 accept  2 -1
@@ -2096,7 +2096,7 @@ Loximuthal
 -------------------------------------------------------------------------------
 operation +proj=loxim   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223382.295791339 55850.536063819
 accept  2 -1
@@ -2126,7 +2126,7 @@ Space oblique for LANDSAT
 -------------------------------------------------------------------------------
 operation +proj=lsat +ellps=GRS80 +lat_1=0.5 +lat_2=2 +lsat=1 +path=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  18241950.014558550 9998256.839822935
 accept  2 -1
@@ -2155,7 +2155,7 @@ McBryde-Thomas Flat-Polar Sine (No. 1)
 -------------------------------------------------------------------------------
 operation +proj=mbt_s   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  204131.517850273 121400.330225508
 accept  2 -1
@@ -2178,7 +2178,7 @@ expect  -0.001959383 -0.000823699
 -------------------------------------------------------------------------------
 operation +proj=mbt_s   +a=6400000    +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  204831.240570992 121816.466696035
 accept  2 -1
@@ -2207,7 +2207,7 @@ McBryde-Thomas Flat-Pole Sine (No. 2)
 -------------------------------------------------------------------------------
 operation +proj=mbt_fps   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  198798.176129850 125512.017254531
 accept  2 -1
@@ -2236,7 +2236,7 @@ McBride-Thomas Flat-Polar Parabolic
 -------------------------------------------------------------------------------
 operation +proj=mbtfpp   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  206804.786929820 120649.762565793
 accept  2 -1
@@ -2265,7 +2265,7 @@ McBryde-Thomas Flat-Polar Quartic
 -------------------------------------------------------------------------------
 operation +proj=mbtfpq   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  209391.854738393 119161.040199055
 accept  2 -1
@@ -2294,7 +2294,7 @@ McBryde-Thomas Flat-Polar Sinusoidal
 -------------------------------------------------------------------------------
 operation +proj=mbtfps   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  204740.117478572 121864.729719340
 accept  2 -1
@@ -2324,7 +2324,7 @@ Mercator
 -------------------------------------------------------------------------------
 operation +proj=merc   +ellps=GRS80  +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222638.981586547 110579.965218250
 accept  2 -1
@@ -2347,7 +2347,7 @@ expect  -0.001796631 -0.000904369
 -------------------------------------------------------------------------------
 operation +proj=merc   +R=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223402.144255274 111706.743574944
 accept  2 -1
@@ -2376,7 +2376,7 @@ Miller Oblated Stereographic
 -------------------------------------------------------------------------------
 operation +proj=mil_os   +R=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  -1908527.949594205 -1726237.473061448
 accept  2 -1
@@ -2405,7 +2405,7 @@ Miller Cylindrical
 -------------------------------------------------------------------------------
 operation +proj=mill   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223402.144255274 111704.701754394
 accept  2 -1
@@ -2435,7 +2435,7 @@ Space oblique for MISR
 -------------------------------------------------------------------------------
 operation +proj=misrsom   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +path=1
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  18556630.368369825 9533394.675311271
 accept  2 -1
@@ -2458,7 +2458,7 @@ expect  127.761567257 -0.001735150
 -------------------------------------------------------------------------------
 operation +proj=misrsom   +R=6400000    +lat_1=0.5 +lat_2=2 +path=1
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  18641249.279170386 9563342.532334166
 accept  2 -1
@@ -2487,7 +2487,7 @@ Mollweide
 -------------------------------------------------------------------------------
 operation +proj=moll   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  201113.698641813 124066.283433860
 accept  2 -1
@@ -2517,7 +2517,7 @@ Murdoch I
 -------------------------------------------------------------------------------
 operation +proj=murd1   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222600.813473554 111404.244180546
 accept  2 -1
@@ -2540,7 +2540,7 @@ expect  -0.001796254 -0.000898316
 -------------------------------------------------------------------------------
 operation +proj=murd1   +a=6400000    +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223363.845309492 111786.116032863
 accept  2 -1
@@ -2570,7 +2570,7 @@ Murdoch II
 -------------------------------------------------------------------------------
 operation +proj=murd2   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222588.099751230 111426.140027412
 accept  2 -1
@@ -2593,7 +2593,7 @@ expect  -0.001796356 -0.000897888
 -------------------------------------------------------------------------------
 operation +proj=murd2   +a=6400000    +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223351.088007027 111808.086934388
 accept  2 -1
@@ -2623,7 +2623,7 @@ Murdoch III
 -------------------------------------------------------------------------------
 operation +proj=murd3   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222600.814077577 111404.246601372
 accept  2 -1
@@ -2646,7 +2646,7 @@ expect  -0.001796254 -0.000898316
 -------------------------------------------------------------------------------
 operation +proj=murd3   +a=6400000    +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223363.845915585 111786.118461987
 accept  2 -1
@@ -2675,7 +2675,7 @@ Natural Earth
 -------------------------------------------------------------------------------
 operation +proj=natearth   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  194507.265257889 112508.737358295
 accept  2 -1
@@ -2704,7 +2704,7 @@ Natural Earth 2
 -------------------------------------------------------------------------------
 operation +proj=natearth2   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  189255.172934731 113022.495810907
 accept  2 -1
@@ -2733,7 +2733,7 @@ Nell
 -------------------------------------------------------------------------------
 operation +proj=nell   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223385.132504696 111698.236447187
 accept  2 -1
@@ -2762,7 +2762,7 @@ Nell-Hammer
 -------------------------------------------------------------------------------
 operation +proj=nell_h   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223385.131640953 111698.236533562
 accept  2 -1
@@ -2791,7 +2791,7 @@ Nicolosi Globular
 -------------------------------------------------------------------------------
 operation +proj=nicol   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223374.561814140 111732.553988545
 accept  2 -1
@@ -2811,7 +2811,7 @@ Near-sided perspective
 -------------------------------------------------------------------------------
 operation +proj=nsper   +a=6400000  +h=1000000
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222239.816114100 111153.763991925
 accept  2 -1
@@ -2840,7 +2840,7 @@ New Zealand Map Grid
 -------------------------------------------------------------------------------
 operation +proj=nzmg   +ellps=GRS80  +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.010
+tolerance 0.010 mm
 accept  2 1
 expect  3352675144.747425100 -7043205391.100243600
 accept  2 -1
@@ -2873,7 +2873,7 @@ General Oblique Transformation
 -------------------------------------------------------------------------------
 operation +proj=ob_tran +R=6400000 +o_proj=latlon +o_lon_p=20 +o_lat_p=20 +lon_0=180
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  -2.685687214 1.237430235
 accept  2 -1
@@ -2903,7 +2903,7 @@ Oblique Cylindrical Equal Area
 -------------------------------------------------------------------------------
 operation +proj=ocea   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  19994423.837934088 223322.760576728
 accept  2 -1
@@ -2933,7 +2933,7 @@ Oblated Equal Area
 -------------------------------------------------------------------------------
 operation +proj=oea   +a=6400000    +lat_1=0.5 +lat_2=2 +n=1 +m=2 +theta=3
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  228926.872097864 99870.488430076
 accept  2 -1
@@ -2964,7 +2964,7 @@ Oblique Mercator
 -------------------------------------------------------------------------------
 operation +proj=omerc   +ellps=GRS80  +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222650.796885261 110642.229314984
 accept  2 -1
@@ -2993,7 +2993,7 @@ Ortelius Oval
 -------------------------------------------------------------------------------
 operation +proj=ortel   +a=6400000    +lat_1=0 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223374.577355253 111701.072127637
 accept  2 -1
@@ -3012,7 +3012,7 @@ Orthographic
 -------------------------------------------------------------------------------
 operation +proj=ortho   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223322.760576727 111695.401198614
 accept  2 -1
@@ -3042,7 +3042,7 @@ Perspective Conic
 -------------------------------------------------------------------------------
 operation +proj=pconic   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222588.098841617 111416.604770067
 accept  2 -1
@@ -3065,7 +3065,7 @@ expect  -0.001796356 -0.000897965
 -------------------------------------------------------------------------------
 operation +proj=pconic   +a=6400000    +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223351.087094295 111798.518992055
 accept  2 -1
@@ -3094,7 +3094,7 @@ Patterson Cylindrical
 -------------------------------------------------------------------------------
 operation +proj=patterson   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223402.144255274 113354.250397780
 accept  2 -1
@@ -3123,7 +3123,7 @@ Polyconic (American)
 -------------------------------------------------------------------------------
 operation +proj=poly   +ellps=GRS80  +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222605.285770237 110642.194561440
 accept  2 -1
@@ -3146,7 +3146,7 @@ expect  -0.001796631 -0.000904369
 -------------------------------------------------------------------------------
 operation +proj=poly   +R=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223368.105210219 111769.110491225
 accept  2 -1
@@ -3175,7 +3175,7 @@ Putnins P1
 -------------------------------------------------------------------------------
 operation +proj=putp1   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  211642.762754160 105831.180787330
 accept  2 -1
@@ -3204,7 +3204,7 @@ Putnins P2
 -------------------------------------------------------------------------------
 operation +proj=putp2   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  211638.039634339 117895.033043380
 accept  2 -1
@@ -3233,7 +3233,7 @@ Putnins P3
 -------------------------------------------------------------------------------
 operation +proj=putp3   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  178227.115507794 89124.560786088
 accept  2 -1
@@ -3262,7 +3262,7 @@ Putnins P3'
 -------------------------------------------------------------------------------
 operation +proj=putp3p   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  178238.118539985 89124.560786088
 accept  2 -1
@@ -3291,7 +3291,7 @@ Putnins P4'
 -------------------------------------------------------------------------------
 operation +proj=putp4p   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  195241.477349386 127796.782307926
 accept  2 -1
@@ -3320,7 +3320,7 @@ Putnins P5
 -------------------------------------------------------------------------------
 operation +proj=putp5   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  226367.213380562 113204.568558475
 accept  2 -1
@@ -3349,7 +3349,7 @@ Putnins P5'
 -------------------------------------------------------------------------------
 operation +proj=putp5p   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  226388.175248756 113204.568558475
 accept  2 -1
@@ -3378,7 +3378,7 @@ Putnins P6
 -------------------------------------------------------------------------------
 operation +proj=putp6   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  226369.395133403 110218.523796521
 accept  2 -1
@@ -3407,7 +3407,7 @@ Putnins P6'
 -------------------------------------------------------------------------------
 operation +proj=putp6p   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  198034.195132195 125989.475461323
 accept  2 -1
@@ -3436,7 +3436,7 @@ Quartic Authalic
 -------------------------------------------------------------------------------
 operation +proj=qua_aut   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222613.549033097 111318.077887984
 accept  2 -1
@@ -3459,7 +3459,7 @@ expect  -0.001796631 -0.000898315
 -------------------------------------------------------------------------------
 operation +proj=qua_aut   +a=6400000    +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223376.624524029 111699.654379186
 accept  2 -1
@@ -3488,7 +3488,7 @@ Quadrilateralized Spherical Cube
 -------------------------------------------------------------------------------
 operation +proj=qsc   +ellps=GRS80  +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  304638.450843852 164123.870923794
 accept  2 -1
@@ -3511,7 +3511,7 @@ expect  -0.001321341 -0.000610653
 -------------------------------------------------------------------------------
 operation +proj=qsc   +R=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  305863.792402891 165827.722754715
 accept  2 -1
@@ -3540,7 +3540,7 @@ Robinson
 -------------------------------------------------------------------------------
 operation +proj=robin   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  189588.423282508 107318.530350703
 accept  2 -1
@@ -3569,7 +3569,7 @@ Roussilhe Stereographic
 -------------------------------------------------------------------------------
 operation +proj=rouss   +ellps=GRS80  +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222644.894131617 110611.091868370
 accept  2 -1
@@ -3599,7 +3599,7 @@ Rectangular Polyconic
 -------------------------------------------------------------------------------
 operation +proj=rpoly   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223368.098302014 111769.110486991
 accept  2 -1
@@ -3618,7 +3618,7 @@ Sinusoidal (Sanson-Flamsteed)
 -------------------------------------------------------------------------------
 operation +proj=sinu   +ellps=GRS80  +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222605.299539466 110574.388554153
 accept  2 -1
@@ -3641,7 +3641,7 @@ expect  -0.001796631 -0.000904369
 -------------------------------------------------------------------------------
 operation +proj=sinu   +R=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223368.119026632 111701.072127637
 accept  2 -1
@@ -3671,7 +3671,7 @@ Swiss. Obl. Mercator
 -------------------------------------------------------------------------------
 operation +proj=somerc   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222638.981586547 110579.965218249
 accept  2 -1
@@ -3694,7 +3694,7 @@ expect  -0.001796631 -0.000904369
 -------------------------------------------------------------------------------
 operation +proj=somerc   +R=6400000    +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223402.144255274 111706.743574944
 accept  2 -1
@@ -3724,7 +3724,7 @@ Stereographic
 -------------------------------------------------------------------------------
 operation +proj=stere   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222644.854550117 110610.883474174
 accept  2 -1
@@ -3747,7 +3747,7 @@ expect  -0.001796631 -0.000904369
 -------------------------------------------------------------------------------
 operation +proj=stere   +R=6400000    +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223407.810259507 111737.938996443
 accept  2 -1
@@ -3776,7 +3776,7 @@ Oblique Stereographic Alternative
 -------------------------------------------------------------------------------
 operation +proj=sterea   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222644.894109198 110611.091871737
 accept  2 -1
@@ -3799,7 +3799,7 @@ expect  -0.001796631 -0.000904369
 -------------------------------------------------------------------------------
 operation +proj=sterea   +R=6400000    +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223407.810259507 111737.938996443
 accept  2 -1
@@ -3829,7 +3829,7 @@ Gauss-Schreiber Transverse Mercator (aka Gauss-Laborde Reunion)
 -------------------------------------------------------------------------------
 operation +proj=gstmerc   +R=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223413.466406322 111769.145040586
 accept  2 -1
@@ -3858,7 +3858,7 @@ Transverse Central Cylindrical
 -------------------------------------------------------------------------------
 operation +proj=tcc   +a=6400000    +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223458.844192458 111769.145040586
 accept  2 -1
@@ -3877,7 +3877,7 @@ Transverse Cylindrical Equal Area
 -------------------------------------------------------------------------------
 operation +proj=tcea   +a=6400000    +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223322.760576727 111769.145040586
 accept  2 -1
@@ -3906,7 +3906,7 @@ Times
 -------------------------------------------------------------------------------
 operation +proj=times +ellps=sphere
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  0.000000000 0.000000000
 expect  0.000000000 0.000000000
 accept  80.000000000 70.000000000
@@ -3940,7 +3940,7 @@ Tissot
 -------------------------------------------------------------------------------
 operation +proj=tissot   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222641.078699631 54347.828487281
 accept  2 -1
@@ -3963,7 +3963,7 @@ expect  -0.001796279 0.511648325
 -------------------------------------------------------------------------------
 operation +proj=tissot   +a=6400000    +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223404.248556849 54534.122161158
 accept  2 -1
@@ -3992,7 +3992,7 @@ Transverse Mercator
 -------------------------------------------------------------------------------
 operation +proj=tmerc   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222650.796795778 110642.229411927
 accept  2 -1
@@ -4015,7 +4015,7 @@ expect  -0.001796631 -0.000904369
 -------------------------------------------------------------------------------
 operation +proj=tmerc   +R=6400000    +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223413.466406322 111769.145040597
 accept  2 -1
@@ -4045,7 +4045,7 @@ Two Point Equidistant
 -------------------------------------------------------------------------------
 operation +proj=tpeqd   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  -27750.758831679 -222599.403691777
 accept  2 -1
@@ -4068,7 +4068,7 @@ expect  0.000898554 1.248203369
 -------------------------------------------------------------------------------
 operation +proj=tpeqd   +a=6400000    +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  -27845.882978485 -223362.430695260
 accept  2 -1
@@ -4098,7 +4098,7 @@ Tilted perspective
 -------------------------------------------------------------------------------
 operation +proj=tpers   +a=6400000  +h=1000000 +azi=20
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  170820.288955531 180460.865555805
 accept  2 -1
@@ -4128,7 +4128,7 @@ Universal Polar Stereographic
 -------------------------------------------------------------------------------
 operation +proj=ups   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  2433455.563438467 -10412543.301512826
 accept  2 -1
@@ -4158,7 +4158,7 @@ Urmaev V
 -------------------------------------------------------------------------------
 operation +proj=urm5   +a=6400000    +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223393.638433964 111696.818785117
 accept  2 -1
@@ -4178,7 +4178,7 @@ Urmaev Flat-Polar Sinusoidal
 -------------------------------------------------------------------------------
 operation +proj=urmfps   +a=6400000    +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  196001.708134192 127306.843329993
 accept  2 -1
@@ -4208,7 +4208,7 @@ Universal Transverse Mercator (UTM)
 -------------------------------------------------------------------------------
 operation +proj=utm   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5 +zone=30
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  1057002.405491298 110955.141175949
 accept  2 -1
@@ -4237,7 +4237,7 @@ van der Grinten (I)
 -------------------------------------------------------------------------------
 operation +proj=vandg   +a=6400000    +lat_1=0.5 +lat_2=2 +no_defs
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223395.249543407 111704.596633675
 rem     223395.249543407 111704.596633675    osgeo
@@ -4270,7 +4270,7 @@ van der Grinten II
 -------------------------------------------------------------------------------
 operation +proj=vandg2   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223395.247850437 111718.491037226
 accept  2 -1
@@ -4289,7 +4289,7 @@ van der Grinten III
 -------------------------------------------------------------------------------
 operation +proj=vandg3   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223395.249552831 111704.519904421
 accept  2 -1
@@ -4308,7 +4308,7 @@ van der Grinten IV
 -------------------------------------------------------------------------------
 operation +proj=vandg4   +R=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.01
+tolerance 0.01 mm
 accept  2 1
 expect  223374.577294355 111701.195484154
 accept  2 -1
@@ -4328,7 +4328,7 @@ Vitkovsky I
 -------------------------------------------------------------------------------
 operation +proj=vitk1   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  222607.171211458 111404.251442435
 accept  2 -1
@@ -4351,7 +4351,7 @@ expect  -0.001796202 -0.000898316
 -------------------------------------------------------------------------------
 operation +proj=vitk1   +a=6400000    +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223370.224840471 111786.123319644
 accept  2 -1
@@ -4380,7 +4380,7 @@ Wagner I (Kavraisky VI)
 -------------------------------------------------------------------------------
 operation +proj=wag1   +a=6400000    +lat_1=0.5 +lat_2=2 +n=0.5
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  195986.781561158 127310.075060660
 accept  2 -1
@@ -4409,7 +4409,7 @@ Wagner II
 -------------------------------------------------------------------------------
 operation +proj=wag2   +a=6400000  +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  206589.888099962 120778.040357547
 accept  2 -1
@@ -4439,7 +4439,7 @@ Wagner III
 -------------------------------------------------------------------------------
 operation +proj=wag3   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223387.021718166 111701.072127637
 accept  2 -1
@@ -4468,7 +4468,7 @@ Wagner IV
 -------------------------------------------------------------------------------
 operation +proj=wag4   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  192801.218662384 129416.216394803
 accept  2 -1
@@ -4497,7 +4497,7 @@ Wagner V
 -------------------------------------------------------------------------------
 operation +proj=wag5   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  203227.051925325 138651.631442713
 accept  2 -1
@@ -4526,7 +4526,7 @@ Wagner VI
 -------------------------------------------------------------------------------
 operation +proj=wag6   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  211652.562164410 105831.180787330
 accept  2 -1
@@ -4555,7 +4555,7 @@ Wagner VII
 -------------------------------------------------------------------------------
 operation +proj=wag7   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  198601.876957312 125637.045714171
 accept  2 -1
@@ -4574,7 +4574,7 @@ Werenskiold I
 -------------------------------------------------------------------------------
 operation +proj=weren   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223378.515757634 146214.093042288
 accept  2 -1
@@ -4604,7 +4604,7 @@ Winkel I
 -------------------------------------------------------------------------------
 operation +proj=wink1   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223385.131640953 111701.072127637
 accept  2 -1
@@ -4634,7 +4634,7 @@ Winkel II
 -------------------------------------------------------------------------------
 operation +proj=wink2   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223387.396433786 124752.032797445
 accept  2 -1
@@ -4654,7 +4654,7 @@ Winkel Tripel
 -------------------------------------------------------------------------------
 operation +proj=wintri   +a=6400000    +lat_1=0 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.00010
+tolerance 0.00010 mm
 accept  2 1
 expect  223390.801533485 111703.907505745
 accept  2 -1