← 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 src/PJ_lsat.c

Committer: Package Import Robot
Author(s): Francesco Paolo Lovergine, Jerome Villeneuve Larouche, Francesco Paolo Lovergine
Date: 2013-11-25 15:11:25 UTC
mfrom: (1.2.7)
Revision ID: package-import@ubuntu.com-20131125151125-mvcw144wvgep1hev

Tags: 4.8.0-1

[ Jerome Villeneuve Larouche ]
* New upstream release
* Modified libproj-dev.install to remove nad_list.h and projects.h
* Modified proj-bin.install to remove nad2nad
* Modified proj-bin.manpages to remove nad2nad man
* Added symbols for libproj0

[ Francesco Paolo Lovergine ]
* Properly merged with current git master and sid version 4.7.0-2.
* Removed proj transitional package and obsolete conflicts/replaces against
series 4.6 and older.

files added:
.pc

.pc/.quilt_patches

.pc/.quilt_series

.pc/.version

.pc/applied-patches

debian/libproj0.symbols

jniwrap/org/proj4/PJ.java

jniwrap/org/proj4/PJException.java

jniwrap/org/proj4/package-info.java

nad/CH

proj.pc.in

src/PJ_healpix.c

src/PJ_igh.c

src/PJ_isea.c

src/PJ_natearth.c

src/multistresstest.c

src/pj_apply_vgridshift.c

src/pj_ctx.c

src/pj_log.c

src/proj_etmerc.c

files removed:
man/man1/nad2nad.1

src/nad2nad.c

src/nad_list.h

files modified:
ChangeLog

Makefile.am

Makefile.in

NEWS

aclocal.m4

configure

configure.in

debian/changelog

debian/control

debian/libproj-dev.install

debian/proj-bin.install

debian/proj-bin.manpages

debian/rules

jniwrap/Makefile.in

jniwrap/README

jniwrap/build.xml

jniwrap/doxygen.cfg

jniwrap/org/Makefile.in

jniwrap/org/proj4/LatLong.java

jniwrap/org/proj4/Makefile.am

jniwrap/org/proj4/Makefile.in

jniwrap/org/proj4/Others.java

jniwrap/org/proj4/Proj4.java

jniwrap/org/proj4/Proj4Factory.java

jniwrap/org/proj4/ProjectionData.java

jniwrap/org/proj4/Projections.java

ltmain.sh *

man/Makefile.in

man/man1/Makefile.am

man/man1/Makefile.in

man/man3/Makefile.in

nad/IGNF

nad/Makefile.am

nad/Makefile.in

nad/epsg

nad/esri.extra

nad/other.extra

nad/proj_outIGNF.dist

nad/td_out.dist

nad/test27

nad/test83

nad/testIGNF

nad/testdatumfile

nad/testntv2

nad/testvarious

nad/tv_out.dist

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_bipc.c

src/PJ_bonne.c

src/PJ_cass.c

src/PJ_cea.c

src/PJ_chamb.c

src/PJ_eck4.c

src/PJ_eqc.c

src/PJ_eqdc.c

src/PJ_fouc_s.c

src/PJ_geos.c

src/PJ_gn_sinu.c

src/PJ_goode.c

src/PJ_gstmerc.c

src/PJ_hammer.c

src/PJ_imw_p.c

src/PJ_krovak.c

src/PJ_labrd.c

src/PJ_lagrng.c

src/PJ_lcc.c

src/PJ_lcca.c

src/PJ_loxim.c

src/PJ_lsat.c

src/PJ_mbt_fps.c

src/PJ_merc.c

src/PJ_mod_ster.c

src/PJ_moll.c

src/PJ_nell.c

src/PJ_nsper.c

src/PJ_ob_tran.c

src/PJ_ocea.c

src/PJ_oea.c

src/PJ_omerc.c

src/PJ_putp2.c

src/PJ_putp4p.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_tmerc.c

src/PJ_tpeqd.c

src/PJ_urm5.c

src/PJ_urmfps.c

src/PJ_wag2.c

src/PJ_wag3.c

src/PJ_wink1.c

src/PJ_wink2.c

src/aasincos.c

src/biveval.c

src/cs2cs.c

src/dmstor.c

src/emess.h

src/geod.c

src/geod_set.c

src/jniproj.c

src/makefile.vc

src/mk_cheby.c

src/nad2bin.c

src/nad_init.c

src/pj_apply_gridshift.c

src/pj_auth.c

src/pj_datum_set.c

src/pj_datums.c

src/pj_ell_set.c

src/pj_factors.c

src/pj_fwd.c

src/pj_gauss.c

src/pj_gridinfo.c

src/pj_gridlist.c

src/pj_init.c

src/pj_initcache.c

src/pj_inv.c

src/pj_list.h

src/pj_malloc.c

src/pj_mlfn.c

src/pj_mutex.c

src/pj_open_lib.c

src/pj_param.c

src/pj_phi2.c

src/pj_pr_list.c

src/pj_release.c

src/pj_strerrno.c

src/pj_transform.c

src/pj_utils.c

src/proj.c

src/proj.def

src/proj_api.h

src/proj_mdist.c

src/proj_rouss.c

src/projects.h

src/vector1.c

Show diffs side-by-side

added added

removed removed

66

66

}

67

67

if (l) {

68

68

sp = sin(lp.phi);

69

phidp = aasin((P->one_es * P->ca * sp - P->sa * cos(lp.phi) *

69

phidp = aasin(P->ctx,(P->one_es * P->ca * sp - P->sa * cos(lp.phi) *

70

70

sin(lamt)) / sqrt(1. - P->es * sp * sp));

71

71

tanph = log(tan(FORTPI + .5 * phidp));

72

72

sd = sin(lamdp);

116

116

lamt -= HALFPI * (1. - scl) * sl;

117

117

lp.lam = lamt - P->p22 * lamdp;

118

118

if (fabs(P->sa) < TOL)

119

lp.phi = aasin(spp / sqrt(P->one_es * P->one_es + P->es * sppsq));

119

lp.phi = aasin(P->ctx,spp / sqrt(P->one_es * P->one_es + P->es * sppsq));

120

120

else

121

121

lp.phi = atan((tan(lamdp) * cos(lamt) - P->ca * sin(lamt)) /

122

122

(P->one_es * P->sa));

127

127

int land, path;

128

128

double lam, alf, esc, ess;

129

129

130

land = pj_param(P->params, "ilsat").i;

130

land = pj_param(P->ctx, P->params, "ilsat").i;

131

131

if (land <= 0 || land > 5) E_ERROR(-28);

132

path = pj_param(P->params, "ipath").i;

132

path = pj_param(P->ctx, P->params, "ipath").i;

133

133

if (path <= 0 || path > (land <= 3 ? 251 : 233)) E_ERROR(-29);

134

134

if (land <= 3) {

135

135

P->lam0 = DEG_TO_RAD * 128.87 - TWOPI / 251. * path;

Older »