Test revisions

2 files changed, 57 insertions, 30 deletions

diff --git a/nad/testvarious b/nad/testvarious
index 420e6628..ef1bfbee 100755
--- a/nad/testvarious
+++ b/nad/testvarious
@@ -508,7 +508,7 @@ $EXE +proj=latlong +ellps=sphere \
 EOF
 #
 echo "##############################################################" >> ${OUT}
-echo "Test the natural earth projection" >> ${OUT}
+echo "Test the Natural Earth Projection" >> ${OUT}
 $EXE +proj=latlong +a=1 +lon_0=0 \
  +to +proj=natearth +a=6371008.7714 +b=6371008.7714 -f '%.'7'f' \
  -E >>${OUT} <<EOF
@@ -539,7 +539,7 @@ $EXE +proj=latlong +a=1 +lon_0=0 \
 180.0 90.0 0 9591912.979377454 9062062.394736718
 EOF
 echo "##############################################################" >> ${OUT}
-echo "Test the natural earth II projection" >> ${OUT}
+echo "Test the Natural Earth II Projection" >> ${OUT}
 $EXE +proj=latlong +a=1 +lon_0=0 \
  +to +proj=natearth2 +a=6371008.7714 +b=6371008.7714 -f '%.'7'f' \
  -E >>${OUT} <<EOF
diff --git a/nad/tv_out.dist b/nad/tv_out.dist
index 84694766..345f98ba 100644
--- a/nad/tv_out.dist
+++ b/nad/tv_out.dist
@@ -236,7 +236,7 @@ Test inv geos on a ellipsoid with alternate sweep
 1605067.15 -3400461.47	18d25'26"E	33d55'31"S 0.000
 3820138.08 2888664.15	47d58'42"E	29d22'11"N 0.000
 ##############################################################
-Test the natural earth projection
+Test the Natural Earth Projection
 0.0 0.0 0	0.0000000	0.0000000 0.0000000 0.0 0.0
 0.0 22.5 0	0.0000000	2525419.5693838 0.0000000 0.0 2525419.569383768
 0.0 45.0 0	0.0000000	5052537.3899732 0.0000000 0.0 5052537.389973222
@@ -263,6 +263,60 @@ Test the natural earth projection
 180.0 67.5 0	13419749.8846233	7400065.6562574 0.0000000 1.341974988462332E7 7400065.6562573705
 180.0 90.0 0	9591912.9793775	9062062.3947367 0.0000000 9591912.979377454 9062062.394736718
 ##############################################################
