From ab7e98b026b327e8b61510ba4e79b5ae42b5e5f2 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 12 Dec 2016 16:33:43 +0100 Subject: Add a scripts/fix_typos.sh script and correct reported errors --- CMakeLists.txt | 2 +- ChangeLog | 22 ++++++++-------- docs/plot/plot.py | 2 +- docs/source/faq.rst | 2 +- docs/source/geodesic.rst | 4 +-- docs/source/projections/merc.rst | 4 +-- html/man_geod.html | 2 +- jniwrap/README | 2 +- jniwrap/doxygen.cfg | 4 +-- jniwrap/org/proj4/PJ.java | 4 +-- man/man1/nad2nad.1 | 2 +- nad/CMakeLists.txt | 2 +- nad/README | 2 +- nad/other.extra | 2 +- nad/test27 | 2 +- nad/test83 | 2 +- nad/testIGNF | 2 +- nad/testdatumfile | 2 +- nad/testflaky | 2 +- nad/testntv2 | 2 +- nad/testvarious | 2 +- nad/world | 8 +++--- scripts/fix_typos.sh | 54 ++++++++++++++++++++++++++++++++++++++++ scripts/typos_whitelist.txt | 1 + src/PJ_aitoff.c | 2 +- src/PJ_healpix.c | 4 +-- src/PJ_isea.c | 8 +++--- src/PJ_omerc.c | 2 +- src/cs2cs.c | 4 +-- src/dmstor.c | 2 +- src/emess.h | 2 +- src/geocent.c | 8 +++--- src/geodesic.c | 6 ++--- src/geodesic.h | 6 ++--- src/jniproj.c | 2 +- src/pj_apply_gridshift.c | 4 +-- src/pj_apply_vgridshift.c | 2 +- src/pj_gridlist.c | 2 +- src/pj_init.c | 2 +- src/pj_mlfn.c | 2 +- src/pj_transform.c | 2 +- src/proj.c | 2 +- src/projects.h | 2 +- test/gigs/TESTNOTES.md | 6 ++--- test/gigs/test_json.py | 4 +-- 45 files changed, 131 insertions(+), 76 deletions(-) create mode 100755 scripts/fix_typos.sh create mode 100644 scripts/typos_whitelist.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index cde21f0c..eb0cbcba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,7 +88,7 @@ if(PROJ4_TESTS) endif(PROJ4_TESTS) include(Proj4Test) -# Put the libaries and binaries that get built into directories at the +# Put the libraries and binaries that get built into directories at the # top of the build tree rather than in hard-to-find leaf # directories. This simplifies manual testing and the use of the build # tree rather than installed Boost libraries. diff --git a/ChangeLog b/ChangeLog index ece889c4..779b6d2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -215,7 +215,7 @@ * src/cs2cs.c: Support -I when there is no +to projection. - * src/PJ_ob_tran.c: Propogate ctx into sub-projection (#225). + * src/PJ_ob_tran.c: Propagate ctx into sub-projection (#225). 2013-10-03 Frank Warmerdam @@ -293,7 +293,7 @@ * src/geodesic.{c,h}: sync relative to GeographicLib 1.31. (#216) - * src/pj_fileapi.c, etc: Implement a virtual file api accessable + * src/pj_fileapi.c, etc: Implement a virtual file api accessible through the context for init file and grid shift file access. * src/mk_cheby.c: reformat, add braces to avoid warnings. @@ -415,7 +415,7 @@ 2012-02-08 Frank Warmerdam - * src/pj_apply_gridshift.c: Ensure that one amoung many points + * src/pj_apply_gridshift.c: Ensure that one among many points falling outside the grid areas will not cause the remainder to not be datum shifted in a way that is hard to diagnose. (#45) @@ -564,7 +564,7 @@ 2011-01-11 Frank Warmerdam - * src/PJ_goode.c: fix propogation of es and ctx to sub-projections. + * src/PJ_goode.c: fix propagation of es and ctx to sub-projections. 2010-10-19 Frank Warmerdam @@ -739,7 +739,7 @@ * src/PJ_gstmerc.c: Correction of a bug in inv() function : the projected origin coordinates where descaled. - * nad/testIGNF: Add a comment on the mandatory existance of the world grid + * nad/testIGNF: Add a comment on the mandatory existence of the world grid in order to make the test. * ChangeLog: this comments @@ -934,7 +934,7 @@ * src/projects.h: Ensure that WIN32 is defined on win32 systems. * src/pj_open_lib.c: support drive letter prefixes on absolute - paths. Support either \ or / as a dir delimeter on windows (bug 1499) + paths. Support either \ or / as a dir delimiter on windows (bug 1499) 2007-03-07 Frank Warmerdam @@ -1067,7 +1067,7 @@ Rel. 4.5.0 2006-04-21 2006-01-12 Frank Warmerdam - * geocent.c: Make global variables static. Amoung other things + * geocent.c: Make global variables static. Among other things this avoids conflicts for apps that link in geotrans. 2005-12-04 Frank Warmerdam @@ -1466,7 +1466,7 @@ Rel. 4.4.4 2001/09/15 See http://bugzilla.remotesensing.org/show_bug.cgi?id=17 - * nad/epsg: commited new updates with fixed units for us state plane + * nad/epsg: committed new updates with fixed units for us state plane zones in feet, as reported by Marc-Andre. 2001-08-23 Frank Warmerdam @@ -1707,7 +1707,7 @@ Rel. 4.3.2 94/10/30 Base-line Thanks to: Alejo Hausner (ah@cs.princeton.edu) 95/9/10 - Some minor file/internal name changes to facilitate xport to primative + Some minor file/internal name changes to facilitate xport to primitive systems. Documented entries unchanged. Rel. 4.3.1 94/2/16 Base-line @@ -1794,7 +1794,7 @@ Rel. 4.2.2 93/9/30 Base-line DOS distribution. 93/11/28 - Added "Final" figure line to begining of -V option ouput. Allows + Added "Final" figure line to beginning of -V option output. Allows user to see results of +ellps and +R_V, etc. arguments. "Feature," not an error. Mod to proj.c. @@ -1893,7 +1893,7 @@ Rel. 4.1.3 93/4/15 Base-line 93/8/19 Minor general corrections. Added nadcon conversion procedures and nad2nad program. - Projects.h modified to reflect nadcon prototypes and stuctures. + Projects.h modified to reflect nadcon prototypes and structures. pj_open_lib extracted from pj_init and made global for use in nad_init. 93/8/25 diff --git a/docs/plot/plot.py b/docs/plot/plot.py index 42581f33..2ccb2814 100644 --- a/docs/plot/plot.py +++ b/docs/plot/plot.py @@ -76,7 +76,7 @@ def meridian(lon, lat_min, lat_max): def parallel(lat, lon_min, lon_max): ''' - Calculate parallell coordinates. + Calculate parallel coordinates. ''' coords = np.zeros((N_POINTS, 2)) coords[:, 0] = np.linspace(lon_min, lon_max, N_POINTS) diff --git a/docs/source/faq.rst b/docs/source/faq.rst index 929386df..0240df1d 100644 --- a/docs/source/faq.rst +++ b/docs/source/faq.rst @@ -163,7 +163,7 @@ default numeric locale by setting the LC_NUMERIC environment variable to C. .. note:: NOTE: Per ticket #49, in PROJ 4.7.0 and later pj_init() operates with locale - overriden to "C" to avoid most locale specific processing for applications + overridden to "C" to avoid most locale specific processing for applications using the API. Command line tools may still have issues. Changing Ellipsoid / Why can't I convert from WGS84 to Google Earth / Virtual Globe Mercator? diff --git a/docs/source/geodesic.rst b/docs/source/geodesic.rst index e2665ab7..0f31802d 100644 --- a/docs/source/geodesic.rst +++ b/docs/source/geodesic.rst @@ -101,7 +101,7 @@ Thaddeus Vincenty's method, April 1975 For a very good procedure to calculate inter point distances see: -http://www.ngs.noaa.gov/PC_PROD/Inv_Fwd/ (Fortan code, DOS executables, and an online app) +http://www.ngs.noaa.gov/PC_PROD/Inv_Fwd/ (Fortran code, DOS executables, and an online app) and algorithm details published in: `Vincenty, T. (1975) `__ @@ -142,7 +142,7 @@ PROJ.4 - geod program The PROJ.4 [wiki:man_geod geod] program can be used for great circle distances -on an ellipsoid. As of proj verion 4.9.0, this uses a translation of +on an ellipsoid. As of proj version 4.9.0, this uses a translation of GeographicLib::Geodesic (see below) into C. The underlying geodesic calculation API is exposed as part of the PROJ.4 library (via the geodesic.h header). Prior to version 4.9.0, the algorithm documented here was used: diff --git a/docs/source/projections/merc.rst b/docs/source/projections/merc.rst index f8269a0e..64ba98a4 100644 --- a/docs/source/projections/merc.rst +++ b/docs/source/projections/merc.rst @@ -102,12 +102,12 @@ For the elliptical form of the projection we introduce the scaling factor: k_0 = m\left( \phi_ts \right) -where :math:`m\left(\phi\right)` is the parallel radius at lattitude :math:`\phi`. +where :math:`m\left(\phi\right)` is the parallel radius at latitude :math:`\phi`. We also use the Isometric Latitude kernel function :math:`t()`. .. note:: - m() and t() should be described properly on a seperate page about the theory of projections on the ellipsoid. + m() and t() should be described properly on a separate page about the theory of projections on the ellipsoid. Forward projection ================== diff --git a/html/man_geod.html b/html/man_geod.html index ec3e4286..8150b4d1 100644 --- a/html/man_geod.html +++ b/html/man_geod.html @@ -145,7 +145,7 @@ See documentation for full list of these parameters and contrl. The options are processed in left to right order from the run line. -Reentry of an option is ignored with the first occurance assumed to +Reentry of an option is ignored with the first occurrence assumed to be the desired value.

