From 3adb9f80135d08ad9e8d90609b034cc1c67a513b Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Wed, 6 Dec 2017 11:38:25 +0100 Subject: Use t_epoch and t_obs instead of epoch and tobs. Prefixing with t_ is more consistent with the existing parameters in PROJ, such as x_0 and friends. t_epoch and t_obs is already used in PJ_deformation. Now users can expect consistency across time-varying transformations. --- test/gie/GDA.gie | 2 +- test/gie/more_builtins.gie | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/gie/GDA.gie b/test/gie/GDA.gie index 3fe0f3e3..423443a6 100644 --- a/test/gie/GDA.gie +++ b/test/gie/GDA.gie @@ -57,7 +57,7 @@ operation proj = helmert; \ y = 0; ry = 0; dy = 0; dry = 0.00118346; \ z = 0; rz = 0; dz = 0; drz = 0.00120716; \ \ - ds = 0; epoch=2020.0; + ds = 0; t_epoch=2020.0; ----------------------------------------------------------------------------------- tolerance 50 um diff --git a/test/gie/more_builtins.gie b/test/gie/more_builtins.gie index ea37a763..1837313e 100644 --- a/test/gie/more_builtins.gie +++ b/test/gie/more_builtins.gie @@ -211,7 +211,7 @@ operation proj=helmert ellps=GRS80 \ dx=-0.0029 dy=-0.0002 dz=-0.0006 ds=0.00001 \ rx=-0.00039 ry=0.00080 rz=-0.00114 \ drx=-0.00011 dry=-0.00019 drz=0.00007 \ - epoch=1988.0 tobs=2017.0 transpose + t_epoch=1988.0 t_obs=2017.0 transpose ------------------------------------------------------------------------------- tolerance 0.03 mm accept 3370658.37800 711877.31400 5349787.08600 2017.0 # ITRF2000@2017.0 @@ -243,7 +243,7 @@ operation proj=helmert ellps=GRS80 \ dx=-0.0029 dy=-0.0002 dz=-0.0006 ds=0.00001 \ rx=-0.00039 ry=0.00080 rz=-0.00114 \ drx=-0.00011 dry=-0.00019 drz=0.00007 \ - epoch=1988.0 transpose + t_epoch=1988.0 transpose ------------------------------------------------------------------------------- tolerance 0.1 mm accept 3370658.378 711877.314 5349787.086 2017.0 -- cgit v1.2.3 From 2203189482646c208cc4c9d212909c5a7944bb1a Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Wed, 6 Dec 2017 14:42:51 +0100 Subject: Use approximate equations instead of exact as default in Helmert. --- test/gie/more_builtins.gie | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/gie/more_builtins.gie b/test/gie/more_builtins.gie index 1837313e..501406ae 100644 --- a/test/gie/more_builtins.gie +++ b/test/gie/more_builtins.gie @@ -192,7 +192,7 @@ expect 3565285.41342351 855948.67986759 5201382.72939791 ------------------------------------------------------------------------------- This example is a random point, transformed from ED50 to ETRS89 using KMStrans2 ------------------------------------------------------------------------------- -operation proj=helmert ellps=GRS80 \ +operation proj=helmert ellps=GRS80 exact \ x=-81.0703 y=-89.3603 z=-115.7526 \ rx=-0.48488 ry=-0.02436 rz=-0.41321 s=-0.540645 ------------------------------------------------------------------------------- -- cgit v1.2.3