From 0a4afc8affdb97edc65863eeaaf62f7513910c9f Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 19 Dec 2018 13:12:37 +0100 Subject: cpp conversion: rename src/projections/nocol.cpp to src/projections/nicol.cpp --- src/Makefile.am | 2 +- src/lib_proj.cmake | 2 +- src/projections/nicol.cpp | 54 +++++++++++++++++++++++++++++++++++++++++++++++ src/projections/nocol.cpp | 54 ----------------------------------------------- 4 files changed, 56 insertions(+), 56 deletions(-) create mode 100644 src/projections/nicol.cpp delete mode 100644 src/projections/nocol.cpp diff --git a/src/Makefile.am b/src/Makefile.am index c67f187e..4b762924 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -114,7 +114,7 @@ libproj_la_SOURCES = \ projections/larr.cpp \ projections/lask.cpp \ projections/latlong.cpp \ - projections/nocol.cpp \ + projections/nicol.cpp \ projections/ob_tran.cpp \ projections/oea.cpp \ projections/tpeqd.cpp \ diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake index 0e72d7e4..57a2f9ef 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -107,7 +107,7 @@ SET(SRC_LIBPROJ_PROJECTIONS projections/larr.cpp projections/lask.cpp projections/latlong.cpp - projections/nocol.cpp + projections/nicol.cpp projections/ob_tran.cpp projections/oea.cpp projections/tpeqd.cpp diff --git a/src/projections/nicol.cpp b/src/projections/nicol.cpp new file mode 100644 index 00000000..541d08b2 --- /dev/null +++ b/src/projections/nicol.cpp @@ -0,0 +1,54 @@ +#define PJ_LIB__ + +#include + +#include "projects.h" + +PROJ_HEAD(nicol, "Nicolosi Globular") "\n\tMisc Sph, no inv"; + +#define EPS 1e-10 + + +static XY s_forward (LP lp, PJ *P) { /* Spheroidal, forward */ + XY xy = {0.0,0.0}; + (void) P; + + if (fabs(lp.lam) < EPS) { + xy.x = 0; + xy.y = lp.phi; + } else if (fabs(lp.phi) < EPS) { + xy.x = lp.lam; + xy.y = 0.; + } else if (fabs(fabs(lp.lam) - M_HALFPI) < EPS) { + xy.x = lp.lam * cos(lp.phi); + xy.y = M_HALFPI * sin(lp.phi); + } else if (fabs(fabs(lp.phi) - M_HALFPI) < EPS) { + xy.x = 0; + xy.y = lp.phi; + } else { + double tb, c, d, m, n, r2, sp; + + tb = M_HALFPI / lp.lam - lp.lam / M_HALFPI; + c = lp.phi / M_HALFPI; + d = (1 - c * c)/((sp = sin(lp.phi)) - c); + r2 = tb / d; + r2 *= r2; + m = (tb * sp / d - 0.5 * tb)/(1. + r2); + n = (sp / r2 + 0.5 * d)/(1. + 1./r2); + xy.x = cos(lp.phi); + xy.x = sqrt(m * m + xy.x * xy.x / (1. + r2)); + xy.x = M_HALFPI * ( m + (lp.lam < 0. ? -xy.x : xy.x)); + xy.y = sqrt(n * n - (sp * sp / r2 + d * sp - 1.) / + (1. + 1./r2)); + xy.y = M_HALFPI * ( n + (lp.phi < 0. ? xy.y : -xy.y )); + } + return (xy); +} + + +PJ *PROJECTION(nicol) { + P->es = 0.; + P->fwd = s_forward; + + return P; +} diff --git a/src/projections/nocol.cpp b/src/projections/nocol.cpp deleted file mode 100644 index 541d08b2..00000000 --- a/src/projections/nocol.cpp +++ /dev/null @@ -1,54 +0,0 @@ -#define PJ_LIB__ - -#include - -#include "projects.h" - -PROJ_HEAD(nicol, "Nicolosi Globular") "\n\tMisc Sph, no inv"; - -#define EPS 1e-10 - - -static XY s_forward (LP lp, PJ *P) { /* Spheroidal, forward */ - XY xy = {0.0,0.0}; - (void) P; - - if (fabs(lp.lam) < EPS) { - xy.x = 0; - xy.y = lp.phi; - } else if (fabs(lp.phi) < EPS) { - xy.x = lp.lam; - xy.y = 0.; - } else if (fabs(fabs(lp.lam) - M_HALFPI) < EPS) { - xy.x = lp.lam * cos(lp.phi); - xy.y = M_HALFPI * sin(lp.phi); - } else if (fabs(fabs(lp.phi) - M_HALFPI) < EPS) { - xy.x = 0; - xy.y = lp.phi; - } else { - double tb, c, d, m, n, r2, sp; - - tb = M_HALFPI / lp.lam - lp.lam / M_HALFPI; - c = lp.phi / M_HALFPI; - d = (1 - c * c)/((sp = sin(lp.phi)) - c); - r2 = tb / d; - r2 *= r2; - m = (tb * sp / d - 0.5 * tb)/(1. + r2); - n = (sp / r2 + 0.5 * d)/(1. + 1./r2); - xy.x = cos(lp.phi); - xy.x = sqrt(m * m + xy.x * xy.x / (1. + r2)); - xy.x = M_HALFPI * ( m + (lp.lam < 0. ? -xy.x : xy.x)); - xy.y = sqrt(n * n - (sp * sp / r2 + d * sp - 1.) / - (1. + 1./r2)); - xy.y = M_HALFPI * ( n + (lp.phi < 0. ? xy.y : -xy.y )); - } - return (xy); -} - - -PJ *PROJECTION(nicol) { - P->es = 0.; - P->fwd = s_forward; - - return P; -} -- cgit v1.2.3