debian/README.Debian

@@ -25,7 +25,7 @@ Direct links to the relevant pages:
   https://www.kadaster.nl/rdnaptrans2008-download-
 
 - RDNAPTRANS2008.zip file
-  https://www.kadaster.nl/documents/20838/87996/RDNAPTRANS2008/93c6e723-9e85-4b9d-abcb-a569e447d564
+  http://gnss-data.kadaster.nl/root/misc/rdnaptrans2008/RDNAPTRANS2008.zip
 
 For the 2018 update of the grids, more information (in dutch) is available
 on the Nederlandse Samenwerking Geodetische Infrastructuur (NSGI) website:
@@ -44,7 +44,7 @@ Direct links to the relevant pages:
   https://formulieren.kadaster.nl/page/download-rdnaptrans
 
 - RDNAPTRANS2018.zip file
-  https://kadaster.nl/documents/1888506/2496175/RDNAPTRANS.zip/827827a3-b88a-5d16-55b6-7f83010e1b2f?t=1565686584552
+  https://kadaster.nl/documents/1888506/2496175/RDNAPTRANS.zip/827827a3-b88a-5d16-55b6-7f83010e1b2f
 
 The license contained in the RDNAPTRANS2008.zip file is problematic, because
 it doesn't allow distribution. The license is documented in the file

debian/changelog

-proj-rdnap (2008+2018-1) UNRELEASED; urgency=medium
+proj-rdnap (2008+2018-1) unstable; urgency=medium
 
   * New upstream release.
   * Bump Standards-Version to 4.4.1, no changes.
   * Update README.Debian & get-orig-source script for 2018 grids.
   * Also install 2018 grids and its documentation.
   * Update copyright for 2018 grids and its documentation.
+  * Add tests for 2018 grids.
+  * Update package description for 2018 grids.
 
- -- Bas Couwenberg <sebastic@debian.org>  Wed, 02 Oct 2019 17:03:17 +0200
+ -- Bas Couwenberg <sebastic@debian.org>  Thu, 17 Oct 2019 13:24:15 +0200
 
 proj-rdnap (2008-9) unstable; urgency=medium
 

debian/control

@@ -56,3 +56,53 @@ Description: RDNAP grid correction files for PROJ
  transformation will be correct, geographic Bessel-1841 coordinates will
  differ in both procedures and should only be considered as an intermediate
  result.
+ .
+ RDNAPTRANS™2018 contains a new datum transformation based on the updated
+ ETRS89 coordinates of realisation ETRF2000(R14). Next to this, a new and
+ slightly more precise quasi-geoid grid model is used. This NLGEO2018
+ quasi-geoid model covers a larger area including a large part of the North
+ Sea. A change with big impact is the use of a new data format of the grid
+ files and a corresponding transformation procedure that changes the order
+ of the steps of the transformation and uses a fixed height in the datum
+ transformation. As a result, the transformation is now possible conform a
+ de facto standard by including the datum transformation in the correction
+ grid (variant 2). This allows straightforward implementation in software
+ like GIS packages and can resolve current problems due to incorrect
+ implementations of the transformation.
+ .
+ Within the administrative borders of the Netherlands, the differences in
+ the resulting horizontal coordinates due to the changes from version 2008
+ to 2018 of RDNAPTRANS™ are at maximum 0.010 m at sea level (zero NAP
+ height), and at maximum an additional 0.001 m per 50 m height above or
+ below zero NAP height. The maximum change in the transformed height
+ coordinates due to the slightly more precise new quasi-geoid grid model
+ is about 0.025 m. The new correction grid has a different sampling in
+ ellipsoidal coordinates. With this resampling, discontinuities in the
+ correction grid are smoothed, especially outside the administrative
+ borders of the Netherlands, to allow bilinear interpolation. As a result,
+ changes in the resulting horizontal coordinates up to 0.05 m occur
+ occasionally in Belgium, Germany and the Dutch EEZ. To use the same
+ bounding box around the Netherlands including the Dutch EEZ of the
+ North Sea of the quasi-geoid grid model for the correction grid, the
+ correction grid has been faded out to zero correction for a seamless
+ land-sea transition. This introduces latitude and longitude corrections
+ up to 0.25 m in areas outside the former validity area of RDNAPTRANS™
+ where no corrections were defined before.
+ .
+ There are two variants for the implementation of RDNAPTRANS™2018.
+ Implementation variant 1 applies the datum transformation as a separate
+ step using a 3D similarity transformation. Implementation variant 2
+ includes the datum transformation in the correction grid and a different
+ quasi-geoid grid for the height transformation is used. The advantage of
+ implementation variant 1 is that it has no strict bounds for the area
+ where horizontal coordinates can be transformed correctly. The
+ disadvantage is that many software packages do not support
+ implementation variant 1. Implementation variant 2 is supported by more
+ software but can only be used within the bounds of the correction grid.
+ The difference in the resulting coordinates between the two variants is
+ well below 0.0010 m within the bounds of the RDNAPTRANS™2008 grids.
+ Although transformation at sea and even outside the grid bounds is
+ possible, the scale factor of the map projection increases rapidly and
+ also the precision of transformation back and forth deteriorates. There
+ are bounds to the recommended use of RD and NAP at sea and outside the
+ Netherlands.

debian/get-orig-source

@@ -21,7 +21,7 @@ VERSION="2008+2018"
 TARDIR=${NAME}-${VERSION}
 
 # RDNAPTRANS2008
-# https://www.kadaster.nl/documents/20838/87996/RDNAPTRANS2008/93c6e723-9e85-4b9d-abcb-a569e447d564
+# http://gnss-data.kadaster.nl/root/misc/rdnaptrans2008/RDNAPTRANS2008.zip
 #
 # Download page:
 # https://www.kadaster.nl/rdnaptrans2008-download-

debian/patches/series

 add-test.patch
+add-test2018.patch

debian/rules

@@ -9,6 +9,7 @@ override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	if [ 6 -le "$(shell cs2cs 2>&1 | head -1 | cut -d' ' -f2 | cut -d'.' -f1)" ]; then \
 	    PROJ_LIB=.:/usr/share/proj perl ./testrdtrans2008.pl -v; \
+	    PROJ_LIB=.:/usr/share/proj perl ./testrdtrans2018.pl -v; \
 	else \
 	    PROJ_LIB=. perl ./testrdtrans2008.pl -v; \
 	fi

debian/source/lintian-overrides

 # No usable upstream URL for uscan, use get-orig-source script instead.
 debian-watch-file-is-missing
 
+# File added via patch
+file-without-copyright-information Z001_ETRS89andRDNAP.txt
+file-without-copyright-information epsg
+file-without-copyright-information rdnap
+file-without-copyright-information testrdtrans2008.json
+file-without-copyright-information testrdtrans2008.pl
+file-without-copyright-information testrdtrans2018.json
+file-without-copyright-information testrdtrans2018.pl
+