From 451c7621ab26e246d350ef18405fa58fccfae111 Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Thu, 14 Feb 2019 23:09:10 +0100 Subject: Bump ABI version number --- CMakeLists.txt | 4 ++-- src/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e71d662e..7d969873 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,8 +72,8 @@ colormsg(_HIBLUE_ "Configuring PROJ:") ################################################################################# include(ProjVersion) proj_version(MAJOR 6 MINOR 0 PATCH 0) -set(PROJ_API_VERSION "14") -set(PROJ_BUILD_VERSION "14.0.2") +set(PROJ_API_VERSION "15") +set(PROJ_BUILD_VERSION "15.0.0") ################################################################################# # Build features and variants diff --git a/src/Makefile.am b/src/Makefile.am index 698baf97..b62a11b0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -42,7 +42,7 @@ geodtest_LDADD = libproj.la lib_LTLIBRARIES = libproj.la -libproj_la_LDFLAGS = -no-undefined -version-info 14:1:1 +libproj_la_LDFLAGS = -no-undefined -version-info 15:0:0 libproj_la_LIBADD = @SQLITE3_LIBS@ libproj_la_SOURCES = \ -- cgit v1.2.3 From b863c3729eccf077a13d51b0495949179f1fc729 Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Thu, 14 Feb 2019 23:15:17 +0100 Subject: Update NEWS for 6.0.0 release --- NEWS | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 145 insertions(+) diff --git a/NEWS b/NEWS index 4cdc4225..42a54368 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,148 @@ +6.0.0 Release Notes +------------------- + +PROJ 6 has undergone extensive changes to increase its functional scope from a +cartographic projection engine with so-called "early-binding" geodetic datum +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 +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++ +API, and also accessible for the most part from bindings in the C API. + +Those geodetic objects can be imported and exported from and into the OGC +Well-Known Text format (WKT) in its different variants: ESRI WKT, GDAL WKT 1, +WKT2:2015 (ISO 19162:2015) and WKT2:2018 (ISO 19162:2018). Import and export of +CRS objects from and into PROJ strings is also supported. This functionality +was previously available in the GDAL software library (except WKT2 support +which is a new feature), and is now an integral part of PROJ. + +A unified database of geodetic objects, coordinate reference systems and their +metadata, and coordinate operations between those CRS is now available in a +SQLite3 database file, proj.db. This includes definitions imported from the +IOGP EPSG dataset (v9.5.5 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. + +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 +number of situations the past requirement of using WGS84 as a pivot system, +which could cause unneeded accuracy loss, or was not doable at all sometimes +when transformation to WGS84 was not available. Those late-binding capabilities +are now used by the proj_create_crs_to_crs() function and the cs2cs utility. + +A new command line utility, projinfo, has been added to query information about +a geodetic object of the database, import and export geodetic objects from/into +WKT and PROJ strings, and display coordinate operations available between two +CRSs. + + UPDATES + ------- + + o Removed projects.h as a public interface (#835) + + o Deprecated the proj_api.h interface. The header file is still available + but will be removed with the next major version release of PROJ. It is + now required to define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H before the + interface can be used (#836) + + o Removed support for the nmake build system (#838) + + o Removed support for the proj_def.dat defaults file (#201) + + o C++11 required for building PROJ (#1203) + + o Added build dependency on SQLite 3.7 (#1175) + + o Added projinfo command line application (#1189) + + o Added many functions to proj.h for handling ISO19111 functionality (#1175) + + o Added C++ API exposing ISO19111 functionality (#1175) + + o Updated cs2cs to use late-binding features (#1182) + + o Removed the nad2bin application. Now available in the proj-datumgrid + git repository (#1236) + + o Removed support for Chebyshev polynomials in proj (#1226) + + o Removed proj_geocentric_latitude from proj.h API (#1170) + + o Changed behaviour of proj: Now only allow initialization of + projections (#1162) + + o Changed behaviour of tmerc: Now default to the Extended Transverse + Mercator algorithm (etmerc). Old implementation available by adding + +approx (#404) + + o Chaged behaviour: Default ellipsoid now set to GRS80 (was WGS84) (#1210) + + o Allow multiple directories in PROJ_LIB environment variable (#1281) + + o Added Lambert Conic Conformal (2SP Michigan) projection (#1142) + + o Added Bertin1953 projection (#1133) + + o Added Tobler-Mercator projection (#1153) + + o Added Molodensky-Badekas transform (#1160) + + o Added push and pop coordinate operations (#1250) + + o Removed +t_obs parameter from helmert and deformation (#1264) + + o Added +dt parameter to deformation as replacement for + removed +t_obs (#1264) + + BUG FIXES + --------- + + o Read +towgs84 values correctly on locales not using dot as comma separator (#1136) + + o Fixed file offset for reading of shift values in NTv1 files (#1144) + + o Avoid problems with PTHREAD_MUTEX_RECURSIVE when using CMake (#1158) + + o Avoid raising errors when setting ellipsoid flattening to zero (#1191) + + o Fixed lower square calculations in rHealpix projection (#1206) + + o Allow Molodensky transform parameters to be zero (#1194) + + o Fixed wrong parameter in ITRF2000 init file (#1240) + + o Fixed use of grid paths including spaces (#1152) + + THANKS TO + ------------ + + Version 6.0.0 is made possible by the following contributors: + + Aaron Puchert + Phil Elson + Mateusz Łoskot + Markus Neteler + Jürgen Fischer + Howard Butler + Charles Karney + Alan D. Snow + Marco Bernasocchi + Karoline Skaar + Ben Boeckel + Ivan Veselov + Mike Taves + Philippe Rivière + Elliott Sales de Andrade + Kai Pastor + Kristian Evers + Even Rouault + 5.2.0 Release Notes ------------------- -- cgit v1.2.3 From 37f2c6f661e722b834c1a7900926ec436903477d Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Thu, 14 Feb 2019 23:15:52 +0100 Subject: Update year in CITATION --- CITATION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CITATION b/CITATION index 861599e8..e999dcc2 100644 --- a/CITATION +++ b/CITATION @@ -1,6 +1,6 @@ To cite PROJ in publications use: - PROJ contributors (2018). PROJ coordinate transformation software + PROJ contributors (2019). PROJ coordinate transformation software library. Open Source Geospatial Foundation. URL https://proj4.org/. A BibTeX entry for LaTeX users is @@ -9,6 +9,6 @@ A BibTeX entry for LaTeX users is title = {{PROJ} coordinate transformation software library}, author = {{PROJ contributors}}, organization = {Open Source Geospatial Foundation}, - year = {2018}, + year = {2019}, url = {https://proj4.org/}, } -- cgit v1.2.3 From 50f8e968783c48fc8164450201cd0ab0970a1c09 Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Thu, 14 Feb 2019 23:24:49 +0100 Subject: Update man-pages from Sphinx-docs --- man/man1/cct.1 | 14 ++++---- man/man1/cs2cs.1 | 97 ++++++++++++++++++++++++++++++++++++++++++++------------ man/man1/geod.1 | 10 +++--- man/man1/gie.1 | 30 +++++++++--------- man/man1/proj.1 | 23 +++----------- 5 files changed, 108 insertions(+), 66 deletions(-) diff --git a/man/man1/cct.1 b/man/man1/cct.1 index ce511d3c..a6f3894b 100644 --- a/man/man1/cct.1 +++ b/man/man1/cct.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "CCT" "1" "Sep 10, 2018" "5.2.0" "PROJ.4" +.TH "CCT" "1" "Feb 14, 2019" "6.0.0" "PROJ.4" .SH NAME cct \- Coordinate Conversion and Transformation . @@ -103,7 +103,7 @@ Usage varies with operation. \fBcct\fP is an acronym meaning \fICoordinate Conversion and Transformation\fP\&. .sp The acronym refers to definitions given in the OGC 08\-015r2/ISO\-19111 -standard “Geographical Information – Spatial Referencing by Coordinates”, +standard "Geographical Information \-\- Spatial Referencing by Coordinates", which defines two different classes of \fIcoordinate operations\fP: .sp \fICoordinate Conversions\fP, which are coordinate operations where input @@ -228,18 +228,18 @@ $ echo 12 56 100 2018.0 auxiliary data | cct +proj=merc .UNINDENT .SH BACKGROUND .sp -\fBcct\fP also refers to Carl Christian Tscherning (1942–2014), +\fBcct\fP also refers to Carl Christian Tscherning (1942\-\-2014), 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 +International Association of Geodesy, IAG (1995\-\-2007), fellow of the American Geophysical Union (1991), recipient of the IAG Levallois Medal (2007), the European Geosciences Union Vening Meinesz Medal (2008), and of numerous other honours. .sp \fIcct\fP, or Christian, as he was known to most of us, was recognized for his good mood, his sharp wit, his tireless work, and his great commitment to -the development of geodesy – both through his scientific contributions, +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. .sp @@ -252,7 +252,7 @@ so much, and meant so much to so many people. Hence, in honour of \fIcct\fP (the geodesist) this is \fBcct\fP (the program). .SH SEE ALSO .sp -\fBproj(1)\fP, \fBcs2cs(1)\fP, \fBgeod(1)\fP, \fBgie(1)\fP +\fBproj(1)\fP, \fBcs2cs(1)\fP, \fBgeod(1)\fP, \fBgie(1)\fP, \fBprojinfo(1)\fP .SH BUGS .sp A list of know bugs can be found at \fI\%https://github.com/OSGeo/proj.4/issues\fP @@ -263,6 +263,6 @@ where new bug reports can be submitted to. .SH AUTHOR Thomas Knudsen .SH COPYRIGHT -1983-2018 +1983-2019 .\" Generated by docutils manpage writer. . diff --git a/man/man1/cs2cs.1 b/man/man1/cs2cs.1 index c262ddfd..5dd037a5 100644 --- a/man/man1/cs2cs.1 +++ b/man/man1/cs2cs.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "CS2CS" "1" "Sep 10, 2018" "5.2.0" "PROJ.4" +.TH "CS2CS" "1" "Feb 14, 2019" "6.0.0" "PROJ.4" .SH NAME cs2cs \- Cartographic coordinate system filter . @@ -36,11 +36,35 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] \fBcs2cs\fP [ \fB\-eEfIlrstvwW\fP [ args ] ] [ \fI+opts[=arg]\fP ] [ +to [\fI+opts[=arg]\fP] ] file[s] .UNINDENT .UNINDENT +.sp +or +.INDENT 0.0 +.INDENT 3.5 +\fBcs2cs\fP [ \fB\-eEfIlrstvwW\fP [ args ] ] {source_crs} +to {target_crs} file[s] +.sp +where {source_crs} or {target_crs} is a PROJ string, a WKT string or a AUTHORITY:CODE +(where AUTHORITY is the name of a CRS authority and CODE the code of a CRS +found in the proj.db database), expressing a coordinate reference system. +.UNINDENT +.UNINDENT +.sp +New in version 6.0.0. + +.sp +or +.INDENT 0.0 +.INDENT 3.5 +\fBcs2cs\fP [ \fB\-eEfIlrstvwW\fP [ args ] ] {source_crs} {target_crs} +.UNINDENT +.UNINDENT +.sp +New in version 6.0.0. + .SH DESCRIPTION .sp \fBcs2cs\fP performs transformation between the source and destination -cartographic coordinate system on a set of input points. The coordinate -system transformation can include translation between projected and +cartographic coordinate reference system on a set of input points. The coordinate +reference system transformation can include translation between projected and geographic coordinates as well as the application of datum shifts. .sp The following control parameters can appear in any order: @@ -153,22 +177,25 @@ the program to be printed prior to input data. The \fI+args\fP run\-line arguments are associated with cartographic parameters. .sp -The \fBcs2cs\fP program requires two coordinate system definitions. The first (or +The \fBcs2cs\fP program requires two coordinate reference system (CRS) definitions. The first (or primary is defined based on all projection parameters not appearing after the \fI+to\fP argument. All projection parameters appearing after the \fI+to\fP argument -are considered the definition of the second coordinate system. If there is no -second coordinate system defined, a geographic coordinate system based on the -datum and ellipsoid of the source coordinate system is assumed. Note that the -source and destination coordinate system can both be projections, both be -geographic, or one of each and may have the same or different datums. -.sp -Additional projection control parameters may be contained in two auxiliary -control files: the first is optionally referenced with the -\fI+init=file:id\fP and the second is always processed after the name of the -projection has been established from either the run\-line or the contents of -\fI+init\fP file. The environment parameter \fBPROJ_LIB\fP establishes the default -directory for a file reference without an absolute path. This is also used -for supporting files like datum shift files. +are considered the definition of the second CRS. If there is no +second CRS defined, a geographic CRS based on the +datum and ellipsoid of the source CRS is assumed. Note that the +source and destination CRS can both of same or different nature (geographic, +projected, compound CRS), or one of each and may have the same or different datums. +.sp +When using a WKT definition or a AUTHORITY:CODE, the axis order of the CRS will +be enforced. So for example if using EPSG:4326, the first value expected (or +returned) will be a latitude. +.sp +Internally, \fBcs2cs\fP uses the \fBproj_create_crs_to_crs()\fP function +to compute the appropriate coordinate operation, so implementation details of +this function directly impact the results returned by the program. +.sp +The environment parameter \fBPROJ_LIB\fP establishes the +directory for resource files (database, datum shift grids, etc.) .sp One or more files (processed in left to right order) specify the source of data to be transformed. A \fB\-\fP will specify the location of processing standard @@ -183,7 +210,8 @@ ellipsoid major axis or sphere radius units. Output geographic coordinates will normally be in DMS format (use \fB\-f %.12f\fP for decimal degrees with 12 decimal places), while projected (cartesian) coordinates will be in linear (meter, feet) units. -.SH EXAMPLE +.SH EXAMPLES +.SS Using PROJ strings .sp The following script .INDENT 0.0 @@ -210,14 +238,41 @@ The x\-y output data will appear as three lines of: .sp .nf .ft C -1402285.98 5076292.42 \-0.00 +1402293.44 5076292.68 0.00 +.ft P +.fi +.UNINDENT +.UNINDENT +.SS Using EPSG codes +.sp +Transforming from WGS 84 latitude/longitude (in that order) to UTM Zone 31N/WGS 84 +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +cs2cs EPSG:4326 EPSG:32631 < -This option creates a set of bivariate Chebyshev polynomial coefficients -that approximate the selected cartographic projection on stdout. The values -\fIlow\fP and \fIhi\fP denote the range of the input where the \fIu\fP or \fIv\fP prefixes apply to -respective longitude\-x or latitude\-y depending upon whether a forward or -inverse projection is selected. The integer \fIres\fP is a number specifying the -power of 10 precision of the approximation. For example, a \fIres\fP of \-3 -specifies an approximation with an accuracy better than 0.001. Optional \fIumax\fP, and \fIvmax\fP -specify maximum degree of the polynomials (default: 15). -.UNINDENT .sp The \fI+args\fP run\-line arguments are associated with cartographic parameters. Additional projection control parameters may be contained in two auxiliary @@ -229,7 +216,7 @@ portions of the input line are appended 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 geographic coordinates will be in DMS (if the -\fB\-w\fP switch is not employed) and precise to 0.001” with trailing, zero\-valued +\fB\-w\fP switch is not employed) and precise to 0.001" with trailing, zero\-valued minute\-second fields deleted. .SH EXAMPLE .sp @@ -273,7 +260,7 @@ between any pair of definable coordinate reference systems, including support for datum translation. .SH SEE ALSO .sp -\fBcs2cs(1)\fP, \fBcct(1)\fP, \fBgeod(1)\fP, \fBgie(1)\fP +\fBcs2cs(1)\fP, \fBcct(1)\fP, \fBgeod(1)\fP, \fBgie(1)\fP, \fBprojinfo(1)\fP .SH BUGS .sp A list of know bugs can be found at \fI\%https://github.com/OSGeo/proj.4/issues\fP @@ -284,6 +271,6 @@ where new bug reports can be submitted to. .SH AUTHOR Gerald I. Evenden .SH COPYRIGHT -1983-2018 +1983-2019 .\" Generated by docutils manpage writer. . -- cgit v1.2.3 From 9dfa390ca5b404f9b5f988e98d058f00f1cad086 Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Fri, 15 Feb 2019 08:52:26 +0100 Subject: Update HOWTO-RELEASE with a better one-liner for generation of contributor list --- HOWTO-RELEASE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HOWTO-RELEASE b/HOWTO-RELEASE index ddf7e563..96b3b0c8 100644 --- a/HOWTO-RELEASE +++ b/HOWTO-RELEASE @@ -82,7 +82,7 @@ End the section by thanking the authors that contributed to the release. Get a sorted list of contributors in descending order of activity: ``` -git shortlog -sn x.y.z..HEAD | tac | awk '{print $2 " " $3}' +git shortlog -sn x.y.z..HEAD | tac | awk '{$1=""; print $0}' ``` where `x.y.z` is the tag of the previous release. You may need to edit the list -- cgit v1.2.3