From a56272923f6246edf8d41776659de2ba9d509793 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 27 Dec 2018 11:02:57 +0100
Subject: tests: remove useless mentions of no_defs (refs #201)

---
 test/cli/testvarious            | 32 ++++++++++++++++----------------
 test/gie/4D-API_cs2cs-style.gie | 10 +++++-----
 test/gie/builtins.gie           |  8 ++++----
 test/gie/ellipsoid.gie          |  2 +-
 test/gigs/5101.4-jhs-etmerc.gie |  6 +++---
 test/gigs/5105.1.gie.failing    |  6 +++---
 test/gigs/5107.gie              |  6 +++---
 test/gigs/5108.gie.failing      |  4 ++--
 test/gigs/5110.gie.failing      |  4 ++--
 test/gigs/5111.1.gie            |  4 ++--
 test/gigs/5111.2.gie.failing    |  6 +++---
 test/gigs/5201.gie              |  4 ++--
 test/gigs/5208.gie              |  4 ++--
 13 files changed, 48 insertions(+), 48 deletions(-)

(limited to 'test')

diff --git a/test/cli/testvarious b/test/cli/testvarious
index 88673c5d..7ec50bb3 100755
--- a/test/cli/testvarious
+++ b/test/cli/testvarious
@@ -631,7 +631,7 @@ echo "##############################################################" >> ${OUT}
 echo "Test laea" >> ${OUT}
 #
 $EXE -f '%.12f' \
-     +proj=laea +lat_0=45 +lon_0=-100 +units=m +datum=WGS84 +no_defs \
+     +proj=laea +lat_0=45 +lon_0=-100 +units=m +datum=WGS84 \
  +to +proj=latlong +datum=WGS84 \
  -E >>${OUT} <<EOF
 -6086629.0 4488761.0
@@ -682,7 +682,7 @@ echo "Test omerc sensitivity with locations 90d from origin(#114)" >> ${OUT}
 $EXE -f '%.8f' \
      +proj=latlong +ellps=WGS84 \
  +to +proj=omerc +ellps=WGS84 +lon_1=62.581150 +lat_1=74.856102 \
-                 +lon_2=53.942810 +lat_2=74.905884 +units=km +no_rot +no_defs \
+                 +lon_2=53.942810 +lat_2=74.905884 +units=km +no_rot \
  -E >>${OUT} <<EOF
 56.958381652832 72.8798
 56.9584 72.8798
@@ -718,12 +718,12 @@ echo "Test qsc" >> ${OUT}
 #
 $EXE -f '%.7f' \
      +proj=latlong +datum=WGS84 \
- +to +proj=qsc +datum=WGS84 +no_defs \
+ +to +proj=qsc +datum=WGS84 \
  -E >>${OUT} <<EOF
 13 -10
 EOF
 $EXE -f '%.13f' \
-     +proj=qsc +datum=WGS84 +no_defs \
+     +proj=qsc +datum=WGS84 \
  +to +proj=latlong +datum=WGS84 \
  -E >>${OUT} <<EOF
 2073986.94908809568733	-1680858.27222427958623
@@ -732,8 +732,8 @@ echo "##############################################################" >> ${OUT}
 echo "Test bug 229" >> ${OUT}
 #
 $EXE -f '%.13f' \
-     +init=epsg:4326 +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs +towgs84=0,0,0 \
- +to +proj=latlong +datum=WGS84 +no_defs \
+     +init=epsg:4326 +proj=longlat +ellps=WGS84 +datum=WGS84 +towgs84=0,0,0 \
+ +to +proj=latlong +datum=WGS84 \
  -E >>${OUT} <<EOF
 13 -10
 EOF
@@ -750,7 +750,7 @@ echo "Test bug 244 " >> ${OUT}
 #
 $EXE -f '%.8f' \
      +init=epsg:4326 \
-     +to +proj=aeqd +lon_0=130.0 +lat_0=40.0 +a=6378137 +b=6378137 +units=m +no_defs \
+     +to +proj=aeqd +lon_0=130.0 +lat_0=40.0 +a=6378137 +b=6378137 +units=m \
  -E >>${OUT} <<EOF
 -140.100000 -87.000000
 EOF
@@ -758,7 +758,7 @@ echo "##############################################################" >> ${OUT}
 echo "Test bug 244 (2)" >> ${OUT}
 #
 $EXE -f '%.11f' \
-     +proj=aeqd +lon_0=130.0 +lat_0=40.0 +a=6378137 +b=6378137 +units=m +no_defs \
+     +proj=aeqd +lon_0=130.0 +lat_0=40.0 +a=6378137 +b=6378137 +units=m \
      +to +init=epsg:4326 \
  -E >>${OUT} <<EOF
 987122.418330284 -14429896.539530909
@@ -767,7 +767,7 @@ echo "##############################################################" >> ${OUT}
 echo "Test bug 245 (use +datum=carthage)" >> ${OUT}
 #
 $EXE -f '%.7f' \
-     +proj=longlat +datum=WGS84 +no_defs +to +proj=utm +zone=32 +datum=carthage +no_defs \
+     +proj=longlat +datum=WGS84 +to +proj=utm +zone=32 +datum=carthage \
  -E >>${OUT} <<EOF
 10 34
 EOF
@@ -775,7 +775,7 @@ echo "##############################################################" >> ${OUT}
 echo "Test bug 245 (use expansion of +datum=carthage)" >> ${OUT}
 #
 $EXE -f '%.7f' \
-     +proj=longlat +datum=WGS84 +no_defs +to +proj=utm +zone=32 +a=6378249.2 +b=6356515 +towgs84=-263.0,6.0,431.0 +no_defs \
+     +proj=longlat +datum=WGS84 +to +proj=utm +zone=32 +a=6378249.2 +b=6356515 +towgs84=-263.0,6.0,431.0 \
  -E >>${OUT} <<EOF
 10 34
 EOF
@@ -810,7 +810,7 @@ echo "##############################################################" >> ${OUT}
 echo "Test issue #316 (switch utm to use etmerc)" >> ${OUT}
 #
 $EXE -f '%.6f' \
-     +proj=latlong +datum=WGS84 +no_defs +to +proj=utm +zone=35 +datum=WGS84 +no_defs \
+     +proj=latlong +datum=WGS84 +to +proj=utm +zone=35 +datum=WGS84 \
  -E >>${OUT} <<EOF
 0 83
 EOF
@@ -819,7 +819,7 @@ echo "##############################################################" >> ${OUT}
 echo "Test issue #316 (switch utm to use etmerc)" >> ${OUT}
 #
 $EXE -f '%.6f' \
-     +proj=latlong +datum=WGS84 +no_defs +to +proj=etmerc +datum=WGS84 +no_defs +k=0.9996 +lon_0=27 +x_0=500000 -f %.6f \
+     +proj=latlong +datum=WGS84 +to +proj=etmerc +datum=WGS84 +k=0.9996 +lon_0=27 +x_0=500000 -f %.6f \
  -E >>${OUT} <<EOF
 0 83
 EOF
@@ -829,7 +829,7 @@ echo  "Test nzmg forward projection" >> ${OUT}
 #
 $EXE -f '%.7f' \
     +proj=latlong +datum=WGS84 +to \
-    +proj=nzmg +lat_0=-41 +lon_0=173 +x_0=2510000 +y_0=6023150 +ellps=WGS84 +units=m +no_defs \
+    +proj=nzmg +lat_0=-41 +lon_0=173 +x_0=2510000 +y_0=6023150 +ellps=WGS84 +units=m \
  -E >> ${OUT} <<EOF
 175. -40. 0.
 EOF
@@ -838,7 +838,7 @@ echo  "##############################################################" >> ${OUT}
 echo  "Test nzmg inverse projection" >> ${OUT}
 #
 $EXE -f '%.7f' \
-    +proj=nzmg +lat_0=-41 +lon_0=173 +x_0=2510000 +y_0=6023150 +ellps=WGS84 +units=m +no_defs +to \
+    +proj=nzmg +lat_0=-41 +lon_0=173 +x_0=2510000 +y_0=6023150 +ellps=WGS84 +units=m +to \
     +proj=latlong +datum=WGS84 \
  -E >> ${OUT} <<EOF
 2680778.57267967 6132228.07645127 0.
@@ -848,7 +848,7 @@ echo  "##############################################################" >> ${OUT}
 echo  "Test misrsom forward projection" >> ${OUT}
 #
 $EXE -f '%.7f' \
-    +proj=latlong +datum=WGS84 +no_defs +to \
+    +proj=latlong +datum=WGS84 +to \
     +proj=misrsom +path=41 +ellps=WGS84 +units=m \
  -E >> ${OUT} <<EOF
 48.64966165540372 66.2263195368941 0.
@@ -858,7 +858,7 @@ echo  "##############################################################" >> ${OUT}
 echo  "Test misrsom inverse projection" >> ${OUT}
 #
 $EXE -f '%.7f' \
-    +proj=misrsom +path=41 +ellps=WGS84 +units=m +no_defs +to \
+    +proj=misrsom +path=41 +ellps=WGS84 +units=m +to \
     +proj=latlong +datum=WGS84 -f '%0.7f' \
  -E >> ${OUT} <<EOF
 7461300.0 528000.0 0.0
diff --git a/test/gie/4D-API_cs2cs-style.gie b/test/gie/4D-API_cs2cs-style.gie
index 0aa12665..f66b26ec 100644
--- a/test/gie/4D-API_cs2cs-style.gie
+++ b/test/gie/4D-API_cs2cs-style.gie
@@ -167,7 +167,7 @@ A test case from a comment by Github user c0nk
 operation  proj=somerc
            lat_0=46.95240555555556 lon_0=7.439583333333333 k_0=1
            x_0=2600000 y_0=1200000 ellps=bessel
-           towgs84=674.374,15.056,405.346 no_defs
+           towgs84=674.374,15.056,405.346
 -------------------------------------------------------------------------------
 tolerance 20 cm
 accept    7.438632495 46.951082877
@@ -178,11 +178,11 @@ where, at the end of pipeline creation, a false warning about missing ellps was
 left behind from the creation of the Helmert step  (now repaired in pj_init).
 -------------------------------------------------------------------------------
 operation proj=pipeline
-     step proj=cart ellps=WGS84 no_defs
-     step proj=helmert x=674.37400 y=15.05600 z=405.34600 inv no_defs
-     step proj=cart ellps=bessel no_defs inv
+     step proj=cart ellps=WGS84
+     step proj=helmert x=674.37400 y=15.05600 z=405.34600 inv
+     step proj=cart ellps=bessel inv
      step proj=somerc lat_0=46.95240555555556 lon_0=7.439583333333333
-                      k_0=1 x_0=2600000 y_0=1200000 ellps=bessel units=m no_defs
+                      k_0=1 x_0=2600000 y_0=1200000 ellps=bessel units=m
 -------------------------------------------------------------------------------
 tolerance 20 cm
 accept    7.438632495 46.951082877
diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie
index f901b5e8..c76272e9 100644
--- a/test/gie/builtins.gie
+++ b/test/gie/builtins.gie
@@ -660,7 +660,7 @@ Cal Coop Ocean Fish Invest Lines/Stations
 ===============================================================================
 
 -------------------------------------------------------------------------------
-operation +proj=calcofi   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +no_defs
+operation +proj=calcofi   +ellps=GRS80  +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
 tolerance 0.1 mm
 accept  2 1
@@ -683,7 +683,7 @@ accept  -200 -100
 expect  -62.486322854 87.980755945
 
 -------------------------------------------------------------------------------
-operation +proj=calcofi   +R=6400000    +lat_1=0.5 +lat_2=2 +no_defs
+operation +proj=calcofi   +R=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
 tolerance 0.1 mm
 accept  2 1
@@ -2191,7 +2191,7 @@ Krovak
 ===============================================================================
 
 -------------------------------------------------------------------------------
-operation +proj=krovak +ellps=GRS80  +no_defs
+operation +proj=krovak +ellps=GRS80 
 -------------------------------------------------------------------------------
 tolerance 0.1 mm
 accept  2 1
@@ -5220,7 +5220,7 @@ van der Grinten (I)
 ===============================================================================
 
 -------------------------------------------------------------------------------
-operation +proj=vandg   +a=6400000    +lat_1=0.5 +lat_2=2 +no_defs
+operation +proj=vandg   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
 tolerance 0.1 mm
 accept  2 1
diff --git a/test/gie/ellipsoid.gie b/test/gie/ellipsoid.gie
index 91ab73d7..88419346 100644
--- a/test/gie/ellipsoid.gie
+++ b/test/gie/ellipsoid.gie
@@ -57,7 +57,7 @@ expect    failure errno unknown_ellp_param
 operation proj=merc +a=-1
 expect    failure errno major_axis_not_given
 
-operation proj=merc no_defs
+operation proj=merc
 expect    failure errno major_axis_not_given
 
 operation proj=merc +es=-1
diff --git a/test/gigs/5101.4-jhs-etmerc.gie b/test/gigs/5101.4-jhs-etmerc.gie
index 42aad560..a4f28a4a 100644
--- a/test/gigs/5101.4-jhs-etmerc.gie
+++ b/test/gigs/5101.4-jhs-etmerc.gie
@@ -11,7 +11,7 @@ use_proj4_init_rules true
 --------------------------------------------------------------------------------
 operation  +proj=pipeline
            +step +init=epsg:4190 +inv
-           +step +proj=etmerc +lat_0=-90 +lon_0=-60 +k=1 +x_0=5500000 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs
+           +step +proj=etmerc +lat_0=-90 +lon_0=-60 +k=1 +x_0=5500000 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m
 --------------------------------------------------------------------------------
 tolerance  0.03 m
 accept    -63.9993433 80.0002644
@@ -107,7 +107,7 @@ expect    5756200.0 5568100.0
 
 --------------------------------------------------------------------------------
 operation  +proj=pipeline
-           +step +proj=etmerc +lat_0=-90 +lon_0=-60 +k=1 +x_0=5500000 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs +inv
+           +step +proj=etmerc +lat_0=-90 +lon_0=-60 +k=1 +x_0=5500000 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +inv
            +step +init=epsg:4190
 --------------------------------------------------------------------------------
 tolerance  0.03 m
@@ -205,7 +205,7 @@ expect    -57.0000158 -40.0002087
 --------------------------------------------------------------------------------
 operation  +proj=pipeline
            +step +init=epsg:4190 +inv
-           +step +proj=etmerc +lat_0=-90 +lon_0=-60 +k=1 +x_0=5500000 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs
+           +step +proj=etmerc +lat_0=-90 +lon_0=-60 +k=1 +x_0=5500000 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m
 --------------------------------------------------------------------------------
 tolerance  0.006 m
 accept    -63.9993433 80.0002644
diff --git a/test/gigs/5105.1.gie.failing b/test/gigs/5105.1.gie.failing
index a0803d2b..881d0808 100644
--- a/test/gigs/5105.1.gie.failing
+++ b/test/gigs/5105.1.gie.failing
@@ -9,7 +9,7 @@ Test 5105 (part 1), Oblique Mercator (variant B), v2-0_2011-06-28.
 --------------------------------------------------------------------------------
 operation  +proj=pipeline
            +step +init=epsg:4742 +inv
-           +step +proj=somerc +lat_0=4 +lonc=115 +alpha=53.31580995 +k=0.99984 +x_0=0 +y_0=0 +no_uoff +gamma=53.13010236111111 +ellps=GRS80 +units=m +no_defs
+           +step +proj=somerc +lat_0=4 +lonc=115 +alpha=53.31580995 +k=0.99984 +x_0=0 +y_0=0 +no_uoff +gamma=53.13010236111111 +ellps=GRS80 +units=m
 --------------------------------------------------------------------------------
 tolerance  0.05 m
 accept    117 12
@@ -105,7 +105,7 @@ expect    479068.802 663798.63
 
 --------------------------------------------------------------------------------
 operation  +proj=pipeline
-           +step +proj=somerc +lat_0=4 +lonc=115 +alpha=53.31580995 +k=0.99984 +x_0=0 +y_0=0 +no_uoff +gamma=53.13010236111111 +ellps=GRS80 +units=m +no_defs +inv
+           +step +proj=somerc +lat_0=4 +lonc=115 +alpha=53.31580995 +k=0.99984 +x_0=0 +y_0=0 +no_uoff +gamma=53.13010236111111 +ellps=GRS80 +units=m +inv
            +step +init=epsg:4742
 --------------------------------------------------------------------------------
 tolerance  0.05 m
@@ -203,7 +203,7 @@ expect    114 6
 --------------------------------------------------------------------------------
 operation  +proj=pipeline
            +step +init=epsg:4742 +inv
-           +step +proj=somerc +lat_0=4 +lonc=115 +alpha=53.31580995 +k=0.99984 +x_0=0 +y_0=0 +no_uoff +gamma=53.13010236111111 +ellps=GRS80 +units=m +no_defs
+           +step +proj=somerc +lat_0=4 +lonc=115 +alpha=53.31580995 +k=0.99984 +x_0=0 +y_0=0 +no_uoff +gamma=53.13010236111111 +ellps=GRS80 +units=m
 --------------------------------------------------------------------------------
 tolerance  0.006 m
 accept    117 12
diff --git a/test/gigs/5107.gie b/test/gigs/5107.gie
index bfd044fd..d3f1df79 100644
--- a/test/gigs/5107.gie
+++ b/test/gigs/5107.gie
@@ -11,7 +11,7 @@ use_proj4_init_rules true
 --------------------------------------------------------------------------------
 operation  +proj=pipeline
            +step +init=epsg:4674 +inv
-           +step +proj=poly +lat_0=0 +lon_0=-54 +x_0=5000000 +y_0=10000000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs 
+           +step +proj=poly +lat_0=0 +lon_0=-54 +x_0=5000000 +y_0=10000000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m 
 --------------------------------------------------------------------------------
 tolerance  0.05 m
 accept    -54 0
@@ -67,7 +67,7 @@ expect    7458947.70133 7313327.31691
 
 --------------------------------------------------------------------------------
 operation  +proj=pipeline
-           +step +proj=poly +lat_0=0 +lon_0=-54 +x_0=5000000 +y_0=10000000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs  +inv
+           +step +proj=poly +lat_0=0 +lon_0=-54 +x_0=5000000 +y_0=10000000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m  +inv
            +step +init=epsg:4674
 --------------------------------------------------------------------------------
 tolerance  0.05 m
@@ -125,7 +125,7 @@ expect    -30 -22.5
 --------------------------------------------------------------------------------
 operation  +proj=pipeline
            +step +init=epsg:4674 +inv
-           +step +proj=poly +lat_0=0 +lon_0=-54 +x_0=5000000 +y_0=10000000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs 
+           +step +proj=poly +lat_0=0 +lon_0=-54 +x_0=5000000 +y_0=10000000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m 
 --------------------------------------------------------------------------------
 tolerance  0.006 m
 accept    -54 0
diff --git a/test/gigs/5108.gie.failing b/test/gigs/5108.gie.failing
index 6a979118..15ecc3cf 100644
--- a/test/gigs/5108.gie.failing
+++ b/test/gigs/5108.gie.failing
@@ -5,10 +5,10 @@ Test 5108, Cassini-Soldner, v2-0_2011-06-28.
 --------------------------------------------------------------------------------
 
 # GDM2000
-<4742> +proj=longlat +ellps=GRS80 +no_defs  <>
+<4742> +proj=longlat +ellps=GRS80  <>
 
 # GDM2000 / Johor Grid
-<3377> +proj=cass +lat_0=2.121679744444445 +lon_0=103.4279362361111 +x_0=-14810.562 +y_0=8758.32 +ellps=GRS80 +units=m +no_defs  <>
+<3377> +proj=cass +lat_0=2.121679744444445 +lon_0=103.4279362361111 +x_0=-14810.562 +y_0=8758.32 +ellps=GRS80 +units=m  <>
 
 
 <gie>
diff --git a/test/gigs/5110.gie.failing b/test/gigs/5110.gie.failing
index 2d26d1ab..52307b53 100644
--- a/test/gigs/5110.gie.failing
+++ b/test/gigs/5110.gie.failing
@@ -5,11 +5,11 @@ Test 5110, Lambert Azimuthal Equal Area, v2-0_2011-06-28.
 --------------------------------------------------------------------------------
 
 # ETRS89
-<4258> +proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_defs  <>
+<4258> +proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0  <>
 
 # ETRS89 / LAEA Europe
 <3035> +proj=laea +lat_0=52 +lon_0=10 +x_0=4321000 +y_0=3210000
-       +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs  <>
+       +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m  <>
 
 
 <gie>
diff --git a/test/gigs/5111.1.gie b/test/gigs/5111.1.gie
index fcbd4b1a..decb7f9f 100644
--- a/test/gigs/5111.1.gie
+++ b/test/gigs/5111.1.gie
@@ -5,9 +5,9 @@ Test 5111 (part 1), Mercator (variant A), v2-0_2011-06-28.
 --------------------------------------------------------------------------------
 
 # Batavia
-<4211> +proj=longlat +ellps=bessel +towgs84=-377,681,-50,0,0,0,0 +no_defs  <>
+<4211> +proj=longlat +ellps=bessel +towgs84=-377,681,-50,0,0,0,0  <>
 # Batavia / NEIEZ
-<3001> +proj=merc +lon_0=110 +k=0.997 +x_0=3900000 +y_0=900000 +ellps=bessel +towgs84=-377,681,-50,0,0,0,0 +units=m +no_defs  <>
+<3001> +proj=merc +lon_0=110 +k=0.997 +x_0=3900000 +y_0=900000 +ellps=bessel +towgs84=-377,681,-50,0,0,0,0 +units=m  <>
 
 
 <gie>
diff --git a/test/gigs/5111.2.gie.failing b/test/gigs/5111.2.gie.failing
index dfa6bca2..815efb97 100644
--- a/test/gigs/5111.2.gie.failing
+++ b/test/gigs/5111.2.gie.failing
@@ -9,7 +9,7 @@ Test 5111 (part 2), Mercator (variant A), v2-0_2011-06-28.
 --------------------------------------------------------------------------------
 operation  +proj=pipeline
            +step +init=epsg:4813 +inv
-           +step +proj=merc +lon_0=110 +k=0.997 +x_0=3900000 +y_0=900000 +ellps=bessel +units=m +no_defs
+           +step +proj=merc +lon_0=110 +k=0.997 +x_0=3900000 +y_0=900000 +ellps=bessel +units=m
 --------------------------------------------------------------------------------
 tolerance  0.05 m
 accept    -6.7200711 77.6534822
@@ -153,7 +153,7 @@ expect    -15964105.84 679490.65
 
 --------------------------------------------------------------------------------
 operation  +proj=pipeline
-           +step +proj=merc +lon_0=110 +k=0.997 +x_0=3900000 +y_0=900000 +ellps=bessel +units=m +no_defs +inv
+           +step +proj=merc +lon_0=110 +k=0.997 +x_0=3900000 +y_0=900000 +ellps=bessel +units=m +inv
            +step +init=epsg:4813
 --------------------------------------------------------------------------------
 tolerance  0.05 m
@@ -299,7 +299,7 @@ expect    -175.8077194 2.0
 --------------------------------------------------------------------------------
 operation  +proj=pipeline
            +step +init=epsg:4813 +inv
-           +step +proj=merc +lon_0=110 +k=0.997 +x_0=3900000 +y_0=900000 +ellps=bessel +units=m +no_defs
+           +step +proj=merc +lon_0=110 +k=0.997 +x_0=3900000 +y_0=900000 +ellps=bessel +units=m
 --------------------------------------------------------------------------------
 tolerance  0.006 m
 accept    -6.7200711 77.6534822
diff --git a/test/gigs/5201.gie b/test/gigs/5201.gie
index 29805b79..7d8f3bfe 100644
--- a/test/gigs/5201.gie
+++ b/test/gigs/5201.gie
@@ -5,9 +5,9 @@ Test 5201, Geographic Geocentric conversions, v2.0_2011-09-28. (EPSG 4979 - WGS8
 --------------------------------------------------------------------------------
 
 # WGS 84
-<4978> +proj=geocent +datum=WGS84 +units=m +no_defs  <>
+<4978> +proj=geocent +datum=WGS84 +units=m  <>
 # WGS 84
-<4326> +proj=longlat +datum=WGS84 +no_defs  <>
+<4326> +proj=longlat +datum=WGS84  <>
 
 
 <gie>
diff --git a/test/gigs/5208.gie b/test/gigs/5208.gie
index 985dfdcb..1c28b26c 100644
--- a/test/gigs/5208.gie
+++ b/test/gigs/5208.gie
@@ -13,10 +13,10 @@ To be on the safe side we, use 0.01 m as the tolerance.
 --------------------------------------------------------------------------------
 
 # NTF
-<4275> +proj=longlat +a=6378249.2 +b=6356515 +towgs84=-168,-60,320,0,0,0,0 +no_defs  <>
+<4275> +proj=longlat +a=6378249.2 +b=6356515 +towgs84=-168,-60,320,0,0,0,0  <>
 
 # NTF (Paris)
-<4807> +proj=longlat +a=6378249.2 +b=6356515 +towgs84=-168,-60,320,0,0,0,0 +pm=paris +no_defs  <>
+<4807> +proj=longlat +a=6378249.2 +b=6356515 +towgs84=-168,-60,320,0,0,0,0 +pm=paris  <>
 
 
 
-- 
cgit v1.2.3