diff --git a/jniwrap/README b/jniwrap/README index a7f4efc5..1c047db0 100644 --- a/jniwrap/README +++ b/jniwrap/README @@ -59,7 +59,7 @@ The documentation is held inside the code and can be retrieved by running doxygen inside the folder jniwrap. This will create the HTML format documentation inside of jniwrap/docs -The standard way to achive this is to use an Ant target: +The standard way to achieve this is to use an Ant target: ant do_make_help diff --git a/jniwrap/doxygen.cfg b/jniwrap/doxygen.cfg index a46a8bb8..e1771b52 100644 --- a/jniwrap/doxygen.cfg +++ b/jniwrap/doxygen.cfg @@ -834,7 +834,7 @@ HTML_FILE_EXTENSION = .html # standard header. Note that when using a custom header you are responsible # for the proper inclusion of any scripts and style sheets that doxygen # needs, which is dependent on the configuration options used. -# It is adviced to generate a default header using "doxygen -w html +# It is advised to generate a default header using "doxygen -w html # header.html footer.html stylesheet.css YourConfigFile" and then modify # that header. Note that the header is subject to change so you typically # have to redo this when upgrading to a newer version of doxygen or when changing the value of configuration settings such as GENERATE_TREEVIEW! @@ -1108,7 +1108,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are # not supported properly for IE 6.0, but are supported on all modern browsers. # Note that when changing this option you need to delete any form_*.png files diff --git a/jniwrap/org/proj4/PJ.java b/jniwrap/org/proj4/PJ.java index f82fe07c..50e7a021 100644 --- a/jniwrap/org/proj4/PJ.java +++ b/jniwrap/org/proj4/PJ.java @@ -37,7 +37,7 @@ package org.proj4; * Proj.4 library. This class is the only place where such native methods are defined. *

