From 47953f0a93cd90d0d52b74f2b2705516f018b2f1 Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Mon, 8 Jan 2018 11:54:54 +0100 Subject: Allow usage of classic +axis parameter in axisswap. Instead of +order the classic PROJ.4 parameter +axis can used instead. This is mostly an inititive to simplify backwars compatibility in the 4D API. P->axis is initialized in pj_init() it can be assumed that it is set up correctly. +order and +axis are mutually exclusive. --- test/gie/axisswap.gie | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'test') diff --git a/test/gie/axisswap.gie b/test/gie/axisswap.gie index 7f0c366c..ac148a92 100644 --- a/test/gie/axisswap.gie +++ b/test/gie/axisswap.gie @@ -52,6 +52,15 @@ accept 1 2 3 4 expect 3 -2 1 4 roundtrip 100 +operation proj=axisswap axis=neu +tolerance 0.000001 m +accept 1 2 3 4 +expect 2 1 3 4 + +operation proj=axisswap axis=swd +tolerance 0.000001 m +accept 1 2 3 4 +expect -2 -1 -3 4 operation proj=pipeline step proj=latlong @@ -73,4 +82,22 @@ tolerance 0.00001 m accept 12 55 0 0 expect -55 -12 0 0 +operation proj=axisswap order=1,2,3,4 axis=enu +expect failure pjd_err_axis + +operation proj=axisswap +expect failure pjd_err_axis + +operation proj=axisswap order=1,2,1,4 +expect failure pjd_err_axis + +operation proj=axisswap order=2,3 +expect failure pjd_err_axis + +operation proj=axisswap order=2,3,4 +expect failure pjd_err_axis + +operation proj=axisswap order=1,2,3,5 +expect failure pjd_err_axis + -- cgit v1.2.3