[proj-rdnap] 06/09: Update test patch, fix ETRS89 typo, use variables for +init values.
Bas Couwenberg
sebastic at xs4all.nl
Tue Nov 25 21:53:26 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository proj-rdnap.
commit 4c956d83bd58d83ad2d9e2afc73e94fea0366c7d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Oct 24 12:17:48 2014 +0200
Update test patch, fix ETRS89 typo, use variables for +init values.
---
debian/patches/add-test.patch | 85 ++++++++++++++++++++++---------------------
1 file changed, 44 insertions(+), 41 deletions(-)
diff --git a/debian/patches/add-test.patch b/debian/patches/add-test.patch
index 96d57fc..f47a520 100644
--- a/debian/patches/add-test.patch
+++ b/debian/patches/add-test.patch
@@ -1,6 +1,6 @@
--- /dev/null
+++ b/testrdtrans2008
-@@ -0,0 +1,380 @@
+@@ -0,0 +1,383 @@
+:
+# Script to do some testing of various transformations
+# required by the RDNAPTRANS™2008 license.
@@ -32,6 +32,9 @@
+
+OUT=testrdtrans2008_out
+
++ETRS89="epsg:4258"
++RDNAP="rdnap:rdnap"
++
+echo "doing tests into file ${OUT}, please wait"
+
+rm -f ${OUT}
@@ -41,7 +44,7 @@
+
+cat >>${OUT} <<EOF
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
-+# | No. | Name | ETS89 | | | RD/NAP | | |
++# | No. | Name | ETRS89 | | | RD/NAP | | |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
+# | | | latitude (°) | longitude (°) | h (m) | x (m) | y (m) | NAP (m) |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
@@ -50,14 +53,14 @@
+
+EOF
+
-+$EXE -r +init=epsg:4258 +to +init=rdnap:rdnap -E -f '%.4f' >>${OUT} <<EOF
++$EXE -r +init=$ETRS89 +to +init=$RDNAP -E -f '%.4f' >>${OUT} <<EOF
+53.160753042 4.824761912 42.8614
+EOF
+
+cat >>${OUT} <<EOF
+
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
-+# | No. | Name | ETS89 | | | RD/NAP | | |
++# | No. | Name | ETRS89 | | | RD/NAP | | |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
+# | | | latitude (°) | longitude (°) | h (m) | x (m) | y (m) | NAP (m) |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
@@ -66,14 +69,14 @@
+
+EOF
+
-+$EXE -r +init=epsg:4258 +to +init=rdnap:rdnap -E -f '%.4f' >>${OUT} <<EOF
++$EXE -r +init=$ETRS89 +to +init=$RDNAP -E -f '%.4f' >>${OUT} <<EOF
+53.419482050 6.776726674 42.3586
+EOF
+
+cat >>${OUT} <<EOF
+
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
-+# | No. | Name | ETS89 | | | RD/NAP | | |
++# | No. | Name | ETRS89 | | | RD/NAP | | |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
+# | | | latitude (°) | longitude (°) | h (m) | x (m) | y (m) | NAP (m) |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
@@ -82,14 +85,14 @@
+
+EOF
+
-+$EXE -r +init=epsg:4258 +to +init=rdnap:rdnap -E -f '%.4f' >>${OUT} <<EOF
++$EXE -r +init=$ETRS89 +to +init=$RDNAP -E -f '%.4f' >>${OUT} <<EOF
+52.155172897 5.387203657 43.2551
+EOF
+
+cat >>${OUT} <<EOF
+
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
-+# | No. | Name | ETS89 | | | RD/NAP | | |
++# | No. | Name | ETRS89 | | | RD/NAP | | |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
+# | | | latitude (°) | longitude (°) | h (m) | x (m) | y (m) | NAP (m) |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
@@ -98,14 +101,14 @@
+
+EOF
+
-+$EXE -r +init=epsg:4258 +to +init=rdnap:rdnap -E -f '%.4f' >>${OUT} <<EOF
++$EXE -r +init=$ETRS89 +to +init=$RDNAP -E -f '%.4f' >>${OUT} <<EOF
+51.368607152 3.397588595 47.4024
+EOF
+
+cat >>${OUT} <<EOF
+
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
-+# | No. | Name | ETS89 | | | RD/NAP | | |
++# | No. | Name | ETRS89 | | | RD/NAP | | |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
+# | | | latitude (°) | longitude (°) | h (m) | x (m) | y (m) | NAP (m) |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
@@ -114,14 +117,14 @@
+
+EOF
+
-+$EXE -r +init=epsg:4258 +to +init=rdnap:rdnap -E -f '%.4f' >>${OUT} <<EOF
++$EXE -r +init=$ETRS89 +to +init=$RDNAP -E -f '%.4f' >>${OUT} <<EOF
+50.792584908 5.773795547 174.9478
+EOF
+
+cat >>${OUT} <<EOF
+
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
-+# | No. | Name | ETS89 | | | RD/NAP | | |
++# | No. | Name | ETRS89 | | | RD/NAP | | |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
+# | | | latitude (°) | longitude (°) | h (m) | x (m) | y (m) | NAP (m) |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
@@ -130,14 +133,14 @@
+
+EOF
+
-+$EXE -r +init=epsg:4258 +to +init=rdnap:rdnap -E -f '%.4f' >>${OUT} <<EOF
++$EXE -r +init=$ETRS89 +to +init=$RDNAP -E -f '%.4f' >>${OUT} <<EOF
+51.947393898 4.072887101 47.5968
+EOF
+
+cat >>${OUT} <<EOF
+
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
-+# | No. | Name | ETS89 | | | RD/NAP | | |
++# | No. | Name | ETRS89 | | | RD/NAP | | |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
+# | | | latitude (°) | longitude (°) | h (m) | x (m) | y (m) | NAP (m) |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
@@ -146,14 +149,14 @@
+
+EOF
+
-+$EXE -r +init=epsg:4258 +to +init=rdnap:rdnap -E -f '%.4f' >>${OUT} <<EOF
++$EXE -r +init=$ETRS89 +to +init=$RDNAP -E -f '%.4f' >>${OUT} <<EOF
+50.687420405 4.608971812
+EOF
+
+cat >>${OUT} <<EOF
+
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
-+# | No. | Name | ETS89 | | | RD/NAP | | |
++# | No. | Name | ETRS89 | | | RD/NAP | | |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
+# | | | latitude (°) | longitude (°) | h (m) | x (m) | y (m) | NAP (m) |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
@@ -162,14 +165,14 @@
+
+EOF
+
-+$EXE -r +init=epsg:4258 +to +init=rdnap:rdnap -E -f '%.4f' >>${OUT} <<EOF
++$EXE -r +init=$ETRS89 +to +init=$RDNAP -E -f '%.4f' >>${OUT} <<EOF
+51.136825197 4.601375361
+EOF
+
+cat >>${OUT} <<EOF
+
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
-+# | No. | Name | ETS89 | | | RD/NAP | | |
++# | No. | Name | ETRS89 | | | RD/NAP | | |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
+# | | | latitude (°) | longitude (°) | h (m) | x (m) | y (m) | NAP (m) |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
@@ -178,14 +181,14 @@
+
+EOF
+
-+$EXE -r +init=epsg:4258 +to +init=rdnap:rdnap -E -f '%.4f' >>${OUT} <<EOF
++$EXE -r +init=$ETRS89 +to +init=$RDNAP -E -f '%.4f' >>${OUT} <<EOF
+52.482440839 4.268403889
+EOF
+
+cat >>${OUT} <<EOF
+
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
-+# | No. | Name | ETS89 | | | RD/NAP | | |
++# | No. | Name | ETRS89 | | | RD/NAP | | |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
+# | | | latitude (°) | longitude (°) | h (m) | x (m) | y (m) | NAP (m) |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
@@ -194,7 +197,7 @@
+
+EOF
+
-+$EXE -r +init=epsg:4258 +to +init=rdnap:rdnap -E -f '%.4f' >>${OUT} <<EOF
++$EXE -r +init=$ETRS89 +to +init=$RDNAP -E -f '%.4f' >>${OUT} <<EOF
+51.003976532 3.891247830
+EOF
+
@@ -213,7 +216,7 @@
+
+EOF
+
-+$EXE -s +init=rdnap:rdnap +to +init=epsg:4258 -E -f '%.9f' >>${OUT} <<EOF
++$EXE -s +init=$RDNAP +to +init=$ETRS89 -E -f '%.9f' >>${OUT} <<EOF
+117380.1200 575040.3400 1.0000
+EOF
+
@@ -229,7 +232,7 @@
+
+EOF
+
-+$EXE -s +init=rdnap:rdnap +to +init=epsg:4258 -E -f '%.9f' >>${OUT} <<EOF
++$EXE -s +init=$RDNAP +to +init=$ETRS89 -E -f '%.9f' >>${OUT} <<EOF
+247380.5600 604580.7800 2.0000
+EOF
+
@@ -245,7 +248,7 @@
+
+EOF
+
-+$EXE -s +init=rdnap:rdnap +to +init=epsg:4258 -E -f '%.9f' >>${OUT} <<EOF
++$EXE -s +init=$RDNAP +to +init=$ETRS89 -E -f '%.9f' >>${OUT} <<EOF
+155000.0000 463000.0000 0.0000
+EOF
+
@@ -261,7 +264,7 @@
+
+EOF
+
-+$EXE -s +init=rdnap:rdnap +to +init=epsg:4258 -E -f '%.9f' >>${OUT} <<EOF
++$EXE -s +init=$RDNAP +to +init=$ETRS89 -E -f '%.9f' >>${OUT} <<EOF
+16460.9100 377380.2300 3.0000
+EOF
+
@@ -277,7 +280,7 @@
+
+EOF
+
-+$EXE -s +init=rdnap:rdnap +to +init=epsg:4258 -E -f '%.9f' >>${OUT} <<EOF
++$EXE -s +init=$RDNAP +to +init=$ETRS89 -E -f '%.9f' >>${OUT} <<EOF
+182260.4500 311480.6700 129.000
+EOF
+
@@ -293,7 +296,7 @@
+
+EOF
+
-+$EXE -s +init=rdnap:rdnap +to +init=epsg:4258 -E -f '%.9f' >>${OUT} <<EOF
++$EXE -s +init=$RDNAP +to +init=$ETRS89 -E -f '%.9f' >>${OUT} <<EOF
+64640.8900 440700.0100 4.0000
+EOF
+
@@ -309,7 +312,7 @@
+
+EOF
+
-+$EXE -s +init=rdnap:rdnap +to +init=epsg:4258 -E -f '%.9f' >>${OUT} <<EOF
++$EXE -s +init=$RDNAP +to +init=$ETRS89 -E -f '%.9f' >>${OUT} <<EOF
+100000.6700 300000.8900
+EOF
+
@@ -325,7 +328,7 @@
+
+EOF
+
-+$EXE -s +init=rdnap:rdnap +to +init=epsg:4258 -E -f '%.9f' >>${OUT} <<EOF
++$EXE -s +init=$RDNAP +to +init=$ETRS89 -E -f '%.9f' >>${OUT} <<EOF
+100000.6700 350000.8900
+EOF
+
@@ -341,7 +344,7 @@
+
+EOF
+
-+$EXE -s +init=rdnap:rdnap +to +init=epsg:4258 -E -f '%.9f' >>${OUT} <<EOF
++$EXE -s +init=$RDNAP +to +init=$ETRS89 -E -f '%.9f' >>${OUT} <<EOF
+
+EOF
+
@@ -357,7 +360,7 @@
+
+EOF
+
-+$EXE -s +init=rdnap:rdnap +to +init=epsg:4258 -E -f '%.9f' >>${OUT} <<EOF
++$EXE -s +init=$RDNAP +to +init=$ETRS89 -E -f '%.9f' >>${OUT} <<EOF
+50000.4500 335999.6700
+EOF
+
@@ -398,7 +401,7 @@
+++ b/testrdtrans2008_out.dist
@@ -0,0 +1,199 @@
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
-+# | No. | Name | ETS89 | | | RD/NAP | | |
++# | No. | Name | ETRS89 | | | RD/NAP | | |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
+# | | | latitude (°) | longitude (°) | h (m) | x (m) | y (m) | NAP (m) |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
@@ -408,7 +411,7 @@
+53.160753042 4.824761912 42.8614 117380.1200 575040.3400 1.0000
+
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
-+# | No. | Name | ETS89 | | | RD/NAP | | |
++# | No. | Name | ETRS89 | | | RD/NAP | | |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
+# | | | latitude (°) | longitude (°) | h (m) | x (m) | y (m) | NAP (m) |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
@@ -418,7 +421,7 @@
+53.419482050 6.776726674 42.3586 247380.5600 604580.7800 2.0000
+
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
-+# | No. | Name | ETS89 | | | RD/NAP | | |
++# | No. | Name | ETRS89 | | | RD/NAP | | |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
+# | | | latitude (°) | longitude (°) | h (m) | x (m) | y (m) | NAP (m) |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
@@ -428,7 +431,7 @@
+52.155172897 5.387203657 43.2551 155000.0000 463000.0000 0.0000
+
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
-+# | No. | Name | ETS89 | | | RD/NAP | | |
++# | No. | Name | ETRS89 | | | RD/NAP | | |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
+# | | | latitude (°) | longitude (°) | h (m) | x (m) | y (m) | NAP (m) |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
@@ -438,7 +441,7 @@
+51.368607152 3.397588595 47.4024 16460.9100 377380.2300 3.0000
+
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
-+# | No. | Name | ETS89 | | | RD/NAP | | |
++# | No. | Name | ETRS89 | | | RD/NAP | | |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
+# | | | latitude (°) | longitude (°) | h (m) | x (m) | y (m) | NAP (m) |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
@@ -448,7 +451,7 @@
+50.792584908 5.773795547 174.9478 182260.4500 311480.6700 129.0000
+
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
-+# | No. | Name | ETS89 | | | RD/NAP | | |
++# | No. | Name | ETRS89 | | | RD/NAP | | |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
+# | | | latitude (°) | longitude (°) | h (m) | x (m) | y (m) | NAP (m) |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
@@ -458,7 +461,7 @@
+51.947393898 4.072887101 47.5968 64640.8900 440700.0101 4.0000
+
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
-+# | No. | Name | ETS89 | | | RD/NAP | | |
++# | No. | Name | ETRS89 | | | RD/NAP | | |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
+# | | | latitude (°) | longitude (°) | h (m) | x (m) | y (m) | NAP (m) |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
@@ -468,7 +471,7 @@
+50.687420405 4.608971812 100000.6700 300000.8900
+
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
-+# | No. | Name | ETS89 | | | RD/NAP | | |
++# | No. | Name | ETRS89 | | | RD/NAP | | |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
+# | | | latitude (°) | longitude (°) | h (m) | x (m) | y (m) | NAP (m) |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
@@ -478,7 +481,7 @@
+51.136825197 4.601375361 100000.6700 350000.8900
+
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
-+# | No. | Name | ETS89 | | | RD/NAP | | |
++# | No. | Name | ETRS89 | | | RD/NAP | | |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
+# | | | latitude (°) | longitude (°) | h (m) | x (m) | y (m) | NAP (m) |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
@@ -488,7 +491,7 @@
+52.482440839 4.268403889 79000.0100 500000.2300
+
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
-+# | No. | Name | ETS89 | | | RD/NAP | | |
++# | No. | Name | ETRS89 | | | RD/NAP | | |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
+# | | | latitude (°) | longitude (°) | h (m) | x (m) | y (m) | NAP (m) |
+# +-----+-------------------+--------------+---------------+----------+-------------+-------------+---------+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/proj-rdnap.git
More information about the Pkg-grass-devel
mailing list