diff options
Diffstat (limited to 'boost/geometry/srs/projections/impl/pj_datums.hpp')
| -rw-r--r-- | boost/geometry/srs/projections/impl/pj_datums.hpp | 49 |
1 files changed, 33 insertions, 16 deletions
diff --git a/boost/geometry/srs/projections/impl/pj_datums.hpp b/boost/geometry/srs/projections/impl/pj_datums.hpp index 55da24a2ca..ab2fcb2357 100644 --- a/boost/geometry/srs/projections/impl/pj_datums.hpp +++ b/boost/geometry/srs/projections/impl/pj_datums.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,53 +41,70 @@ #include <boost/geometry/srs/projections/impl/projects.hpp> +#include <string> + namespace boost { namespace geometry { namespace projections { namespace detail { +// Originally defined in projects.h +struct pj_datums_type +{ + std::string id; /* datum keyword */ + std::string defn_n; /* e.g. "to_wgs84" */ + std::string defn_v; /* e.g. "0,0,0" */ + std::string ellipse_id; /* ie from ellipse table */ + std::string comments; /* EPSG code, etc */ +}; + +// Originally defined in projects.h +struct pj_prime_meridians_type +{ + std::string id; /* prime meridian keyword */ + std::string defn; /* offset from greenwich in DMS format. */ +}; + /* * The ellipse code must match one from pj_ellps.c. The datum id should * be kept to 12 characters or less if possible. Use the official OGC * datum name for the comments if available. */ -static const PJ_DATUMS pj_datums[] = +static const pj_datums_type pj_datums[] = { - /* id definition ellipse comments */ - /* -- ---------- ------- -------- */ - {"WGS84", "towgs84=0,0,0", + {"WGS84", "towgs84", "0,0,0", "WGS84", ""}, - {"GGRS87", "towgs84=-199.87,74.79,246.62", + {"GGRS87", "towgs84", "-199.87,74.79,246.62", "GRS80", "Greek_Geodetic_Reference_System_1987"}, - {"NAD83", "towgs84=0,0,0", + {"NAD83", "towgs84", "0,0,0", "GRS80", "North_American_Datum_1983"}, - {"NAD27", "nadgrids=@conus,@alaska,@ntv2_0.gsb,@ntv1_can.dat", + {"NAD27", "nadgrids", "@conus,@alaska,@ntv2_0.gsb,@ntv1_can.dat", "clrk66", "North_American_Datum_1927"}, - {"potsdam", "towgs84=598.1,73.7,418.2,0.202,0.045,-2.455,6.7", + {"potsdam", "towgs84", "598.1,73.7,418.2,0.202,0.045,-2.455,6.7", "bessel", "Potsdam Rauenberg 1950 DHDN"}, - {"carthage", "towgs84=-263.0,6.0,431.0", + {"carthage", "towgs84", "-263.0,6.0,431.0", "clrk80ign", "Carthage 1934 Tunisia"}, - {"hermannskogel", "towgs84=577.326,90.129,463.919,5.137,1.474,5.297,2.4232", + {"hermannskogel", "towgs84", "577.326,90.129,463.919,5.137,1.474,5.297,2.4232", "bessel", "Hermannskogel"}, - {"ire65", "towgs84=482.530,-130.596,564.557,-1.042,-0.214,-0.631,8.15", + {"ire65", "towgs84", "482.530,-130.596,564.557,-1.042,-0.214,-0.631,8.15", "mod_airy", "Ireland 1965"}, - {"nzgd49", "towgs84=59.47,-5.04,187.44,0.47,-0.1,1.024,-4.5993", + {"nzgd49", "towgs84", "59.47,-5.04,187.44,0.47,-0.1,1.024,-4.5993", "intl", "New Zealand Geodetic Datum 1949"}, - {"OSGB36", "towgs84=446.448,-125.157,542.060,0.1502,0.2470,0.8421,-20.4894", + {"OSGB36", "towgs84", "446.448,-125.157,542.060,0.1502,0.2470,0.8421,-20.4894", "airy", "Airy 1830"} }; -static const PJ_PRIME_MERIDIANS pj_prime_meridians[] = +static const pj_prime_meridians_type pj_prime_meridians[] = { /* id definition */ /* -- ---------- */ |