aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/cli/proj_outIGNF.dist24
-rw-r--r--test/gie/4D-API_cs2cs-style.gie6
-rw-r--r--test/gie/axisswap.gie4
-rw-r--r--test/gie/builtins.gie8
-rw-r--r--test/gie/ellipsoid.gie5
-rw-r--r--test/gie/more_builtins.gie6
-rw-r--r--test/unit/gie_self_tests.cpp7
-rw-r--r--test/unit/test_io.cpp6
8 files changed, 31 insertions, 35 deletions
diff --git a/test/cli/proj_outIGNF.dist b/test/cli/proj_outIGNF.dist
index 611144b8..c12b883b 100644
--- a/test/cli/proj_outIGNF.dist
+++ b/test/cli/proj_outIGNF.dist
@@ -1,22 +1,22 @@
+init=IGNF:NTFG +to +init=IGNF:RGF93G
3.300866856 43.4477976569 0.0000 3d18'0.915"E 43d26'52.077"N 0.000
+init=IGNF:LAMBE +to +init=IGNF:LAMB93
- 600000.0000 2600545.4523 0.0000 652759.036 7033588.609 0.000
- 135638.3592 2418760.4094 0.0000 187444.148 6856142.911 0.000
- 998137.3947 2413822.2844 0.0000 1048843.997 6843923.913 0.000
+ 600000.0000 2600545.4523 0.0000 652760.737 7033791.243 0.000
+ 135638.3592 2418760.4094 0.0000 187194.062 6855928.882 0.000
+ 998137.3947 2413822.2844 0.0000 1049052.258 6843776.562 0.000
600000.0000 2200000.0000 0.0000 649398.872 6633524.191 0.000
- 311552.5340 1906457.4840 0.0000 358593.374 6342647.465 0.000
- 960488.4138 1910172.8812 0.0000 1007324.119 6340956.093 0.000
- 600000.0000 1699510.8340 0.0000 645201.753 6133255.515 0.000
+ 311552.5340 1906457.4840 0.0000 358799.172 6342652.486 0.000
+ 960488.4138 1910172.8812 0.0000 1007068.686 6340907.237 0.000
+ 600000.0000 1699510.8340 0.0000 645204.279 6133556.746 0.000
1203792.5981 626873.17210 0.0000 * * inf
+init=IGNF:LAMBE +to +init=IGNF:GEOPORTALFXX
- 600000.0000 2600545.4523 0.0000 179040.150 5610292.766 0.000
- 135638.3592 2418760.4094 0.0000 -303490.059 5410353.890 0.000
- 998137.3947 2413822.2844 0.0000 592635.926 5410280.335 0.000
+ 600000.0000 2600545.4523 0.0000 179040.148 5610495.275 0.000
+ 135638.3592 2418760.4094 0.0000 -303729.363 5410118.356 0.000
+ 998137.3947 2413822.2844 0.0000 592842.792 5410120.554 0.000
600000.0000 2200000.0000 0.0000 179041.670 5209746.080 0.000
- 311552.5340 1906457.4840 0.0000 -97021.878 4909167.981 0.000
- 960488.4138 1910172.8812 0.0000 524126.466 4909227.598 0.000
- 600000.0000 1699510.8340 0.0000 179047.637 4708515.623 0.000
+ 311552.5340 1906457.4840 0.0000 -96825.465 4909184.136 0.000
+ 960488.4138 1910172.8812 0.0000 523880.019 4909191.141 0.000
+ 600000.0000 1699510.8340 0.0000 179047.633 4708817.007 0.000
1203792.5981 626873.17210 0.0000 * * inf
+init=IGNF:RGF93G +to +init=IGNF:GEOPORTALFXX
2d20'11.4239243" 50d23'59.7718445" 0.0 179040.151 5610495.281 0.000
diff --git a/test/gie/4D-API_cs2cs-style.gie b/test/gie/4D-API_cs2cs-style.gie
index e653454e..0aa12665 100644
--- a/test/gie/4D-API_cs2cs-style.gie
+++ b/test/gie/4D-API_cs2cs-style.gie
@@ -219,7 +219,7 @@ expect -10370728.80 5552839.74 0
-------------------------------------------------------------------------------
-------------------------------------------------------------------------------
-Test Google's Web Mercator with +proj=webmerc
+Test Google's Web Mercator with +proj=webmerc +ellps=WGS84
-------------------------------------------------------------------------------
use_proj4_init_rules true
operation proj=pipeline step init=epsg:26915 inv step proj=webmerc datum=WGS84
@@ -235,7 +235,7 @@ expect -10370728.80 5552839.74 0
-------------------------------------------------------------------------------
Web Mercator test data from EPSG Guidance Note 7-2, p. 44.
-------------------------------------------------------------------------------
-operation proj=webmerc
+operation proj=webmerc +ellps=WGS84
tolerance 1 cm
accept -100.33333333 24.46358028
@@ -288,7 +288,7 @@ operation +proj=pipeline
expect failure pjd_err_malformed_pipeline
operation +proj=pipeline
- +step +proj=merc
+ +step +proj=merc +ellps=WGS84
+step +proj=unitconvert +xy_in=m +xy_out=km
accept 12 56
expect 1335.8339 7522.963
diff --git a/test/gie/axisswap.gie b/test/gie/axisswap.gie
index 5fe86200..a44a61a6 100644
--- a/test/gie/axisswap.gie
+++ b/test/gie/axisswap.gie
@@ -71,7 +71,7 @@ accept 1 2 3 4
expect -2 -1 -3 4
operation proj=pipeline
- step proj=latlong
+ step proj=latlong +ellps=WGS84
step proj=axisswap
order=1,2,3,4
angularunits
@@ -81,7 +81,7 @@ accept 12 55 0 0
expect 12 55 0 0
operation proj=pipeline
- step proj=latlong
+ step proj=latlong +ellps=WGS84
step proj=axisswap
order=-2,-1,3,4
angularunits
diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie
index 48be629c..f901b5e8 100644
--- a/test/gie/builtins.gie
+++ b/test/gie/builtins.gie
@@ -705,7 +705,7 @@ expect -207.544906814 81.314089279
accept -200 -100
expect -62.576950372 87.980755945
-operation +proj=calcofi +lon_0=50
+operation +proj=calcofi +lon_0=50 +ellps=WGS84
accept 10 50
expect 303.525850 -1576.974388
roundtrip 100
@@ -2007,7 +2007,7 @@ accept -200 -100
expect -0.001790493 -0.000759909
-------------------------------------------------------------------------------
-operation +proj=rhealpix +south_square=2 +north_square=3
+operation +proj=rhealpix +south_square=2 +north_square=3 +ellps=WGS84
-------------------------------------------------------------------------------
tolerance 1 m
accept 45 50
@@ -2625,7 +2625,7 @@ accept 0 0
expect 0 0
-------------------------------------------------------------------------------
-operation +proj=lcc +ellps=GRS80 +lat_1=30
+operation +proj=lcc +ellps=GRS80 +lat_1=30 +lat_2=45
-------------------------------------------------------------------------------
tolerance 0.1 mm
@@ -2639,7 +2639,7 @@ accept -1 -2
expect -137536.205750651 -269686.591917190
-------------------------------------------------------------------------------
-operation +proj=lcc +ellps=sphere +lat_1=30
+operation +proj=lcc +ellps=sphere +lat_1=30 +lat_2=45
-------------------------------------------------------------------------------
tolerance 0.1 mm
diff --git a/test/gie/ellipsoid.gie b/test/gie/ellipsoid.gie
index c2c7770a..91ab73d7 100644
--- a/test/gie/ellipsoid.gie
+++ b/test/gie/ellipsoid.gie
@@ -60,11 +60,6 @@ expect failure errno major_axis_not_given
operation proj=merc no_defs
expect failure errno major_axis_not_given
-# This one should succeed due to ellps=WGS84 in proj_def.dat
-operation proj=merc
-accept 0 0
-expect 0 0
-
operation proj=merc +es=-1
expect failure errno major_axis_not_given
diff --git a/test/gie/more_builtins.gie b/test/gie/more_builtins.gie
index 276b1fef..44d01385 100644
--- a/test/gie/more_builtins.gie
+++ b/test/gie/more_builtins.gie
@@ -213,12 +213,12 @@ operation proj=pipeline inv step
expect failure pjd_err_malformed_pipeline
operation proj=pipeline inv step
- proj=urm5 n=0.5 inv
+ proj=urm5 n=0.5 ellps=WGS84 inv
accept 12 56
expect 1215663.2814182492 5452209.5424045017
operation proj=pipeline step
- proj=urm5 n=0.5
+ proj=urm5 ellps=WGS84 n=0.5
accept 12 56
expect 1215663.2814182492 5452209.5424045017
-------------------------------------------------------------------------------
@@ -502,7 +502,7 @@ expect 69187.5632 609890.7825
Test that gie can read DMS style coordinates as well as coordinates where _
is used as a thousands separator.
-------------------------------------------------------------------------------
-operation +step +proj=latlong
+operation +step +proj=latlong +ellps=WGS84
-------------------------------------------------------------------------------
tolerance 1 m
diff --git a/test/unit/gie_self_tests.cpp b/test/unit/gie_self_tests.cpp
index b7af926b..4e788358 100644
--- a/test/unit/gie_self_tests.cpp
+++ b/test/unit/gie_self_tests.cpp
@@ -405,7 +405,7 @@ TEST(gie, info_functions) {
ASSERT_NEAR(-2.0, proj_dmstor(&buf[0], NULL), 1e-7);
/* 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_coord(0, 0, 0, 0);
a.lp.lam = proj_torad(12);
a.lp.phi = proj_torad(55);
@@ -488,7 +488,7 @@ TEST(gie, io_predicates) {
" +rx=-0.00039 +ry=0.00080 +rz=-0.00114"
" +dx=-0.0029 +dy=-0.0002 +dz=-0.0006 +ds=0.00001"
" +drx=-0.00011 +dry=-0.00019 +drz=0.00007"
- " +t_epoch=1988.0 +convention=coordinate_frame +no_defs");
+ " +t_epoch=1988.0 +convention=coordinate_frame");
ASSERT_TRUE(P != nullptr);
ASSERT_FALSE(proj_angular_input(P, PJ_FWD));
ASSERT_FALSE(proj_angular_input(P, PJ_INV));
@@ -500,14 +500,13 @@ TEST(gie, io_predicates) {
ASSERT_FALSE(proj_angular_output(P, PJ_FWD));
ASSERT_FALSE(proj_angular_output(P, PJ_INV));
- /* We specified "no_defs" but didn't give any ellipsoid info */
/* pj_init_ctx should default to WGS84 */
ASSERT_EQ(P->a, 6378137.0);
ASSERT_EQ(P->f, 1.0 / 298.257223563);
proj_destroy(P);
/* Test that pj_fwd* and pj_inv* returns NaNs when receiving NaN input */
- P = proj_create(PJ_DEFAULT_CTX, "+proj=merc");
+ P = proj_create(PJ_DEFAULT_CTX, "+proj=merc +ellps=WGS84");
ASSERT_TRUE(P != nullptr);
auto a = proj_coord(NAN, NAN, NAN, NAN);
a = proj_trans(P, PJ_FWD, a);
diff --git a/test/unit/test_io.cpp b/test/unit/test_io.cpp
index 466ce80b..5ea92fd0 100644
--- a/test/unit/test_io.cpp
+++ b/test/unit/test_io.cpp
@@ -7967,12 +7967,14 @@ TEST(io, projparse_init) {
{
auto obj = createFromUserInput(
- "proj=pipeline step init=epsg:4326 step proj=longlat", dbContext,
+ "proj=pipeline step init=epsg:4326 step proj=longlat ellps=WGS84",
+ dbContext,
true);
auto co = nn_dynamic_pointer_cast<CoordinateOperation>(obj);
ASSERT_TRUE(co != nullptr);
EXPECT_EQ(co->exportToPROJString(PROJStringFormatter::create().get()),
- "+proj=pipeline +step +init=epsg:4326 +step +proj=longlat");
+ "+proj=pipeline +step +init=epsg:4326 +step +proj=longlat "
+ "+ellps=WGS84");
}
{
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-06 10:24:00 +0000