Merge remote-tracking branch 'osgeo/master' into docs-release-4.10.0

5 files changed, 6 insertions, 53 deletions

diff --git a/nad/CMakeLists.txt b/nad/CMakeLists.txt
index 9858e055..904066f4 100644
--- a/nad/CMakeLists.txt
+++ b/nad/CMakeLists.txt
@@ -23,7 +23,8 @@ set(PROJ_DICTIONARY  epsg
 #
 
 file(GLOB GSB_FILES  *.gsb)
-set(GRIDSHIFT_FILES ${GSB_FILES})
+file(GLOB GTX_FILES  *.gtx)
+set(GRIDSHIFT_FILES ${GSB_FILES} ${GTX_FILES})
 set(GRIDSHIFT_FILES ${GRIDSHIFT_FILES}
                      )
 option(CONVERT_DATA "convert some ascii file to binary file for use in proj4" OFF)
diff --git a/nad/Makefile.am b/nad/Makefile.am
index 99d00da3..001b1b06 100644
--- a/nad/Makefile.am
+++ b/nad/Makefile.am
@@ -50,7 +50,7 @@ install-data-local: process-nad2bin
 	else \
 	  echo "nad2nad NADCON source files not present"; \
 	fi
-	@for gridfile in $(NADPATH)/*.gsb $(NADPATH)/ntv1_can.dat dummy \
+	@for gridfile in $(NADPATH)/*.gsb $(NADPATH)/*.gtx $(NADPATH)/ntv1_can.dat dummy \
 	                 $(NADPATH)/alaska $(NADPATH)/conus $(NADPATH)/hawaii $(NADPATH)/null \
 	                 $(NADPATH)/prvi $(NADPATH)/stgeorge $(NADPATH)/stlrnc $(NADPATH)/stpaul \
 	                 $(NADPATH)/FL $(NADPATH)/MD $(NADPATH)/TN $(NADPATH)/WI $(NADPATH)/WO; do \
@@ -63,7 +63,7 @@ install-data-local: process-nad2bin
 check-local: process-nad2bin
 # Check if we are doing an out-of-tree build
 	@if test ! -f epsg; then \
-	  for gridfile in $(NADPATH)/*.gsb $(NADPATH)/ntv1_can.dat dummy ; do \
+	  for gridfile in $(NADPATH)/*.gsb $(NADPATH)/*.gtx $(NADPATH)/ntv1_can.dat dummy ; do \
 	    if test "$$gridfile" != "dummy" -a -f "$$gridfile" ; then \
 	      cp $$gridfile .; \
 	    fi; \
diff --git a/nad/README.GRD b/nad/README.GRD
deleted file mode 100644
index 1ecf4b22..00000000
--- a/nad/README.GRD
+++ /dev/null
@@ -1,48 +0,0 @@
-	Grid Shift File Formats
-	=======================
-
-
-ASCII .lla
-----------
-
-First line: comment, at most 80 characters in length.
-
-Second line:
-
-<grid_size_x> <grid_size_y> <ignore> <lowleft_longitude> <resolution_longitude>
-<lowleft_latitude> <resolution_latitude>
-
-Angles are in decimal degrees.
-
-
-Subsequent lines are:
-
-<line_no>: <x_shift> <y_shift> *
-
-The <line_no> is zero based, and will vary from 0 to <grid_size_y>-1.  The 
-number of x/y shift pairs will match <grid_size_x>.  Grid lines can be
-split over multiple physical text lines.  Use the colon to identify starts
-of new grid lines.  The shift values are in millionths of a secondc of arc. 
-
-
-For example, from MD.lla:
-
-Maryland - HP
-  25  17   1   -80.00000      .25000    37.00000      .25000
-0: 5107 -2502 -700 496 -656 468 -587 418 -481 347 -325 256 -111 152 166 50
-493 -37 854 -96 1221 -118 1568 -125 1953 -143 2433 -195 2464 -281 2529 -395
-1987 -729 447 -916 -3011 -1181 -5559 -406 -6094 541 -5714 1110 -5247 1289
--4993 1254 -4960 1151
-1: 4757 -1695 -644 429 -627 411 -602 368 -555 299 -470 206 -328 96 -125 -15
-126 -105 391 -146 634 -120 762 -58 911 -13 1583 -8 1049 -28 1451 123 1377 -464
-907 -603 -4056 -1955 -6769 -485 -5797 929 -4254 1413 -3251 1295 -2871 993
--2899 724
-
-
-The grid is 25x7, and covers the region with a lower left corner of
-80d00'W 37d00'N and an upper right corner of 73d45'W 43d15'N.  
-
-
-BINARY 
-------
-
diff --git a/nad/test27 b/nad/test27
index 917f5710..e154a0d6 100755
--- a/nad/test27
+++ b/nad/test27
@@ -4,7 +4,7 @@
 #   the second pair of numbers are respective easting and northing output.
 #
 # Proj will vary in the .001ft range with projections using Transverse
-#   Mercator due to greater precision of meridinal distance function.
+#   Mercator due to greater precision of meridional distance function.
 #
 NAD_DIR=`dirname $0`
 EXE=$1
diff --git a/nad/test83 b/nad/test83
index cf182cea..c025938b 100755
--- a/nad/test83
+++ b/nad/test83
@@ -5,7 +5,7 @@
 #   the second pair of numbers are respective easting and northing output.
 #
 # Proj will vary in the .001ft range with projections using Transverse
-#   Mercator due to greater precision of meridinal distance function.
+#   Mercator due to greater precision of meridional distance function.
 #
 NAD_DIR=`dirname $0`
 EXE=$1