From 3f91fd4286559a3842e54aac28668bff32b42f41 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 13 Jan 2025 02:09:07 +0100 Subject: [PATCH] typo fixes --- docs/source/news.rst | 2 +- scripts/fix_typos.sh | 4 ++-- scripts/typos_whitelist.txt | 11 +++++++---- src/iso19111/factory.cpp | 2 +- src/iso19111/operation/coordinateoperationfactory.cpp | 2 +- src/projections/airocean.cpp | 2 +- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/docs/source/news.rst b/docs/source/news.rst index 5ec1d52abf..5137217318 100644 --- a/docs/source/news.rst +++ b/docs/source/news.rst @@ -325,7 +325,7 @@ Bug fixes * CMake: avoid imbalanced cmake_policy push/pop if TIFF or CURL dependency cannot be found (`#3697 `_) -* ``proj_create_crs_to_crs()``: restore transformation selection behaviour of PROJ 9.1 when grids are missing (`#3707 `_) +* ``proj_create_crs_to_crs()``: restore transformation selection behavior of PROJ 9.1 when grids are missing (`#3707 `_) * ESRI WKT: improve roundtrip of name and definition for UPS WGS84 CRS (`#3720 `_) diff --git a/scripts/fix_typos.sh b/scripts/fix_typos.sh index 68a2617e12..cf210aa350 100755 --- a/scripts/fix_typos.sh +++ b/scripts/fix_typos.sh @@ -46,8 +46,8 @@ if ! test -d fix_typos; then ) fi -EXCLUDED_FILES="*configure,config.status,config.sub,*/autom4te.cache/*,libtool,aclocal.m4,depcomp,ltmain.sh,*.pdf,./m4/*,./fix_typos/*,./docs/build/*,./src/*generated*,./test/googletest/*,./include/proj/internal/nlohmann/json.hpp,*.before_reformat,geodesic.h,geodesic.c,geodtest.c,./docs/source/spelling_wordlist.txt" -WORDS_WHITE_LIST="metres,als,lsat,twon,ang,PJD_ERR_LSAT_NOT_IN_RANGE,COLOR_GRAT,interm,Interm,Cartesian,cartesian,CARTESIAN,kilometre,centimetre,millimetre,millimetres,Australia,LINZ,LaTeX,BibTeX" +EXCLUDED_FILES="*configure,config.status,config.sub,*/autom4te.cache/*,libtool,aclocal.m4,depcomp,ltmain.sh,*.pdf,./m4/*,./fix_typos/*,./docs/build/*,./src/*generated*,./test/googletest/*,./include/proj/internal/nlohmann/json.hpp,*.before_reformat,geodesic.h,geodesic.c,geodtest.c,./docs/source/spelling_wordlist.txt,./test/cli/test_proj_nad83.yaml,./test/cli/test_proj_nad27.yaml" +WORDS_WHITE_LIST="metres,als,lsat,twon,ang,PJD_ERR_LSAT_NOT_IN_RANGE,COLOR_GRAT,interm,Interm,Cartesian,cartesian,CARTESIAN,kilometre,centimetre,millimetre,millimetres,Australia,LINZ,LaTeX,BibTeX,lon,Lon" python3 fix_typos/codespell/codespell.py -w -i 3 -q 2 -S $EXCLUDED_FILES \ -x scripts/typos_whitelist.txt --words-white-list=$WORDS_WHITE_LIST \ diff --git a/scripts/typos_whitelist.txt b/scripts/typos_whitelist.txt index d0306dc88e..1a6ce7b13e 100644 --- a/scripts/typos_whitelist.txt +++ b/scripts/typos_whitelist.txt @@ -1,6 +1,6 @@ $EXE +units=us-ft +init=${INIT_FILE}:404 -E -f '%.3f' >>${OUT} <`_) -{"CPM", "a=6375738.7", "rf=334.29", "Comm. des Poids et Mesures 1799"}, + {"CPM", "a=6375738.7", "rf=334.29", "Comm. des Poids et Mesures 1799"}, double lamtp, cl, sd, sp, sav, tanphi; sav = lampp; lamt = lp.lam + Q->p22 * sav; @@ -39,10 +39,10 @@ static const ParamMapping paramLonCentreLonCenterLonc = { ¶mLonCentreLonCenterLonc, * This implements the Space Oblique Mercator (SOM) projection, used by the * This code was originally developed for the Landsat SOM projection with the - * For the MISR path based SOM projection, the code is identical to that of Landsat - * SOM with the following parameter changes: + * For the MISR path based SOM projection, the code is identical to that of + *Landsat SOM with the following parameter changes: * For the generic SOM projection, the code is identical to the above for MISR -PJ *PROJECTION(som) { +PJ *PJ_PROJECTION(som) { operation +proj=som +ellps=GRS80 +inc_angle=1.7157253262878522r +ps_rev=0.06866666666666667 +asc_lon=2.2298420007209447r operation +proj=som +R=6400000 +inc_angle=1.7157253262878522r +ps_rev=0.06866666666666667 +asc_lon=2.2298420007209447r operation +proj=som +ellps=GRS80 +inc_angle=98.30382 +ps_rev=0.06866666666666667 +asc_lon=127.7605356226 @@ -112,3 +112,6 @@ Space oblique for MISR is a specialization of :doc:`Space Oblique Mercator` NOTE: This is Windows syntax - Unix users use $HEL, etc. * https://github.com/Unidata/netcdf-java/blob/3ce72c0cd167609ed8c69152bb4a004d1daa9273/cdm/core/src/main/java/ucar/unidata/geoloc/projection/RotatedLatLon.java " \"abbreviation\": \"lon\",\n" + .5 / Te * log((1. - con) / (1. + con))); + * C++ API function :cpp:func:`createTunisiaMapingGrid()`. Use :cpp:func:`createTunisiaMiningGrid()` instead (`#3559 `_) + (gives same results as: ``+proj=som +inc_angle=1.7157253262878522r +ps_rev=0.06866666666666667 +asc_lon=1.1242171183417042r``) diff --git a/src/iso19111/factory.cpp b/src/iso19111/factory.cpp index 793bffae58..966c878dce 100644 --- a/src/iso19111/factory.cpp +++ b/src/iso19111/factory.cpp @@ -7605,7 +7605,7 @@ AuthorityFactory::createFromCRSCodesWithIntermediates( const auto checkPivotForETRFToETRF = [ETRFtoETRF, &sourceCRS, &targetCRS](const crs::CRSPtr &intermediateCRS) { - // Make sure that ETRF2000 to ETRF2014 doesn't go throught ITRF9x or + // Make sure that ETRF2000 to ETRF2014 doesn't go through ITRF9x or // ITRF>2014 if (ETRFtoETRF && intermediateCRS && starts_with(intermediateCRS->nameStr(), "ITRF")) { diff --git a/src/iso19111/operation/coordinateoperationfactory.cpp b/src/iso19111/operation/coordinateoperationfactory.cpp index b36dcd5e04..34b3a08328 100644 --- a/src/iso19111/operation/coordinateoperationfactory.cpp +++ b/src/iso19111/operation/coordinateoperationfactory.cpp @@ -3322,7 +3322,7 @@ void CoordinateOperationFactory::Private::createOperationsWithDatumPivot( // by allowing directly all transformation. There is no strong reason for // that particular case, except that otherwise we'd get different results // for test/cli/test_cs2cs_ignf.yaml when transforming a point outside - // the area of validity... Not totally sure the behaviour we try to preserve + // the area of validity... Not totally sure the behavior we try to preserve // here with the particular case is fundamentally better than the general // case. The general case is needed typically for the RGNC91-93 -> RGNC15 // transformation where we we need to actually use a transformation between diff --git a/src/projections/airocean.cpp b/src/projections/airocean.cpp index 2630e1e146..e33b4471e7 100644 --- a/src/projections/airocean.cpp +++ b/src/projections/airocean.cpp @@ -30,7 +30,7 @@ struct pj_face { Robert W. Gray (1995) Exact Transformation Equations for Fuller's World Map, Vol. 32. Autumn, 1995, pp. 17-25. - To accomodate for land parts that would be interrupted by using a mere + To accommodate for land parts that would be interrupted by using a mere icosahedron, some faces are split in two (Australia) and 3 (Japan) subfaces. The parameters below were computed using the script located at: