From a3a67fb366e4628e5bda9e30b93b73648665e4d3 Mon Sep 17 00:00:00 2001 From: Thomas Knudsen Date: Wed, 3 Jan 2018 21:06:58 +0100 Subject: Introduce preparation/finalization steps in fwd/inv subsystem, supporting arbitrary dimensionality in test code * Call trans func of same dimensionality as input in gie * Refactor prep/fin code for pj_fwd/pj_inv 2D,3D,4D * Remove prime meridian handling from pj_transform (now handled in pj_fwd_prepare/pj_inv_finalize) * Introduce prep/fin skips, mostly in support of axisswap and pipeline drivers * Refactor fwd/inv subsystem * pj_transform: Let pj_fwd/inv handle scaling * Let pj_fwd/inv3d fall back to 2D eventually --- test/gie/builtins.gie | 4 +++- test/gie/more_builtins.gie | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie index a9acf4f9..3877b58a 100644 --- a/test/gie/builtins.gie +++ b/test/gie/builtins.gie @@ -509,7 +509,9 @@ Central Conic =============================================================================== ------------------------------------------------------------------------------- -operation +proj=pipeline +step +proj=ccon +lat_1=52 +lat_0=52 +lon_0=19 +a=6390000 +x_0=330000 +y_0=-350000 +step +proj=axisswap +order=1,-2,3,4 +operation +proj=pipeline +R=6390000 + +step +proj=ccon +lat_1=52 +lat_0=52 +lon_0=19 +x_0=330000 +y_0=-350000 + +step +proj=axisswap +order=1,-2 ------------------------------------------------------------------------------- tolerance 0.00010 mm accept 24 55 diff --git a/test/gie/more_builtins.gie b/test/gie/more_builtins.gie index 2d558f88..099934a7 100644 --- a/test/gie/more_builtins.gie +++ b/test/gie/more_builtins.gie @@ -18,13 +18,13 @@ operation +proj=ob_tran +o_proj=moll +R=6378137.0 +o_lon_p=0 +o_lat_p=0 +lo tolerance 1 mm direction inverse -accept 300000 400000 0 0 -expect -42.7562158333 85.5911341667 0 0 +accept 300000 400000 +expect -42.7562158333 85.5911341667 direction forward -accept 10 20 0 0 -expect -1384841.18787 7581707.88240 0 0 +accept 10 20 +expect -1384841.18787 7581707.88240 ------------------------------------------------------------------------------- -- cgit v1.2.3