WKT2_2018: always export ID of SOURCECRS/TARGETCRS and STEPs

even if there is one on upper node

This is a particular logic allowed by paragraph 7.3.3 Identifier
of OGC 18-010r6

1 files changed, 28 insertions, 30 deletions

diff --git a/test/cli/testprojinfo_out.dist b/test/cli/testprojinfo_out.dist
index ee9aeca7..eaa10689 100644
--- a/test/cli/testprojinfo_out.dist
+++ b/test/cli/testprojinfo_out.dist
@@ -193,10 +193,6 @@ COORDINATEOPERATION["Ballpark geographic offset from NAD27 to NAD83",
                 AXIS["geodetic longitude (Lon)",east,
                     ORDER[2],
                     ANGLEUNIT["degree",0.0174532925199433]],
-            USAGE[
-                SCOPE["unknown"],
-                AREA["North America - NAD27"],
-                BBOX[7.15,167.65,83.17,-47.74]],
             ID["EPSG",4267]]],
     TARGETCRS[
         GEOGCRS["NAD83",
@@ -212,10 +208,6 @@ COORDINATEOPERATION["Ballpark geographic offset from NAD27 to NAD83",
                 AXIS["geodetic longitude (Lon)",east,
                     ORDER[2],
                     ANGLEUNIT["degree",0.0174532925199433]],
-            USAGE[
-                SCOPE["unknown"],
-                AREA["North America - NAD83"],
-                BBOX[14.92,167.65,86.46,-47.74]],
             ID["EPSG",4269]]],
     METHOD["Geographic2D offsets",
         ID["EPSG",9619]],
@@ -265,7 +257,8 @@ COORDINATEOPERATION["NAD27 to NAD83 (3)",
                     ANGLEUNIT["degree",0.0174532925199433]],
                 AXIS["geodetic longitude (Lon)",east,
                     ORDER[2],
-                    ANGLEUNIT["degree",0.0174532925199433]]]],
+                    ANGLEUNIT["degree",0.0174532925199433]],
+            ID["EPSG",4267]]],
     TARGETCRS[
         GEOGCRS["NAD83",
             DATUM["North American Datum 1983",
@@ -279,7 +272,8 @@ COORDINATEOPERATION["NAD27 to NAD83 (3)",
                     ANGLEUNIT["degree",0.0174532925199433]],
                 AXIS["geodetic longitude (Lon)",east,
                     ORDER[2],
-                    ANGLEUNIT["degree",0.0174532925199433]]]],
+                    ANGLEUNIT["degree",0.0174532925199433]],
+            ID["EPSG",4269]]],
     METHOD["NTv1",
         ID["EPSG",9614]],
     PARAMETERFILE["Latitude and longitude difference file","ntv1_can.dat"],
@@ -313,7 +307,8 @@ COORDINATEOPERATION["NAD27 to NAD83 (4)",
                     ANGLEUNIT["degree",0.0174532925199433]],
                 AXIS["geodetic longitude (Lon)",east,
                     ORDER[2],
-                    ANGLEUNIT["degree",0.0174532925199433]]]],
+                    ANGLEUNIT["degree",0.0174532925199433]],
+            ID["EPSG",4267]]],
     TARGETCRS[
         GEOGCRS["NAD83",
             DATUM["North American Datum 1983",
@@ -327,7 +322,8 @@ COORDINATEOPERATION["NAD27 to NAD83 (4)",
                     ANGLEUNIT["degree",0.0174532925199433]],
                 AXIS["geodetic longitude (Lon)",east,
                     ORDER[2],
-                    ANGLEUNIT["degree",0.0174532925199433]]]],
+                    ANGLEUNIT["degree",0.0174532925199433]],
+            ID["EPSG",4269]]],
     METHOD["NTv2",
         ID["EPSG",9615]],
     PARAMETERFILE["Latitude and longitude difference file","ntv2_0.gsb"],
@@ -361,7 +357,8 @@ COORDINATEOPERATION["NAD27 to NAD83 (1)",
                     ANGLEUNIT["degree",0.0174532925199433]],
                 AXIS["geodetic longitude (Lon)",east,
                     ORDER[2],
-                    ANGLEUNIT["degree",0.0174532925199433]]]],
+                    ANGLEUNIT["degree",0.0174532925199433]],
+            ID["EPSG",4267]]],
     TARGETCRS[
         GEOGCRS["NAD83",
             DATUM["North American Datum 1983",
@@ -375,7 +372,8 @@ COORDINATEOPERATION["NAD27 to NAD83 (1)",
                     ANGLEUNIT["degree",0.0174532925199433]],
                 AXIS["geodetic longitude (Lon)",east,
                     ORDER[2],
-                    ANGLEUNIT["degree",0.0174532925199433]]]],
+                    ANGLEUNIT["degree",0.0174532925199433]],
+            ID["EPSG",4269]]],
     METHOD["CTABLE2"],
     PARAMETERFILE["Latitude and longitude difference file","conus"],
     OPERATIONACCURACY[0.15],
