AUTHORS

-Original Author:
-Gerald Evenden
+--------------------------------------------------------------------------------
+Authors
+--------------------------------------------------------------------------------
+
+Original Author
+................................................................................
+
+Gerald Evenden (1935-2016)
+
+Maintainer(s)
+................................................................................
+
+Kristian Evers <kreve@sdfe.dk>
+Even Rouault <even.rouault@spatialys.com>
+
+
+Project Steering Committee
+--------------------------------------------------------------------------------
+
+Process and membership can be found at:
+https://proj4.org/community/rfc/rfc-1.html
+
+Chair
+................................................................................
+
+Kristian Evers <kreve@sdfe.dk>
+
+Members
+................................................................................
 
-Maintainer(s):
 Frank Warmerdam <warmerdam@pobox.com>
 Howard Butler <howard@hobu.co>
-
-Contributors:
-Brent Fraser <bfraser@geoanalytic.com>
-Chris Stuber <imap@chesapeake.net>
-Craig Bruce <cbruce@cubewerx.com>
-Victor Osipkov <vctos@email.com>
-Andrea Antonello <andrea.antonello@hydrologis.com>
 Charles Karney <charles.karney@sri.com>
-Karsten Engsager
-Knud Poder
-Kristian Evers <kreve@sdfe.dk>
 Thomas Knudsen <thokn@sdfe.dk>
 Even Rouault <even.rouault@spatialys.com>
+Kurt Schwehr <schwehr@gmail.com>
+
+Contributors
+--------------------------------------------------------------------------------
+
+The full list of contributors can be found on GitHub
+https://github.com/OSGeo/proj.4/graphs/contributors

NEWS

