Skip to content

Commit

Permalink
typo fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
rouault committed Jan 13, 2025
1 parent 84d1a09 commit 3f91fd4
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion docs/source/news.rst
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ Bug fixes

* CMake: avoid imbalanced cmake_policy push/pop if TIFF or CURL dependency cannot be found (`#3697 <https://github.com/OSGeo/PROJ/issues/3697>`_)

* ``proj_create_crs_to_crs()``: restore transformation selection behaviour of PROJ 9.1 when grids are missing (`#3707 <https://github.com/OSGeo/PROJ/issues/3707>`_)
* ``proj_create_crs_to_crs()``: restore transformation selection behavior of PROJ 9.1 when grids are missing (`#3707 <https://github.com/OSGeo/PROJ/issues/3707>`_)

* ESRI WKT: improve roundtrip of name and definition for UPS WGS84 CRS (`#3720 <https://github.com/OSGeo/PROJ/issues/3720>`_)

Expand Down
4 changes: 2 additions & 2 deletions scripts/fix_typos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
11 changes: 7 additions & 4 deletions scripts/typos_whitelist.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$EXE +units=us-ft +init=${INIT_FILE}:404 -E -f '%.3f' >>${OUT} <<EOF
(`#404 <https://github.com/OSGeo/proj.4/issues/404>`_)
{"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;
Expand Down Expand Up @@ -39,10 +39,10 @@ static const ParamMapping paramLonCentreLonCenterLonc = {
&paramLonCentreLonCenterLonc,
* 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
Expand Down Expand Up @@ -112,3 +112,6 @@ Space oblique for MISR is a specialization of :doc:`Space Oblique Mercator<som>`
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 <https://github.com/OSGeo/PROJ/issues/3559>`_)
(gives same results as: ``+proj=som +inc_angle=1.7157253262878522r +ps_rev=0.06866666666666667 +asc_lon=1.1242171183417042r``)
2 changes: 1 addition & 1 deletion src/iso19111/factory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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")) {
Expand Down
2 changes: 1 addition & 1 deletion src/iso19111/operation/coordinateoperationfactory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/projections/airocean.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 3f91fd4

Please sign in to comment.