projinfo: output WKT2_2018 by default (fixes #1187)

3 files changed, 137 insertions, 49 deletions

diff --git a/src/apps/projinfo.cpp b/src/apps/projinfo.cpp
index 446a1e9e..2f94c916 100644
--- a/src/apps/projinfo.cpp
+++ b/src/apps/projinfo.cpp
@@ -642,8 +642,8 @@ int main(int argc, char **argv) {
                     outputOpt.WKT1_ESRI = true;
                 } else if (ci_equal(format, "default")) {
                     outputOpt.PROJ5 = true;
-                    outputOpt.WKT2_2018 = false;
-                    outputOpt.WKT2_2015 = true;
+                    outputOpt.WKT2_2018 = true;
+                    outputOpt.WKT2_2015 = false;
                     outputOpt.WKT1_GDAL = false;
                 } else if (ci_equal(format, "PROJ")) {
                     outputOpt.PROJ5 = true;
@@ -902,7 +902,7 @@ int main(int argc, char **argv) {
 
     if (!outputSwithSpecified) {
         outputOpt.PROJ5 = true;
-        outputOpt.WKT2_2015 = true;
+        outputOpt.WKT2_2018 = true;
     }
 
     if (outputOpt.quiet &&
diff --git a/test/cli/testprojinfo b/test/cli/testprojinfo
index 70e4912f..111c071e 100755
--- a/test/cli/testprojinfo
+++ b/test/cli/testprojinfo
@@ -33,6 +33,18 @@ echo "Testing projinfo EPSG:4326" >> ${OUT}
 $EXE EPSG:4326 >>${OUT}
 echo "" >>${OUT}
 
+echo "Testing projinfo -o WKT1_GDAL EPSG:4326" >> ${OUT}
+$EXE -o WKT1_GDAL EPSG:4326 >>${OUT}
+echo "" >>${OUT}
+
+echo "Testing projinfo -o WKT2_2015 EPSG:4326" >> ${OUT}
+$EXE -o WKT2_2015 EPSG:4326 >>${OUT}
+echo "" >>${OUT}
+
+echo "Testing projinfo -o WKT2_2018 EPSG:4326" >> ${OUT}
+$EXE -o WKT2_2018 EPSG:4326 >>${OUT}
+echo "" >>${OUT}
+
 echo "Testing projinfo -o ALL EPSG:4326" >> ${OUT}
 $EXE -o ALL EPSG:4326 >>${OUT}
 echo "" >>${OUT}
diff --git a/test/cli/testprojinfo_out.dist b/test/cli/testprojinfo_out.dist
index 23e26975..462e8062 100644
--- a/test/cli/testprojinfo_out.dist
+++ b/test/cli/testprojinfo_out.dist
@@ -2,6 +2,41 @@ Testing projinfo EPSG:4326
 PROJ.4 string:
 +proj=longlat +datum=WGS84 +no_defs
 
+WKT2_2018 string:
+GEOGCRS["WGS 84",
+    DATUM["World Geodetic System 1984",
+        ELLIPSOID["WGS 84",6378137,298.257223563,
+            LENGTHUNIT["metre",1]]],
+    PRIMEM["Greenwich",0,
+        ANGLEUNIT["degree",0.0174532925199433]],
+    CS[ellipsoidal,2],
+        AXIS["geodetic latitude (Lat)",north,
+            ORDER[1],
+            ANGLEUNIT["degree",0.0174532925199433]],
+        AXIS["geodetic longitude (Lon)",east,
+            ORDER[2],
+            ANGLEUNIT["degree",0.0174532925199433]],
+    USAGE[
+        SCOPE["unknown"],
+        AREA["World"],
+        BBOX[-90,-180,90,180]],
+    ID["EPSG",4326]]
+
+Testing projinfo -o WKT1_GDAL EPSG:4326
+WKT1_GDAL:
+GEOGCS["WGS 84",
+    DATUM["WGS_1984",
+        SPHEROID["WGS 84",6378137,298.257223563,
+            AUTHORITY["EPSG","7030"]],
+        AUTHORITY["EPSG","6326"]],
+    PRIMEM["Greenwich",0,
+        AUTHORITY["EPSG","8901"]],
+    UNIT["degree",0.0174532925199433,
+        AUTHORITY["EPSG","9122"]],
+    AUTHORITY["EPSG","4326"]]
+
+
+Testing projinfo -o WKT2_2015 EPSG:4326
 WKT2_2015 string:
 GEODCRS["WGS 84",
     DATUM["World Geodetic System 1984",
@@ -20,6 +55,27 @@ GEODCRS["WGS 84",
     BBOX[-90,-180,90,180],
     ID["EPSG",4326]]
 
+Testing projinfo -o WKT2_2018 EPSG:4326
+WKT2_2018 string:
+GEOGCRS["WGS 84",
+    DATUM["World Geodetic System 1984",
+        ELLIPSOID["WGS 84",6378137,298.257223563,
+            LENGTHUNIT["metre",1]]],
+    PRIMEM["Greenwich",0,
+        ANGLEUNIT["degree",0.0174532925199433]],
+    CS[ellipsoidal,2],
+        AXIS["geodetic latitude (Lat)",north,
+            ORDER[1],
+            ANGLEUNIT["degree",0.0174532925199433]],
+        AXIS["geodetic longitude (Lon)",east,
+            ORDER[2],
+            ANGLEUNIT["degree",0.0174532925199433]],
+    USAGE[
+        SCOPE["unknown"],
+        AREA["World"],
+        BBOX[-90,-180,90,180]],
+    ID["EPSG",4326]]
+
 Testing projinfo -o ALL EPSG:4326
 PROJ.4 string:
 +proj=longlat +datum=WGS84 +no_defs
@@ -85,7 +141,7 @@ EPSG:16031, UTM zone 31N, 0 m, World - N hemisphere - 0°E to 6°E
 PROJ string:
 +proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=utm +zone=31 +ellps=WGS84
 
-WKT2_2015 string:
+WKT2_2018 string:
 CONVERSION["UTM zone 31N",
     METHOD["Transverse Mercator",
         ID["EPSG",9807]],
@@ -125,10 +181,10 @@ DERIVED_FROM(EPSG):1312, NAD27 to NAD83 (3), 1.0 m, Canada
 PROJ string:
 +proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=hgridshift +grids=ntv1_can.dat +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1
 
-WKT2_2015 string:
+WKT2_2018 string:
 COORDINATEOPERATION["NAD27 to NAD83 (3)",
     SOURCECRS[
-        GEODCRS["NAD27",
+        GEOGCRS["NAD27",
             DATUM["North American Datum 1927",
                 ELLIPSOID["Clarke 1866",6378206.4,294.978698213898,
                     LENGTHUNIT["metre",1]]],
@@ -142,7 +198,7 @@ COORDINATEOPERATION["NAD27 to NAD83 (3)",
                     ORDER[2],
                     ANGLEUNIT["degree",0.0174532925199433]]]],
     TARGETCRS[
-        GEODCRS["NAD83",
+        GEOGCRS["NAD83",
             DATUM["North American Datum 1983",
                 ELLIPSOID["GRS 1980",6378137,298.257222101,
                     LENGTHUNIT["metre",1]]],
@@ -159,8 +215,10 @@ COORDINATEOPERATION["NAD27 to NAD83 (3)",
         ID["EPSG",9614]],
     PARAMETERFILE["Latitude and longitude difference file","ntv1_can.dat"],
     OPERATIONACCURACY[1.0],
-    AREA["Canada"],
-    BBOX[40.04,-141.01,86.46,-47.74],
+    USAGE[
+        SCOPE["unknown"],
+        AREA["Canada"],
+        BBOX[40.04,-141.01,86.46,-47.74]],
     ID["DERIVED_FROM(EPSG)",1312]]
 
 -------------------------------------
@@ -171,10 +229,10 @@ DERIVED_FROM(EPSG):1313, NAD27 to NAD83 (4), 1.5 m, Canada - NAD27
 PROJ string:
 +proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=hgridshift +grids=ntv2_0.gsb +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1
 
-WKT2_2015 string:
+WKT2_2018 string:
 COORDINATEOPERATION["NAD27 to NAD83 (4)",
     SOURCECRS[
-        GEODCRS["NAD27",
+        GEOGCRS["NAD27",
             DATUM["North American Datum 1927",
                 ELLIPSOID["Clarke 1866",6378206.4,294.978698213898,
                     LENGTHUNIT["metre",1]]],
@@ -188,7 +246,7 @@ COORDINATEOPERATION["NAD27 to NAD83 (4)",
                     ORDER[2],
                     ANGLEUNIT["degree",0.0174532925199433]]]],
     TARGETCRS[
-        GEODCRS["NAD83",
+        GEOGCRS["NAD83",
             DATUM["North American Datum 1983",
                 ELLIPSOID["GRS 1980",6378137,298.257222101,
                     LENGTHUNIT["metre",1]]],
@@ -205,8 +263,10 @@ COORDINATEOPERATION["NAD27 to NAD83 (4)",
         ID["EPSG",9615]],
     PARAMETERFILE["Latitude and longitude difference file","ntv2_0.gsb"],
     OPERATIONACCURACY[1.5],
-    AREA["Canada - NAD27"],
-    BBOX[40.04,-141.01,83.17,-47.74],
+    USAGE[
+        SCOPE["unknown"],
+        AREA["Canada - NAD27"],
+        BBOX[40.04,-141.01,83.17,-47.74]],
     ID["DERIVED_FROM(EPSG)",1313]]
 
 -------------------------------------
@@ -217,10 +277,10 @@ DERIVED_FROM(EPSG):1241, NAD27 to NAD83 (1), 0.15 m, USA - CONUS including EEZ
 PROJ string:
 +proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=hgridshift +grids=conus +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1
 
-WKT2_2015 string:
+WKT2_2018 string:
 COORDINATEOPERATION["NAD27 to NAD83 (1)",
     SOURCECRS[
-        GEODCRS["NAD27",
+        GEOGCRS["NAD27",
             DATUM["North American Datum 1927",
                 ELLIPSOID["Clarke 1866",6378206.4,294.978698213898,
                     LENGTHUNIT["metre",1]]],
@@ -234,7 +294,7 @@ COORDINATEOPERATION["NAD27 to NAD83 (1)",
                     ORDER[2],
                     ANGLEUNIT["degree",0.0174532925199433]]]],
     TARGETCRS[
-        GEODCRS["NAD83",
+        GEOGCRS["NAD83",
             DATUM["North American Datum 1983",
                 ELLIPSOID["GRS 1980",6378137,298.257222101,
                     LENGTHUNIT["metre",1]]],
@@ -250,8 +310,10 @@ COORDINATEOPERATION["NAD27 to NAD83 (1)",
     METHOD["CTABLE2"],
     PARAMETERFILE["Latitude and longitude difference file","conus"],
     OPERATIONACCURACY[0.15],
-    AREA["USA - CONUS including EEZ"],
-    BBOX[23.81,-129.17,49.38,-65.69],
+    USAGE[
+        SCOPE["unknown"],
+        AREA["USA - CONUS including EEZ"],
+        BBOX[23.81,-129.17,49.38,-65.69]],
     ID["DERIVED_FROM(EPSG)",1241]]
 
 -------------------------------------
@@ -262,10 +324,10 @@ DERIVED_FROM(EPSG):1243, NAD27 to NAD83 (2), 0.5 m, USA - Alaska including EEZ
 PROJ string:
 +proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=hgridshift +grids=alaska +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1
 
-WKT2_2015 string:
+WKT2_2018 string:
 COORDINATEOPERATION["NAD27 to NAD83 (2)",
     SOURCECRS[
-        GEODCRS["NAD27",
+        GEOGCRS["NAD27",
             DATUM["North American Datum 1927",
                 ELLIPSOID["Clarke 1866",6378206.4,294.978698213898,
                     LENGTHUNIT["metre",1]]],
@@ -279,7 +341,7 @@ COORDINATEOPERATION["NAD27 to NAD83 (2)",
                     ORDER[2],
                     ANGLEUNIT["degree",0.0174532925199433]]]],
     TARGETCRS[
-        GEODCRS["NAD83",
+        GEOGCRS["NAD83",
             DATUM["North American Datum 1983",
                 ELLIPSOID["GRS 1980",6378137,298.257222101,
                     LENGTHUNIT["metre",1]]],
@@ -295,8 +357,10 @@ COORDINATEOPERATION["NAD27 to NAD83 (2)",
     METHOD["CTABLE2"],
     PARAMETERFILE["Latitude and longitude difference file","alaska"],
     OPERATIONACCURACY[0.5],
-    AREA["USA - Alaska including EEZ"],
-    BBOX[47.88,167.65,74.71,-129.99],
+    USAGE[
+        SCOPE["unknown"],
+        AREA["USA - Alaska including EEZ"],
+        BBOX[47.88,167.65,74.71,-129.99]],
     ID["DERIVED_FROM(EPSG)",1243]]
 
 -------------------------------------
@@ -307,10 +371,10 @@ unknown id, Null geographic offset from NAD27 to NAD83, unknown accuracy, World
 PROJ string:
 
 
-WKT2_2015 string:
+WKT2_2018 string:
 COORDINATEOPERATION["Null geographic offset from NAD27 to NAD83",
     SOURCECRS[
-        GEODCRS["NAD27",
+        GEOGCRS["NAD27",
             DATUM["North American Datum 1927",
                 ELLIPSOID["Clarke 1866",6378206.4,294.978698213898,
                     LENGTHUNIT["metre",1]]],
@@ -323,11 +387,13 @@ COORDINATEOPERATION["Null geographic offset from NAD27 to NAD83",
                 AXIS["geodetic longitude (Lon)",east,
                     ORDER[2],
                     ANGLEUNIT["degree",0.0174532925199433]],
-            AREA["North America - NAD27"],
-            BBOX[7.15,167.65,83.17,-47.74],
+            USAGE[
+                SCOPE["unknown"],
+                AREA["North America - NAD27"],
+                BBOX[7.15,167.65,83.17,-47.74]],
             ID["EPSG",4267]]],
     TARGETCRS[
-        GEODCRS["NAD83",
+        GEOGCRS["NAD83",
             DATUM["North American Datum 1983",
                 ELLIPSOID["GRS 1980",6378137,298.257222101,
                     LENGTHUNIT["metre",1]]],
@@ -340,8 +406,10 @@ COORDINATEOPERATION["Null geographic offset from NAD27 to NAD83",
                 AXIS["geodetic longitude (Lon)",east,
                     ORDER[2],
                     ANGLEUNIT["degree",0.0174532925199433]],
-            AREA["North America - NAD83"],
-            BBOX[14.92,167.65,86.46,-47.74],
+            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]],
@@ -351,8 +419,10 @@ COORDINATEOPERATION["Null geographic offset from NAD27 to NAD83",
     PARAMETER["Longitude offset",0,
         ANGLEUNIT["degree",0.0174532925199433],
         ID["EPSG",8602]],
-    AREA["World"],
-    BBOX[-90,-180,90,180]]
+    USAGE[
+        SCOPE["unknown"],
+        AREA["World"],
+        BBOX[-90,-180,90,180]]]
 
 -------------------------------------
 Operation n°6:
@@ -362,10 +432,10 @@ EPSG:1462, NAD27 to NAD83 (5), 1.0 m, Canada - Quebec
 PROJ string:
 +proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=hgridshift +grids=GS2783v1.QUE +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1
 
-WKT2_2015 string:
+WKT2_2018 string:
 COORDINATEOPERATION["NAD27 to NAD83 (5)",
     SOURCECRS[
-        GEODCRS["NAD27",
+        GEOGCRS["NAD27",
             DATUM["North American Datum 1927",
                 ELLIPSOID["Clarke 1866",6378206.4,294.978698213898,
                     LENGTHUNIT["metre",1]]],
@@ -379,7 +449,7 @@ COORDINATEOPERATION["NAD27 to NAD83 (5)",
                     ORDER[2],
                     ANGLEUNIT["degree",0.0174532925199433]]]],
     TARGETCRS[
-        GEODCRS["NAD83",
+        GEOGCRS["NAD83",
             DATUM["North American Datum 1983",
                 ELLIPSOID["GRS 1980",6378137,298.257222101,
                     LENGTHUNIT["metre",1]]],
@@ -396,8 +466,10 @@ COORDINATEOPERATION["NAD27 to NAD83 (5)",
         ID["EPSG",9614]],
     PARAMETERFILE["Latitude and longitude difference file","GS2783v1.QUE"],
     OPERATIONACCURACY[1.0],
-    AREA["Canada - Quebec"],
-    BBOX[44.99,-79.85,62.62,-57.1],
+    USAGE[
+        SCOPE["unknown"],
+        AREA["Canada - Quebec"],
+        BBOX[44.99,-79.85,62.62,-57.1]],
     ID["EPSG",1462]]
 
 -------------------------------------
@@ -408,10 +480,10 @@ EPSG:1573, NAD27 to NAD83 (6), 1.5 m, Canada - Quebec
 PROJ string:
 +proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=hgridshift +grids=QUE27-83.gsb +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1
 
-WKT2_2015 string:
+WKT2_2018 string:
 COORDINATEOPERATION["NAD27 to NAD83 (6)",
     SOURCECRS[
-        GEODCRS["NAD27",
+        GEOGCRS["NAD27",
             DATUM["North American Datum 1927",
                 ELLIPSOID["Clarke 1866",6378206.4,294.978698213898,
                     LENGTHUNIT["metre",1]]],
@@ -425,7 +497,7 @@ COORDINATEOPERATION["NAD27 to NAD83 (6)",
                     ORDER[2],
                     ANGLEUNIT["degree",0.0174532925199433]]]],
     TARGETCRS[
-        GEODCRS["NAD83",
+        GEOGCRS["NAD83",
             DATUM["North American Datum 1983",
                 ELLIPSOID["GRS 1980",6378137,298.257222101,
                     LENGTHUNIT["metre",1]]],
@@ -442,8 +514,10 @@ COORDINATEOPERATION["NAD27 to NAD83 (6)",
         ID["EPSG",9615]],
     PARAMETERFILE["Latitude and longitude difference file","QUE27-83.gsb"],
     OPERATIONACCURACY[1.5],
-    AREA["Canada - Quebec"],
-    BBOX[44.99,-79.85,62.62,-57.1],
+    USAGE[
+        SCOPE["unknown"],
+        AREA["Canada - Quebec"],
+        BBOX[44.99,-79.85,62.62,-57.1]],
     ID["EPSG",1573]]
 
 Testing projinfo -s EPSG:4230 -t EPSG:4258 --bbox 8,54.51,15.24,57.8 --summary
@@ -483,9 +557,9 @@ Alternative non-deprecated CRS:
 PROJ.4 string:
 +proj=tmerc +lat_0=0 +lon_0=9 +k=0.9996 +x_0=1500000 +y_0=0 +ellps=intl +pm=rome +units=m +no_defs
 
-WKT2_2015 string:
+WKT2_2018 string:
 PROJCRS["Monte Mario (Rome) / Italy zone 1",
-    BASEGEODCRS["Monte Mario (Rome)",
+    BASEGEOGCRS["Monte Mario (Rome)",
         DATUM["Monte Mario (Rome)",
             ELLIPSOID["International 1924",6378388,297,
                 LENGTHUNIT["metre",1]]],
@@ -516,8 +590,10 @@ PROJCRS["Monte Mario (Rome) / Italy zone 1",
         AXIS["northing (Y)",north,
             ORDER[2],
             LENGTHUNIT["metre",1]],
-    AREA["Italy - west of 12°E"],
-    BBOX[36.53,5.94,47.04,12],
+    USAGE[
+        SCOPE["unknown"],
+        AREA["Italy - west of 12°E"],
+        BBOX[36.53,5.94,47.04,12]],
     ID["EPSG",26591]]
 
 Testing non compliant WKT1
@@ -528,8 +604,8 @@ HEROID["WGS 84",6378137,298.257223563]],UNIT["degree",0.0174532925199433]]
 PROJ.4 string:
 +proj=longlat +datum=WGS84 +no_defs
 
-WKT2_2015 string:
-GEODCRS["WGS 84",
+WKT2_2018 string:
+GEOGCRS["WGS 84",
     DATUM["World Geodetic System 1984",
         ELLIPSOID["WGS 84",6378137,298.257223563,
             LENGTHUNIT["metre",1,