diff --git a/.github/workflows/doc_checks.yml b/.github/workflows/doc_checks.yml new file mode 100644 index 0000000000..704846b814 --- /dev/null +++ b/.github/workflows/doc_checks.yml @@ -0,0 +1,54 @@ +name: Docs + +on: + push: + branches-ignore: + - 'backport**' + - 'dependabot**' + pull_request: + +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} + cancel-in-progress: true + +permissions: + contents: read + +jobs: + docs: + name: Documentation checks + + runs-on: ubuntu-latest + strategy: + fail-fast: true + container: ghcr.io/osgeo/proj-docs + + steps: + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + + - name: Print versions + shell: bash -l {0} + run: | + python3 --version + sphinx-build --version + python3 -m pip list --not-required --format=columns + - name: Lint .rst files + shell: bash -l {0} + run: | + set -eu + if find . -name '*.rst' | xargs grep -P '\t'; then echo 'Tabs are bad, please use four spaces in .rst files.'; false; fi + if find . -name '*.rst' | xargs grep "\.\.versionadded"; then echo 'Wrong annotation. Should be .. versionadded'; false; fi + if find . -name '*.rst' | xargs grep "\.\.note"; then echo 'Wrong annotation. Should be .. note'; false; fi + if find . -name '*.rst' | xargs grep "\.\.warning"; then echo 'Wrong annotation. Should be .. warning'; false; fi + if find . -name '*.rst' | xargs grep "\.\.codeblock"; then echo 'Wrong annotation. Should be .. codeblock'; false; fi + working-directory: ./docs + - name: Doxygen + shell: bash -l {0} + run: | + make .doxygen_up_to_date + working-directory: ./docs + - name: Spelling + shell: bash -l {0} + run: | + make spelling SPHINXOPTS=-W + working-directory: ./docs diff --git a/docs/source/apps/proj.rst b/docs/source/apps/proj.rst index fefdd9741a..235cf14c47 100644 --- a/docs/source/apps/proj.rst +++ b/docs/source/apps/proj.rst @@ -228,8 +228,8 @@ The output will appear as: .. code-block:: console #Lambert Conformal Conic - # Conic, Sph&Ell - # lat_1= and lat_2= or lat_0, k_0= + # Conic, Sph&Ell + # lat_1= and lat_2= or lat_0, k_0= # +proj=lcc +lat_0=35.3333333333333 +lon_0=-119 +lat_1=37.25 +lat_2=36 # +x_0=2000000 +y_0=500000 +ellps=GRS80 #Final Earth figure: ellipsoid diff --git a/docs/source/community/rfc/rfc-3.rst b/docs/source/community/rfc/rfc-3.rst index 439f22d1d4..482352994f 100644 --- a/docs/source/community/rfc/rfc-3.rst +++ b/docs/source/community/rfc/rfc-3.rst @@ -132,7 +132,7 @@ This RFC comes with a set of guidelines for handling dependencies for PROJ in the future. Up until now dependencies hasn't been handled consistently, with some dependencies not being approved formally by the projects governing body. Therefore minimum versions of PROJ dependencies is proposed so that at the -acception of this RFC PROJ will have the following external requirements: +approval of this RFC PROJ will have the following external requirements: * C99 (was C89) * C++11 (already approved in :ref:`RFC2 `) diff --git a/docs/source/conf.py b/docs/source/conf.py index 67f2e933f3..bc0cf80801 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -278,3 +278,10 @@ # Tell Jinja2 templates the build is running on Read the Docs if os.environ.get("READTHEDOCS", "") == "True": html_context["READTHEDOCS"] = True + +# -- Spelling -------------------------------------------------- + +# Avoid running git +spelling_ignore_contributor_names = False + +spelling_word_list_filename = ["spelling_wordlist.txt"] diff --git a/docs/source/news.rst b/docs/source/news.rst index 1c0f802827..a5b9ca4112 100644 --- a/docs/source/news.rst +++ b/docs/source/news.rst @@ -12,7 +12,7 @@ Updates * Database: add constraint for unicity of CRS and operation names (`#4071 `_) - * Make a few more functions that accept a ``PJ*`` to actually acccept a ``const PJ*`` (`#4074 `_) + * Make a few more functions that accept a ``PJ*`` to actually accept a ``const PJ*`` (`#4074 `_) * Database: Increase consistency in trigger checks (`#4080 `_) @@ -136,7 +136,7 @@ Updates * ``+proj=gridshift``: enhance to support grids referenced in projected CRS, and with easting_offset/northing_offset corrections (`#4038 `_) -* Tune concatenated operation instanciation, reference CR2005 geoid for Czechia and add (disabled by default) records for Czechia S-JTSK/05 based transformations (`#4044 `_) +* Tune concatenated operation instantiation, reference CR2005 geoid for Czechia and add (disabled by default) records for Czechia S-JTSK/05 based transformations (`#4044 `_) * Database: update to EPSG v11.004 (`#4062 `_) @@ -293,7 +293,7 @@ Bug fixes * ESRI WKT: improve roundtrip of name and definition for UPS WGS84 CRS (`#3720 `_) -* CRS instanciation from PROJ.4 string: set 'Unknown based on XXXX ellipsoid' datum name when instanciating from known +a, +rf (`#3727 `_) +* CRS instantiation from PROJ.4 string: set 'Unknown based on XXXX ellipsoid' datum name when instantiating from known +a, +rf (`#3727 `_) * :program:`cs2cs` / ``proj_create_crs_to_crs()``: fix regression with geocentric CRS (`#3729 `_) @@ -329,14 +329,14 @@ Updates * Added option ``ONLY_BEST=YES`` (`#3535 `_) When enabled only use the best possible transformation between two CRS's can be - instantiated. If the best possible transfomations can't be instantiated it will + instantiated. If the best possible transformations can't be instantiated it will fail instead of opting for the next best transformation. With ``ONLY_BEST=YES`` a transformation will fail if a needed grid is unavailable. The option can be toggled in ``proj.ini`` and with ``--only-best`` in :program:`cs2cs`. - * Implement 'Similarity transformation' (EPSG:9621) and import related tranformations from EPSG (`#3578 `_) + * Implement 'Similarity transformation' (EPSG:9621) and import related transformations from EPSG (`#3578 `_) * Optimise transformations between GDA94, GDA2020 and WGS84 (`#3621 `_) @@ -437,7 +437,7 @@ Bug fixes * ProjectedCRS::identify(): Relax trust in id/authority in definition to identify (`#3532 `_) -* Fix instantion of http://www.opengis.net/def/crs/IAU/2015/xxx URNs (`#3569 `_) +* Fix instantiation of http://www.opengis.net/def/crs/IAU/2015/xxx URNs (`#3569 `_) * Fix :c:func:`proj_normalize_for_visualization()` on a transformation with ``FORCE_OVERb=YES`` (`#3570 `_) @@ -578,7 +578,7 @@ Updates * Make it possible to determine which grid files were actually used during a transformation (`#3180 `_) - * Transformation: no longer do vertical trasnformation when doing compound CRS to 2D CRS / add --3d to cs2cs (`#3119 `_) + * Transformation: no longer do vertical transformation when doing compound CRS to 2D CRS / add --3d to cs2cs (`#3119 `_) * Deprecate PROJ4 CMake name (`#3094 `_) @@ -922,7 +922,7 @@ Bug Fixes * ortho: remove useless and invalid log trace (`#2777 `_) * CMake: remove external nlohmann_json from INTERFACE_LINK_LIBRARIES target (`#2781 `_) -* reateOperations(): fix SourceTargetCRSExtentUse::NONE mode (`#2783 `_) +* createOperations(): fix SourceTargetCRSExtentUse::NONE mode (`#2783 `_) * GeoTIFF grid reading: perf improvements (`#2788 `_) @@ -1271,7 +1271,7 @@ Bug fixes * Avoid core dumps when copying contexts in certain scenarios (`#2324 `_) -* :c:func:`proj_trans()`: reset errno before attemptying a retry with a new +* :c:func:`proj_trans()`: reset errno before attempting a retry with a new coordinate operation (`#2353 `_) * PROJJSON schema corrected to allow prime meridians values with @@ -1318,7 +1318,7 @@ Bug fixes * Helmert 2D: do not require a useless +convention= parameter (`#2305 `_) -* Fix a few spelling errors ("vgridshit" vs. "vgridshift") (`#2307 `_) +* Fix a few spelling errors related to "vgridshift" (`#2307 `_) * Fix ability to identify EPSG:2154 as a candidate for 'RGF93_Lambert_93' (`#2316 `_) @@ -1668,7 +1668,7 @@ Updates WKT2_2018 to WKT2_2019 to reflect the proper name of the standard (`#1585 `_) * Improvements in transformations from/to WGS 84 (Gxxxx) realizations and - vertical <--> geog transormations (`#1608 `_) + vertical <--> geog transformations (`#1608 `_) * Update to version 1.50 of the geodesic library (`#1629 `_) @@ -2085,7 +2085,7 @@ transformation capabilities to a more complete library supporting coordinate transformations and coordinate reference systems. As a foundation for other enhancements, PROJ now includes a C++ implementation -of the modelisation propopsed by the ISO-19111:2019 standard / OGC Abstract +of the modelisation proposed by the ISO-19111:2019 standard / OGC Abstract Specification Topic 2: "Referencing By Coordinates", for geodetic reference frames (datums), coordinate reference systems and coordinate operations. Construction and query of those geodetic objects is available through a new C++ @@ -2105,7 +2105,7 @@ IOGP EPSG dataset (v9.6.0 release), the IGNF (French national mapping agency) geodetic registry and the ESRI projection engine database. PROJ is now the reference software in the "OSGeo C stack" for this CRS and coordinate operation database, whereas previously this functionality was spread over PROJ, GDAL and -libgeotiff, and used CSV or other adhoc text-based formats. +libgeotiff, and used CSV or other ad hoc text-based formats. Late-binding coordinate operation capabilities, that takes metadata such as area of use and accuracy into account, has been added. This can avoid in a diff --git a/docs/source/operations/projections/mod_krovak.rst b/docs/source/operations/projections/mod_krovak.rst index 6b72c88b32..27a67f08b5 100644 --- a/docs/source/operations/projections/mod_krovak.rst +++ b/docs/source/operations/projections/mod_krovak.rst @@ -30,7 +30,7 @@ Modified Krovak proj-string: ``+proj=mod_krovak`` -Modified Krovak builts upon traditional :ref:`krovak`, with corrective terms that +Modified Krovak builds upon traditional :ref:`krovak`, with corrective terms that are better suited when using it with the S-JTSK/05 datum. This method is specific to the Czech Republic. Due to the corrective terms, this projection method is no longer strictly conformal. diff --git a/docs/source/operations/projections/omerc.rst b/docs/source/operations/projections/omerc.rst index 00c40d583e..9ea0bf10ee 100644 --- a/docs/source/operations/projections/omerc.rst +++ b/docs/source/operations/projections/omerc.rst @@ -77,10 +77,10 @@ projections are limiting forms of the Oblique Mercator :: $ echo 12 55 | proj +proj=merc +ellps=GRS80 - 1335833.89 7326837.71 + 1335833.89 7326837.71 $ echo 12 55 | proj +proj=omerc +alpha=90 +ellps=GRS80 - 1335833.89 7326837.71 + 1335833.89 7326837.71 $ echo 12 55 | proj +proj=omerc +alpha=0 +R=6400000 766869.97 6209742.96 @@ -199,11 +199,11 @@ Note for the two-point method no rectification is done, :: echo 0 0|proj -I +proj=omerc +R=6400000 +lonc=-87 +lat_0=42 +alpha=0 - 87dW 42dN + 87dW 42dN echo 0 0|proj -I +proj=omerc +R=6400000 +lonc=-87 +lat_0=42 +alpha=0 +no_rot - 87dW 0dS + 87dW 0dS echo 0 0|proj -I +proj=omerc +R=6400000 +lon_1=-87 +lat_1=42 +lon_2=-87 +lat_2=43 - 87dW 0dN + 87dW 0dN Thus, just as was noted above regarding +no_rot, the two-point method itself is also probably only marginally useful. diff --git a/docs/source/spelling_wordlist.txt b/docs/source/spelling_wordlist.txt index 4105b2adb8..da7cfb7bf9 100644 --- a/docs/source/spelling_wordlist.txt +++ b/docs/source/spelling_wordlist.txt @@ -1,457 +1,1038 @@ -# Core library and programs -PROJ -proj -libproj -projinfo -projsync -geod -gie -cct -cs2cs - -# Short English -db -de -etc -ok -pre -st -nd -rd -th - -# Expanded English accuracies +Acknowledgements +adams advertized -authorized -authorizes -Authorizing -Behavior -behavior -behaviors -catalog -Center -center -centered -centerline -centers -centimeter -centimetric -centralizes -customized -characterized -decimeter -favorable -favorite -formalization -formalized -generalization -generalized -homology -honored -initialization -initialize -initialized -initializing -instantiation -interpretable -Kilometer -materializes -Millimeter -millimeters -millimetric -minimize -modeling -nanometers -normalized -Optimization -optimization -optimizations -optimized -organization -organizations -organized -parametrize -piecewise -prioritized -realized -realization -realizations -recognize -recognized -selectable -serialization -serialized -specialized -standardize -standardized -synchronizing -synthetize -synthetized -timespan -unrecognized -utilized -utilizing -visualization - -# CRS-related abbreviations -bbox -calcofi -conus -crs -cs -dms -ENU -ETRS -EPSG -epsg -IGNF -lcc -lcca -laea -lat -latlon -latlong -lats -lon -lonlat -longlat -misrsom -nad -NTv -ogc -omerc -OSGeo -osgeo -som -srs -tmerc -towgs -utm -wgs -wkt - -# Names -Aitoff +aea +aeqd +affine +Affine +Agri aitoff +Aitoff Albers -Apian -apian -Badekas -Bertin -bertin -Boaga -Boggs -boggs -Bonne -bonne -cartesian -Cassini -Chamberlin -Chebyshev -clarke -Collignon -Craster -Delaunay -der -Denoyer -Eckert -euler -Eumorphic -Evenden -Fahey -fahey -Fairgrieve -Flamsteed -Foucaut -Goode -goode -Greifendorff -Grinten -Guyou -Hartebeesthoek -Hatano -Hayford -Helmert -helmert -Horner -horner -Hotine -Karney -Kavraisky -Kavrayskiy -Krovak -krovak -Krüger -Laborde -Larrivée -Larrivee -Laskowski -mercator -Mollweide -Molodensky -molodensky -Nicolosi -Ortelius -Putnins -Raphson -Roussilhe -Sanson -Schreiber -Soldner -Tissot -Tobler -Tscherning -Urmaev -Vincenty -Vitkovsky -Warmerdam -Werenskiold -Werner -Winkel - -# Terminology -Affine -affine -aseismic -anamorphosis -antimeridian -aposphere -Authalic -Azimuthal -azimuthal -barycentric -biaxial -bilinear -cadastral -Carrée -carrée -centrographic -Conformal -conformal -conformant -datums -dataset -datasets -dodecahedron -easting -Epicycloidal -Equirectangular -equirectangular -Geoid -geoid -geodesist -geodesists -Geospatial -geospatial -georeferencing -gimbal -Gnomonic -graticule -graticules -gridded -HEALPix -healpix -Homolosine -homolosine -Icosahedral -icosahedron -inhomogeneous -intraplate -Isostatic -isostatic -invertible -kinematically -Landsat -Loximuthal -mapmaking -maximimize -Meridional -meridional -Microradian -Northing -northing -northings -Oblated -parameterising -planetocentric -planetographic -polewards -Polyconic -prolate -proleptic -Pseudoazimuthal -Pseudoconical -pseudoconical -Pseudocylindrical -pseudocylindrical -Quadrilateralized -Quartic -Quincuncial -rasters -rHEALPix -rhealpix -rhumb -roundtrip -Semimajor -semimajor -Semiminor -sexagesimal -Southing -southing -spatiotemporal -Stereographic -stereographic -supersession -tangency -topocentric -triangulations -triaxial -Trimetric -Tripel -unitless -unrotated -Webmercator -westing - -# Locations +Alegre +Aleksejenko +algo +aliasedName +alsk +Altamimi Amersfoort -athens -bern -bogota -brussels -europe -greenwich -jakarta -lisbon -madrid -oslo -paris -Potsdam -Pulkovo -rome -stockholm - -# Technology jargon +ammend +amongst +analys analyzer +Analyzer +anamorphosis +andrae +ang +angleFromRectifiedToSkrewGrid +Anmerkungen +antimeridian api +apian +Apian +aposphere +arcminutes +arcseconds argc args argv +artifact +artifacts +asc +aseismic +ast +athens +aut +auth +authalic +Authalic +authName +authorityFactory +authorized +authorizes +Authorizing +autoclose autoconf -Autotools +Autoconf +Automake +autopromote autotools +Autotools +auxDbPaths +axisswap +axisUnitID +azimuthal +Azimuthal +azimuthInitialLine +Badekas +Baja +barycentric +baseCRS basename +BaseObject +bashism +Bavnehoj +Bazel +bbildung +bbox +behavior +behaviors +behaviour +behavioural +Behavioural +Behrmann +bene +bern +Bernhard +bertin +Bertin +bessel +biaxial +bilinear +bipc +biquadratic +Biquadratic +Boaga +boggs +Boggs +bogota +Bojan +bonne +Bonne boolean -CMake +Boucher +boundcrs +boundCRS +Bregler +brussels +cadastral +cadastre +Cadastre +Calabretta +calcofi +Canoa +CApi +capitalization +carrée +Carrée +cartesian +cartesiennes +cass +Cassini +catalog +cbk +ccon +cct +cdn +cea +Celestia +center +centered +Centered +centerLat +centerline +centers +centimeter +Centimeter +centimetric +centralizes +centre +centred +centrographic +centroid +chamb +Chamberlin +Chapin +characterized +Chebyshev +childName +clarke +clrk cmake +CMake codespace +codeSpace +colatitudeConeAxis +collg +Collignon +comill +compat +compilable compoundCRS -Conda +computeInverseFlattening +concatenatedOperation conda +Conda +conf +config +conformally +conformant const constexpr +Contig +conus +conv +conveniency +coord +coordinateMetadata +CoordinateMetadata +coordinateOperation +CoordinateOperation +coordinateTransformer +coordniate +coordonnees +coordoperation +coordoperationmethod +coordoperationparam +coordoperationparamusage +coordoperationparamvalue +copenhagen +Corrego +Corriente +corrigendum cpp cppcheck +crast +Craster +createBoundCRSToWGS +createCoordinateReferenceSystem +createdMolodensky +createFromCoordinateReferenceSystemCodes +createObject +createOperations +critcl +criticity +crs +CSRS csv +ctable CTable CTest ctx cURL -datatype +customizability +customizations +customize +customized +cvs +cvt +Cygwin +czech +Danielsen +datarootdir +dataset +datasets datatypes +dateTime +datumEnsemble datumgrid +datums +de +dE +Deakin +Deallocate +deallocated +Deault decimalyear decimalyears +decimeter +Decimeter defmodel +Delaunay +demoteTo +denoy +Denoyer +densify +densifying +der +dereference +derivingConversion +derivingConversionRef +des +determinted +dev +dh +dialiect +dimensionality +discoverable +dm +dms +domainOfValidity +Doxygen +doxygenenum +doxygenfunction +doxygengroup +doxygennamespace +doxygenpage +doxygenstruct +doxygentypedef +duplicateBreak +d'utilisation +dx +dy +eastBoundLongitude +easting +eastings +Eber +eck +Eckert +ecosphere +eg +egm +ellps +emphasize encodings endian +engsager +Engsager +ENh +Entwerfung +ENU +Enum +env +envisionned +Epicycloidal +epsg +EPSG +eq +eqc +eqdc +eqearth +Equirectangular +ercator errno +errorhandling +esri +Esri +et +ETag +etmerc +ETRS +euler +Eumorphic +eur +Eurographics +europe +evenden +Evenden +Evers +eXchange +executables +Exercie +exportToProj +exportToPROJ +exportToPROJString +exportToWKT +expressivity +ExtentNNPtr +facto +fahey +Fahey +Fairgrieve +falseEasting +falseNorthing +familiarize +fath +favor +favorable +favorably +favorite +favour +ferro +filemanager +Finalize +Flamsteed +flyout +formalization +formalized formatter Fortran +fouc +Foucaut +Francais frontend +ftUS +func +gc gcc +gdalinfo +gencentric +generalization +generalized +geobotanical +geoc +geocent +geocentriques +geod geodata +Geodesie +Geodesique +geodesist +geodesists +geodeticCRS +geodtest +GEOGCRS +geogoffset +geographicCRS +Geographique +geographiques +geoid geoidgrids -geojson +geokeys +geomatic +Geomatics +georeferencing +geos +Geosciences +geospatial +geotiff +getAuthority +getMetadata +getters +getWKT GFortran +gg +gie +gimbal +Gitter +gn +gnom +gnomonic +Gnomonic +Golang +goode +googletest +gps +Grafarend +graticule +graticules +greenwich +Greifendorff +Greisen +gridcatalog +gridded +Gridded +Gridname gridshift -gridshifts gridshifting +gridshifts +gridvalue +Grieger +Grinten +GRS +gsb +gstmerc +gtest +GTest +gtiff gtx +GTX +guyou +Guyou +Gxxxx +gz +Häkli hardcoded +hardcodes +hatano +Hatano +Hayford +hBG +healpix +helmert +Helmert +hemi +Hernando hgridshift +Himmelscharten +hoc Homebrew +homolographic +homolosine +Homolosine +honored +honour +honoured +honours +horiz +horner +Horner +Hotine hpp html http -https +hubCRS +hydroid +IComparable +Icosahedral +icosahedron +IdentifierNNPtr +ie +ifdefs +IfPossible +igh +ign +IGNF +imoll +impl +imw +inclinate +inclinated +ingester +inhomogeneous +ini init -interoperability +Init +initialization +initializations +initialize +initialized +initializer +Initializer +initializing +instantiation +instantion +Institut +interoperable +interpretable +intersectingExtent +intl +intr +intraplate +Intraplate +inv +invertible +Investigaciones +invgeod +invproj io +isea +isEquivalentTo +Isographic +isostatic +Isostatic +isw +iteratively +ITRF +Jagiellonian +jakarta +jitter +Jivall +João +json JSON jsonschema +jtsk +JTSK +Karney +kav +Kavraisky +Kavrayskiy +Kilometer +kinematically +kmi +Kolb +Komsta +Konforme +Koper +Kristian +krovak +Krovak +Krüger +Laborde +labrd +laea +lagrng +Lambers +larr +Larrivee +lask +Laskowski +latitudeFirstParallel +latitudePseudoStandardParallel +latlon +latlong +Laubscher +lcc +lcca +ld +leac +len +Levallois +levelling +Levu libc libcurl libgeotiff +libm libnetcdf +libproj +libproject libsqlite +libstdc libtiff +Lidberg +likeno +linters +lisbon +lon +longlat +lonlat +lookups +losslessly +loxim +Loximuthal +lp +lsat +Macedo macOS +madrid +Maitland +maj +makefile Makefile +Makefiles +mapmaking +materializes +maximimize +maximize +maximumValue +mbt +mbtfpp +mbtfpq +mbtfps +md +Meinesz +Melborne +merc +mercator +meridional +Meridional +Meteosat +metre +Metre +metres +Mexicanas +micrometre +Microradian +Millimeter +millimeters +millimetric +mingw +Mingw +miniconda +minimize +minimized +minimizing +minimumValue +misrsom +mjd +mnt +modeling +modelisation +modelled +modelling +Mollweide +molobadekas +molodensky +Molodensky MSVC +msys +MTM +multiarch +multigrids multiline +murd mutex +nad +NAD nadgrids namespace namespaces namespacing NaN +nanometers +naptrans +natearth +natively +nd +nell +netcdf netCDF +nga +nicol +Nicolosi +Niermann +Nivellement +nkg +nlohmann +nm nmake +NMake nodata +noncircular noop +Nørbech +normalization +normalize +normalized +normalizing +northamerica northing +northings +Norting +norwegian +NRCAN +nsper +ntf +ntv +NTv +nul +NUL +nullable nullptr -obj -org +objectDomain +Oblated +ocea +oceania +ocentric +oea +ogc +OGC +ok +omerc +oneOf +onwards +opengeospatial +opengis +optimise +Optimise +optimised +optimization +optimizations +Optimizations +optimized +optimizer +organization +Organization +organizations +organized +ortel +Ortelius +orth +ortho +orthometric +os +osgeo +oslo +oss +ossfuzz +Ostend +ou +packageName +param +parameterising +parametres +parametrize +params +paris +Paršeliunas +patterson +pc +pconic +peirce +Peirce +perf +photogrammetry +piecewise +Pihlak pj +PJ +planetocentric +planetographic +pluggable +poder +Poder +polewards +Polyconic +polynormal +pre +Pre +preconfigured +preconfiguring printf -pthreads +prioritized +priorly +proj +projinfo +projString +projsync +prolate +proleptic +Pseudoazimuthal +Pseudoconical +pseudocylindrical +Pseudocylindrical +pseudocylindricals +ptr +Pulkovo +Putnins +putp +py +qsc +quadrilateralized +Quadrilateralized quadtree +Quartic +quincuncial +Quincuncial +quincunx +Raphson +rasters +rb +rdellipsoids +realisation +realisations +realization +realizations +realize +realized +recognised +recognize +recognized +reinitialize +reproducibility +reprojecting +reprojection +Reseau reStructuredText +resulative +rf +rhealpix +rHEALPix +rhumb +Rittri +Rivière +robustify +rome +rouault +roundtrip +Roundtrip +rouss +Roussilhe +rpoly +Ruffhead runtime +Runtime +Sanson +Savric +Šavrič +sbv +Schreiber +Schwehr +Scripps +searchpath +selectable +Selftest +selftests +semimajor +semiminor +serialization +serialized +serverless +setStrict +sexagesimal +sexualized shapefile +Sillard +sinu +sizeBytes +sji +SLO +smv +sniplets +snyder +socio Solaris +Soldner +som +somefilename sourceCRS +sourceCRSAuthName +sourceCRSCode +sourceCRSIn +southing +southPoleLatInUnrotatedCRS +southPoleLongInUnrotatedCRS +spatialys +spatiotemporal +specialization +specializations +specialized +Spectroradiometer +spherification +splitted +spx sql sqlite src -std +srs +standardised +Standardization +standardize +standardized stderr stdin -Struct +stere +sterea +stereographic +Stereographic +stockholm +Storebælt +Strecha +strided struct +Struct structs Subclassed subdirectories +subdirectory subgrid subgrids -sublicense subtype +supersession +symlinks +synchronizing +synthetize +synthetized +Talinn +Tangen +tangency targetCRS +targetCRSAuthName +targetCRSCode +Taves +tcc +tcea +tcl +Teubner +th +TideFree tif +timespan tinshift +Tissot +tmerc +Tobler +tobmerc +toFullyQualifiedName +topocentric +Topocentric +topoOriginHeight +topoOriginLat +topoOriginLong +toString +towgs +tpeqd +tpers +tradeoff +tran +Tranverse +triangulations +triaxial +Trimetric +Tripel +Triptychial +Tscherning +tunisia +tuplies +txt typedef +uncommenting +und +Und +unfrequent +unicity +uninitialized +unitconvert +unitless +unrecognized +unref unreferenced +unrotated +unscaled +untiled +uoff +uri url +Urmaev util +utilized +utilizing +utm +uv +vandg +Vanua vcpkg +Vcpkg +VDatum +vendored +Vening +Verey verticalCRS +vertoffset +vetoers +vfs vgridshift -xyzgridshift +Vincenty +visionscarto +Visionscarto +visualisation +Visualisation +visualization +visualize +vitk +Vitkovsky +VRP +vsicurl +vto +vunits +Warmerdam +webmerc +Webmercator +webpage +weren +Werenskiold +Werner +westing wget +wgs +WGS whitespace -writable +Whitespace +Wimmer +Winkel +winsock +wintri +wkt +ws www +XDG +xmax +xmin +xml +xoff +xxxNNPtr +xxxx +XXXX +xyzgridshift +ymax +ymin +yoff yyyymmdd +Zajaç +zenodo +zlib +zur +Zusätze diff --git a/docs/source/tutorials/EUREF2019/exercises/projections2.gie b/docs/source/tutorials/EUREF2019/exercises/projections2.gie index 9038061a5e..655c1cac4c 100644 --- a/docs/source/tutorials/EUREF2019/exercises/projections2.gie +++ b/docs/source/tutorials/EUREF2019/exercises/projections2.gie @@ -77,7 +77,7 @@ expect 1371811.19 218598.22 By reducing the scale factor, the line of zero distance distortion degenerates into two lines, north and south of the standard parallel. - For the abovementioned point in Tallinn, the distance error is around 0.002%, + For the above-mentioned point in Tallinn, the distance error is around 0.002%, but this can be reduced to zero by varying the scaling factor. Even by trial and error it is not hard to reduce it to a few millionths of a diff --git a/docs/source/tutorials/EUREF2019/exercises/projections2.rst b/docs/source/tutorials/EUREF2019/exercises/projections2.rst index ac23278860..b6d8795ae8 100644 --- a/docs/source/tutorials/EUREF2019/exercises/projections2.rst +++ b/docs/source/tutorials/EUREF2019/exercises/projections2.rst @@ -72,7 +72,7 @@ line segments at the latitude of the standard parallel. By reducing the scale factor, the line of zero distance distortion degenerates into two lines, north and south of the standard parallel. -For the abovementioned point in Tallinn, the distance error is around 0.002%, +For the above-mentioned point in Tallinn, the distance error is around 0.002%, but this can be reduced to zero by varying the scaling factor. Even by trial and error it is not hard to reduce it to a few millionths of a diff --git a/docs/source/tutorials/EUREF2019/exercises/projections3.gie b/docs/source/tutorials/EUREF2019/exercises/projections3.gie index c296525595..4ff4e1c7ab 100644 --- a/docs/source/tutorials/EUREF2019/exercises/projections3.gie +++ b/docs/source/tutorials/EUREF2019/exercises/projections3.gie @@ -105,7 +105,7 @@ Hints: ------------------------------------------------------------------------------- -* 3a. As a baseline, determine the roundtrip accuracy of the default algorirthm +* 3a. As a baseline, determine the roundtrip accuracy of the default algorithm using UTM zone 22: ------------------------------------------------------------------------------- diff --git a/docs/source/tutorials/EUREF2019/exercises/projections3.rst b/docs/source/tutorials/EUREF2019/exercises/projections3.rst index 385e0ca420..3cde352cac 100644 --- a/docs/source/tutorials/EUREF2019/exercises/projections3.rst +++ b/docs/source/tutorials/EUREF2019/exercises/projections3.rst @@ -84,7 +84,7 @@ consider in which situation use of each of the algorithms is appropriate. Exercise 3a =========== -As a baseline, determine the roundtrip accuracy of the default algorirthm +As a baseline, determine the roundtrip accuracy of the default algorithm using UTM zone 22. .. literalinclude:: projections3.gie diff --git a/docs/source/usage/network.rst b/docs/source/usage/network.rst index 37a32d34cb..f570cc659d 100644 --- a/docs/source/usage/network.rst +++ b/docs/source/usage/network.rst @@ -98,8 +98,8 @@ data: wget --mirror https://cdn.proj.org/ -Acknowledgments ---------------- +Acknowledgements +---------------- The s3://cdn.proj.org bucket is hosted by the `Amazon Public Datasets program `_. diff --git a/docs/source/usage/projections.rst b/docs/source/usage/projections.rst index bc0a32f0d3..967af8910b 100644 --- a/docs/source/usage/projections.rst +++ b/docs/source/usage/projections.rst @@ -142,7 +142,7 @@ center longitude. So ``+lon_wrap=180`` means wrap longitudes in the range 0 to :: $ echo -1 0 cs2cs +proj=longlat +to +proj=longlat +lon_wrap=180 - 359dE 0dN 0.000 + 359dE 0dN 0.000 Note that ``+over`` does **not** disable ``+lon_wrap``. @@ -190,7 +190,7 @@ meridian. cs2cs +proj=latlong +datum=WGS84 +to +proj=latlong +datum=WGS84 +pm=lisbon 0 0 - 9d7'54.862"E 0dN 0.000 + 9d7'54.862"E 0dN 0.000 Decimal degrees can also be simply specified for the prime meridian. diff --git a/src/4D_api.cpp b/src/4D_api.cpp index 1965d47ea9..1ce26537da 100644 --- a/src/4D_api.cpp +++ b/src/4D_api.cpp @@ -2617,7 +2617,7 @@ PJ_PROJ_INFO proj_pj_info(PJ *P) { } else { PJ *candidateOp = nullptr; // If there's just a single coordinate operation which is - // instanciable, use it. + // instantiable, use it. for (const auto &op : P->alternativeCoordinateOperations) { if (op.isInstantiable()) { if (candidateOp == nullptr) { diff --git a/src/iso19111/c_api.cpp b/src/iso19111/c_api.cpp index f2eca319ae..3a0a8b1900 100644 --- a/src/iso19111/c_api.cpp +++ b/src/iso19111/c_api.cpp @@ -9667,7 +9667,7 @@ proj_get_geoid_models_from_database(PJ_CONTEXT *ctx, const char *auth_name, // --------------------------------------------------------------------------- -/** \brief Instanciate a CoordinateMetadata object +/** \brief Instantiate a CoordinateMetadata object * * @since 9.4 */ diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp index 8026b68d90..2ffcc22f44 100644 --- a/src/iso19111/io.cpp +++ b/src/iso19111/io.cpp @@ -4523,7 +4523,7 @@ WKTParser::Private::buildProjectedCRS(const WKTNodeNNPtr &node) { if (isNull(csNode) && ci_equal(nodeValue, WKTConstants::BASEPROJCRS) && !isNull(conversionNode)) { // A BASEPROJCRS (as of WKT2 18-010r11) normally lacks an explicit - // CS[] which cause issues to properly instanciate it. So we first + // CS[] which cause issues to properly instantiate it. So we first // start by trying to identify the BASEPROJCRS by its id or name. // And fallback to exploring the conversion parameters to infer the // CS AXIS unit from the linear parameter unit... Not fully bullet