diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-03-01 18:46:06 +0100 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2019-03-01 18:46:06 +0100 |
| commit | a2aab5e44f5671d4b79deebcdea0b449354aa9c7 (patch) | |
| tree | 2ffe42831666ebca0f59aaf5b2c3dd54f4d33035 | |
| parent | 5284dfd3c7d66893b6e8f23c0b18bee26aadabc3 (diff) | |
| parent | b4b7d02deaad22246d8c23507725cf31f3dc4986 (diff) | |
| download | PROJ-a2aab5e44f5671d4b79deebcdea0b449354aa9c7.tar.gz PROJ-a2aab5e44f5671d4b79deebcdea0b449354aa9c7.zip | |
Merge branch '6.0' of https://github.com/OSGeo/proj.4 into 6.0
40 files changed, 212 insertions, 211 deletions
@@ -5,6 +5,8 @@ To cite PROJ in publications use: A BibTeX entry for LaTeX users is +.. code-block:: latex + @Manual{, title = {{PROJ} coordinate transformation software library}, author = {{PROJ contributors}}, diff --git a/HOWTO-RELEASE b/HOWTO-RELEASE index 96b3b0c8..3bfbe7ba 100644 --- a/HOWTO-RELEASE +++ b/HOWTO-RELEASE @@ -94,7 +94,7 @@ slightly since not all authors has properly configured their names in git. 1.4 Update `CITATION` ------------------------------------------------------------------------------- -If needed, update the year in `CITATION` and `docs/source/about.rst`. +If needed, update the year in `CITATION`. *Commit the changes to master.* @@ -48,7 +48,7 @@ On Windows, one may need to specify generator: cmake -G "Visual Studio 15 2017" .. If the SQLite3 dependency is installed in a custom location, specify the -paths to the include directory and the library:: +paths to the include directory and the library: cmake -DSQLITE3_INCLUDE_DIR=/opt/SQLite/include -DSQLITE3_LIBRARY=/opt/SQLite/lib/libsqlite3.so .. diff --git a/appveyor.yml b/appveyor.yml index 728e77c9..a353f8db 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,8 +43,8 @@ test_script: - echo test_script - set PROJ_LIB=%PROJ_DIR%\share\proj - cd %PROJ_LIB% - - curl -O http://download.osgeo.org/proj/proj-datumgrid-1.7.zip - - 7z e -aoa -y proj-datumgrid-1.7.zip + - curl -O http://download.osgeo.org/proj/proj-datumgrid-1.8.zip + - 7z e -aoa -y proj-datumgrid-1.8.zip - cd %PROJ_BUILD% - ctest -V -C Release - set PATH=%PATH%;%PROJ_DIR%\bin diff --git a/configure.ac b/configure.ac index 1135b4a4..d0aecf75 100644 --- a/configure.ac +++ b/configure.ac @@ -326,7 +326,7 @@ AC_ARG_WITH(external-gtest, AS_HELP_STRING([--with-external-gtest], [Whether to use external Google Test]),,) -if test "x$with_external_gtest" == "xyes" ; then +if test "x$with_external_gtest" = "xyes" ; then AC_MSG_RESULT([using external GTest.]) PKG_CHECK_MODULES([GTEST], [gtest >= 1.8.0]) else @@ -334,7 +334,7 @@ else GTEST_CFLAGS="-I\$(top_srcdir)/test/googletest/include" GTEST_LIBS="\$(top_builddir)/test/googletest/libgtest.la" fi -AM_CONDITIONAL(USE_EXTERNAL_GTEST, [test "x$with_external_gtest" == "xyes"]) +AM_CONDITIONAL(USE_EXTERNAL_GTEST, [test "x$with_external_gtest" = "xyes"]) AC_SUBST(GTEST_CFLAGS,$GTEST_CFLAGS) AC_SUBST(GTEST_LIBS,$GTEST_LIBS) diff --git a/data/Makefile.am b/data/Makefile.am index 7594fd8d..98f3557a 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -72,7 +72,7 @@ proj.db: $(DATAPATH)/sql/*.sql fi; \ echo "" | head -c1; \ if [ $$? -eq 0 ] ; then \ - echo "Running foreign_key_check"; \ + echo "Running foreign_key_check"; \ if [[ $$(echo "pragma foreign_key_check;" | sqlite3 proj.db | head -c1 | wc -c) -ne 0 ]]; then \ echo "Foreign key check failed"; \ $(RM) proj.db; \ diff --git a/docs/source/about.rst b/docs/source/about.rst index 5e625288..5171e4c7 100644 --- a/docs/source/about.rst +++ b/docs/source/about.rst @@ -23,22 +23,9 @@ datums using all but the most obscure geodetic techniques. Citation ------------------------------------------------------------------------------- -To cite PROJ in publications use: - PROJ contributors (2018). PROJ coordinate transformation software - library. Open Source Geospatial Foundation. URL https://proj4.org/. +.. include:: ../../CITATION -A BibTeX entry for LaTeX users is - -.. code-block:: latex - - @Manual{, - title = {{PROJ} coordinate transformation software library}, - author = {{PROJ contributors}}, - organization = {Open Source Geospatial Foundation}, - year = {2018}, - url = {https://proj4.org/}, - } License ------------------------------------------------------------------------------- diff --git a/docs/source/apps/projinfo.rst b/docs/source/apps/projinfo.rst index fb17e480..151b3079 100644 --- a/docs/source/apps/projinfo.rst +++ b/docs/source/apps/projinfo.rst @@ -67,7 +67,7 @@ The following control parameters can appear in any order: .. option:: --summary When listing coordinate operations available between 2 CRS, return the - result in a summary format, mentionning only the name of the coordinate + result in a summary format, mentioning only the name of the coordinate operation, its accuracy and its area of use. .. note:: only used for coordinate operation computation @@ -104,7 +104,7 @@ The following control parameters can appear in any order: Specify how the area of use of coordinate operations found in the database are compared to the area of use specified explicitly with :option:`--area` or :option:`--bbox`, - or derivedi implictly from the area of use of the source and target CRS. + or derived implicitly from the area of use of the source and target CRS. By default, projinfo will only keep coordinate operations whose are of use is strictly within the area of interest (``contains`` strategy). If using the ``intersects`` strategy, the spatial test is relaxed, and any diff --git a/docs/source/operations/projections/comill.rst b/docs/source/operations/projections/comill.rst index 94b2695c..fa04ec18 100644 --- a/docs/source/operations/projections/comill.rst +++ b/docs/source/operations/projections/comill.rst @@ -7,7 +7,7 @@ Compact Miller The Compact Miller projection is a cylindrical map projection with a height-to-width ratio of 0.6:1. -See :cite:`Jenny2014` +See :cite:`Jenny2015` +---------------------+----------------------------------------------------------+ | **Classification** | Cylindrical | diff --git a/docs/source/operations/projections/natearth2.rst b/docs/source/operations/projections/natearth2.rst index ec33141d..a5128ea9 100644 --- a/docs/source/operations/projections/natearth2.rst +++ b/docs/source/operations/projections/natearth2.rst @@ -30,9 +30,9 @@ Natural Earth II The Natural Earth II projection is intended for making world maps. At high latitudes, meridians bend steeply toward short pole lines resulting in a map -with highly rounded corners that resembles an elongated globe +with highly rounded corners that resembles an elongated globe. -See :cite:`Savric2016` +See :cite:`Savric2015` Parameters diff --git a/docs/source/operations/projections/patterson.rst b/docs/source/operations/projections/patterson.rst index 11211a5f..b68a14d0 100644 --- a/docs/source/operations/projections/patterson.rst +++ b/docs/source/operations/projections/patterson.rst @@ -7,7 +7,7 @@ Patterson The Patterson projection is a cylindrical map projection designed for general-purpose mapmaking. -See :cite:`Patterson2015` +See :cite:`Patterson2014` +---------------------+----------------------------------------------------------+ | **Classification** | Cylindrical | diff --git a/docs/source/references.bib b/docs/source/references.bib index df1dc66c..7c1be5c8 100644 --- a/docs/source/references.bib +++ b/docs/source/references.bib @@ -3,7 +3,7 @@ @Article{Altamimi2002, - Title = {ITRF2000: A new release of the International Terrestrial Reference Frame for earth science applications}, + Title = {{ITRF2000}: A new release of the {International Terrestrial Reference Frame} for earth science applications}, Author = {Z. Altamimi and P. Sillard and C. Boucher}, Journal = {Journal of Geophysical Research: Solid Earth}, Year = {2002}, @@ -73,7 +73,7 @@ @Article{EberHewitt1979, Title = {Conversion algorithms for the {CalCOFI} station grid}, - Author = {L. E. Eber and R.P. Hewitt}, + Author = {L. E. Eber and R. P. Hewitt}, Journal = {California Cooperative Oceanic Fisheries Investigations Reports}, Year = {1979}, Pages = {135--137}, @@ -82,14 +82,6 @@ Url = {http://www.calcofi.org/publications/calcofireports/v20/Vol_20_Eber___Hewitt.pdf} } -@Manual{EPSGGuidanceNumber7Part2, - Title = {Geomatics Guidance Note 7, part 2 - Coordinate Conversions & Transformations including Formulas}, - Institution = {International Association For Oil And Gas Producers}, - Year = {2018}, - - Url = {https://www.iogp.org/bookstore/product/coordinate-conversions-and-transformation-including-formulas/} -} - @Manual{Evenden2005, Title = {libproj4: A Comprehensive Library of Cartographic Projection Functions (Preliminary Draft)}, Author = {G. I. Evenden}, @@ -140,19 +132,24 @@ Doi = {10.5281/zenodo.32050} } -@Article{Hensley2002, - Title = {Improved Processing of AIRSAR Data Based on the GeoSAR Processor}, - Author = {Scott Hensley and Elaine Chapin and Adam Freedman and Thierry Michel}, - Journal = {Airsar earth science and applications workshop}, +@InProceedings{Hensley2002, + Title = {Improved Processing of {AIRSAR} Data Based on the {GeoSAR} Processor}, + Author = {S. Hensley and E. Chapin and A. Freedman and T. Michel}, + Booktitle = {AIRSAR Earth Science and Application Workshop}, Year = {2002}, + Organization = {Jet Propulsion Laboratory}, + Url = {https://airsar.jpl.nasa.gov/documents/workshop2002/papers/T3.pdf} } -@Article{Jenny2014, +@Article{Jenny2015, Title = {A compromise aspect-adaptive cylindrical projection for world maps}, - Author = {Bernhard Jenny, Bojan Šavrič, Tom Patterson}, + Author = {B. Jenny and B. Šavrič and T. Patterson}, Journal = {International Journal of Geographical Information Science}, - Year = {2014}, + Year = {2015}, + Number = {6}, + Pages = {935--952}, + Volume = {29}, Doi = {10.1080/13658816.2014.997734}, Url = {http://www.cartography.oregonstate.edu/pdf/2015_Jenny_etal_ACompromiseAspect-adaptiveCylindricalProjectionForWorldMaps.pdf} @@ -215,90 +212,99 @@ Url = {https://archive.org/details/DTIC_ADA026294} } -@techreport{Poder1998, - author = {Knud Poder and Karsten Engsager}, - year = {1998}, - title = {Some Conformal Mappings and Transformations for Geodesy - and Topographic Cartography}, - address = {Copenhagen, Denmark}, - institution = {National Survey and Cadastre}, - type = {National Survey and Cadastre Publications}, - series = {4}, - volume = {6}, - isbn = {87-7866-085-8}, - pages = {63} -} - -@Article{Patterson2015, - Title = {Introducing the Patterson Cylindrical Projection}, - Author = {Tom Patterson, Bojan Šavrič, Bernhard Jenny}, +@Article{Patterson2014, + Title = {Introducing the {Patterson} Cylindrical Projection}, + Author = {T. Patterson and B. Šavrič and B. Jenny}, Journal = {Cartographic Perspectives}, - Year = {2015}, - Number = {78}, + Year = {2014}, + Volume = {78}, Doi = {10.14714/CP78.1270} } -@Misc{Rittri2012, - author = {Mikael Rittri}, - title = {New omerc approximations of Denmark System 34}, - year = {2012}, - url = {https://lists.osgeo.org/pipermail/proj/2012-June/005926.html} -} +@TechReport{Poder1998, + Title = {Some Conformal Mappings and Transformations for Geodesy and Topographic Cartography}, + Author = {K. Poder and K. Engsager}, + Institution = {National Survey and Cadastre}, + Year = {1998}, + + Address = {Copenhagen, Denmark}, + Type = {National Survey and Cadastre Publications}, -@article{Ruffhead2016, - author = {A. C. Ruffhead}, - title = {Introduction to multiple regression equations in datum transformations and their reversibility}, - journal = {Survey Review}, - volume = {50}, - number = {358}, - pages = {82-90}, - year = {2016}, - publisher = {Taylor & Francis}, - doi = {10.1080/00396265.2016.1244143}, + ISBN = {87-7866-085-8}, + Pages = {63}, + Series = {4}, + Volume = {6} } -@Book{Snyder1993, - Title = {Flattening the Earth}, - Author = {J. P. Snyder}, - Publisher = {University of Chicago Press}, - Year = {1993} +@Misc{Rittri2012, + Title = {New omerc approximations of {Denmark System 34}}, + + Author = {M. Rittri}, + HowPublished = {e-mail}, + Year = {2012}, + + Url = {https://lists.osgeo.org/pipermail/proj/2012-June/005926.html} } -@Article{Savric2016, - Title = {The Natural Earth II world map projection}, - Author = {Bojan Šavrič, Tom Patterson, Bernhard Jenny}, - Journal = {International Journal of Geographical Information Science}, +@Article{Ruffhead2016, + Title = {Introduction to multiple regression equations in datum transformations and their reversibility}, + Author = {A. C. Ruffhead}, + Journal = {Survey Review}, Year = {2016}, + Number = {358}, + Pages = {82-90}, + Volume = {50}, - Doi = {10.1080/23729333.2015.1093312}, - Url = {http://berniejenny.info/pdf/2016_Savric_etal_NaturalEarthII.pdf} + Doi = {10.1080/00396265.2016.1244143}, + Publisher = {Taylor \& Francis} } @Article{Savric2018, + Title = {The {Equal Earth} map projection}, Author = {B. Šavrič and T. Patterson and B. Jenny}, - Title = {The Equal Earth map projection}, Journal = {International Journal of Geographical Information Science}, Year = {2018}, - Publisher = {Taylor & Francis}, + Number = {3}, + Volume = {33}, + Doi = {10.1080/13658816.2018.1504949}, - Url = {https://www.researchgate.net/profile/Bojan_Savric2/publication/326879978_The_Equal_Earth_map_projection/links/5b69d0ae299bf14c6d951b77/The-Equal-Earth-map-projection.pdf} + Url = {https://www.researchgate.net/publication/326879978_The_Equal_Earth_map_projection} +} + +@Article{Savric2015, + Title = {The {Natural Earth II} world map projection}, + Author = {B. Šavrič and T. Patterson and B. Jenny}, + Journal = {International Journal of Geographical Information Science}, + Year = {2015}, + Number = {2}, + Pages = {123--133}, + Volume = {1}, + + Doi = {10.1080/23729333.2015.1093312}, + Url = {https://www.researchgate.net/publication/290447301_The_Natural_Earth_II_world_map_projection} +} + +@Book{Snyder1993, + Title = {Flattening the Earth}, + Author = {J. P. Snyder}, + Publisher = {University of Chicago Press}, + Year = {1993} } @Article{Snyder1988, - Author = {J. P. Snyder }, Title = {New Equal-Area Map Projections For Noncircular Regions}, + Author = {J. P. Snyder}, Journal = {The American Cartographer}, - Volume = {15}, - Number = {4}, - Pages = {341-356}, Year = {1988}, - Publisher = {Taylor and Francis}, + Number = {4}, + Pages = {341--356}, + Volume = {15}, - Doi = {10.1559/152304088783886784} + Doi = {10.1559/152304088783886784}, + Publisher = {Taylor and Francis} } - @TechReport{Snyder1987, Title = {Map Projections --- {A} Working Manual}, Author = {J. P. Snyder}, @@ -319,15 +325,16 @@ } @Article{Tobler2017, + Title = {A new companion for {Mercator}}, Author = {W. Tobler}, - Title = {A new companion for Mercator}, Journal = {Cartography and Geographic Information Science}, - Volume = {45}, - Number = {3}, - Pages = {284-285}, - Publisher = {Taylor & Francis}, Year = {2017}, + Number = {3}, + Pages = {284--285}, + Volume = {45}, + Doi = {10.1080/15230406.2017.1308837}, + Publisher = {Taylor \& Francis} } @Article{Verey2017, @@ -377,3 +384,11 @@ Doi = {10.2307/1219899} } +@Manual{EPSGGuidanceNumber7Part2, + Title = {Geomatics Guidance Note 7, part 2 - Coordinate Conversions \& Transformations including Formulas}, + Year = {2018}, + + Institution = {International Association For Oil And Gas Producers}, + Url = {https://www.iogp.org/bookstore/product/coordinate-conversions-and-transformation-including-formulas/} +} + diff --git a/include/proj/common.hpp b/include/proj/common.hpp index d0ecf5d6..7940f4fc 100644 --- a/include/proj/common.hpp +++ b/include/proj/common.hpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: ISO19111:2018 implementation + * Purpose: ISO19111:2019 implementation * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** @@ -291,7 +291,7 @@ using IdentifiedObjectNNPtr = util::nn<IdentifiedObjectPtr>; /** \brief Abstract class representating a CRS-related object that has an * identification. * - * \remark Implements IdentifiedObject from \ref ISO_19111_2018 + * \remark Implements IdentifiedObject from \ref ISO_19111_2019 */ class PROJ_GCC_DLL IdentifiedObject : public util::BaseObject, public util::IComparable, @@ -364,7 +364,7 @@ using ObjectDomainNNPtr = util::nn<ObjectDomainPtr>; /** \brief The scope and validity of a CRS-related object. * - * \remark Implements ObjectDomain from \ref ISO_19111_2018 + * \remark Implements ObjectDomain from \ref ISO_19111_2019 */ class PROJ_GCC_DLL ObjectDomain : public util::BaseObject, public util::IComparable { @@ -419,7 +419,7 @@ using ObjectUsageNNPtr = util::nn<ObjectUsagePtr>; /** \brief Abstract class of a CRS-related object that has usages. * - * \remark Implements ObjectUsage from \ref ISO_19111_2018 + * \remark Implements ObjectUsage from \ref ISO_19111_2019 */ class PROJ_GCC_DLL ObjectUsage : public IdentifiedObject { public: diff --git a/include/proj/coordinateoperation.hpp b/include/proj/coordinateoperation.hpp index fd737dcc..ce8021a0 100644 --- a/include/proj/coordinateoperation.hpp +++ b/include/proj/coordinateoperation.hpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: ISO19111:2018 implementation + * Purpose: ISO19111:2019 implementation * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** @@ -113,7 +113,7 @@ using CoordinateOperationNNPtr = util::nn<CoordinateOperationPtr>; * (some) entirely different parameter values are needed, a different coordinate * operation shall be defined. * - * \remark Implements CoordinateOperation from \ref ISO_19111_2018 + * \remark Implements CoordinateOperation from \ref ISO_19111_2019 */ class PROJ_GCC_DLL CoordinateOperation : public common::ObjectUsage, public io::IPROJStringExportable { @@ -181,7 +181,7 @@ class PROJ_GCC_DLL CoordinateOperation : public common::ObjectUsage, /** \brief Abstract class modelling a parameter value (OperationParameter) * or group of parameters. * - * \remark Implements GeneralOperationParameter from \ref ISO_19111_2018 + * \remark Implements GeneralOperationParameter from \ref ISO_19111_2019 */ class PROJ_GCC_DLL GeneralOperationParameter : public common::IdentifiedObject { public: @@ -225,7 +225,7 @@ using OperationParameterNNPtr = util::nn<OperationParameterPtr>; * Most parameter values are numeric, but other types of parameter values are * possible. * - * \remark Implements OperationParameter from \ref ISO_19111_2018 + * \remark Implements OperationParameter from \ref ISO_19111_2019 */ class PROJ_GCC_DLL OperationParameter final : public GeneralOperationParameter { public: @@ -271,7 +271,7 @@ struct MethodMapping; /** \brief Abstract class modelling a parameter value (OperationParameterValue) * or group of parameter values. * - * \remark Implements GeneralParameterValue from \ref ISO_19111_2018 + * \remark Implements GeneralParameterValue from \ref ISO_19111_2019 */ class PROJ_GCC_DLL GeneralParameterValue : public util::BaseObject, public io::IWKTExportable, @@ -325,7 +325,7 @@ using ParameterValueNNPtr = util::nn<ParameterValuePtr>; * Most parameter values are numeric, but other types of parameter values are * possible. * - * \remark Implements ParameterValue from \ref ISO_19111_2018 + * \remark Implements ParameterValue from \ref ISO_19111_2019 */ class PROJ_GCC_DLL ParameterValue final : public util::BaseObject, public io::IWKTExportable, @@ -400,7 +400,7 @@ using OperationParameterValueNNPtr = util::nn<OperationParameterValuePtr>; * * This combines a OperationParameter with the corresponding ParameterValue. * - * \remark Implements OperationParameterValue from \ref ISO_19111_2018 + * \remark Implements OperationParameterValue from \ref ISO_19111_2019 */ class PROJ_GCC_DLL OperationParameterValue final : public GeneralParameterValue { @@ -463,7 +463,7 @@ using OperationMethodNNPtr = util::nn<OperationMethodPtr>; * For a projection method, this contains the name of the projection method * and the name of the projection parameters. * - * \remark Implements OperationMethod from \ref ISO_19111_2018 + * \remark Implements OperationMethod from \ref ISO_19111_2019 */ class PROJ_GCC_DLL OperationMethod : public common::IdentifiedObject { public: @@ -534,7 +534,7 @@ using SingleOperationNNPtr = util::nn<SingleOperationPtr>; /** \brief A single (not concatenated) coordinate operation * (CoordinateOperation) * - * \remark Implements SingleOperation from \ref ISO_19111_2018 + * \remark Implements SingleOperation from \ref ISO_19111_2019 */ class PROJ_GCC_DLL SingleOperation : virtual public CoordinateOperation { public: @@ -633,7 +633,7 @@ using ConversionNNPtr = util::nn<ConversionPtr>; * associations, but through associations from crs::DerivedCRS to * crs::SingleCRS. * - * \remark Implements Conversion from \ref ISO_19111_2018 + * \remark Implements Conversion from \ref ISO_19111_2019 */ /*! @@ -1353,7 +1353,7 @@ using TransformationNNPtr = util::nn<TransformationPtr>; * coordinates are referenced to different datums (reference frames) will be a * coordinate transformation. * - * \remark Implements Transformation from \ref ISO_19111_2018 + * \remark Implements Transformation from \ref ISO_19111_2019 */ class PROJ_GCC_DLL Transformation : public SingleOperation { public: @@ -1553,7 +1553,7 @@ using PointMotionOperationNNPtr = util::nn<PointMotionOperationPtr>; * * The motion is due to tectonic plate movement or deformation. * - * \remark Implements PointMotionOperation from \ref ISO_19111_2018 + * \remark Implements PointMotionOperation from \ref ISO_19111_2019 */ class PROJ_GCC_DLL PointMotionOperation : public SingleOperation { public: @@ -1582,7 +1582,7 @@ using ConcatenatedOperationNNPtr = util::nn<ConcatenatedOperationPtr>; * the source coordinate reference system of step n+1 shall be the same as * the target coordinate reference system of step n. * - * \remark Implements ConcatenatedOperation from \ref ISO_19111_2018 + * \remark Implements ConcatenatedOperation from \ref ISO_19111_2019 */ class PROJ_GCC_DLL ConcatenatedOperation final : public CoordinateOperation { public: diff --git a/include/proj/coordinatesystem.hpp b/include/proj/coordinatesystem.hpp index 9216bf33..ea1c1f99 100644 --- a/include/proj/coordinatesystem.hpp +++ b/include/proj/coordinatesystem.hpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: ISO19111:2018 implementation + * Purpose: ISO19111:2019 implementation * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** @@ -51,7 +51,7 @@ namespace cs { /** \brief The direction of positive increase in the coordinate value for a * coordinate system axis. * - * \remark Implements AxisDirection from \ref ISO_19111_2018 + * \remark Implements AxisDirection from \ref ISO_19111_2019 */ class AxisDirection : public util::CodeList { public: @@ -119,7 +119,7 @@ using MeridianNNPtr = util::nn<MeridianPtr>; /** \brief The meridian that the axis follows from the pole, for a coordinate * reference system centered on a pole. * - * \note There is no modelling for this concept in \ref ISO_19111_2018 + * \note There is no modelling for this concept in \ref ISO_19111_2019 * * \remark Implements MERIDIAN from \ref WKT2 */ @@ -163,7 +163,7 @@ using CoordinateSystemAxisNNPtr = util::nn<CoordinateSystemAxisPtr>; /** \brief The definition of a coordinate system axis. * - * \remark Implements CoordinateSystemAxis from \ref ISO_19111_2018 + * \remark Implements CoordinateSystemAxis from \ref ISO_19111_2019 */ class PROJ_GCC_DLL CoordinateSystemAxis final : public common::IdentifiedObject { @@ -233,7 +233,7 @@ class PROJ_GCC_DLL CoordinateSystemAxis final * The coordinate values in a coordinate tuple shall be recorded in the order * in which the coordinate system axes associations are recorded. * - * \remark Implements CoordinateSystem from \ref ISO_19111_2018 + * \remark Implements CoordinateSystem from \ref ISO_19111_2019 */ class PROJ_GCC_DLL CoordinateSystem : public common::IdentifiedObject { public: @@ -289,7 +289,7 @@ using SphericalCSNNPtr = util::nn<SphericalCSPtr>; * ellipsoid "degenerated" into a sphere. A SphericalCS shall have three * axis associations. * - * \remark Implements SphericalCS from \ref ISO_19111_2018 + * \remark Implements SphericalCS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL SphericalCS final : public CoordinateSystem { public: @@ -332,7 +332,7 @@ using EllipsoidalCSNNPtr = util::nn<EllipsoidalCSPtr>; * * An EllipsoidalCS shall have two or three associations. * - * \remark Implements EllipsoidalCS from \ref ISO_19111_2018 + * \remark Implements EllipsoidalCS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL EllipsoidalCS final : public CoordinateSystem { public: @@ -411,7 +411,7 @@ using VerticalCSNNPtr = util::nn<VerticalCSPtr>; * Such a coordinate system is usually dependent on the Earth's gravity field. * A VerticalCS shall have one axis association. * - * \remark Implements VerticalCS from \ref ISO_19111_2018 + * \remark Implements VerticalCS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL VerticalCS final : public CoordinateSystem { public: @@ -460,7 +460,7 @@ using CartesianCSNNPtr = util::nn<CartesianCSPtr>; * three axis associations; the number of associations shall equal the * dimension of the CS. * - * \remark Implements CartesianCS from \ref ISO_19111_2018 + * \remark Implements CartesianCS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL CartesianCS final : public CoordinateSystem { public: @@ -529,7 +529,7 @@ using OrdinalCSNNPtr = util::nn<OrdinalCSPtr>; * The number of associations shall equal the * dimension of the CS. * - * \remark Implements OrdinalCS from \ref ISO_19111_2018 + * \remark Implements OrdinalCS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL OrdinalCS final : public CoordinateSystem { public: @@ -565,7 +565,7 @@ using ParametricCSNNPtr = util::nn<ParametricCSPtr>; /** \brief one-dimensional coordinate reference system which uses parameter * values or functions that may vary monotonically with height. * - * \remark Implements ParametricCS from \ref ISO_19111_2018 + * \remark Implements ParametricCS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL ParametricCS final : public CoordinateSystem { public: @@ -603,7 +603,7 @@ using TemporalCSNNPtr = util::nn<TemporalCSPtr>; * * A TemporalCS shall have one axis association. * - * \remark Implements TemporalCS from \ref ISO_19111_2018 + * \remark Implements TemporalCS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL TemporalCS : public CoordinateSystem { public: @@ -637,7 +637,7 @@ using DateTimeTemporalCSNNPtr = util::nn<DateTimeTemporalCSPtr>; * axisUnitID; the temporal quantities are defined through the ISO 8601 * representation. * - * \remark Implements DateTimeTemporalCS from \ref ISO_19111_2018 + * \remark Implements DateTimeTemporalCS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL DateTimeTemporalCS final : public TemporalCS { public: @@ -673,7 +673,7 @@ using TemporalCountCSNNPtr = util::nn<TemporalCountCSPtr>; * * A TemporalCountCS shall have one axis association. * - * \remark Implements TemporalCountCS from \ref ISO_19111_2018 + * \remark Implements TemporalCountCS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL TemporalCountCS final : public TemporalCS { public: @@ -709,7 +709,7 @@ using TemporalMeasureCSNNPtr = util::nn<TemporalMeasureCSPtr>; * * A TemporalMeasureCS shall have one axis association. * - * \remark Implements TemporalMeasureCS from \ref ISO_19111_2018 + * \remark Implements TemporalMeasureCS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL TemporalMeasureCS final : public TemporalCS { public: diff --git a/include/proj/crs.hpp b/include/proj/crs.hpp index fb34d3b7..33038683 100644 --- a/include/proj/crs.hpp +++ b/include/proj/crs.hpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: ISO19111:2018 implementation + * Purpose: ISO19111:2019 implementation * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** @@ -79,7 +79,7 @@ using CRSNNPtr = util::nn<CRSPtr>; /** \brief Abstract class modelling a coordinate reference system which is * usually single but may be compound. * - * \remark Implements CRS from \ref ISO_19111_2018 + * \remark Implements CRS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL CRS : public common::ObjectUsage { public: @@ -149,7 +149,7 @@ class PROJ_GCC_DLL CRS : public common::ObjectUsage { * one Coordinate System and either one datum::Datum or one * datum::DatumEnsemble. * - * \remark Implements SingleCRS from \ref ISO_19111_2018 + * \remark Implements SingleCRS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL SingleCRS : public CRS { public: @@ -204,7 +204,7 @@ using GeodeticCRSNNPtr = util::nn<GeodeticCRSPtr>; * association to a velocity model then the geodetic CRS is dynamic, else it * is static. * - * \remark Implements GeodeticCRS from \ref ISO_19111_2018 + * \remark Implements GeodeticCRS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL GeodeticCRS : virtual public SingleCRS, public io::IPROJStringExportable { @@ -312,7 +312,7 @@ class PROJ_GCC_DLL GeodeticCRS : virtual public SingleCRS, * association to a velocity model then the geodetic CRS is dynamic, else it is * static. * - * \remark Implements GeographicCRS from \ref ISO_19111_2018 + * \remark Implements GeographicCRS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL GeographicCRS : public GeodeticCRS { public: @@ -398,7 +398,7 @@ class PROJ_GCC_DLL GeographicCRS : public GeodeticCRS { * reference system. They exist only as an inseparable part of a 3D coordinate * tuple defined in a geographic 3D coordinate reference system. * - * \remark Implements VerticalCRS from \ref ISO_19111_2018 + * \remark Implements VerticalCRS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL VerticalCRS : virtual public SingleCRS, public io::IPROJStringExportable { @@ -476,7 +476,7 @@ class PROJ_GCC_DLL VerticalCRS : virtual public SingleCRS, * coordinate reference system is implemented using the parameters and * formula(s) specified in the definition of the coordinate conversion. * - * \remark Implements DerivedCRS from \ref ISO_19111_2018 + * \remark Implements DerivedCRS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL DerivedCRS : virtual public SingleCRS { public: @@ -539,7 +539,7 @@ using ProjectedCRSNNPtr = util::nn<ProjectedCRSPtr>; * height is passed through unchanged and forms the vertical axis of the * projected CRS's Cartesian coordinate system. * - * \remark Implements ProjectedCRS from \ref ISO_19111_2018 + * \remark Implements ProjectedCRS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL ProjectedCRS final : public DerivedCRS, public io::IPROJStringExportable { @@ -612,7 +612,7 @@ using TemporalCRSNNPtr = util::nn<TemporalCRSPtr>; /** \brief A coordinate reference system associated with a temporal datum and a * one-dimensional temporal coordinate system. * - * \remark Implements TemporalCRS from \ref ISO_19111_2018 + * \remark Implements TemporalCRS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL TemporalCRS : virtual public SingleCRS { public: @@ -671,7 +671,7 @@ using EngineeringCRSNNPtr = util::nn<EngineeringCRSPtr>; * In \ref WKT2, it maps to a ENGINEERINGCRS / ENGCRS keyword. In \ref WKT1, * it maps to a LOCAL_CS keyword. * - * \remark Implements EngineeringCRS from \ref ISO_19111_2018 + * \remark Implements EngineeringCRS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL EngineeringCRS : virtual public SingleCRS { public: @@ -725,7 +725,7 @@ using ParametricCRSNNPtr = util::nn<ParametricCRSPtr>; * without geodetic corrections, or on moving platforms such as road vehicles * vessels, aircraft or spacecraft, or as the internal CRS of an image. * - * \remark Implements ParametricCRS from \ref ISO_19111_2018 + * \remark Implements ParametricCRS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL ParametricCRS : virtual public SingleCRS { public: @@ -781,11 +781,11 @@ using CompoundCRSNNPtr = util::nn<CompoundCRSPtr>; * if coordinate values in one cannot be converted or transformed into * coordinate values in the other. * - * \note As a departure to \ref ISO_19111_2018, we allow to build a CompoundCRS - * from CRS objects, whereas ISO19111:2018 restricts the components to + * \note As a departure to \ref ISO_19111_2019, we allow to build a CompoundCRS + * from CRS objects, whereas ISO19111:2019 restricts the components to * SingleCRS. * - * \remark Implements CompoundCRS from \ref ISO_19111_2018 + * \remark Implements CompoundCRS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL CompoundCRS final : public CRS, public io::IPROJStringExportable { @@ -857,7 +857,7 @@ class PROJ_GCC_DLL CompoundCRS final : public CRS, * present in \ref WKT1. * * \note Contrary to other CRS classes of this package, there is no - * \ref ISO_19111_2018 modelling of a BoundCRS. + * \ref ISO_19111_2019 modelling of a BoundCRS. * * \remark Implements BoundCRS from \ref WKT2 */ @@ -935,7 +935,7 @@ using DerivedGeodeticCRSNNPtr = util::nn<DerivedGeodeticCRSPtr>; * inheriting a geodetic reference frame, and associated with a 3D Cartesian * or spherical coordinate system. * - * \remark Implements DerivedGeodeticCRS from \ref ISO_19111_2018 + * \remark Implements DerivedGeodeticCRS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL DerivedGeodeticCRS final : public GeodeticCRS, public DerivedCRS { @@ -1010,7 +1010,7 @@ using DerivedGeographicCRSNNPtr = util::nn<DerivedGeographicCRSPtr>; * A derived geographic CRS can be based on a geodetic CRS only if that * geodetic CRS definition includes an ellipsoid. * - * \remark Implements DerivedGeographicCRS from \ref ISO_19111_2018 + * \remark Implements DerivedGeographicCRS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL DerivedGeographicCRS final : public GeographicCRS, public DerivedCRS { @@ -1075,7 +1075,7 @@ using DerivedProjectedCRSNNPtr = util::nn<DerivedProjectedCRSPtr>; * * A DerivedProjectedCRS is not a ProjectedCRS. * - * \remark Implements DerivedProjectedCRS from \ref ISO_19111_2018 + * \remark Implements DerivedProjectedCRS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL DerivedProjectedCRS final : public DerivedCRS { public: @@ -1129,7 +1129,7 @@ using DerivedVerticalCRSNNPtr = util::nn<DerivedVerticalCRSPtr>; * coordinate reference system as its base CRS, thereby inheriting a vertical * reference frame, and a vertical coordinate system. * - * \remark Implements DerivedVerticalCRS from \ref ISO_19111_2018 + * \remark Implements DerivedVerticalCRS from \ref ISO_19111_2019 */ class PROJ_GCC_DLL DerivedVerticalCRS final : public VerticalCRS, public DerivedCRS { @@ -1275,7 +1275,7 @@ struct PROJ_GCC_DLL DerivedEngineeringCRSTraits { * engineering datum, and is associated with one of the coordinate system * types for an EngineeringCRS * - * \remark Implements DerivedEngineeringCRS from \ref ISO_19111_2018 + * \remark Implements DerivedEngineeringCRS from \ref ISO_19111_2019 */ #ifdef DOXYGEN_ENABLED class DerivedEngineeringCRS @@ -1312,7 +1312,7 @@ struct PROJ_GCC_DLL DerivedParametricCRSTraits { * coordinate reference system as its base CRS, thereby inheriting a parametric * datum, and a parametric coordinate system. * - * \remark Implements DerivedParametricCRS from \ref ISO_19111_2018 + * \remark Implements DerivedParametricCRS from \ref ISO_19111_2019 */ #ifdef DOXYGEN_ENABLED class DerivedParametricCRS @@ -1349,7 +1349,7 @@ struct PROJ_GCC_DLL DerivedTemporalCRSTraits { * coordinate reference system as its base CRS, thereby inheriting a temporal * datum, and a temporal coordinate system. * - * \remark Implements DerivedTemporalCRS from \ref ISO_19111_2018 + * \remark Implements DerivedTemporalCRS from \ref ISO_19111_2019 */ #ifdef DOXYGEN_ENABLED class DerivedTemporalCRS : public DerivedCRSTemplate<DerivedTemporalCRSTraits> { diff --git a/include/proj/datum.hpp b/include/proj/datum.hpp index 17c4c2c1..b7416497 100644 --- a/include/proj/datum.hpp +++ b/include/proj/datum.hpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: ISO19111:2018 implementation + * Purpose: ISO19111:2019 implementation * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** @@ -59,7 +59,7 @@ namespace datum { * subtype can be associated with only specific types of coordinate reference * systems. * - * \remark Implements Datum from \ref ISO_19111_2018 + * \remark Implements Datum from \ref ISO_19111_2019 */ class PROJ_GCC_DLL Datum : public common::ObjectUsage { public: @@ -115,7 +115,7 @@ using DatumEnsembleNNPtr = util::nn<DatumEnsemblePtr>; * Every frame within the datum ensemble must be a realizations of the same * Terrestrial Reference System or Vertical Reference System. * - * \remark Implements DatumEnsemble from \ref ISO_19111_2018 + * \remark Implements DatumEnsemble from \ref ISO_19111_2019 */ class PROJ_GCC_DLL DatumEnsemble final : public common::IdentifiedObject { public: @@ -168,7 +168,7 @@ using PrimeMeridianNNPtr = util::nn<PrimeMeridianPtr>; * \note The default value for prime meridian name is "Greenwich". When the * default applies, the value for the longitude shall be 0 (degrees). * - * \remark Implements PrimeMeridian from \ref ISO_19111_2018 + * \remark Implements PrimeMeridian from \ref ISO_19111_2019 */ class PROJ_GCC_DLL PrimeMeridian final : public common::IdentifiedObject, public io::IPROJStringExportable { @@ -240,7 +240,7 @@ using EllipsoidNNPtr = util::nn<EllipsoidPtr>; * For the Earth an oblate biaxial ellipsoid is used: in mathematical terms, * it is a surface formed by the rotation of an ellipse about its minor axis. * - * \remark Implements Ellipsoid from \ref ISO_19111_2018 + * \remark Implements Ellipsoid from \ref ISO_19111_2019 */ class PROJ_GCC_DLL Ellipsoid final : public common::IdentifiedObject, public io::IPROJStringExportable { @@ -369,7 +369,7 @@ using GeodeticReferenceFrameNNPtr = util::nn<GeodeticReferenceFramePtr>; * * \note In \ref ISO_19111_2007, this class was called GeodeticDatum. * - * \remark Implements GeodeticReferenceFrame from \ref ISO_19111_2018 + * \remark Implements GeodeticReferenceFrame from \ref ISO_19111_2019 */ class PROJ_GCC_DLL GeodeticReferenceFrame : public Datum { public: @@ -443,7 +443,7 @@ using DynamicGeodeticReferenceFrameNNPtr = * For example defining station coordinates having linear velocities to account * for crustal motion. * - * \remark Implements DynamicGeodeticReferenceFrame from \ref ISO_19111_2018 + * \remark Implements DynamicGeodeticReferenceFrame from \ref ISO_19111_2019 */ class PROJ_GCC_DLL DynamicGeodeticReferenceFrame final : public GeodeticReferenceFrame { @@ -498,7 +498,7 @@ class PROJ_GCC_DLL DynamicGeodeticReferenceFrame final /** \brief The specification of the method by which the vertical reference frame * is realized. * - * \remark Implements RealizationMethod from \ref ISO_19111_2018 + * \remark Implements RealizationMethod from \ref ISO_19111_2019 */ class PROJ_GCC_DLL RealizationMethod : public util::CodeList { public: @@ -528,7 +528,7 @@ using VerticalReferenceFrameNNPtr = util::nn<VerticalReferenceFramePtr>; * * \note In \ref ISO_19111_2007, this class was called VerticalDatum. - * \remark Implements VerticalReferenceFrame from \ref ISO_19111_2018 + * \remark Implements VerticalReferenceFrame from \ref ISO_19111_2019 */ class PROJ_GCC_DLL VerticalReferenceFrame : public Datum { public: @@ -585,7 +585,7 @@ using DynamicVerticalReferenceFrameNNPtr = * For example defining station heights have velocity to account for * post-glacial isostatic rebound motion. * - * \remark Implements DynamicVerticalReferenceFrame from \ref ISO_19111_2018 + * \remark Implements DynamicVerticalReferenceFrame from \ref ISO_19111_2019 */ class PROJ_GCC_DLL DynamicVerticalReferenceFrame final : public VerticalReferenceFrame { @@ -645,7 +645,7 @@ using TemporalDatumNNPtr = util::nn<TemporalDatumPtr>; /** \brief The definition of the relationship of a temporal coordinate system * to an object. The object is normally time on the Earth. * - * \remark Implements TemporalDatum from \ref ISO_19111_2018 + * \remark Implements TemporalDatum from \ref ISO_19111_2019 */ class PROJ_GCC_DLL TemporalDatum final : public Datum { public: @@ -698,7 +698,7 @@ using EngineeringDatumNNPtr = util::nn<EngineeringDatumPtr>; * point at a construction site), or be a defined point on a moving vehicle * (such as on a ship or satellite), or a defined point of an image. * - * \remark Implements EngineeringDatum from \ref ISO_19111_2018 + * \remark Implements EngineeringDatum from \ref ISO_19111_2019 */ class PROJ_GCC_DLL EngineeringDatum final : public Datum { public: @@ -742,7 +742,7 @@ using ParametricDatumNNPtr = util::nn<ParametricDatumPtr>; * particular reference surface used as the origin of a parametric coordinate * system, including its position with respect to the Earth. * - * \remark Implements ParametricDatum from \ref ISO_19111_2018 + * \remark Implements ParametricDatum from \ref ISO_19111_2019 */ class PROJ_GCC_DLL ParametricDatum final : public Datum { public: diff --git a/include/proj/internal/coordinateoperation_constants.hpp b/include/proj/internal/coordinateoperation_constants.hpp index accb4a1e..9d65dab8 100644 --- a/include/proj/internal/coordinateoperation_constants.hpp +++ b/include/proj/internal/coordinateoperation_constants.hpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: ISO19111:2018 implementation + * Purpose: ISO19111:2019 implementation * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** diff --git a/include/proj/internal/coordinateoperation_internal.hpp b/include/proj/internal/coordinateoperation_internal.hpp index 65b786b2..3dbb8e0b 100644 --- a/include/proj/internal/coordinateoperation_internal.hpp +++ b/include/proj/internal/coordinateoperation_internal.hpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: ISO19111:2018 implementation + * Purpose: ISO19111:2019 implementation * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** diff --git a/include/proj/internal/coordinatesystem_internal.hpp b/include/proj/internal/coordinatesystem_internal.hpp index 63c5f7af..ccef2e7d 100644 --- a/include/proj/internal/coordinatesystem_internal.hpp +++ b/include/proj/internal/coordinatesystem_internal.hpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: ISO19111:2018 implementation + * Purpose: ISO19111:2019 implementation * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** diff --git a/include/proj/internal/internal.hpp b/include/proj/internal/internal.hpp index b16e12bc..84fc1c2b 100644 --- a/include/proj/internal/internal.hpp +++ b/include/proj/internal/internal.hpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: ISO19111:2018 implementation + * Purpose: ISO19111:2019 implementation * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** diff --git a/include/proj/internal/io_internal.hpp b/include/proj/internal/io_internal.hpp index 3b0e7c0f..403698db 100644 --- a/include/proj/internal/io_internal.hpp +++ b/include/proj/internal/io_internal.hpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: ISO19111:2018 implementation + * Purpose: ISO19111:2019 implementation * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** diff --git a/include/proj/io.hpp b/include/proj/io.hpp index 091efcb7..de1c1d1b 100644 --- a/include/proj/io.hpp +++ b/include/proj/io.hpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: ISO19111:2018 implementation + * Purpose: ISO19111:2019 implementation * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** diff --git a/include/proj/metadata.hpp b/include/proj/metadata.hpp index 02873c81..d32996fb 100644 --- a/include/proj/metadata.hpp +++ b/include/proj/metadata.hpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: ISO19111:2018 implementation + * Purpose: ISO19111:2019 implementation * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** @@ -357,7 +357,7 @@ using IdentifierNNPtr = util::nn<IdentifierPtr>; /** \brief Value uniquely identifying an object within a namespace. * - * \remark Implements Identifier as described in \ref ISO_19111_2018 but which + * \remark Implements Identifier as described in \ref ISO_19111_2019 but which * originates from \ref ISO_19115 */ class PROJ_GCC_DLL Identifier : public util::BaseObject, diff --git a/include/proj/util.hpp b/include/proj/util.hpp index 30985ec8..9425c3a3 100644 --- a/include/proj/util.hpp +++ b/include/proj/util.hpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: ISO19111:2018 implementation + * Purpose: ISO19111:2019 implementation * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** diff --git a/src/general_doc.dox b/src/general_doc.dox index ce5a8130..04248ae5 100644 --- a/src/general_doc.dox +++ b/src/general_doc.dox @@ -4,7 +4,7 @@ \section general_api_design General API design -The design of the class hierarchy is strongly derived from \ref ISO_19111_2018. +The design of the class hierarchy is strongly derived from \ref ISO_19111_2019. Classes for which the constructors are not directly accessible have their instances constructed with create() methods. The returned object is a non-null @@ -78,13 +78,12 @@ Coordinate Reference Systems (CRS), coordinate systems (CS) and coordinate transformation or coordinate conversion between two different coordinate reference systems. -\subsubsection ISO_19111_2018 ISO 19111:2018 +\subsubsection ISO_19111_2019 ISO 19111:2019 This is the revision mostly used for PROJ C++ modelling. -[OGC 18-005r1, 2018-04-04, ISO 19111:2018] -(https://portal.opengeospatial.org/files/?artifact_id=78556) -(not yet adopted, at time of writing) +[OGC 18-005r4, 2019-02-08, ISO 19111:2019] +(http://docs.opengeospatial.org/as/18-005r4/18-005r4.html) \subsubsection ISO_19111_2007 ISO 19111:2007 @@ -111,7 +110,7 @@ PROJ implements the two following revisions of the standard: \subsubsection WKT2_2015 WKT2:2015 -[OGC 12-063r5, 2015-05-01, WKT2-2015] +[OGC 12-063r5, 2015-05-01, ISO 19162:2015(E), WKT2-2015] (http://docs.opengeospatial.org/is/12-063r5/12-063r5.html) \subsection WKT1 WKT1 specification diff --git a/src/internal.cpp b/src/internal.cpp index 44246842..b4b7a683 100644 --- a/src/internal.cpp +++ b/src/internal.cpp @@ -491,9 +491,7 @@ void proj_log_func (PJ_CONTEXT *ctx, void *app_data, PJ_LOG_FUNCTION logf) { passed as first arg at each call to the logger ******************************************************************************/ if (nullptr==ctx) - pj_get_default_ctx (); - if (nullptr==ctx) - return; + ctx = pj_get_default_ctx (); ctx->logger_app_data = app_data; if (nullptr!=logf) ctx->logger = logf; diff --git a/src/iso19111/common.cpp b/src/iso19111/common.cpp index bdd836e1..4b947dc9 100644 --- a/src/iso19111/common.cpp +++ b/src/iso19111/common.cpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: ISO19111:2018 implementation + * Purpose: ISO19111:2019 implementation * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** @@ -641,7 +641,7 @@ const std::string &IdentifiedObject::remarks() PROJ_PURE_DEFN { /** \brief Return whether the object is deprecated. * - * \remark Extension of \ref ISO_19111_2018 + * \remark Extension of \ref ISO_19111_2019 */ bool IdentifiedObject::isDeprecated() PROJ_PURE_DEFN { return d->isDeprecated; } diff --git a/src/iso19111/coordinateoperation.cpp b/src/iso19111/coordinateoperation.cpp index fbb67e6b..d5bcfa84 100644 --- a/src/iso19111/coordinateoperation.cpp +++ b/src/iso19111/coordinateoperation.cpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: ISO19111:2018 implementation + * Purpose: ISO19111:2019 implementation * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** diff --git a/src/iso19111/coordinatesystem.cpp b/src/iso19111/coordinatesystem.cpp index 2f6c5af7..ef9cac93 100644 --- a/src/iso19111/coordinatesystem.cpp +++ b/src/iso19111/coordinatesystem.cpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: ISO19111:2018 implementation + * Purpose: ISO19111:2019 implementation * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** diff --git a/src/iso19111/crs.cpp b/src/iso19111/crs.cpp index aabb15a1..4293c087 100644 --- a/src/iso19111/crs.cpp +++ b/src/iso19111/crs.cpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: ISO19111:2018 implementation + * Purpose: ISO19111:2019 implementation * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** diff --git a/src/iso19111/datum.cpp b/src/iso19111/datum.cpp index 66717f70..5f7e4775 100644 --- a/src/iso19111/datum.cpp +++ b/src/iso19111/datum.cpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: ISO19111:2018 implementation + * Purpose: ISO19111:2019 implementation * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** @@ -154,7 +154,7 @@ const util::optional<std::string> &Datum::anchorDefinition() const { /** \brief Return the date on which the datum definition was published. * - * \note Departure from \ref ISO_19111_2018 : we return a DateTime instead of + * \note Departure from \ref ISO_19111_2019 : we return a DateTime instead of * a Citation::Date. * * @return the publication date, or empty. @@ -1010,7 +1010,7 @@ GeodeticReferenceFrame::primeMeridian() PROJ_PURE_DEFN { /** \brief Return the Ellipsoid associated with a GeodeticReferenceFrame. * - * \note The \ref ISO_19111_2018 modelling allows (but discourages) a + * \note The \ref ISO_19111_2019 modelling allows (but discourages) a * GeodeticReferenceFrame * to not be associated with a Ellipsoid in the case where it is used by a * geocentric crs::GeodeticCRS. We have made the choice of making the ellipsoid @@ -1223,7 +1223,7 @@ DynamicGeodeticReferenceFrame::frameReferenceEpoch() const { /** \brief Return the name of the deformation model. * - * @note This is an extension to the \ref ISO_19111_2018 modeling, to + * @note This is an extension to the \ref ISO_19111_2019 modeling, to * hold the content of the DYNAMIC.MODEL WKT2 node. * * @return the name of the deformation model. @@ -1660,7 +1660,7 @@ DynamicVerticalReferenceFrame::frameReferenceEpoch() const { /** \brief Return the name of the deformation model. * - * @note This is an extension to the \ref ISO_19111_2018 modeling, to + * @note This is an extension to the \ref ISO_19111_2019 modeling, to * hold the content of the DYNAMIC.MODEL WKT2 node. * * @return the name of the deformation model. diff --git a/src/iso19111/factory.cpp b/src/iso19111/factory.cpp index bafa1b5d..b00a2c1a 100644 --- a/src/iso19111/factory.cpp +++ b/src/iso19111/factory.cpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: ISO19111:2018 implementation + * Purpose: ISO19111:2019 implementation * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** diff --git a/src/iso19111/internal.cpp b/src/iso19111/internal.cpp index 0c330d30..240c98f4 100644 --- a/src/iso19111/internal.cpp +++ b/src/iso19111/internal.cpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: ISO19111:2018 implementation + * Purpose: ISO19111:2019 implementation * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp index eb4403ea..51f93e2f 100644 --- a/src/iso19111/io.cpp +++ b/src/iso19111/io.cpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: ISO19111:2018 implementation + * Purpose: ISO19111:2019 implementation * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** diff --git a/src/iso19111/metadata.cpp b/src/iso19111/metadata.cpp index 6bf9d600..3725b072 100644 --- a/src/iso19111/metadata.cpp +++ b/src/iso19111/metadata.cpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: ISO19111:2018 implementation + * Purpose: ISO19111:2019 implementation * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** diff --git a/src/iso19111/static.cpp b/src/iso19111/static.cpp index 588d05da..ef2635b5 100644 --- a/src/iso19111/static.cpp +++ b/src/iso19111/static.cpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: ISO19111:2018 implementation + * Purpose: ISO19111:2019 implementation * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** diff --git a/src/iso19111/util.cpp b/src/iso19111/util.cpp index d6cfa9f4..25207d5c 100644 --- a/src/iso19111/util.cpp +++ b/src/iso19111/util.cpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: ISO19111:2018 implementation + * Purpose: ISO19111:2019 implementation * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** diff --git a/src/open_lib.cpp b/src/open_lib.cpp index 510704e9..a00d3d0e 100644 --- a/src/open_lib.cpp +++ b/src/open_lib.cpp @@ -194,10 +194,10 @@ pj_open_lib_ex(projCtx ctx, const char *name, const char *mode, sysname = name; /* or try to use application provided file finder */ - else if( ctx && ctx->file_finder != nullptr && (sysname = ctx->file_finder( ctx, name, ctx->file_finder_user_data )) != nullptr ) + else if( ctx->file_finder != nullptr && (sysname = ctx->file_finder( ctx, name, ctx->file_finder_user_data )) != nullptr ) ; - else if( ctx && ctx->file_finder_legacy != nullptr && (sysname = ctx->file_finder_legacy( name )) != nullptr ) + else if( ctx->file_finder_legacy != nullptr && (sysname = ctx->file_finder_legacy( name )) != nullptr ) ; /* or is environment PROJ_LIB defined */ @@ -234,7 +234,7 @@ pj_open_lib_ex(projCtx ctx, const char *name, const char *mode, } /* If none of those work and we have a search path, try it */ - if (!fid && ctx && !ctx->search_paths.empty() ) + if( !fid && !ctx->search_paths.empty() ) { for( const auto& path: ctx->search_paths ) { try { diff --git a/travis/install.sh b/travis/install.sh index f5fa7d08..e37644f4 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -3,7 +3,7 @@ set -e # Download grid files -wget http://download.osgeo.org/proj/proj-datumgrid-1.7.zip +wget http://download.osgeo.org/proj/proj-datumgrid-1.8.zip # prepare build files ./autogen.sh @@ -49,7 +49,7 @@ cd .. cd ../.. # Install grid files -(cd data && unzip -o ../proj-datumgrid-1.7.zip) +(cd data && unzip -o ../proj-datumgrid-1.8.zip) # autoconf build with grids mkdir build_autoconf_grids |