@@ -408,7 +406,8 @@ COORDINATEOPERATION["NAD27 to NAD83 (2)",
                     ANGLEUNIT["degree",0.0174532925199433]],
                 AXIS["geodetic longitude (Lon)",east,
                     ORDER[2],
-                    ANGLEUNIT["degree",0.0174532925199433]]]],
+                    ANGLEUNIT["degree",0.0174532925199433]],
+            ID["EPSG",4267]]],
     TARGETCRS[
         GEOGCRS["NAD83",
             DATUM["North American Datum 1983",
@@ -422,7 +421,8 @@ COORDINATEOPERATION["NAD27 to NAD83 (2)",
                     ANGLEUNIT["degree",0.0174532925199433]],
                 AXIS["geodetic longitude (Lon)",east,
                     ORDER[2],
-                    ANGLEUNIT["degree",0.0174532925199433]]]],
+                    ANGLEUNIT["degree",0.0174532925199433]],
+            ID["EPSG",4269]]],
     METHOD["CTABLE2"],
     PARAMETERFILE["Latitude and longitude difference file","alaska"],
     OPERATIONACCURACY[0.5],
@@ -455,7 +455,8 @@ COORDINATEOPERATION["NAD27 to NAD83 (5)",
                     ANGLEUNIT["degree",0.0174532925199433]],
                 AXIS["geodetic longitude (Lon)",east,
                     ORDER[2],
-                    ANGLEUNIT["degree",0.0174532925199433]]]],
+                    ANGLEUNIT["degree",0.0174532925199433]],
+            ID["EPSG",4267]]],
     TARGETCRS[
         GEOGCRS["NAD83",
             DATUM["North American Datum 1983",
@@ -469,7 +470,8 @@ COORDINATEOPERATION["NAD27 to NAD83 (5)",
                     ANGLEUNIT["degree",0.0174532925199433]],
                 AXIS["geodetic longitude (Lon)",east,
                     ORDER[2],
-                    ANGLEUNIT["degree",0.0174532925199433]]]],
+                    ANGLEUNIT["degree",0.0174532925199433]],
+            ID["EPSG",4269]]],
     METHOD["NTv1",
         ID["EPSG",9614]],
     PARAMETERFILE["Latitude and longitude difference file","GS2783v1.QUE"],
@@ -503,7 +505,8 @@ COORDINATEOPERATION["NAD27 to NAD83 (6)",
                     ANGLEUNIT["degree",0.0174532925199433]],
                 AXIS["geodetic longitude (Lon)",east,
                     ORDER[2],
-                    ANGLEUNIT["degree",0.0174532925199433]]]],
+                    ANGLEUNIT["degree",0.0174532925199433]],
+            ID["EPSG",4267]]],
     TARGETCRS[
         GEOGCRS["NAD83",
             DATUM["North American Datum 1983",
@@ -517,7 +520,8 @@ COORDINATEOPERATION["NAD27 to NAD83 (6)",
                     ANGLEUNIT["degree",0.0174532925199433]],
                 AXIS["geodetic longitude (Lon)",east,
                     ORDER[2],
-                    ANGLEUNIT["degree",0.0174532925199433]]]],
+                    ANGLEUNIT["degree",0.0174532925199433]],
+            ID["EPSG",4269]]],
     METHOD["NTv2",
         ID["EPSG",9615]],
     PARAMETERFILE["Latitude and longitude difference file","QUE27-83.gsb"],
@@ -552,10 +556,6 @@ COORDINATEOPERATION["Ballpark geographic offset from NAD27 to NAD83",
                 AXIS["geodetic longitude (Lon)",east,
                     ORDER[2],
                     ANGLEUNIT["degree",0.0174532925199433]],
-            USAGE[
-                SCOPE["unknown"],
-                AREA["North America - NAD27"],
-                BBOX[7.15,167.65,83.17,-47.74]],
             ID["EPSG",4267]]],
     TARGETCRS[
         GEOGCRS["NAD83",
@@ -571,10 +571,6 @@ COORDINATEOPERATION["Ballpark geographic offset from NAD27 to NAD83",
                 AXIS["geodetic longitude (Lon)",east,
                     ORDER[2],
                     ANGLEUNIT["degree",0.0174532925199433]],
-            USAGE[
-                SCOPE["unknown"],
-                AREA["North America - NAD83"],
-                BBOX[14.92,167.65,86.46,-47.74]],
             ID["EPSG",4269]]],
     METHOD["Geographic2D offsets",
         ID["EPSG",9619]],
@@ -712,7 +708,8 @@ COORDINATEOPERATION["RH2000 height to SWEREF99",
             VDATUM["Rikets hojdsystem 2000"],
             CS[vertical,1],
                 AXIS["gravity-related height (H)",up,
-                    LENGTHUNIT["metre",1]]]],
+                    LENGTHUNIT["metre",1]],
+            ID["EPSG",5613]]],
     TARGETCRS[
         GEOGCRS["SWEREF99 (3D)",
             DATUM["SWEREF99",
@@ -729,7 +726,8 @@ COORDINATEOPERATION["RH2000 height to SWEREF99",
                     ANGLEUNIT["degree minute second hemisphere",0.0174532925199433]],
                 AXIS["ellipsoidal height (h)",up,
                     ORDER[3],
-                    LENGTHUNIT["metre",1]]]],
+                    LENGTHUNIT["metre",1]],
+            ID["EPSG",4377]]],
     METHOD["GravityRelatedHeight to Geographic3D",
         ID["PROJ","HEIGHT_TO_GEOGRAPHIC3D"]],
     PARAMETERFILE["Geoid (height correction) model file","SWEN17_RH2000.gtx"],