Merge branch '6.0' of https://github.com/OSGeo/proj.4 into 6.0

14 files changed, 25 insertions, 28 deletions

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 {