boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-02 21:02:13 +00:00
Code Issues Projects Releases Wiki Activity

[projections] commit changes for new generation (minor code changes)

Browse Source
This commit is contained in:
Barend Gehrels
2015-04-22 15:54:04 +02:00
parent aa1ec1c832
commit 8a66ade71a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/boost/geometry/extensions/gis/projections/proj/lcca.hpp
View File

@@ -117,7 +117,8 @@ namespace boost { namespace geometry { namespace projections
template <typename Parameters>
void setup_lcca(Parameters& par, par_lcca& proj_parm)
{
double s2p0, N0, R0, tan0/*, tan20*/;
double s2p0, N0, R0, tan0, tan20;
boost::ignore_unused(tan20);
pj_enfn(par.es, proj_parm.en);
if (!pj_param(par.params, "tlat_0").i) throw proj_exception(50);
if (par.phi0 == 0.) throw proj_exception(51);
@@ -128,7 +129,7 @@ namespace boost { namespace geometry { namespace projections
N0 = sqrt(R0);
R0 *= par.one_es * N0;
tan0 = tan(par.phi0);
//tan20 = tan0 * tan0;
tan20 = tan0 * tan0;
proj_parm.r0 = N0 / tan0;
proj_parm.C = 1. / (6. * R0 * N0);
// par.inv = e_inverse;

1
include/boost/geometry/extensions/gis/projections/proj/sconics.hpp
View File

@@ -112,7 +112,6 @@ namespace boost { namespace geometry { namespace projections
break;
case PCONIC:
rho = this->m_proj_parm.c2 * (this->m_proj_parm.c1 - tan(lp_lat - this->m_proj_parm.sig));
// rho = this->m_proj_parm.c2 * (this->m_proj_parm.c1 - tan(lp_lat)); BUG STILL IN proj (reported 2012-03-03)
break;
default:
rho = this->m_proj_parm.rho_c - lp_lat;