diff options
| -rw-r--r-- | CONTRIBUTING.md | 6 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | docs/source/apps/geod.rst | 4 | ||||
| -rw-r--r-- | docs/source/apps/index.rst | 5 | ||||
| -rw-r--r-- | docs/source/apps/proj.rst | 20 | ||||
| -rw-r--r-- | docs/source/development/api.rst | 2 | ||||
| -rw-r--r-- | docs/source/faq.rst | 4 | ||||
| -rw-r--r-- | docs/source/parameters.rst | 2 | ||||
| -rw-r--r-- | docs/source/projections/cass.rst | 2 | ||||
| -rw-r--r-- | docs/source/projections/geos.rst | 2 | ||||
| -rw-r--r-- | docs/source/projections/merc.rst | 2 | ||||
| -rw-r--r-- | docs/source/projections/rhealpix.rst | 2 | ||||
| -rw-r--r-- | docs/source/projections/tmerc.rst | 2 | ||||
| -rw-r--r-- | docs/source/references.rst | 6 | ||||
| -rw-r--r-- | html/gen_parms.html | 4 | ||||
| -rw-r--r-- | html/man_pj_init.html | 2 | ||||
| -rw-r--r-- | html/man_proj.html | 4 | ||||
| -rw-r--r-- | man/man1/cct.1 | 4 | ||||
| -rw-r--r-- | man/man1/proj.1 | 4 | ||||
| -rwxr-xr-x | nad/test27 | 2 | ||||
| -rwxr-xr-x | nad/test83 | 2 | ||||
| -rw-r--r-- | src/PJ_calcofi.c | 2 | ||||
| -rw-r--r-- | src/cct.c | 4 | ||||
| -rw-r--r-- | src/pj_mlfn.c | 2 |
24 files changed, 46 insertions, 47 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fd2ab269..59cb14be 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -67,8 +67,8 @@ Note that not all feature requests are accepted. ## Write documentation -PROJ.4 is in dire need of better documentation. Any contributiions of documentation -are greatly appreaciated. The PROJ.4 documentation is available on [proj4.org](ttp://proj4.org). +PROJ.4 is in dire need of better documentation. Any contributions of documentation +are greatly appreciated. The PROJ.4 documentation is available on [proj4.org](ttp://proj4.org). The website is generated with [Sphinx](http://www.sphinx-doc.org/en/stable/). Contributions to the documentation should be made as [Pull Requests](https://github.com/OSGeo/proj.4/pulls) on GitHub. @@ -121,7 +121,7 @@ Throughout the PROJ.4 code base you will see differing whitespace use. The general rule is to keep whitespace in whatever form it is in the file you are currently editing. If the file has a mix of tabs and space please convert the tabs to space in a separate commit before making any other changes. This -makes it a lot easier to see the changes in diffs when evaulating the changed code. New +makes it a lot easier to see the changes in diffs when evaluating the changed code. New files should use spaces as whitespace. #### File names @@ -232,9 +232,9 @@ o The PROJ.4 project also distributes the datum-grid package, o Equations for meridian convergence and partial derivatives have been corrected for non-conformal projections. #526. - o Fixed scaling of cartesian coordiantes in pj_transform(). #726. + o Fixed scaling of cartesian coordinates in pj_transform(). #726. - o Additional bug fixes courtesy of Googles OSS-Fuzz program: + o Additional bug fixes courtesy of Google's OSS-Fuzz program: https://bugs.chromium.org/p/oss-fuzz/issues/list?can=1&q=proj4 diff --git a/docs/source/apps/geod.rst b/docs/source/apps/geod.rst index 49fa4925..03418815 100644 --- a/docs/source/apps/geod.rst +++ b/docs/source/apps/geod.rst @@ -141,8 +141,8 @@ which gives the results: where the first two values are the azimuth from Boston to Portland, the back azimuth from Portland to Boston followed by the distance. -An example of forward geodesic use is to use the Boston loca- -tion and determine Portland's location by azimuth and distance: +An example of forward geodesic use is to use the Boston location +and determine Portland's location by azimuth and distance: :: diff --git a/docs/source/apps/index.rst b/docs/source/apps/index.rst index 1baaf1c5..5eefd393 100644 --- a/docs/source/apps/index.rst +++ b/docs/source/apps/index.rst @@ -9,9 +9,8 @@ between geographic and projection coordinates within one datum. The cs2cs program operates similarly, but allows -translation between any pair of definable coor- -dinate systems, including support for datum -translation. +translation between any pair of definable coordinate +systems, including support for datum translation. The geod program provides the ability to compute geodesic (Great Circle) computations. diff --git a/docs/source/apps/proj.rst b/docs/source/apps/proj.rst index a06df383..f54643fd 100644 --- a/docs/source/apps/proj.rst +++ b/docs/source/apps/proj.rst @@ -65,9 +65,9 @@ The following control parameters can appear in any order -s This options reverses the order of the output from x-y or longitude-latitude to y-x or latitude-longitude. - -S Causes estimation of meridinal and parallel scale factors, area scale factor and + -S Causes estimation of meridional and parallel scale factors, area scale factor and angular distortion, and maximum and minimum scale factors to be listed between <> - for each input point. For conformal projections meridinal and parallel scales + for each input point. For conformal projections meridional and parallel scales factors will be equal and angular distortion zero. Equal area projections will have an area factor of 1. @@ -122,10 +122,10 @@ is also used for supporting files like datum shift files. One or more files (processed in left to right -order) specify the source of data to be trans- -formed. A - will specify the location of pro- -cessing standard input. If no files are speci- -fied, the input is assumed to be from stdin. +order) specify the source of data to be transformed. +A - will specify the location of processing +standard input. If no files are specified, +the input is assumed to be from stdin. For ASCII input data the two data values must be in the first two white space separated fields and when both input and output are ASCII all @@ -135,8 +135,8 @@ to the output line. Input geographic data (longitude and latitude) must be in DMS format and input cartesian data must be in units consistent with the ellipsoid -major axis or sphere radius units. Output geo- -graphic coordinates will be in DMS (if the -w +major axis or sphere radius units. Output +geographic coordinates will be in DMS (if the -w switch is not employed) and precise to 0.001" with trailing, zero-valued minute-second fields deleted. @@ -154,8 +154,8 @@ The following script +45.25919444444 111d30'000w EOF -will perform UTM forward projection with a stan- -dard UTM central meridian nearest longitude +will perform UTM forward projection with a standard +UTM central meridian nearest longitude 112W. The geographic values of this example are equivalent and meant as examples of various forms of DMS input. The x-y output data will diff --git a/docs/source/development/api.rst b/docs/source/development/api.rst index 5b915edf..98cd2e1d 100644 --- a/docs/source/development/api.rst +++ b/docs/source/development/api.rst @@ -53,7 +53,7 @@ Example ------- The following program reads latitude and longitude values in decimal -degress, performs Mercator projection with a Clarke 1866 ellipsoid and a +degrees, performs Mercator projection with a Clarke 1866 ellipsoid and a 33° latitude of true scale and prints the projected cartesian values in meters: diff --git a/docs/source/faq.rst b/docs/source/faq.rst index 14ceda85..40daa4d0 100644 --- a/docs/source/faq.rst +++ b/docs/source/faq.rst @@ -134,7 +134,7 @@ to use EPSG numbers like this: The proj/nad/epsg file can be browsed and searched in a text editor for coordinate systems. There are known to be problems with some coordinate systems, and any coordinate systems with odd axes, a non-greenwich prime -meridian or other quirkyness are unlikely to work properly. Caveat Emptor! +meridian or other quirkiness are unlikely to work properly. Caveat Emptor! How do I use 3 parameter and 7 parameter datum shifting -------------------------------------------------------------------------------- @@ -282,7 +282,7 @@ What is the rHEALPix projection and how can I use it? rHEALPix is a projection based on the HEALPix projection. The implementation of rHEALPix uses the HEALPix projection. The rHEALPix combines the peaks of the HEALPix into a square. The square's position can be translated and rotated -across the x-axis which is a noval approach for the rHEALPix projection. The +across the x-axis which is a novel approach for the rHEALPix projection. The initial intention of using rHEALPix in the Spatial Computation Engine Science Collaboration Environment (SCENZGrid). diff --git a/docs/source/parameters.rst b/docs/source/parameters.rst index e4623b9a..941f7beb 100644 --- a/docs/source/parameters.rst +++ b/docs/source/parameters.rst @@ -310,7 +310,7 @@ same. nadgrids - Grid Based Datum Adjustments -------------------------------------------------------------------------------- -In many places (notably North America and Austrialia) national geodetic +In many places (notably North America and Australia) national geodetic organizations provide grid shift files for converting between different datums, such as NAD27 to NAD83. These grid shift files include a shift to be applied at each grid location. Actually grid shifts are normally computed based on an diff --git a/docs/source/projections/cass.rst b/docs/source/projections/cass.rst index 83f8c2ce..4111a2ee 100644 --- a/docs/source/projections/cass.rst +++ b/docs/source/projections/cass.rst @@ -106,7 +106,7 @@ Forward projection y = M(\phi) - M(\phi_0) + N \tan(\phi)(\frac{A^2}{2} + (5-T+6C)\frac{A^4}{24}) -and M() is the meridionial distance function. +and M() is the meridional distance function. Inverse projection ------------------ diff --git a/docs/source/projections/geos.rst b/docs/source/projections/geos.rst index 2e309241..a7290b74 100644 --- a/docs/source/projections/geos.rst +++ b/docs/source/projections/geos.rst @@ -10,7 +10,7 @@ Geostationary Satellite View +---------------------+----------------------------------------------------------+ | **Defined area** | Global | +---------------------+----------------------------------------------------------+ -| **Implemented by** | Gerald I. Evenden and Martin Raspaud$ | +| **Implemented by** | Gerald I. Evenden and Martin Raspaud | +---------------------+----------------------------------------------------------+ | **Options** | +---------------------+----------------------------------------------------------+ diff --git a/docs/source/projections/merc.rst b/docs/source/projections/merc.rst index 64ba98a4..8895abc8 100644 --- a/docs/source/projections/merc.rst +++ b/docs/source/projections/merc.rst @@ -53,7 +53,7 @@ Example using scaling factor:: 12545706.61 2746073.80 -Note that ``+lat_ts`` and ``+k_0`` are mutually excusive. +Note that ``+lat_ts`` and ``+k_0`` are mutually exclusive. If used together, ``+lat_ts`` takes precedence over ``+k_0``. Mathematical definition diff --git a/docs/source/projections/rhealpix.rst b/docs/source/projections/rhealpix.rst index 1701558e..213c5d14 100644 --- a/docs/source/projections/rhealpix.rst +++ b/docs/source/projections/rhealpix.rst @@ -28,7 +28,7 @@ rHEALPix rHEALPix is a projection based on the HEALPix projection. The implementation of rHEALPix uses the HEALPix projection. The rHEALPix combines the peaks of the HEALPix into a square. The square's position can be translated and rotated across -the x-axis which is a noval approach for the rHEALPix projection. The initial +the x-axis which is a novel approach for the rHEALPix projection. The initial intention of using rHEALPix in the Spatial Computation Engine Science Collaboration Environment (SCENZGrid). diff --git a/docs/source/projections/tmerc.rst b/docs/source/projections/tmerc.rst index 03aa2830..1fc0cd7e 100644 --- a/docs/source/projections/tmerc.rst +++ b/docs/source/projections/tmerc.rst @@ -74,7 +74,7 @@ The formulas describing the Transverse Mercator are all taken from Evenden's [Ev :math:`k_0` is the scale factor at the natural origin (on the central meridian). It can be set with ``+k_0``. -:math:`M(\phi)` is the meridianal distance. +:math:`M(\phi)` is the meridional distance. Spherical form ************** diff --git a/docs/source/references.rst b/docs/source/references.rst index e80e8caf..e90ca09d 100644 --- a/docs/source/references.rst +++ b/docs/source/references.rst @@ -25,7 +25,7 @@ References Survey Review **30**\ (232), 61–66. .. [EberHewitt1979] L. E. Eber and R.P. Hewitt, 1979, - `Conversion algorithms for the CALCOFI station grid + `Conversion algorithms for the CalCOFI station grid <http://www.calcofi.org/publications/calcofireports/v20/Vol_20_Eber___Hewitt.pdf>`_, California Cooperative Oceanic Fisheries Investigations Reports 20:135-137. @@ -71,7 +71,7 @@ References .. [LambersKolb2012] M. Lambers and A. Kolb, 2012, "Ellipsoidal Cube Maps for Accurate Rendering of Planetary-Scale - Terrain Data", Proc. Pacfic Graphics (Short Papers). + Terrain Data", Proc. Pacific Graphics (Short Papers). .. [ONeilLaubscher1976] E. M. O'Neill and R. E. Laubscher, 1976, "Extended Studies of a Quadrilateralized Spherical Cube Earth Data Base", @@ -104,7 +104,7 @@ References Survey Review **23**\ (176), 88–93. .. [WeberMoore2013] E. D. Weber and T.J. Moore, 2013, - `Corrected Conversion Algorithms For The Calcofi Station Grid And Their + `Corrected Conversion Algorithms For The CalCOFI Station Grid And Their Implementation In Several Computer Languages <http://calcofi.org/publications/calcofireports/v54/Vol_54_Weber.pdf>`_, California Cooperative Oceanic Fisheries Investigations Reports 54. diff --git a/html/gen_parms.html b/html/gen_parms.html index d2b8305f..8cd8e161 100644 --- a/html/gen_parms.html +++ b/html/gen_parms.html @@ -10,7 +10,7 @@ which can be applied to all, or many coordinate system definitions. This document does not attempt to describe the parameters particular to particular projection types. Some of these can be found in the GeoTIFF <a href="http://www.remotesensing.org/geotiff/proj_list/">Projections -Transform List</a>. The definitative documentation for most parameters +Transform List</a>. The definitive documentation for most parameters is Gerald's original documentation available from the main PROJ.4 page. <p> <hr> @@ -136,7 +136,7 @@ otherwise the same.<p> <hr> <h2><a name="nadgrids">nadgrids - Grid Based Datum Adjustments</a></h2> -In many places (notably North America and Austrialia) national geodetic +In many places (notably North America and Australia) national geodetic organizations provide grid shift files for converting between different datums, such as NAD27 to NAD83. These grid shift files include a shift to be applied at each grid location. Actually grid shifts are normally computed diff --git a/html/man_pj_init.html b/html/man_pj_init.html index 9e3c73e0..25889942 100644 --- a/html/man_pj_init.html +++ b/html/man_pj_init.html @@ -91,7 +91,7 @@ Memory associated with the projection may be freed with <B>pj_free</B>. <H2>EXAMPLE</H2> The following program reads latitude and longitude values in decimal -degress, performs Mercator projection with a Clarke 1866 ellipsoid and +degrees, performs Mercator projection with a Clarke 1866 ellipsoid and a 33° latitude of true scale and prints the projected cartesian values in meters: <PRE> diff --git a/html/man_proj.html b/html/man_proj.html index 79658d31..74980a94 100644 --- a/html/man_proj.html +++ b/html/man_proj.html @@ -177,7 +177,7 @@ output from x-y or longitude-latitude to y-x or latitude-longitude. <DD> Causes estimation of -<I>meridinal</I> +<I>meridional</I> and <I>parallel</I> @@ -195,7 +195,7 @@ and <I>minimum</I> scale factors to be listed between <> for each input point. -For conformal projections meridinal and parallel scales factors +For conformal projections meridional and parallel scales factors will be equal and angular distortion zero. Equal area projections will have an area factor of 1. <DT><B>-m</B><I> mult</I> diff --git a/man/man1/cct.1 b/man/man1/cct.1 index b74896f4..d0553104 100644 --- a/man/man1/cct.1 +++ b/man/man1/cct.1 @@ -30,7 +30,7 @@ professor of Geodesy at the University of Copenhagen, mentor and advisor for a generation of Danish geodesists, colleague and collaborator for two generations of global geodesists, Secretary General for the International Association of Geodesy, IAG (1995--2007), fellow of the -Amercan Geophysical Union (1991), recipient of the IAG Levallois Medal +American Geophysical Union (1991), recipient of the IAG Levallois Medal (2007), the European Geosciences Union Vening Meinesz Medal (2008), and of numerous other honours. .PP @@ -40,7 +40,7 @@ the development of geodesy - both through his scientific contributions, comprising more than 250 publications, and by his mentoring and teaching of the next generations of geodesists. .PP -As Christian was an avid Fortran programmer, and a keen Unix connoiseur, +As Christian was an avid Fortran programmer, and a keen Unix connoisseur, he would have enjoyed to know that his initials would be used to name a modest Unix style transformation filter, hinting at the tireless aspect of his personality, which was certainly one of the reasons he accomplished diff --git a/man/man1/proj.1 b/man/man1/proj.1 index 5bcd11ca..5b58fcd8 100644 --- a/man/man1/proj.1 +++ b/man/man1/proj.1 @@ -119,7 +119,7 @@ output from x-y or longitude-latitude to y-x or latitude-longitude. .TP .BI \-S Causes estimation of -.I meridinal +.I meridional and .I parallel scale factors, @@ -131,7 +131,7 @@ and and .I minimum scale factors to be listed between <> for each input point. -For conformal projections meridinal and parallel scales factors +For conformal projections meridional and parallel scales factors will be equal and angular distortion zero. Equal area projections will have an area factor of 1. .TP @@ -4,7 +4,7 @@ # the second pair of numbers are respective easting and northing output. # # Proj will vary in the .001ft range with projections using Transverse -# Mercator due to greater precision of meridinal distance function. +# Mercator due to greater precision of meridional distance function. # NAD_DIR=`dirname $0` EXE=$1 @@ -5,7 +5,7 @@ # the second pair of numbers are respective easting and northing output. # # Proj will vary in the .001ft range with projections using Transverse -# Mercator due to greater precision of meridinal distance function. +# Mercator due to greater precision of meridional distance function. # NAD_DIR=`dirname $0` EXE=$1 diff --git a/src/PJ_calcofi.c b/src/PJ_calcofi.c index 5c0b64ab..955e82c2 100644 --- a/src/PJ_calcofi.c +++ b/src/PJ_calcofi.c @@ -13,7 +13,7 @@ PROJ_HEAD(calcofi, /* Conversions for the California Cooperative Oceanic Fisheries Investigations Line/Station coordinate system following the algorithm of: -Eber, L.E., and R.P. Hewitt. 1979. Conversion algorithms for the CALCOFI +Eber, L.E., and R.P. Hewitt. 1979. Conversion algorithms for the CalCOFI station grid. California Cooperative Oceanic Fisheries Investigations Reports 20:135-137. (corrected for typographical errors). http://www.calcofi.org/publications/calcofireports/v20/Vol_20_Eber___Hewitt.pdf @@ -24,7 +24,7 @@ professor of Geodesy at the University of Copenhagen, mentor and advisor for a generation of Danish geodesists, colleague and collaborator for two generations of global geodesists, Secretary General for the International Association of Geodesy, IAG (1995--2007), fellow of the -Amercan Geophysical Union (1991), recipient of the IAG Levallois Medal +American Geophysical Union (1991), recipient of the IAG Levallois Medal (2007), the European Geosciences Union Vening Meinesz Medal (2008), and of numerous other honours. @@ -34,7 +34,7 @@ the development of geodesy - both through his scientific contributions, comprising more than 250 publications, and by his mentoring and teaching of the next generations of geodesists. -As Christian was an avid Fortran programmer, and a keen Unix connoiseur, +As Christian was an avid Fortran programmer, and a keen Unix connoisseur, he would have enjoyed to know that his initials would be used to name a modest Unix style transformation filter, hinting at the tireless aspect of his personality, which was certainly one of the reasons he accomplished diff --git a/src/pj_mlfn.c b/src/pj_mlfn.c index e00f2bf1..84282d2b 100644 --- a/src/pj_mlfn.c +++ b/src/pj_mlfn.c @@ -1,5 +1,5 @@ #include <projects.h> -/* meridinal distance for ellipsoid and inverse +/* meridional distance for ellipsoid and inverse ** 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. |