diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-01-20 16:16:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-20 16:16:10 +0100 |
| commit | a4ec5e49bbcf3de1c779c3ed13389def99dd6a4e (patch) | |
| tree | 179b4b60d3e387d3f8ba528db73c8e348819bd70 /test | |
| parent | aba9c7747fc47bbc6f0ec6e6957449ea5090c5fc (diff) | |
| parent | 53a8cbbec1a6c9c644b35da86bc26a33ff1279e0 (diff) | |
| download | PROJ-a4ec5e49bbcf3de1c779c3ed13389def99dd6a4e.tar.gz PROJ-a4ec5e49bbcf3de1c779c3ed13389def99dd6a4e.zip | |
Merge pull request #1230 from rouault/space_in_grid_names
Add support for spaces in grid name parameters (fixes #1152)
Diffstat (limited to 'test')
| -rw-r--r-- | test/cli/Makefile.am | 2 | ||||
| -rwxr-xr-x | test/cli/testdatumfile | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/test/cli/Makefile.am b/test/cli/Makefile.am index 55667ee8..50654968 100644 --- a/test/cli/Makefile.am +++ b/test/cli/Makefile.am @@ -36,7 +36,7 @@ testvarious-check: PROJ_LIB=$(DATAPATH) $(TESTVARIOUS) $(CS2CSEXE) testdatumfile-check: - @if [ -f $(DATAPATH)/conus -a -f $(DATAPATH)/ntv1_can.dat -a -f $(DATAPATH)/MD -a -f $(DATAPATH)/ntf_r93.dat ]; then \ + @if [ -f $(DATAPATH)/conus -a -f $(DATAPATH)/ntv1_can.dat -a -f $(DATAPATH)/MD -a -f $(DATAPATH)/ntf_r93.gsb ]; then \ PROJ_LIB=$(DATAPATH) $(TESTDATUMFILE) $(CS2CSEXE) ; \ fi diff --git a/test/cli/testdatumfile b/test/cli/testdatumfile index 55900427..d048d8e6 100755 --- a/test/cli/testdatumfile +++ b/test/cli/testdatumfile @@ -27,6 +27,9 @@ echo "============================================" echo "Running ${0} using ${EXE}:" echo "============================================" +mkdir "dir with \" space" +cp ${PROJ_LIB}/conus "dir with \" space/myconus" + OUT=td_out #EXE=../src/cs2cs # @@ -46,7 +49,7 @@ EOF echo "##############################################################" >> ${OUT} echo As above, but without ntv1 everything goes through conus file. >> ${OUT} # -$EXE +proj=latlong +ellps=clrk66 +nadgrids=conus \ +$EXE +proj=latlong +ellps=clrk66 '+nadgrids="./dir with "" space/myconus"' \ +to +proj=latlong +datum=NAD83 \ -E >>${OUT} <<EOF 111d00'00.000"W 44d00'00.000"N 0.0 @@ -94,6 +97,9 @@ $EXE +proj=latlong +datum=WGS84 \ -5.4999 51.9999 -5.5001 52.0 EOF + +rm -rf "dir with \" space" + # ############################################################################## # Done! |