aboutsummaryrefslogtreecommitdiff
path: root/nad
diff options
context:
space:
mode:
Diffstat (limited to 'nad')
-rwxr-xr-xnad/testvarious23
-rw-r--r--nad/tv_out.dist12
2 files changed, 29 insertions, 6 deletions
diff --git a/nad/testvarious b/nad/testvarious
index c213456e..0ea4c133 100755
--- a/nad/testvarious
+++ b/nad/testvarious
@@ -675,19 +675,36 @@ echo "##############################################################" >> ${OUT}
echo "Test bug 245 (use +datum=carthage)" >> ${OUT}
#
$EXE -f '%.7f' \
- +proj=longlat +datum=WGS84 +nodefs +to +proj=utm +zone=32 +datum=carthage +nodefs \
+ +proj=longlat +datum=WGS84 +no_defs +to +proj=utm +zone=32 +datum=carthage +no_defs \
-E >>${OUT} <<EOF
10 34
EOF
echo "##############################################################" >> ${OUT}
-echo "Test bug 245 (use expension of +datum=carthage)" >> ${OUT}
+echo "Test bug 245 (use expansion of +datum=carthage)" >> ${OUT}
#
$EXE -f '%.7f' \
- +proj=longlat +datum=WGS84 +nodefs +to +proj=utm +zone=32 +a=6378249.2 +b=6356515 +towgs84=-263.0,6.0,431.0 +nodefs \
+ +proj=longlat +datum=WGS84 +no_defs +to +proj=utm +zone=32 +a=6378249.2 +b=6356515 +towgs84=-263.0,6.0,431.0 +no_defs \
-E >>${OUT} <<EOF
10 34
EOF
##############################################################################
+echo "##############################################################" >> ${OUT}
+echo "Test issue #316 (switch utm to use etmerc)" >> ${OUT}
+#
+$EXE -f '%.6f' \
+ +proj=latlong +datum=WGS84 +no_defs +to +proj=utm +zone=35 +datum=WGS84 +no_defs \
+ -E >>${OUT} <<EOF
+0 83
+EOF
+##############################################################################
+echo "##############################################################" >> ${OUT}
+echo "Test issue #316 (switch utm to use etmerc)" >> ${OUT}
+#
+$EXE -f '%.6f' \
+ +proj=latlong +datum=WGS84 +no_defs +to +proj=etmerc +datum=WGS84 +no_defs +k=0.9996 +lon_0=27 +x_0=500000 -f %.6f \
+ -E >>${OUT} <<EOF
+0 83
+EOF
# Done!
# do 'diff' with distribution results
echo "diff ${OUT} with ${OUT}.dist"
diff --git a/nad/tv_out.dist b/nad/tv_out.dist
index 76d5b1e2..00063c47 100644
--- a/nad/tv_out.dist
+++ b/nad/tv_out.dist
@@ -313,7 +313,13 @@ Test bug 244 (2)
987122.418330284 -14429896.539530909 -140.10000000000 -87.00000000000 0.00000000000
##############################################################
Test bug 245 (use +datum=carthage)
-10 34 592302.9819462 3762148.7340610 -30.3110170
+10 34 592302.9819461 3762148.7340609 -30.3110170
##############################################################
-Test bug 245 (use expension of +datum=carthage)
-10 34 592302.9819462 3762148.7340610 -30.3110170
+Test bug 245 (use expansion of +datum=carthage)
+10 34 592302.9819461 3762148.7340609 -30.3110170
+##############################################################
+Test issue #316 (switch utm to use etmerc)
+0 83 145723.870553 9300924.845226 0.000000
+##############################################################
+Test issue #316 (switch utm to use etmerc)
+0 83 145723.870553 9300924.845226 0.000000