diff options
| author | Charles Karney <charles@karney.com> | 2020-11-01 06:53:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-01 06:53:02 -0500 |
| commit | cccd65e50d1143a1119afedae97cec5a6b9397e9 (patch) | |
| tree | 4e5af1fb8faab2c049d065a2d6d1e5e473321196 /test/gie | |
| parent | b7bf499b8449a61cdc24dcdaa0bf035f57af1b3c (diff) | |
| parent | 692fc26b6d494aeaa85658314bc020a5cd6da7a1 (diff) | |
| download | PROJ-cccd65e50d1143a1119afedae97cec5a6b9397e9.tar.gz PROJ-cccd65e50d1143a1119afedae97cec5a6b9397e9.zip | |
Merge pull request #2397 from cffk/merc-update
Update Mercator projection, more accurate, faster
Diffstat (limited to 'test/gie')
| -rw-r--r-- | test/gie/builtins.gie | 116 |
1 files changed, 85 insertions, 31 deletions
diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie index cfce5041..def30206 100644 --- a/test/gie/builtins.gie +++ b/test/gie/builtins.gie @@ -1423,9 +1423,9 @@ expect -0.001790143 -0.000895247 =============================================================================== ------------------------------------------------------------------------------- -operation +proj=etmerc +ellps=GRS80 +zone=30 +operation +proj=etmerc +ellps=GRS80 ------------------------------------------------------------------------------- -tolerance 0.1 mm +tolerance 50 nm accept 2 1 expect 222650.796797586 110642.229411933 accept 2 -1 @@ -1434,17 +1434,28 @@ accept -2 1 expect -222650.796797586 110642.229411933 accept -2 -1 expect -222650.796797586 -110642.229411933 +# near pole +accept 30 89.9999 +expect 5.584698978 10001956.056248082 +# 3900 km from central meridian +accept 44.69 35.37 +expect 4168136.489446198 4985511.302287407 direction inverse accept 200 100 -expect 0.001796631 0.000904369 +expect 0.00179663056816 0.00090436947663 accept 200 -100 -expect 0.001796631 -0.000904369 +expect 0.00179663056816 -0.00090436947663 accept -200 100 -expect -0.001796631 0.000904369 +expect -0.00179663056816 0.00090436947663 accept -200 -100 -expect -0.001796631 -0.000904369 - +expect -0.00179663056816 -0.00090436947663 +# near pole +accept 6 1.0001e7 +expect 0.35596960759234 89.99135362646302 +# 3900 km from central meridian +accept 4168136.489446198 4985511.302287407 +expect 44.69 35.37 =============================================================================== # Fahey @@ -3355,30 +3366,54 @@ expect -0.001953415 -0.000820580 ------------------------------------------------------------------------------- operation +proj=merc +ellps=GRS80 ------------------------------------------------------------------------------- -tolerance 0.1 mm +tolerance 0 m +accept 0 0 +expect 0 0 +tolerance 50 nm accept 2 1 -expect 222638.981586547 110579.965218250 +expect 222638.981586547 110579.965218249 accept 2 -1 expect 222638.981586547 -110579.965218249 accept -2 1 -expect -222638.981586547 110579.965218250 +expect -222638.981586547 110579.965218249 accept -2 -1 expect -222638.981586547 -110579.965218249 +# inflate tolerance by scale (k = 5.7e15) +tolerance 3e8 +accept 0 89.99999999999999 +expect 0 235805185.015130176 +accept 0 -89.99999999999999 +expect 0 -235805185.015130176 direction inverse +tolerance 0 m +accept 0 0 +expect 0 0 +tolerance 50 nm accept 200 100 -expect 0.001796631 0.000904369 +expect 0.00179663056824 0.00090436947704 accept 200 -100 -expect 0.001796631 -0.000904369 +expect 0.00179663056824 -0.00090436947704 accept -200 100 -expect -0.001796631 0.000904369 +expect -0.00179663056824 0.00090436947704 accept -200 -100 -expect -0.001796631 -0.000904369 +expect -0.00179663056824 -0.00090436947704 +accept 0 235805185.015130176 +expect 0 89.99999999999999 +accept 0 -235805185.015130176 +expect 0 -89.99999999999999 +accept 0 1e10 +expect 0 90 +accept 0 -1e10 +expect 0 -90 ------------------------------------------------------------------------------- operation +proj=merc +R=6400000 ------------------------------------------------------------------------------- -tolerance 0.1 mm +tolerance 0 m +accept 0 0 +expect 0 0 +tolerance 50 nm accept 2 1 expect 223402.144255274 111706.743574944 accept 2 -1 @@ -3389,25 +3424,32 @@ accept -2 -1 expect -223402.144255274 -111706.743574944 direction inverse +tolerance 0 m +accept 0 0 +expect 0 0 +tolerance 50 nm accept 200 100 -expect 0.001790493 0.000895247 +expect 0.00179049310978 0.00089524655486 accept 200 -100 -expect 0.001790493 -0.000895247 +expect 0.00179049310978 -0.00089524655486 accept -200 100 -expect -0.001790493 0.000895247 +expect -0.00179049310978 0.00089524655486 accept -200 -100 -expect -0.001790493 -0.000895247 - +expect -0.00179049310978 -0.00089524655486 ------------------------------------------------------------------------------- operation +proj=merc +R=1 ------------------------------------------------------------------------------- # Test the numerical stability of the inverse spherical Mercator ------------------------------------------------------------------------------- -tolerance 1e-15 m -accept 0 1e-15 +tolerance 1e-17 m +accept 0 57.295779513e-15 expect 0 1e-15 +direction inverse +accept 0 1e-15 +expect 0 57.295779513e-15 + =============================================================================== # Miller Oblated Stereographic @@ -5658,25 +5700,37 @@ expect -0.001790143 0.511651393 ------------------------------------------------------------------------------- operation +proj=tmerc +ellps=GRS80 ------------------------------------------------------------------------------- -tolerance 0.1 mm +tolerance 50 nm accept 2 1 -expect 222650.796795778 110642.229411927 +expect 222650.796797586 110642.229411933 accept 2 -1 -expect 222650.796795778 -110642.229411927 +expect 222650.796797586 -110642.229411933 accept -2 1 -expect -222650.796795778 110642.229411927 +expect -222650.796797586 110642.229411933 accept -2 -1 -expect -222650.796795778 -110642.229411927 +expect -222650.796797586 -110642.229411933 +# near pole +accept 30 89.9999 +expect 5.584698978 10001956.056248082 +# 3900 km from central meridian +accept 44.69 35.37 +expect 4168136.489446198 4985511.302287407 direction inverse accept 200 100 -expect 0.001796631 0.000904369 +expect 0.00179663056816 0.00090436947663 accept 200 -100 -expect 0.001796631 -0.000904369 +expect 0.00179663056816 -0.00090436947663 accept -200 100 -expect -0.001796631 0.000904369 +expect -0.00179663056816 0.00090436947663 accept -200 -100 -expect -0.001796631 -0.000904369 +expect -0.00179663056816 -0.00090436947663 +# near pole +accept 6 1.0001e7 +expect 0.35596960759234 89.99135362646302 +# 3900 km from central meridian +accept 4168136.489446198 4985511.302287407 +expect 44.69 35.37 ------------------------------------------------------------------------------- operation +proj=tmerc +R=6400000 |