← Back to branch summary

~ubuntu-branches/ubuntu/wily/proj/wily

~ubuntu-branches/ubuntu/wily/proj/wily

« back to all changes in this revision

Viewing changes to nad/testdatumfile

Committer: Bazaar Package Importer
Author(s): Francesco Paolo Lovergine
Date: 2009-10-05 16:28:55 UTC
mfrom: (1.2.6 upstream)
Revision ID: james.westby@ubuntu.com-20091005162855-gnsd4jzn7wtw8uwg

Tags: 4.7.0-1

http://bugs.debian.org/548297

* New upstream release
* Datum grids files updated to version 1.5.
(closes: #548297)
* Removed manpages.dpatch, applied upstream.
* Generalized libproj0.install file.
* Policy changed to 3.8.3, without futher changes.
* Minor change to nad2bin.1 man page.

files added:
nad/testdatumfile

nad/tv_out.dist

src/pj_initcache.c

src/pj_mutex.c

files removed:
debian/patches/manpages.dpatch

files modified:
AUTHORS

ChangeLog

Makefile.in

NEWS

README

configure

configure.in

debian/TODO

debian/changelog

debian/control

debian/datumgrids.shar

debian/libproj0.install

debian/nad2bin.1

debian/patches/00list

jniwrap/Makefile.in

jniwrap/org/Makefile.in

jniwrap/org/proj4/Makefile.in

makefile.vc

man/Makefile.in

man/man1/Makefile.in

man/man1/cs2cs.1

man/man1/geod.1

man/man1/nad2nad.1

man/man1/proj.1

man/man3/Makefile.in

man/man3/pj_init.3

mkinstalldirs

nad/Makefile.am

nad/Makefile.in

nad/epsg

nad/makefile.vc

nad/td_out.dist

nad/testIGNF

nad/testvarious

nmake.opt

src/Makefile.am

src/Makefile.in

src/PJ_aea.c

src/PJ_aeqd.c

src/PJ_airy.c

src/PJ_aitoff.c

src/PJ_august.c

src/PJ_bacon.c

src/PJ_bipc.c

src/PJ_boggs.c

src/PJ_bonne.c

src/PJ_cass.c

src/PJ_cc.c

src/PJ_cea.c

src/PJ_chamb.c

src/PJ_collg.c

src/PJ_crast.c

src/PJ_denoy.c

src/PJ_eck1.c

src/PJ_eck2.c

src/PJ_eck3.c

src/PJ_eck4.c

src/PJ_eck5.c

src/PJ_eqc.c

src/PJ_eqdc.c

src/PJ_fahey.c

src/PJ_fouc_s.c

src/PJ_gall.c

src/PJ_geos.c

src/PJ_gins8.c

src/PJ_gn_sinu.c

src/PJ_gnom.c

src/PJ_goode.c

src/PJ_gstmerc.c

src/PJ_hammer.c

src/PJ_hatano.c

src/PJ_imw_p.c

src/PJ_krovak.c

src/PJ_labrd.c

src/PJ_laea.c

src/PJ_lagrng.c

src/PJ_larr.c

src/PJ_lask.c

src/PJ_lcc.c

src/PJ_lcca.c

src/PJ_loxim.c

src/PJ_lsat.c

src/PJ_mbt_fps.c

src/PJ_mbtfpp.c

src/PJ_mbtfpq.c

src/PJ_merc.c

src/PJ_mill.c

src/PJ_mod_ster.c

src/PJ_moll.c

src/PJ_nell.c

src/PJ_nell_h.c

src/PJ_nocol.c

src/PJ_nsper.c

src/PJ_nzmg.c

src/PJ_ob_tran.c

src/PJ_ocea.c

src/PJ_oea.c

src/PJ_omerc.c

src/PJ_ortho.c

src/PJ_poly.c

src/PJ_putp2.c

src/PJ_putp3.c

src/PJ_putp4p.c

src/PJ_putp5.c

src/PJ_putp6.c

src/PJ_robin.c

src/PJ_rpoly.c

src/PJ_sconics.c

src/PJ_somerc.c

src/PJ_stere.c

src/PJ_sterea.c

src/PJ_sts.c

src/PJ_tcc.c

src/PJ_tcea.c

src/PJ_tmerc.c

src/PJ_tpeqd.c

src/PJ_urm5.c

src/PJ_urmfps.c

src/PJ_vandg.c

src/PJ_vandg2.c

src/PJ_vandg4.c

src/PJ_wag2.c

src/PJ_wag3.c

src/PJ_wag7.c

src/PJ_wink1.c

src/PJ_wink2.c

src/aasincos.c

src/adjlon.c

src/bch2bps.c

src/bchgen.c

src/biveval.c

src/cs2cs.c

src/dmstor.c

src/emess.c

src/gen_cheb.c

src/geocent.c

src/geod.c

src/geod_for.c

src/geod_inv.c

src/geod_set.c

src/jniproj.c

src/makefile.vc

src/mk_cheby.c

src/nad2bin.c

src/nad2nad.c

src/nad_cvt.c

src/nad_init.c

src/nad_intr.c

src/p_series.c

src/pj_apply_gridshift.c

src/pj_auth.c

src/pj_datum_set.c

src/pj_datums.c

src/pj_deriv.c

src/pj_ell_set.c

src/pj_ellps.c

src/pj_errno.c

src/pj_factors.c

src/pj_fwd.c

src/pj_gauss.c

src/pj_geocent.c

src/pj_gridinfo.c

src/pj_gridlist.c

src/pj_init.c

src/pj_inv.c

src/pj_latlong.c

src/pj_list.c

src/pj_malloc.c

src/pj_mlfn.c

src/pj_msfn.c

src/pj_open_lib.c

src/pj_param.c

src/pj_phi2.c

src/pj_pr_list.c

src/pj_qsfn.c

src/pj_release.c

src/pj_strerrno.c

src/pj_transform.c

src/pj_tsfn.c

src/pj_units.c

src/pj_utils.c

src/pj_zpoly1.c

src/proj.c

src/proj_api.h

src/proj_mdist.c

src/proj_rouss.c

src/projects.h

src/rtodms.c

src/vector1.c

Show diffs side-by-side

added added

removed removed

nad/testdatumfile

1

:

2

# Script to do some testing of various transformations depending on datum

3

# files that are not always available.

4

#

5

#

6

EXE=$1

7

8

usage()

9

{

10

echo "Usage: ${0} <path to 'cs2cs' program>"

11

echo

12

exit 1

13

}

14

15

if test -z "${EXE}"; then

16

echo "*** ERROR: Missing path to 'cs2cs' program."

17

usage

18

else

19

if test ! -x ${EXE}; then

20

echo "*** ERROR: Can not find '${EXE}' program!"

21

exit 1

22

fi

23

fi

24

25

echo "============================================"

26

echo "Running ${0} using ${EXE}:"

27

echo "============================================"

28

29

OUT=td_out

30

#EXE=../src/cs2cs

31

#

32

echo "doing tests into file ${OUT}, please wait"

33

rm -f ${OUT}

34

#

35

echo "##############################################################" >> ${OUT}

36

echo 1st through ntv1, 2nd through conus >> ${OUT}

37

#

38

$EXE +proj=latlong +ellps=clrk66 +nadgrids=ntv1_can.dat,conus \

39

+to +proj=latlong +datum=NAD83 \

40

-E >>${OUT} <<EOF

41

111d00'00.000"W 44d00'00.000"N 0.0

42

111d00'00.000"W 39d00'00.000"N 0.0

43

EOF

44

45

echo "##############################################################" >> ${OUT}

46

echo As above, but without ntv1 everything goes through conus file. >> ${OUT}

47

#

48

$EXE +proj=latlong +ellps=clrk66 +nadgrids=conus \

49

+to +proj=latlong +datum=NAD83 \

50

-E >>${OUT} <<EOF

51

111d00'00.000"W 44d00'00.000"N 0.0

52

111d00'00.000"W 39d00'00.000"N 0.0

53

EOF

54

55

echo "##############################################################" >> ${OUT}

56

echo Test MD used where available >> ${OUT}

57

#

58

$EXE +proj=latlong +ellps=clrk66 +nadgrids=MD,conus \

59

+to +proj=latlong +datum=NAD83 \

60

-E >>${OUT} <<EOF

61

79d58'00.000"W 37d02'00.000"N 0.0

62

79d58'00.000"W 36d58'00.000"N 0.0

63

EOF

64

#

65

$EXE +proj=latlong +ellps=clrk66 +nadgrids=conus \

66

+to +proj=latlong +datum=NAD83 \

67

-E >>${OUT} <<EOF

68

79d58'00.000"W 37d02'00.000"N 0.0

69

79d58'00.000"W 36d58'00.000"N 0.0

70

EOF

71

#

72

##############################################################################

73

# Done!

74

# do 'diff' with distribution results

75

echo "diff ${OUT} with ${OUT}.dist"

76

diff -b ${OUT} ${OUT}.dist

77

if [ $? -ne 0 ] ; then

78

echo ""

79

echo "PROBLEMS HAVE OCCURED"

80

echo "test file ${OUT} saved"

81

echo

82

exit 100

83

else

84

echo "TEST OK"

85

echo "test file ${OUT} removed"

86

echo

87

/bin/rm -f ${OUT}

88

exit 0

89

fi

Older »