Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pro forma PR - do not merge #619

Closed
wants to merge 4 commits into from
+14 −25
Closed

Pro forma PR - do not merge #619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
469d5da
What happens to tests if we get rid of proj_def.dat
busstoptaktik Oct 20, 2017
b6f283e
Make GRS80 standard ellipsoid
busstoptaktik Oct 20, 2017
78aa91d
update tv_out.dist to GRS80 version
busstoptaktik Oct 24, 2017
a386121
Repair a test in pj_cart.c, requiring WGS84
busstoptaktik Oct 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions nad/proj_def.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,5 @@
# SCCSID--- @(#)proj_def.dat 4.3 94/02/23 GIE REL"
# very preliminary version
<general>
ellps=WGS84
<>
<aea> # Conterminous U.S. map
lat_1=29.5
lat_2=45.5
<>
<lcc> # Conterminous U.S. map
lat_1=33
lat_2=45
<>
<lagrng>
W=2
ellps=GRS80
<>
16 changes: 8 additions & 8 deletions nad/tv_out.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ Test inverse handling
10 20 -1384841.19 7581707.88 0.00
##############################################################
Test MGI datum gives expected results (#207)
16.33 48.20 595710.3732102 5357598.4645755 -44.4951085
16.33 48.20 595710.3732183 5357598.4644713 -44.4951666
##############################################################
Test omerc sensitivity with locations 90d from origin(#114)
56.958381652832 72.8798 -9985.16336453 -227.67701050 0.00000000
Expand Down Expand Up @@ -368,7 +368,7 @@ Test bug 229
Test bug 229 (2)
13 -10 13.0000000000000 -10.0000000000000 0.0000000000000
##############################################################
Test bug 244
Test bug 244
-140.100000 -87.000000 987122.41833028 -14429896.53953091 0.00000000
##############################################################
Test bug 244 (2)
Expand All @@ -381,12 +381,12 @@ Test bug 245 (use expansion of +datum=carthage)
10 34 592302.9819461 3762148.7340609 -30.3110170
##############################################################
Test SCH forward projection
0.0 0.0 -1977112.0305592 5551475.1418378 6595.7256583
0.0 90.0 6618337.9734775 -1152927.4060894 10055.1157181
45.0 45.0 1630035.5650122 -342353.6396475 128.3445654
45.1 44.9 1617547.4295637 -347855.9734973 125.4645102
44.9 45.1 1642526.7453121 -336878.8571851 131.3265616
30.0 45.0 1974596.2356203 787409.8217445 773.0028577
0.0 0.0 -1977112.0304360 5551475.1418095 6595.7256909
0.0 90.0 6618337.9734799 -1152927.4060805 10055.1157677
45.0 45.0 1630035.5649883 -342353.6396425 128.3445661
45.1 44.9 1617547.4295399 -347855.9734923 125.4645108
44.9 45.1 1642526.7452882 -336878.8571800 131.3265623
30.0 45.0 1974596.2355993 787409.8217585 773.0028616
##############################################################
Test SCH inverse projection
0. 0. 45.0000000 30.0000000 0.0000000
Expand Down
10 changes: 5 additions & 5 deletions src/PJ_cart.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,10 +387,10 @@ int pj_cart_selftest (void) {
b = proj_trans_obs (P, PJ_FWD, obs[1]);

n = proj_transform (
P, PJ_FWD,
P, PJ_FWD,
&(obs[0].coo.lpz.lam), sz, 2,
&(obs[0].coo.lpz.phi), sz, 2,
&(obs[0].coo.lpz.z), sz, 2,
&(obs[0].coo.lpz.z), sz, 2,
0, sz, 0
);
if (2!=n)
Expand All @@ -408,10 +408,10 @@ int pj_cart_selftest (void) {
h = 27;
t = 33;
n = proj_transform (
P, PJ_FWD,
P, PJ_FWD,
&(obs[0].coo.lpz.lam), sz, 2,
&(obs[0].coo.lpz.phi), sz, 2,
&h, 0, 1,
&h, 0, 1,
&t, 0, 1
);
if (2!=n)
Expand Down Expand Up @@ -540,7 +540,7 @@ int pj_cart_selftest (void) {


/* test proj_derivatives_retrieve() and proj_factors_retrieve() */
P = proj_create(PJ_DEFAULT_CTX, "+proj=merc");
P = proj_create(PJ_DEFAULT_CTX, "+proj=merc +ellps=WGS84");
a = proj_obs_null;
a.coo.lp.lam = PJ_TORAD(12);
a.coo.lp.phi = PJ_TORAD(55);
Expand Down