Remove proj_def.dat (fixes #201)

5 files changed, 12 insertions, 17 deletions

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