diff options
Diffstat (limited to 'boost/geometry/srs/projections/impl/pj_ellps.hpp')
-rw-r--r-- | boost/geometry/srs/projections/impl/pj_ellps.hpp | 104 |
1 files changed, 58 insertions, 46 deletions
diff --git a/boost/geometry/srs/projections/impl/pj_ellps.hpp b/boost/geometry/srs/projections/impl/pj_ellps.hpp index 586802778c..7a10b7de67 100644 --- a/boost/geometry/srs/projections/impl/pj_ellps.hpp +++ b/boost/geometry/srs/projections/impl/pj_ellps.hpp @@ -3,8 +3,8 @@ // Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands. -// This file was modified by Oracle on 2017. -// Modifications copyright (c) 2017, Oracle and/or its affiliates. +// This file was modified by Oracle on 2017, 2018. +// Modifications copyright (c) 2017-2018, Oracle and/or its affiliates. // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle // Use, modification and distribution is subject to the Boost Software License, @@ -41,55 +41,67 @@ #include <boost/geometry/srs/projections/impl/projects.hpp> +#include <string> + namespace boost { namespace geometry { namespace projections { namespace detail { -static const PJ_ELLPS pj_ellps[] = +// Originally defined in projects.h +struct pj_ellps_type +{ + std::string id; /* ellipse keyword name */ + std::string major_v; /* a's value */ + std::string ell_n; /* elliptical parameter name */ + std::string ell_v; /* elliptical parameter value */ + std::string name; /* comments */ +}; + +static const pj_ellps_type pj_ellps[] = { - {"MERIT", "a=6378137.0", "rf=298.257", "MERIT 1983"}, - {"SGS85", "a=6378136.0", "rf=298.257", "Soviet Geodetic System 85"}, - {"GRS80", "a=6378137.0", "rf=298.257222101", "GRS 1980(IUGG, 1980)"}, - {"IAU76", "a=6378140.0", "rf=298.257", "IAU 1976"}, - {"airy", "a=6377563.396", "b=6356256.910", "Airy 1830"}, - {"APL4.9", "a=6378137.0.", "rf=298.25", "Appl. Physics. 1965"}, - {"NWL9D", "a=6378145.0.", "rf=298.25", "Naval Weapons Lab., 1965"}, - {"mod_airy", "a=6377340.189", "b=6356034.446", "Modified Airy"}, - {"andrae", "a=6377104.43", "rf=300.0", "Andrae 1876 (Den., Iclnd.)"}, - {"aust_SA", "a=6378160.0", "rf=298.25", "Australian Natl & S. Amer. 1969"}, - {"GRS67", "a=6378160.0", "rf=298.2471674270", "GRS 67(IUGG 1967)"}, - {"bessel", "a=6377397.155", "rf=299.1528128", "Bessel 1841"}, - {"bess_nam", "a=6377483.865", "rf=299.1528128", "Bessel 1841 (Namibia)"}, - {"clrk66", "a=6378206.4", "b=6356583.8", "Clarke 1866"}, - {"clrk80", "a=6378249.145", "rf=293.4663", "Clarke 1880 mod."}, - {"clrk80ign", "a=6378249.2", "rf=293.4660212936269", "Clarke 1880 (IGN)."}, - {"CPM", "a=6375738.7", "rf=334.29", "Comm. des Poids et Mesures 1799"}, - {"delmbr", "a=6376428.", "rf=311.5", "Delambre 1810 (Belgium)"}, - {"engelis", "a=6378136.05", "rf=298.2566", "Engelis 1985"}, - {"evrst30", "a=6377276.345", "rf=300.8017", "Everest 1830"}, - {"evrst48", "a=6377304.063", "rf=300.8017", "Everest 1948"}, - {"evrst56", "a=6377301.243", "rf=300.8017", "Everest 1956"}, - {"evrst69", "a=6377295.664", "rf=300.8017", "Everest 1969"}, - {"evrstSS", "a=6377298.556", "rf=300.8017", "Everest (Sabah & Sarawak)"}, - {"fschr60", "a=6378166.", "rf=298.3", "Fischer (Mercury Datum) 1960"}, - {"fschr60m", "a=6378155.", "rf=298.3", "Modified Fischer 1960"}, - {"fschr68", "a=6378150.", "rf=298.3", "Fischer 1968"}, - {"helmert", "a=6378200.", "rf=298.3", "Helmert 1906"}, - {"hough", "a=6378270.0", "rf=297.", "Hough"}, - {"intl", "a=6378388.0", "rf=297.", "International 1909 (Hayford)"}, - {"krass", "a=6378245.0", "rf=298.3", "Krassovsky, 1942"}, - {"kaula", "a=6378163.", "rf=298.24", "Kaula 1961"}, - {"lerch", "a=6378139.", "rf=298.257", "Lerch 1979"}, - {"mprts", "a=6397300.", "rf=191.", "Maupertius 1738"}, - {"new_intl", "a=6378157.5", "b=6356772.2", "New International 1967"}, - {"plessis", "a=6376523.", "b=6355863.", "Plessis 1817 (France)"}, - {"SEasia", "a=6378155.0", "b=6356773.3205", "Southeast Asia"}, - {"walbeck", "a=6376896.0", "b=6355834.8467", "Walbeck"}, - {"WGS60", "a=6378165.0", "rf=298.3", "WGS 60"}, - {"WGS66", "a=6378145.0", "rf=298.25", "WGS 66"}, - {"WGS72", "a=6378135.0", "rf=298.26", "WGS 72"}, - {"WGS84", "a=6378137.0", "rf=298.257223563", "WGS 84"}, - {"sphere", "a=6370997.0", "b=6370997.0", "Normal Sphere (r=6370997)"} + {"MERIT", "6378137.0", "rf", "298.257", "MERIT 1983"}, + {"SGS85", "6378136.0", "rf", "298.257", "Soviet Geodetic System 85"}, + {"GRS80", "6378137.0", "rf", "298.257222101", "GRS 1980(IUGG, 1980)"}, + {"IAU76", "6378140.0", "rf", "298.257", "IAU 1976"}, + {"airy", "6377563.396", "b", "6356256.910", "Airy 1830"}, + {"APL4.9", "6378137.0.", "rf", "298.25", "Appl. Physics. 1965"}, + {"NWL9D", "6378145.0.", "rf", "298.25", "Naval Weapons Lab., 1965"}, + {"mod_airy", "6377340.189", "b", "6356034.446", "Modified Airy"}, + {"andrae", "6377104.43", "rf", "300.0", "Andrae 1876 (Den., Iclnd.)"}, + {"aust_SA", "6378160.0", "rf", "298.25", "Australian Natl & S. Amer. 1969"}, + {"GRS67", "6378160.0", "rf", "298.2471674270", "GRS 67(IUGG 1967)"}, + {"bessel", "6377397.155", "rf", "299.1528128", "Bessel 1841"}, + {"bess_nam", "6377483.865", "rf", "299.1528128", "Bessel 1841 (Namibia)"}, + {"clrk66", "6378206.4", "b", "6356583.8", "Clarke 1866"}, + {"clrk80", "6378249.145", "rf", "293.4663", "Clarke 1880 mod."}, + {"clrk80ign", "6378249.2", "rf", "293.4660212936269", "Clarke 1880 (IGN)."}, + {"CPM", "6375738.7", "rf", "334.29", "Comm. des Poids et Mesures 1799"}, + {"delmbr", "6376428.", "rf", "311.5", "Delambre 1810 (Belgium)"}, + {"engelis", "6378136.05", "rf", "298.2566", "Engelis 1985"}, + {"evrst30", "6377276.345", "rf", "300.8017", "Everest 1830"}, + {"evrst48", "6377304.063", "rf", "300.8017", "Everest 1948"}, + {"evrst56", "6377301.243", "rf", "300.8017", "Everest 1956"}, + {"evrst69", "6377295.664", "rf", "300.8017", "Everest 1969"}, + {"evrstSS", "6377298.556", "rf", "300.8017", "Everest (Sabah & Sarawak)"}, + {"fschr60", "6378166.", "rf", "298.3", "Fischer (Mercury Datum) 1960"}, + {"fschr60m", "6378155.", "rf", "298.3", "Modified Fischer 1960"}, + {"fschr68", "6378150.", "rf", "298.3", "Fischer 1968"}, + {"helmert", "6378200.", "rf", "298.3", "Helmert 1906"}, + {"hough", "6378270.0", "rf", "297.", "Hough"}, + {"intl", "6378388.0", "rf", "297.", "International 1909 (Hayford)"}, + {"krass", "6378245.0", "rf", "298.3", "Krassovsky, 1942"}, + {"kaula", "6378163.", "rf", "298.24", "Kaula 1961"}, + {"lerch", "6378139.", "rf", "298.257", "Lerch 1979"}, + {"mprts", "6397300.", "rf", "191.", "Maupertius 1738"}, + {"new_intl", "6378157.5", "b", "6356772.2", "New International 1967"}, + {"plessis", "6376523.", "b", "6355863.", "Plessis 1817 (France)"}, + {"SEasia", "6378155.0", "b", "6356773.3205", "Southeast Asia"}, + {"walbeck", "6376896.0", "b", "6355834.8467", "Walbeck"}, + {"WGS60", "6378165.0", "rf", "298.3", "WGS 60"}, + {"WGS66", "6378145.0", "rf", "298.25", "WGS 66"}, + {"WGS72", "6378135.0", "rf", "298.26", "WGS 72"}, + {"WGS84", "6378137.0", "rf", "298.257223563", "WGS 84"}, + {"sphere", "6370997.0", "b", "6370997.0", "Normal Sphere (r=6370997)"} }; } // namespace detail |