@@ -119,25 +119,30 @@ CRSs.
 
  o Fixed use of grid paths including spaces (#1152)
 
+ o Robinson: fix wrong values for forward path for latitudes >= 87.5 (#1172),
+   and fix inaccurate inverse method.
+
  THANKS TO
  ------------
 
  Version 6.0.0 is made possible by the following contributors:
 
  Aaron Puchert
+ Thomas Knudsen
  Phil Elson
  Mateusz Łoskot
  Markus Neteler
  Jürgen Fischer
- Howard Butler
  Charles Karney
+ Bas Couwenberg
+ Karoline Skaar
  Alan D. Snow
+ Howard Butler
  Marco Bernasocchi
- Karoline Skaar
  Ben Boeckel
  Ivan Veselov
- Mike Taves
  Philippe Rivière
+ Mike Taves
  Elliott Sales de Andrade
  Kai Pastor
  Kristian Evers

debian/changelog

+proj (6.0.0~rc3-1~exp1) experimental; urgency=medium
+
+  * New upstream release candidate.
+  * Update 6.0.0~rc2 symbols for other architectures.
+  * Drop spelling-errors.patch, applied upstream.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Mon, 25 Feb 2019 22:08:06 +0100
+
 proj (6.0.0~rc2-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.

debian/patches/series

-spelling-errors.patch

debian/patches/spelling-errors.patch

-Description: Fix spelling errors.
- * specfied -> specified
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: https://github.com/OSGeo/proj.4/pull/1286
-Applied-Upstream: https://github.com/OSGeo/proj.4/commit/159e500be0df926596df4c5f6d8795f91a4d83eb
-
---- a/man/man1/projinfo.1
-+++ b/man/man1/projinfo.1
-@@ -144,7 +144,7 @@ only used for coordinate operation compu
- .TP
- .B \-\-spatial\-test contains|intersects
- Specify how the area of use of coordinate operations found in the database
--are compared to the area of use specfied explicitly with \fI\%\-\-area\fP or \fI\%\-\-bbox\fP,
-+are compared to the area of use specified explicitly with \fI\%\-\-area\fP or \fI\%\-\-bbox\fP,
- or derivedi implictly 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 (\fBcontains\fP strategy).

man/man1/projinfo.1

@@ -144,7 +144,7 @@ only used for coordinate operation computation
 .TP
 .B \-\-spatial\-test contains|intersects
 Specify how the area of use of coordinate operations found in the database
-are compared to the area of use specfied explicitly with \fI\%\-\-area\fP or \fI\%\-\-bbox\fP,
+are compared to the area of use specified explicitly with \fI\%\-\-area\fP or \fI\%\-\-bbox\fP,
 or derivedi implictly 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 (\fBcontains\fP strategy).

src/iso19111/coordinateoperation.cpp

@@ -2156,8 +2156,9 @@ void ParameterValue::_exportToWKT(io::WKTFormatter *formatter) const {
     const bool isWKT2 = formatter->version() == io::WKTFormatter::Version::WKT2;
 
     const auto &l_type = type();
+    if (l_type == Type::MEASURE) {
         const auto &l_value = value();
-    if (formatter->abridgedTransformation() && l_type == Type::MEASURE) {
+        if (formatter->abridgedTransformation()) {
             const auto &unit = l_value.unit();
             const auto &unitType = unit.type();
             if (unitType == common::UnitOfMeasure::Type::LINEAR) {
@@ -2170,7 +2171,7 @@ void ParameterValue::_exportToWKT(io::WKTFormatter *formatter) const {
             } else {
                 formatter->add(l_value.value());
             }
-    } else if (l_type == Type::MEASURE) {
+        } else {
             const auto &unit = l_value.unit();
             if (isWKT2) {
                 formatter->add(l_value.value());
@@ -2197,13 +2198,15 @@ void ParameterValue::_exportToWKT(io::WKTFormatter *formatter) const {
                 }
             }
             if (isWKT2 && unit != common::UnitOfMeasure::NONE) {
-            if (!formatter->primeMeridianOrParameterUnitOmittedIfSameAsAxis() ||
+                if (!formatter
+                         ->primeMeridianOrParameterUnitOmittedIfSameAsAxis() ||
                     (unit != common::UnitOfMeasure::SCALE_UNITY &&
                      unit != *(formatter->axisLinearUnit()) &&
                      unit != *(formatter->axisAngularUnit()))) {
                     unit._exportToWKT(formatter);
                 }
             }
+        }
     } else if (l_type == Type::STRING || l_type == Type::FILENAME) {
         formatter->addQuotedString(stringValue());
     } else if (l_type == Type::INTEGER) {

src/jniproj.cpp

@@ -279,7 +279,7 @@ JNIEXPORT jcharArray JNICALL Java_org_proj4_PJ_getAxisDirections
 {
     PJ *pj = getPJ(env, object);
     if (pj) {
-        int length = strlen(pj->axis);
+        int length = static_cast<int>(strlen(pj->axis));
         jcharArray array = env->NewCharArray(length);
         if (array) {
             jchar* axis = env->GetCharArrayElements(array, nullptr);

src/projections/robin.cpp

@@ -7,7 +7,7 @@
 PROJ_HEAD(robin, "Robinson") "\n\tPCyl, Sph";
 
 #define V(C,z) (C.c0 + z * (C.c1 + z * (C.c2 + z * C.c3)))
-#define DV(C,z) (C.c1 + z * (C.c2 + C.c2 + z * 3. * C.c3))
+#define DV(C,z) (C.c1 + 2 * z * C.c2 + z * z * 3. * C.c3)
 
 /*
 note: following terms based upon 5 deg. intervals in degrees.
@@ -74,7 +74,7 @@ static const struct COEFS Y[] = {
 #define RC1 0.08726646259971647884
 #define NODES   18
 #define ONEEPS  1.000001
-#define EPS 1e-8
+#define EPS 1e-10
 /* Not sure at all of the appropriate number for MAX_ITER... */
 #define MAX_ITER 100
 
@@ -90,7 +90,7 @@ static PJ_XY s_forward (PJ_LP lp, PJ *P) {           /* Spheroidal, forward */
         proj_errno_set(P, PJD_ERR_TOLERANCE_CONDITION);
         return xy;
     }
-    if (i >= NODES) i = NODES - 1;
+    if (i >= NODES) i = NODES;
     dphi = RAD_TO_DEG * (dphi - RC1 * i);
     xy.x = V(X[i], dphi) * FXC * lp.lam;
     xy.y = V(Y[i], dphi) * FYC;
@@ -133,10 +133,8 @@ static PJ_LP s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, inverse */
         T = Y[i];
         /* first guess, linear interp */
         t = 5. * (lp.phi - T.c0)/(Y[i+1].c0 - T.c0);
-        /* make into root */
-        T.c0 = (float)(T.c0 - lp.phi);
         for (iters = MAX_ITER; iters ; --iters) { /* Newton-Raphson */
-            t -= t1 = V(T,t) / DV(T,t);
+            t -= t1 = (V(T,t) - lp.phi) / DV(T,t);
             if (fabs(t1) < EPS)
                 break;
         }

src/projections/sch.cpp

@@ -215,7 +215,7 @@ PJ *PROJECTION(sch) {
         return pj_default_destructor(P, PJD_ERR_FAILED_TO_FIND_PROJ);
     }
 
-    /* Check if peg latitude is defined */
+    /* Check if peg heading is defined */
     if (pj_param(P->ctx, P->params, "tphdg_0").i)
         Q->phdg = pj_param(P->ctx, P->params, "rphdg_0").f;
     else {

test/cli/Makefile.am

 # Executables paths passed to test scripts
-DATAPATH = ../../data
+PROJ_LIB ?= ../../data
 THIS_DIR = $(top_srcdir)/test/cli
 EXEPATH = ../../src
 PROJEXE = $(EXEPATH)/proj
@@ -27,7 +27,7 @@ EXTRA_DIST = pj_out27.dist pj_out83.dist td_out.dist \
 		CMakeLists.txt
 
 testprojinfo-check:
-	PROJ_LIB=$(DATAPATH) $(TESTPROJINFO) $(PROJINFOEXE)
+	PROJ_LIB=$(PROJ_LIB) $(TESTPROJINFO) $(PROJINFOEXE)
 
 test27-check:
 	$(TEST27) $(PROJEXE)
@@ -36,24 +36,24 @@ test83-check:
 	$(TEST83) $(PROJEXE)
 
 testvarious-check:
-	PROJ_LIB=$(DATAPATH) $(TESTVARIOUS) $(CS2CSEXE)
+	PROJ_LIB=$(PROJ_LIB) $(TESTVARIOUS) $(CS2CSEXE)
 
 testdatumfile-check:
-	@if [ -f $(DATAPATH)/conus -a -f $(DATAPATH)/ntv1_can.dat -a -f $(DATAPATH)/MD -a -f $(DATAPATH)/ntf_r93.gsb ]; then \
-	  PROJ_LIB=$(DATAPATH) $(TESTDATUMFILE) $(CS2CSEXE) ; \
+	@if [ -f $(PROJ_LIB)/conus -a -f $(PROJ_LIB)/ntv1_can.dat -a -f $(PROJ_LIB)/MD -a -f $(PROJ_LIB)/ntf_r93.gsb ]; then \
+	  PROJ_LIB=$(PROJ_LIB) $(TESTDATUMFILE) $(CS2CSEXE) ; \
 	fi
 
 testign-check:
-	@if [ -f $(DATAPATH)/ntf_r93.gsb ] ; then \
-	  PROJ_LIB=$(DATAPATH) $(TESTIGN) $(CS2CSEXE) ; \
+	@if [ -f $(PROJ_LIB)/ntf_r93.gsb ] ; then \
+	  PROJ_LIB=$(PROJ_LIB) $(TESTIGN) $(CS2CSEXE) ; \
 	fi
 
 testntv2-check:
-	@if [ -f $(DATAPATH)/ntv2_0.gsb ] ; then \
-	  PROJ_LIB=$(DATAPATH) $(TESTNTV2) $(CS2CSEXE) ; \
+	@if [ -f $(PROJ_LIB)/ntv2_0.gsb ] ; then \
+	  PROJ_LIB=$(PROJ_LIB) $(TESTNTV2) $(CS2CSEXE) ; \
 	fi
 
 testcct-check:
-	PROJ_LIB=$(DATAPATH) $(TESTCCT) $(CCTEXE)
+	PROJ_LIB=$(PROJ_LIB) $(TESTCCT) $(CCTEXE)
 
 check-local: testprojinfo-check test27-check test83-check testvarious-check testdatumfile-check testign-check testntv2-check testcct-check

test/cli/Makefile.in

@@ -260,9 +260,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-
-# Executables paths passed to test scripts
-DATAPATH = ../../data
 THIS_DIR = $(top_srcdir)/test/cli
 EXEPATH = ../../src
 PROJEXE = $(EXEPATH)/proj
@@ -485,8 +482,11 @@ uninstall-am:
 .PRECIOUS: Makefile
 
 
+# Executables paths passed to test scripts
+PROJ_LIB ?= ../../data
+
 testprojinfo-check:
-	PROJ_LIB=$(DATAPATH) $(TESTPROJINFO) $(PROJINFOEXE)
+	PROJ_LIB=$(PROJ_LIB) $(TESTPROJINFO) $(PROJINFOEXE)
 
 test27-check:
 	$(TEST27) $(PROJEXE)
@@ -495,25 +495,25 @@ test83-check:
 	$(TEST83) $(PROJEXE)
 
 testvarious-check:
-	PROJ_LIB=$(DATAPATH) $(TESTVARIOUS) $(CS2CSEXE)
+	PROJ_LIB=$(PROJ_LIB) $(TESTVARIOUS) $(CS2CSEXE)
 
 testdatumfile-check:
-	@if [ -f $(DATAPATH)/conus -a -f $(DATAPATH)/ntv1_can.dat -a -f $(DATAPATH)/MD -a -f $(DATAPATH)/ntf_r93.gsb ]; then \
-	  PROJ_LIB=$(DATAPATH) $(TESTDATUMFILE) $(CS2CSEXE) ; \
+	@if [ -f $(PROJ_LIB)/conus -a -f $(PROJ_LIB)/ntv1_can.dat -a -f $(PROJ_LIB)/MD -a -f $(PROJ_LIB)/ntf_r93.gsb ]; then \
+	  PROJ_LIB=$(PROJ_LIB) $(TESTDATUMFILE) $(CS2CSEXE) ; \
 	fi
 
 testign-check:
-	@if [ -f $(DATAPATH)/ntf_r93.gsb ] ; then \
-	  PROJ_LIB=$(DATAPATH) $(TESTIGN) $(CS2CSEXE) ; \
+	@if [ -f $(PROJ_LIB)/ntf_r93.gsb ] ; then \
+	  PROJ_LIB=$(PROJ_LIB) $(TESTIGN) $(CS2CSEXE) ; \
 	fi
 
 testntv2-check:
-	@if [ -f $(DATAPATH)/ntv2_0.gsb ] ; then \
-	  PROJ_LIB=$(DATAPATH) $(TESTNTV2) $(CS2CSEXE) ; \
+	@if [ -f $(PROJ_LIB)/ntv2_0.gsb ] ; then \
+	  PROJ_LIB=$(PROJ_LIB) $(TESTNTV2) $(CS2CSEXE) ; \
 	fi
 
 testcct-check:
-	PROJ_LIB=$(DATAPATH) $(TESTCCT) $(CCTEXE)
+	PROJ_LIB=$(PROJ_LIB) $(TESTCCT) $(CCTEXE)
 
 check-local: testprojinfo-check test27-check test83-check testvarious-check testdatumfile-check testign-check testntv2-check testcct-check
 

test/cli/test27

@@ -7,7 +7,6 @@
 #   Mercator due to greater precision of meridional distance function.
 #
 TEST_CLI_DIR=`dirname $0`
-DATA_DIR=`dirname $0`/../../data
 EXE=$1
 
 usage()
@@ -26,12 +25,16 @@ if test ! -x ${EXE}; then
     exit 1
 fi
 
+if test -z "${PROJ_LIB}"; then
+    export PROJ_LIB="`dirname $0`/../../data"
+fi
+
 echo "============================================"
 echo "Running ${0} using ${EXE}:"
 echo "============================================"
 
 OUT=proj_out27
-INIT_FILE=${DATA_DIR}/nad27
+INIT_FILE=${PROJ_LIB}/nad27
 #
 echo "doing tests into file ${OUT}, please wait"
 #

test/cli/test83

@@ -8,7 +8,6 @@
 #   Mercator due to greater precision of meridional distance function.
 #
 TEST_CLI_DIR=`dirname $0`
-DATA_DIR=`dirname $0`/../../data
 EXE=$1
 
 usage()
@@ -27,12 +26,16 @@ if test ! -x ${EXE}; then
     exit 1
 fi
 
+if test -z "${PROJ_LIB}"; then
+    export PROJ_LIB="`dirname $0`/../../data"
+fi
+
 echo "============================================"
 echo "Running ${0} using ${EXE}:"
 echo "============================================"
 
 OUT=proj_out83
-INIT_FILE=${DATA_DIR}/nad83
+INIT_FILE=${PROJ_LIB}/nad83
 #
 echo "doing tests into file ${OUT}, please wait"
 #

test/cli/testIGNF

@@ -12,7 +12,6 @@
 #               the gsb grid is still ok
 
 TEST_CLI_DIR=`dirname $0`
-DATA_DIR=`dirname $0`/../../data
 EXE=$1
 
 usage()
@@ -32,7 +31,7 @@ if test ! -x ${EXE}; then
 fi
 
 if test -z "${PROJ_LIB}"; then
-    export PROJ_LIB=${DATA_DIR}
+    export PROJ_LIB="`dirname $0`/../../data"
 fi
 
 echo "============================================"

test/cli/testcct

@@ -2,7 +2,6 @@
 # Test cct
 
 TEST_CLI_DIR=`dirname $0`
-DATA_DIR=`dirname $0`/../../data
 EXE=$1
 
 usage()

test/cli/testdatumfile

@@ -4,7 +4,6 @@
 #
 #
 TEST_CLI_DIR=`dirname $0`
-DATA_DIR=`dirname $0`/../../data
 EXE=$1
 
 usage()

test/cli/testflaky

@@ -4,7 +4,6 @@
 #
 #
 TEST_CLI_DIR=`dirname $0`
-DATA_DIR=`dirname $0`/../../data
 EXE=$1
 
 usage()

test/cli/testntv2

@@ -4,7 +4,6 @@
 #
 #
 TEST_CLI_DIR=`dirname $0`
-DATA_DIR=`dirname $0`/../../data
 EXE=$1
 
 usage()