+Test the Natural Earth II Projection
+0.0 0.0 0	0.0000000	0.0000000 0.0000000 0.00000000 0.00000000
+0.0 22.5 0	0.0000000	2531453.5708096 0.0000000 0.00000000 2531453.57080958
+0.0 45.0 0	0.0000000	5051471.5008684 0.0000000 0.00000000 5051471.50086845
+0.0 67.5 0	0.0000000	7395411.2247898 0.0000000 0.00000000 7395411.22478983
+0.0 90.0 0	0.0000000	9073776.5266281 0.0000000 0.00000000 9073776.52662810
+45.0 0.0 0	4239151.1820072	0.0000000 0.0000000 4239151.18200719 0.00000000
+45.0 22.5 0	4138348.6190424	2531453.5708096 0.0000000 4138348.61904244 2531453.57080958
+45.0 45.0 0	3830621.3388077	5051471.5008684 0.0000000 3830621.33880773 5051471.50086845
+45.0 67.5 0	3158326.3283700	7395411.2247898 0.0000000 3158326.32836996 7395411.22478983
+45.0 90.0 0	957973.3703423	9073776.5266281 0.0000000 957973.37034235 9073776.52662810
+90.0 0.0 0	8478302.3640144	0.0000000 0.0000000 8478302.36401439 0.00000000
+90.0 22.5 0	8276697.2380849	2531453.5708096 0.0000000 8276697.23808488 2531453.57080958
+90.0 45.0 0	7661242.6776155	5051471.5008684 0.0000000 7661242.67761547 5051471.50086845
+90.0 67.5 0	6316652.6567399	7395411.2247898 0.0000000 6316652.65673992 7395411.22478983
+90.0 90.0 0	1915946.7406847	9073776.5266281 0.0000000 1915946.74068470 9073776.52662810
+135.0 0.0 0	12717453.5460216	0.0000000 0.0000000 12717453.54602160 0.00000000
+135.0 22.5 0	12415045.8571273	2531453.5708096 0.0000000 12415045.85712730 2531453.57080958
+135.0 45.0 0	11491864.0164232	5051471.5008684 0.0000000 11491864.01642320 5051471.50086845
+135.0 67.5 0	9474978.9851099	7395411.2247898 0.0000000 9474978.98510988 7395411.22478983
+135.0 90.0 0	2873920.1110270	9073776.5266281 0.0000000 2873920.11102705 9073776.52662810
+180.0 0.0 0	16956604.7280288	0.0000000 0.0000000 16956604.72802880 0.00000000
+180.0 22.5 0	16553394.4761698	2531453.5708096 0.0000000 16553394.47616980 2531453.57080958
+180.0 45.0 0	15322485.3552309	5051471.5008684 0.0000000 15322485.35523090 5051471.50086845
+180.0 67.5 0	12633305.3134798	7395411.2247898 0.0000000 12633305.31347990 7395411.22478983
+180.0 90.0 0	3831893.4813694	9073776.5266281 0.0000000 3831893.48136940 9073776.52662810
+##############################################################
+Test the Compact Miller projection
+0 0.0 0	0.0000000	0.0000000 0.0000000 0.0 0.0
+0 22.5 0	0.0000000	2537439.6610749 0.0000000 0.0 2537439.6610749415
+0 45.0 0	0.0000000	5391682.4322641 0.0000000 0.0 5391682.432264133
+0 67.5 0	0.0000000	8661480.5102609 0.0000000 0.0 8661480.510260897
+0 90.0 0	0.0000000	12009484.2649167 0.0000000 0.0 12009484.264916677
+45 0.0 0	5003778.5880466	0.0000000 0.0000000 5003778.588046594 0.0
+45 22.5 0	5003778.5880466	2537439.6610749 0.0000000 5003778.588046594 2537439.6610749415
+45 45.0 0	5003778.5880466	5391682.4322641 0.0000000 5003778.588046594 5391682.432264133
+45 67.5 0	5003778.5880466	8661480.5102609 0.0000000 5003778.588046594 8661480.510260897
+45 90.0 0	5003778.5880466	12009484.2649167 0.0000000 5003778.588046594 12009484.264916677
+90 0.0 0	10007557.1760932	0.0000000 0.0000000 10007557.176093187 0.0
+90 22.5 0	10007557.1760932	2537439.6610749 0.0000000 10007557.176093187 2537439.6610749415
+90 45.0 0	10007557.1760932	5391682.4322641 0.0000000 10007557.176093187 5391682.432264133
+90 67.5 0	10007557.1760932	8661480.5102609 0.0000000 10007557.176093187 8661480.510260897
+90 90.0 0	10007557.1760932	12009484.2649167 0.0000000 10007557.176093187 12009484.264916677
+135 0.0 0	15011335.7641398	0.0000000 0.0000000 15011335.76413978 0.0
+135 22.5 0	15011335.7641398	2537439.6610749 0.0000000 15011335.76413978 2537439.6610749415
+135 45.0 0	15011335.7641398	5391682.4322641 0.0000000 15011335.76413978 5391682.432264133
+135 67.5 0	15011335.7641398	8661480.5102609 0.0000000 15011335.76413978 8661480.510260897
+135 90.0 0	15011335.7641398	12009484.2649167 0.0000000 15011335.76413978 12009484.264916677
+180 0.0 0	20015114.3521864	0.0000000 0.0000000 20015114.352186374 0.0
+180 22.5 0	20015114.3521864	2537439.6610749 0.0000000 20015114.352186374 2537439.6610749415
+180 45.0 0	20015114.3521864	5391682.4322641 0.0000000 20015114.352186374 5391682.432264133
+180 67.5 0	20015114.3521864	8661480.5102609 0.0000000 20015114.352186374 8661480.510260897
+180 90.0 0	20015114.3521864	12009484.2649167 0.0000000 20015114.352186374 12009484.264916677
+##############################################################
 Test pconic (#148)
 -70.4 -23.65	-2240096.40	-6940342.15 0.00
 -2240096.40 -6940342.15	70d24'W	23d39'S 0.000
@@ -379,30 +433,3 @@ Test patterson inverse projection
 10007557.176093187 -5366413.421153781	90.000	-45.000 0.000
 15011335.76413978 -8729502.054111844	135.000	-67.500 0.000
 20015114.352186374 -11409566.822831295	180.000	-90.000 0.000
-##############################################################
-Test the Compact Miller projection
-0 0.0 0	0.0000000	0.0000000 0.0000000 0.0 0.0
-0 22.5 0	0.0000000	2537439.6610749 0.0000000 0.0 2537439.6610749415
-0 45.0 0	0.0000000	5391682.4322641 0.0000000 0.0 5391682.432264133
-0 67.5 0	0.0000000	8661480.5102609 0.0000000 0.0 8661480.510260897
-0 90.0 0	0.0000000	12009484.2649167 0.0000000 0.0 12009484.264916677
-45 0.0 0	5003778.5880466	0.0000000 0.0000000 5003778.588046594 0.0
-45 22.5 0	5003778.5880466	2537439.6610749 0.0000000 5003778.588046594 2537439.6610749415
-45 45.0 0	5003778.5880466	5391682.4322641 0.0000000 5003778.588046594 5391682.432264133
-45 67.5 0	5003778.5880466	8661480.5102609 0.0000000 5003778.588046594 8661480.510260897
-45 90.0 0	5003778.5880466	12009484.2649167 0.0000000 5003778.588046594 12009484.264916677
-90 0.0 0	10007557.1760932	0.0000000 0.0000000 10007557.176093187 0.0
-90 22.5 0	10007557.1760932	2537439.6610749 0.0000000 10007557.176093187 2537439.6610749415
-90 45.0 0	10007557.1760932	5391682.4322641 0.0000000 10007557.176093187 5391682.432264133
-90 67.5 0	10007557.1760932	8661480.5102609 0.0000000 10007557.176093187 8661480.510260897
-90 90.0 0	10007557.1760932	12009484.2649167 0.0000000 10007557.176093187 12009484.264916677
-135 0.0 0	15011335.7641398	0.0000000 0.0000000 15011335.76413978 0.0
-135 22.5 0	15011335.7641398	2537439.6610749 0.0000000 15011335.76413978 2537439.6610749415
-135 45.0 0	15011335.7641398	5391682.4322641 0.0000000 15011335.76413978 5391682.432264133
-135 67.5 0	15011335.7641398	8661480.5102609 0.0000000 15011335.76413978 8661480.510260897
-135 90.0 0	15011335.7641398	12009484.2649167 0.0000000 15011335.76413978 12009484.264916677
-180 0.0 0	20015114.3521864	0.0000000 0.0000000 20015114.352186374 0.0
-180 22.5 0	20015114.3521864	2537439.6610749 0.0000000 20015114.352186374 2537439.6610749415
-180 45.0 0	20015114.3521864	5391682.4322641 0.0000000 20015114.352186374 5391682.432264133
-180 67.5 0	20015114.3521864	8661480.5102609 0.0000000 20015114.352186374 8661480.510260897
-180 90.0 0	20015114.3521864	12009484.2649167 0.0000000 20015114.352186374 12009484.264916677