* In the Proj.4 library, the {@code PJ} structure aggregates in a single place information usually - * splitted in many different ISO 19111 interfaces: {@link org.opengis.referencing.datum.Ellipsoid}, + * split in many different ISO 19111 interfaces: {@link org.opengis.referencing.datum.Ellipsoid}, * {@link org.opengis.referencing.datum.Datum}, {@link org.opengis.referencing.datum.PrimeMeridian}, * {@link org.opengis.referencing.cs.CoordinateSystem}, {@link org.opengis.referencing.crs.CoordinateReferenceSystem} * and their sub-interfaces. The relationship with the GeoAPI methods is indicated in the @@ -285,7 +285,7 @@ public class PJ { /** * Deallocates the native PJ data structure. This method can be invoked only by the garbage * collector, and must be invoked exactly once (no more, no less). - * NEVER INVOKE THIS METHOD EXPLICITELY, NEVER OVERRIDE. + * NEVER INVOKE THIS METHOD EXPLICITLY, NEVER OVERRIDE. */ @Override protected final native void finalize(); diff --git a/man/man1/nad2nad.1 b/man/man1/nad2nad.1 index 1454aca7..c5f57c8f 100644 --- a/man/man1/nad2nad.1 +++ b/man/man1/nad2nad.1 @@ -132,7 +132,7 @@ stpaul \- St. Paul Is, Alaska stlrnc \- St. Lawrence Is, Alaska .TP .B \-E -Input coordinates are echoed to output before ouput values. +Input coordinates are echoed to output before output values. .RE .TP .BI \-f " format" diff --git a/nad/CMakeLists.txt b/nad/CMakeLists.txt index 7cd25c21..e1403c55 100644 --- a/nad/CMakeLists.txt +++ b/nad/CMakeLists.txt @@ -1,5 +1,5 @@ # -# files containing dictionnary of useful projection +# files containing dictionary of useful projection # set(PROJ_DICTIONARY epsg diff --git a/nad/README b/nad/README index 8a22721e..884cedda 100644 --- a/nad/README +++ b/nad/README @@ -47,7 +47,7 @@ pj_out27 --- Comparison files for above test procedures. pj_out83 The following NADCON conversion files are distributed in separate, -uncompressed distibution file(s). +uncompressed distribution file(s). Ascii source (in delta format) of grid data to convert geographic coordinates from NAD27 to NAD83 diff --git a/nad/other.extra b/nad/other.extra index 39c27e27..4b5797e9 100644 --- a/nad/other.extra +++ b/nad/other.extra @@ -1,4 +1,4 @@ -## NAD83 / BC Albers (this has been superceeded but is kept for compatibility) +## NAD83 / BC Albers (this has been superseded but is kept for compatibility) <42102> +proj=aea +ellps=GRS80 +lat_0=45 +lon_0=-126.0 +lat_1=50.0 +lat_2=58.5 +x_0=1000000.0 +y_0=0 +datum=NAD83 +units=m no_defs <> diff --git a/nad/test27 b/nad/test27 index 66f6f1c4..917f5710 100755 --- a/nad/test27 +++ b/nad/test27 @@ -835,7 +835,7 @@ echo "diff ${OUT} with pj_out27.dist" diff -b ${OUT} ${NAD_DIR}/pj_out27.dist if [ $? -ne 0 ] ; then echo "" - echo "PROBLEMS HAVE OCCURED" + echo "PROBLEMS HAVE OCCURRED" echo "test file ${OUT} saved" echo exit 100 diff --git a/nad/test83 b/nad/test83 index 4dcb15e4..cf182cea 100755 --- a/nad/test83 +++ b/nad/test83 @@ -716,7 +716,7 @@ echo "diff ${OUT} with pj_out83.dist" diff -b ${OUT} ${NAD_DIR}/pj_out83.dist if [ $? -ne 0 ] ; then echo "" - echo "PROBLEMS HAVE OCCURED" + echo "PROBLEMS HAVE OCCURRED" echo "test file ${OUT} saved" echo exit 100 diff --git a/nad/testIGNF b/nad/testIGNF index 6f8437f3..0249b432 100755 --- a/nad/testIGNF +++ b/nad/testIGNF @@ -154,7 +154,7 @@ echo "diff ${OUT} with ${OUT}.dist" diff -b ${OUT} ${NAD_DIR}/${OUT}.dist if [ $? -ne 0 ] ; then echo "" -echo "PROBLEMS HAVE OCCURED" +echo "PROBLEMS HAVE OCCURRED" echo "test file ${OUT} saved" echo exit 100 diff --git a/nad/testdatumfile b/nad/testdatumfile index e3f2764f..7106bd47 100755 --- a/nad/testdatumfile +++ b/nad/testdatumfile @@ -101,7 +101,7 @@ echo "diff ${OUT} with ${OUT}.dist" diff -b ${OUT} ${NAD_DIR}/${OUT}.dist if [ $? -ne 0 ] ; then echo "" - echo "PROBLEMS HAVE OCCURED" + echo "PROBLEMS HAVE OCCURRED" echo "test file ${OUT} saved" echo exit 100 diff --git a/nad/testflaky b/nad/testflaky index 0a287204..970d8320 100755 --- a/nad/testflaky +++ b/nad/testflaky @@ -61,7 +61,7 @@ echo "diff ${OUT} with ${OUT}.dist" diff -b ${OUT} ${NAD_DIR}/${OUT}.dist if [ $? -ne 0 ] ; then echo "" - echo "PROBLEMS HAVE OCCURED" + echo "PROBLEMS HAVE OCCURRED" echo "test file ${OUT} saved" echo exit 100 diff --git a/nad/testntv2 b/nad/testntv2 index 669517d5..6983a48b 100755 --- a/nad/testntv2 +++ b/nad/testntv2 @@ -60,7 +60,7 @@ echo "diff ${OUT} with ${OUT}.dist" diff -b ${OUT} ${NAD_DIR}/${OUT}.dist if [ $? -ne 0 ] ; then echo "" - echo "PROBLEMS HAVE OCCURED" + echo "PROBLEMS HAVE OCCURRED" echo "test file ${OUT} saved" echo exit 100 diff --git a/nad/testvarious b/nad/testvarious index ef1bfbee..58770347 100755 --- a/nad/testvarious +++ b/nad/testvarious @@ -891,7 +891,7 @@ echo "diff ${OUT} with ${OUT}.dist" diff -b ${OUT} ${NAD_DIR}/${OUT}.dist if [ $? -ne 0 ] ; then echo "" - echo "PROBLEMS HAVE OCCURED" + echo "PROBLEMS HAVE OCCURRED" echo "test file ${OUT} saved" echo exit 100 diff --git a/nad/world b/nad/world index 2018b533..092df230 100644 --- a/nad/world +++ b/nad/world @@ -146,7 +146,7 @@ proj=tmerc ellps=mod_airy lat_0=53d30'N lon_0=8W x_0=200000 y_0=250000 k_0=1.000035 no_defs <> - # Netherlands East Indies Equitorial Zone + # Netherlands East Indies Equatorial Zone proj=merc ellps=bessel lon_0=110E x_0=3900000 y_0=900000 k_0=0.997 no_defs <> @@ -176,12 +176,12 @@ no_defs <> # Gauss Krueger Grid for Germany # -# The first figure of the easting is lon_0 devided by 3 +# The first figure of the easting is lon_0 divided by 3 # ( 2 for 6d0E, 3 for 9d0E, 4 for 12d0E) # For translations you have to remove this first figure # and convert northings and eastings from km to meter . -# The other way round, devide by 1000 and add the figure. -# I made 3 entrys for the officially used grids in Germany +# The other way round, divide by 1000 and add the figure. +# I made 3 entries for the officially used grids in Germany # # # Und nochmal in deutsch : diff --git a/scripts/fix_typos.sh b/scripts/fix_typos.sh new file mode 100755 index 00000000..1e3e5b43 --- /dev/null +++ b/scripts/fix_typos.sh @@ -0,0 +1,54 @@ +#!/bin/sh +# -*- coding: utf-8 -*- +############################################################################### +# $Id$ +# +# Project: GDAL +# Purpose: (Interactive) script to identify and fix typos +# Author: Even Rouault +# +############################################################################### +# Copyright (c) 2016, Even Rouault +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. +############################################################################### + +if ! test -d fix_typos; then + # Get our fork of codespell that adds --words-white-list and full filename support for -S option + mkdir fix_typos + cd fix_typos + git clone https://github.com/rouault/codespell + cd codespell + git checkout gdal_improvements + cd .. + # Aggregate base dictionary + QGIS one + Debian Lintian one + curl https://raw.githubusercontent.com/qgis/QGIS/master/scripts/spelling.dat | sed "s/:/->/" | grep -v "colour->" | grep -v "colours->" > qgis.txt + curl https://anonscm.debian.org/cgit/lintian/lintian.git/plain/data/spelling/corrections| grep "||" | grep -v "#" | sed "s/||/->/" > debian.txt + cat codespell/data/dictionary.txt qgis.txt debian.txt | awk 'NF' > gdal_dict.txt + echo "difered->deferred" >> gdal_dict.txt + echo "differed->deferred" >> gdal_dict.txt + cd .. +fi + +EXCLUDED_FILES="*configure,config.status,config.sub,*/autom4te.cache/*,libtool,aclocal.m4,depcomp,ltmain.sh,*.pdf,./m4/*,./nad/epsg,./fix_typos/*" +WORDS_WHITE_LIST="metres,als,lsat,twon,ang" + +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 \ + -D fix_typos/gdal_dict.txt . diff --git a/scripts/typos_whitelist.txt b/scripts/typos_whitelist.txt new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/scripts/typos_whitelist.txt @@ -0,0 +1 @@ + diff --git a/src/PJ_aitoff.c b/src/PJ_aitoff.c index ef6e7d71..68d95ef8 100644 --- a/src/PJ_aitoff.c +++ b/src/PJ_aitoff.c @@ -94,7 +94,7 @@ static LP s_inverse (XY xy, PJ *P) { /* Spheroidal, inverse */ if ((fabs(xy.x) < EPSILON) && (fabs(xy.y) < EPSILON )) { lp.phi = 0.; lp.lam = 0.; return lp; } - /* intial values for Newton-Raphson method */ + /* initial values for Newton-Raphson method */ lp.phi = xy.y; lp.lam = xy.x; do { iter = 0; diff --git a/src/PJ_healpix.c b/src/PJ_healpix.c index 318f42bc..8fd2c829 100644 --- a/src/PJ_healpix.c +++ b/src/PJ_healpix.c @@ -183,7 +183,7 @@ int in_image(double x, double y, int proj, int north_square, int south_square) { * Before C99 this was not allowed and to keep as portable as * possible we do it the C89 way here. * We need to assign the array this way because the input is - * dynamic (north_square and south_square vars are unknow at + * dynamic (north_square and south_square vars are unknown at * compile time). **/ double rhealpixVertsJit[12][2]; @@ -221,7 +221,7 @@ int in_image(double x, double y, int proj, int north_square, int south_square) { /** * Return the authalic latitude of latitude alpha (if inverse=0) or * return the approximate latitude of authalic latitude alpha (if inverse=1). - * P contains the relavent ellipsoid parameters. + * P contains the relevant ellipsoid parameters. **/ double auth_lat(PJ *P, double alpha, int inverse) { struct pj_opaque *Q = P->opaque; diff --git a/src/PJ_isea.c b/src/PJ_isea.c index 34a2aac8..ab9a5a8c 100644 --- a/src/PJ_isea.c +++ b/src/PJ_isea.c @@ -485,15 +485,15 @@ isea_snyder_forward(struct isea_geo * ll, struct isea_pt * out) exit(EXIT_FAILURE); /* not reached */ - return 0; /* supresses a warning */ + return 0; /* suppresses a warning */ } /* - * return the new coordinates of any point in orginal coordinate system. - * Define a point (newNPold) in orginal coordinate system as the North Pole in + * return the new coordinates of any point in original coordinate system. + * Define a point (newNPold) in original coordinate system as the North Pole in * new coordinate system, and the great circle connect the original and new * North Pole as the lon0 longitude in new coordinate system, given any point - * in orginal coordinate system, this function return the new coordinates. + * in original coordinate system, this function return the new coordinates. */ #define PRECISION 0.0000000000005 diff --git a/src/PJ_omerc.c b/src/PJ_omerc.c index 6abd2d33..8874784d 100644 --- a/src/PJ_omerc.c +++ b/src/PJ_omerc.c @@ -140,7 +140,7 @@ PJ *PROJECTION(omerc) { if (alp || gam) { lamc = pj_param(P->ctx, P->params, "rlonc").f; no_off = - /* For libproj4 compatability */ + /* For libproj4 compatibility */ pj_param(P->ctx, P->params, "tno_off").i /* for backward compatibility */ || pj_param(P->ctx, P->params, "tno_uoff").i; diff --git a/src/cs2cs.c b/src/cs2cs.c index 90369326..83e2d3f0 100644 --- a/src/cs2cs.c +++ b/src/cs2cs.c @@ -404,7 +404,7 @@ int main(int argc, char **argv) if( use_env_locale ) { - /* Restore C locale to avoid issues in parsing/outputing numbers*/ + /* Restore C locale to avoid issues in parsing/outputting numbers*/ setlocale(LC_ALL, "C"); } @@ -415,7 +415,7 @@ int main(int argc, char **argv) pj_pr_list(toProj); } - /* set input formating control */ + /* set input formatting control */ if( !fromProj->is_latlong ) informat = strtod; else { diff --git a/src/dmstor.c b/src/dmstor.c index 9665d5a9..b994589f 100644 --- a/src/dmstor.c +++ b/src/dmstor.c @@ -5,7 +5,7 @@ static double proj_strtod(char *nptr, char **endptr); -/* following should be sufficient for all but the rediculous */ +/* following should be sufficient for all but the ridiculous */ #define MAX_WORK 64 static const char *sym = "NnEeSsWw"; diff --git a/src/emess.h b/src/emess.h index 4106e11d..b8203246 100644 --- a/src/emess.h +++ b/src/emess.h @@ -6,7 +6,7 @@ struct EMESS { char *File_name, /* input file name */ *Prog_name; /* name of program */ int File_line; /* approximate line read - where error occured */ + where error occurred */ }; #ifdef EMESS_ROUTINE /* use type */ diff --git a/src/geocent.c b/src/geocent.c index 6ac6c40b..66e2c314 100644 --- a/src/geocent.c +++ b/src/geocent.c @@ -320,7 +320,7 @@ void pj_Convert_Geocentric_To_Geodetic (GeocentricInfo *gi, * das Gravitationspotential der Erde. Wiss. Arb. Univ. Hannover * Nr. 137, p. 130-131. -* Programmed by GGA- Leibniz-Institue of Applied Geophysics +* Programmed by GGA- Leibniz-Institute of Applied Geophysics * Stilleweg 2 * D-30655 Hannover * Federal Republic of Germany @@ -344,7 +344,7 @@ void pj_Convert_Geocentric_To_Geodetic (GeocentricInfo *gi, * (e.g. -6300000.m), algorithm needs about 15 steps. */ -/* local defintions and variables */ +/* local definitions and variables */ /* end-criterium of loop, accuracy of sin(Latitude) */ #define genau 1.E-12 #define genau2 (genau*genau) @@ -362,7 +362,7 @@ void pj_Convert_Geocentric_To_Geodetic (GeocentricInfo *gi, double CPHI; /* cos of searched geodetic latitude */ double SPHI; /* sin of searched geodetic latitude */ double SDPHI; /* end-criterium: addition-theorem of sin(Latitude(iter)-Latitude(iter-1)) */ - int iter; /* # of continous iteration, max. 30 is always enough (s.a.) */ + int iter; /* # of continuous iteration, max. 30 is always enough (s.a.) */ P = sqrt(X*X+Y*Y); RR = sqrt(X*X+Y*Y+Z*Z); @@ -389,7 +389,7 @@ void pj_Convert_Geocentric_To_Geodetic (GeocentricInfo *gi, } /* -------------------------------------------------------------- - * Following iterative algorithm was developped by + * Following iterative algorithm was developed by * "Institut für Erdmessung", University of Hannover, July 1988. * Internet: www.ife.uni-hannover.de * Iterative computation of CPHI,SPHI and Height. diff --git a/src/geodesic.c b/src/geodesic.c index e897e89e..ad4a2686 100644 --- a/src/geodesic.c +++ b/src/geodesic.c @@ -896,7 +896,7 @@ static real geod_geninverse_int(const struct geod_geodesic* g, continue; } } - /* Either dv was not postive or updated value was outside legal + /* Either dv was not positive or updated value was outside legal * range. Use the midpoint of the bracket as the next estimate. * This mechanism is not needed for the WGS84 ellipsoid, but it does * catch problems with more eccentric ellipsoids. Its efficacy is @@ -1484,7 +1484,7 @@ real A3f(const struct geod_geodesic* g, real eps) { void C3f(const struct geod_geodesic* g, real eps, real c[]) { /* Evaluate C3 coeffs - * Elements c[1] thru c[nC3 - 1] are set */ + * Elements c[1] through c[nC3 - 1] are set */ real mult = 1; int o = 0, l; for (l = 1; l < nC3; ++l) { /* l is index of C3[l] */ @@ -1497,7 +1497,7 @@ void C3f(const struct geod_geodesic* g, real eps, real c[]) { void C4f(const struct geod_geodesic* g, real eps, real c[]) { /* Evaluate C4 coeffs - * Elements c[0] thru c[nC4 - 1] are set */ + * Elements c[0] through c[nC4 - 1] are set */ real mult = 1; int o = 0, l; for (l = 0; l < nC4; ++l) { /* l is index of C4[l] */ diff --git a/src/geodesic.h b/src/geodesic.h index c3f28c79..ff10c906 100644 --- a/src/geodesic.h +++ b/src/geodesic.h @@ -448,7 +448,7 @@ extern "C" { * * This function sets point 3 of the geod_geodesicline to correspond to point * 2 of the direct geodesic problem. See geod_lineinit() for more - * informaion. + * information. **********************************************************************/ void geod_directline(struct geod_geodesicline* l, const struct geod_geodesic* g, @@ -478,7 +478,7 @@ extern "C" { * * This function sets point 3 of the geod_geodesicline to correspond to point * 2 of the direct geodesic problem. See geod_lineinit() for more - * informaion. + * information. **********************************************************************/ void geod_gendirectline(struct geod_geodesicline* l, const struct geod_geodesic* g, @@ -504,7 +504,7 @@ extern "C" { * * This function sets point 3 of the geod_geodesicline to correspond to point * 2 of the inverse geodesic problem. See geod_lineinit() for more - * informaion. + * information. **********************************************************************/ void geod_inverseline(struct geod_geodesicline* l, const struct geod_geodesic* g, diff --git a/src/jniproj.c b/src/jniproj.c index 6094d577..85d984da 100644 --- a/src/jniproj.c +++ b/src/jniproj.c @@ -454,7 +454,7 @@ JNIEXPORT jstring JNICALL Java_org_proj4_PJ_getLastError * This method will also set the Java "ptr" final field to 0 as a safety. In theory we are not * supposed to change the value of a final field. But no Java code should use this field, and * the PJ object is being garbage collected anyway. We set the field to 0 as a safety in case - * some user invoked the finalize() method explicitely despite our warning in the Javadoc to + * some user invoked the finalize() method explicitly despite our warning in the Javadoc to * never do such thing. * * \param env - The JNI environment. diff --git a/src/pj_apply_gridshift.c b/src/pj_apply_gridshift.c index d6141905..40fe7cdc 100644 --- a/src/pj_apply_gridshift.c +++ b/src/pj_apply_gridshift.c @@ -72,7 +72,7 @@ int pj_apply_gridshift( projCtx ctx, const char *nadgrids, int inverse, /************************************************************************/ /* pj_apply_gridshift_2() */ /* */ -/* This implmentation takes uses the gridlist from a coordinate */ +/* This implementation takes uses the gridlist from a coordinate */ /* system definition. If the gridlist has not yet been */ /* populated in the coordinate system definition we set it up */ /* now. */ @@ -228,7 +228,7 @@ int pj_apply_gridshift_3( projCtx ctx, PJ_GRIDINFO **tables, int grid_count, * We don't actually have any machinery currently to set the * following macro, so this is mostly kept here to make it clear * how we ought to operate if we wanted to make it super clear - * that an error has occured when points are outside our available + * that an error has occurred when points are outside our available * datum shift areas. But if this is on, we will find that "low * value" points on the fringes of some datasets will completely * fail causing lots of problems when it is more or less ok to diff --git a/src/pj_apply_vgridshift.c b/src/pj_apply_vgridshift.c index 297211c1..7c498085 100644 --- a/src/pj_apply_vgridshift.c +++ b/src/pj_apply_vgridshift.c @@ -35,7 +35,7 @@ /************************************************************************/ /* pj_apply_vgridshift() */ /* */ -/* This implmentation takes uses the gridlist from a coordinate */ +/* This implementation takes uses the gridlist from a coordinate */ /* system definition. If the gridlist has not yet been */ /* populated in the coordinate system definition we set it up */ /* now. */ diff --git a/src/pj_gridlist.c b/src/pj_gridlist.c index a54dbe6f..6b7e2ffa 100644 --- a/src/pj_gridlist.c +++ b/src/pj_gridlist.c @@ -92,7 +92,7 @@ static int pj_gridlist_merge_gridfile( projCtx ctx, { got_match = 1; - /* dont add to the list if it is invalid. */ + /* don't add to the list if it is invalid. */ if( this_grid->ct == NULL ) return 0; diff --git a/src/pj_init.c b/src/pj_init.c index d5fe2433..c468f1d7 100644 --- a/src/pj_init.c +++ b/src/pj_init.c @@ -290,7 +290,7 @@ get_init(projCtx ctx, paralist **start, paralist *next, char *name, /* pj_init_plus() */ /* */ /* Same as pj_init() except it takes one argument string with */ -/* individual arguments preceeded by '+', such as "+proj=utm */ +/* individual arguments preceded by '+', such as "+proj=utm */ /* +zone=11 +ellps=WGS84". */ /************************************************************************/ diff --git a/src/pj_mlfn.c b/src/pj_mlfn.c index aeab6117..2b823026 100644 --- a/src/pj_mlfn.c +++ b/src/pj_mlfn.c @@ -1,6 +1,6 @@ #include /* meridinal distance for ellipsoid and inverse -** 8th degree - accurate to < 1e-5 meters when used in conjuction +** 8th degree - accurate to < 1e-5 meters when used in conjunction ** with typical major axis values. ** Inverse determines phi to EPS (1e-11) radians, about 1e-6 seconds. */ diff --git a/src/pj_transform.c b/src/pj_transform.c index 1794678b..cf840db4 100644 --- a/src/pj_transform.c +++ b/src/pj_transform.c @@ -555,7 +555,7 @@ int pj_compare_datums( PJ *srcdefn, PJ *dstdefn ) else if( srcdefn->a_orig != dstdefn->a_orig || ABS(srcdefn->es_orig - dstdefn->es_orig) > 0.000000000050 ) { - /* the tolerence for es is to ensure that GRS80 and WGS84 are + /* the tolerance for es is to ensure that GRS80 and WGS84 are considered identical */ return 0; } diff --git a/src/proj.c b/src/proj.c index e4524677..ed555ed0 100644 --- a/src/proj.c +++ b/src/proj.c @@ -441,7 +441,7 @@ int main(int argc, char **argv) { gen_cheb(inverse, int_proj, cheby_str, Proj, iargc, iargv); exit(0); } - /* set input formating control */ + /* set input formatting control */ if (mon) { pj_pr_list(Proj); if (very_verby) { diff --git a/src/projects.h b/src/projects.h index 47a3364a..33af9ca7 100644 --- a/src/projects.h +++ b/src/projects.h @@ -443,7 +443,7 @@ struct FACTORS { #define PJD_3PARAM 1 #define PJD_7PARAM 2 #define PJD_GRIDSHIFT 3 -#define PJD_WGS84 4 /* WGS84 (or anything considered equivelent) */ +#define PJD_WGS84 4 /* WGS84 (or anything considered equivalent) */ /* library errors */ #define PJD_ERR_GEOCENTRIC -45 diff --git a/test/gigs/TESTNOTES.md b/test/gigs/TESTNOTES.md index 003872e8..ff9c03a1 100644 --- a/test/gigs/TESTNOTES.md +++ b/test/gigs/TESTNOTES.md @@ -1,7 +1,7 @@ ## TEST JSON ########################################################### -This is the testing framework that uses JSON formated files that tests -PROJ.4 using Geospatial Integrity of Geoscience Sofware (GIGS) calculations. +This is the testing framework that uses JSON formatted files that tests +PROJ.4 using Geospatial Integrity of Geoscience Software (GIGS) calculations. This could be used as a framework for testing projections from other sources. @@ -61,7 +61,7 @@ courts of England and Wales. 2) Upgrade `pip` (possibly not needed) https://pip.pypa.io/en/stable/installing/#upgrading-pip 3) Install pyproj - * requires a C/C++ compiler be usuable by python + * requires a C/C++ compiler be usable by python * repository version requires Cython to be installed, releases do not require this ``` diff --git a/test/gigs/test_json.py b/test/gigs/test_json.py index 2c1f9f02..11aec31e 100644 --- a/test/gigs/test_json.py +++ b/test/gigs/test_json.py @@ -122,7 +122,7 @@ def match_func(cor, exc, tolerance): # parse multiple tests and call TransformTest # TODO: needs some awareness of the driver, so driver_info function in -# TranformTest classes can be called, could allow a dummy instance of +# TransformTest classes can be called, could allow a dummy instance of # Driver and move all the initization code to another function? Or allow # dipatch function to check if everything is in order do a transform. # Not an elegant solution. @@ -131,7 +131,7 @@ class TransformRunner(object): """ fn_pattern - file name or file name pattern (example "*.json") driver - this is the type of driver to run - kwargs - parameters passed to the respective driver TransfromTest class + kwargs - parameters passed to the respective driver TransformTest class """ self.driver = driver json_input = [] -- cgit v1.2.3