aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2020-01-07 21:38:05 +0100
committerEven Rouault <even.rouault@spatialys.com>2020-01-07 21:38:05 +0100
commit18ba7b3dfcf1142227eacd8e76d4086a3d8292f4 (patch)
treebae2918cc2329008e3ad8000ec3135159ce1544a
parenta76be01b5b5b7ae6d650ecd79acecd22b3275371 (diff)
downloadPROJ-18ba7b3dfcf1142227eacd8e76d4086a3d8292f4.tar.gz
PROJ-18ba7b3dfcf1142227eacd8e76d4086a3d8292f4.zip
projinfo: use No. abbreviation instead of UTF-8 character (fixes #1828)
-rw-r--r--src/apps/projinfo.cpp4
-rw-r--r--test/cli/testprojinfo_out.dist38
2 files changed, 20 insertions, 22 deletions
diff --git a/src/apps/projinfo.cpp b/src/apps/projinfo.cpp
index c1139564..8ce9eefe 100644
--- a/src/apps/projinfo.cpp
+++ b/src/apps/projinfo.cpp
@@ -686,9 +686,7 @@ static void outputOperations(
}
first = false;
std::cout << "-------------------------------------" << std::endl;
- std::cout << "Operation n"
- "\xC2\xB0"
- << (i + 1) << ":" << std::endl
+ std::cout << "Operation No. " << (i + 1) << ":" << std::endl
<< std::endl;
outputOperationSummary(op, dbContext);
std::cout << std::endl;
diff --git a/test/cli/testprojinfo_out.dist b/test/cli/testprojinfo_out.dist
index afadbd27..794f313b 100644
--- a/test/cli/testprojinfo_out.dist
+++ b/test/cli/testprojinfo_out.dist
@@ -182,7 +182,7 @@ PROJJSON:
Testing projinfo -s EPSG:4326 -t EPSG:32631
Candidate operations found: 1
-------------------------------------
-Operation n°1:
+Operation No. 1:
EPSG:16031, UTM zone 31N, 0 m, World - N hemisphere - 0°E to 6°E
@@ -214,7 +214,7 @@ Testing projinfo -s NAD27 -t NAD83
Candidate operations found: 1
Note: using '--spatial-test intersects' would bring more results (10)
-------------------------------------
-Operation n°1:
+Operation No. 1:
unknown id, Ballpark geographic offset from NAD27 to NAD83, unknown accuracy, World, has ballpark transformation
@@ -282,7 +282,7 @@ EPSG:8549, NAD27 to NAD83 (8), 0.5 m, USA - Alaska
Testing projinfo -s NAD27 -t NAD83 --grid-check none --spatial-test intersects
Candidate operations found: 10
-------------------------------------
-Operation n°1:
+Operation No. 1:
DERIVED_FROM(EPSG):1312, NAD27 to NAD83 (3), 2.0 m, Canada
@@ -332,7 +332,7 @@ COORDINATEOPERATION["NAD27 to NAD83 (3)",
ID["DERIVED_FROM(EPSG)",1312]]
-------------------------------------
-Operation n°2:
+Operation No. 2:
DERIVED_FROM(EPSG):1313, NAD27 to NAD83 (4), 1.5 m, Canada - NAD27
@@ -382,7 +382,7 @@ COORDINATEOPERATION["NAD27 to NAD83 (4)",
ID["DERIVED_FROM(EPSG)",1313]]
-------------------------------------
-Operation n°3:
+Operation No. 3:
DERIVED_FROM(EPSG):1241, NAD27 to NAD83 (1), 0.15 m, USA - CONUS including EEZ
@@ -431,7 +431,7 @@ COORDINATEOPERATION["NAD27 to NAD83 (1)",
ID["DERIVED_FROM(EPSG)",1241]]
-------------------------------------
-Operation n°4:
+Operation No. 4:
DERIVED_FROM(EPSG):1243, NAD27 to NAD83 (2), 0.5 m, USA - Alaska including EEZ
@@ -480,7 +480,7 @@ COORDINATEOPERATION["NAD27 to NAD83 (2)",
ID["DERIVED_FROM(EPSG)",1243]]
-------------------------------------
-Operation n°5:
+Operation No. 5:
DERIVED_FROM(EPSG):1573, NAD27 to NAD83 (6), 1.5 m, Canada - Quebec
@@ -530,7 +530,7 @@ COORDINATEOPERATION["NAD27 to NAD83 (6)",
ID["DERIVED_FROM(EPSG)",1573]]
-------------------------------------
-Operation n°6:
+Operation No. 6:
EPSG:1462, NAD27 to NAD83 (5), 2.0 m, Canada - Quebec
@@ -582,7 +582,7 @@ COORDINATEOPERATION["NAD27 to NAD83 (5)",
REMARK["Densification for Quebec of code 1312. Replaced by NAD27 to NAD83 (6) (code 1573). Uses NT method which expects longitudes positive west; EPSG GeogCRSs NAD27 (code 4267) and NAD83 (code 4269) have longitudes positive east."]]
-------------------------------------
-Operation n°7:
+Operation No. 7:
EPSG:9111, NAD27 to NAD83 (9), 1.5 m, Canada - Saskatchewan
@@ -633,7 +633,7 @@ COORDINATEOPERATION["NAD27 to NAD83 (9)",
ID["EPSG",9111]]
-------------------------------------
-Operation n°8:
+Operation No. 8:
unknown id, Ballpark geographic offset from NAD27 to NAD83, unknown accuracy, World, has ballpark transformation
@@ -686,7 +686,7 @@ COORDINATEOPERATION["Ballpark geographic offset from NAD27 to NAD83",
BBOX[-90,-180,90,180]]]
-------------------------------------
-Operation n°9:
+Operation No. 9:
EPSG:8555, NAD27 to NAD83 (7), 0.15 m, USA - CONUS and GoM
@@ -738,7 +738,7 @@ COORDINATEOPERATION["NAD27 to NAD83 (7)",
REMARK["Uses NADCON5 method which expects longitudes positive east in range 0-360°; source and target CRSs have longitudes positive east in range -180° to +180°. Accuracy at 67% confidence level is 0.15m onshore, 1m nearshore and undetermined farther offshore."]]
-------------------------------------
-Operation n°10:
+Operation No. 10:
EPSG:8549, NAD27 to NAD83 (8), 0.5 m, USA - Alaska
@@ -901,7 +901,7 @@ PROJ.4 string:
Testing RH2000 height to SWEREF99: projinfo -s EPSG:5613 -t EPSG:4977
Candidate operations found: 1
-------------------------------------
-Operation n°1:
+Operation No. 1:
PROJ:EPSG_5613_TO_EPSG_4977, RH2000 height to SWEREF99, unknown accuracy, Sweden - onshore
@@ -947,7 +947,7 @@ COORDINATEOPERATION["RH2000 height to SWEREF99",
Testing NAD83(2011) + NAVD88 height -> NAD83(2011) : projinfo -s EPSG:6349 -t EPSG:6319 --spatial-test intersects -o PROJ
Candidate operations found: 2
-------------------------------------
-Operation n°1:
+Operation No. 1:
unknown id, Inverse of NAD83(2011) to NAVD88 height (3), 0.015 m, USA - CONUS - onshore
@@ -955,7 +955,7 @@ PROJ string:
+proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=vgridshift +grids=g2018u0.gtx +multiplier=1 +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1
-------------------------------------
-Operation n°2:
+Operation No. 2:
unknown id, Inverse of NAD83(2011) to NAVD88 height (2), 0.02 m, USA - Alaska
@@ -965,7 +965,7 @@ PROJ string:
Testing NGF IGN69 height to RGF93: projinfo -s EPSG:5720 -t EPSG:4965 -o PROJ
Candidate operations found: 2
-------------------------------------
-Operation n°1:
+Operation No. 1:
INVERSE(DERIVED_FROM(EPSG)):8885, Inverse of RGF93 to NGF IGN69 height (3), 0.01 m, France - mainland onshore
@@ -973,7 +973,7 @@ PROJ string:
+proj=vgridshift +grids=RAF18.gtx +multiplier=1
-------------------------------------
-Operation n°2:
+Operation No. 2:
INVERSE(EPSG):10000, Inverse of RGF93 to NGF IGN69 height (1), 0.5 m, France - mainland onshore
@@ -1079,7 +1079,7 @@ unknown id, Inverse of 3-degree Gauss-Kruger zone 3 + DHDN to ETRS89 (2), 3 m, G
Testing -s "GDA94" -t "AHD height" --grid-check none -o PROJ --spatial-test intersects
Candidate operations found: 1
-------------------------------------
-Operation n°1:
+Operation No. 1:
DERIVED_FROM(EPSG):5656, GDA94 to AHD height (49), 0.03 m, Australia - mainland
@@ -1089,7 +1089,7 @@ PROJ string:
Testing -s "GDA2020" -t "AHD height" --grid-check none -o PROJ --spatial-test intersects
Candidate operations found: 1
-------------------------------------
-Operation n°1:
+Operation No. 1:
DERIVED_FROM(EPSG):8451, GDA2020 to AHD height (1), 0.03 m, Australia Christmas and Cocos - onshore