root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-28 13:41:16 +01:00
Code Issues Projects Releases Activity

Some more naming unification

Browse Source
This commit is contained in:
Martin Tůma 2018-05-18 00:21:59 +02:00
parent a486f9e78d
commit be9da5aabe
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/map/lambertconic.cpp
View File

@ -198,7 +198,7 @@ LambertConic2::LambertConic2(const Ellipsoid *ellipsoid,
double standardParallel1, double standardParallel2, double latitudeOrigin, double standardParallel1, double standardParallel2, double latitudeOrigin,
double longitudeOrigin, double falseEasting, double falseNorthing) double longitudeOrigin, double falseEasting, double falseNorthing)
{ {
double es, es_over_2, es2, es_sin; double e, e_over_2, e_sin;
double lat0; double lat0;
double k0; double k0;
double t0; double t0;
@ -218,29 +218,27 @@ LambertConic2::LambertConic2(const Ellipsoid *ellipsoid,
sp2 = deg2rad(standardParallel2); sp2 = deg2rad(standardParallel2);
if (fabs(sp1 - sp2) > 1.0e-10) { if (fabs(sp1 - sp2) > 1.0e-10) {
es2 = 2 * ellipsoid->flattening() - ellipsoid->flattening() e = sqrt(ellipsoid->es());
* ellipsoid->flattening(); e_over_2 = e / 2.0;
es = sqrt(es2);
es_over_2 = es / 2.0;
es_sin = es * sin(lat_orig); e_sin = e * sin(lat_orig);
t_olat = LAMBERT2_t(lat_orig, es_sin, es_over_2); t_olat = LAMBERT2_t(lat_orig, e_sin, e_over_2);
es_sin = es * sin(sp1); e_sin = e * sin(sp1);
m1 = LAMBERT_m(cos(sp1), es_sin); m1 = LAMBERT_m(cos(sp1), e_sin);
t1 = LAMBERT2_t(sp1, es_sin, es_over_2); t1 = LAMBERT2_t(sp1, e_sin, e_over_2);
es_sin = es * sin(sp2); e_sin = e * sin(sp2);
m2 = LAMBERT_m(cos(sp2), es_sin); m2 = LAMBERT_m(cos(sp2), e_sin);
t2 = LAMBERT2_t(sp2, es_sin, es_over_2); t2 = LAMBERT2_t(sp2, e_sin, e_over_2);
n = log(m1 / m2) / log(t1 / t2); n = log(m1 / m2) / log(t1 / t2);
lat0 = asin(n); lat0 = asin(n);
es_sin = es * sin(lat0); e_sin = e * sin(lat0);
m0 = LAMBERT_m(cos(lat0), es_sin); m0 = LAMBERT_m(cos(lat0), e_sin);
t0 = LAMBERT2_t(lat0, es_sin, es_over_2); t0 = LAMBERT2_t(lat0, e_sin, e_over_2);
k0 = (m1 / m0) * (pow(t0 / t1, n)); k0 = (m1 / m0) * (pow(t0 / t1, n));