Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ authors:
orcid: https://orcid.org/0000-0002-5340-1380
- given-names: Mike W.
family-names: Taves
affiliation: GNS Science
affiliation: Earth Sciences New Zealand
orcid: https://orcid.org/0000-0003-3657-7963
- given-names: Kurt
family-names: Schwehr
Expand Down
4 changes: 2 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@

* WKT importer: better error message when `BBOX` is invalid (e.g south_lat > north_lat) (#4525)

* Added `proj_geod_direct` for PJ trasformation object (#4532)
* Added `proj_geod_direct` for PJ transformation object (#4532)

* Support exporting Mercator (Spherical) on a sphere as `Mercator_1SP` in WKT1 (#4555)

Expand All @@ -126,7 +126,7 @@

* `gie`: fix memory leak on non existing input file (#4531)

* Database: referene `nl_nsgi_nllat2018.tif` and `nl_nsgi_bongeo2004.tif` grids (#4534)
* Database: reference `nl_nsgi_nllat2018.tif` and `nl_nsgi_bongeo2004.tif` grids (#4534)

* Fixes related to WKT import/export of `DerivedGeodetic/GeographicCRS` (#4536)

Expand Down
2 changes: 1 addition & 1 deletion data/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ set(ALL_SQL_IN "${CMAKE_CURRENT_BINARY_DIR}/all.sql.in")
set(PROJ_DB "${CMAKE_CURRENT_BINARY_DIR}/proj.db")
include(sql_filelist.cmake)

set(PROJ_DB_SQL_EXPECTED_MD5 "56b3283d1be4ef0ae80eb270582daeff")
set(PROJ_DB_SQL_EXPECTED_MD5 "508af8fb359ca6d532900f1ebd2469a7")

add_custom_command(
OUTPUT ${PROJ_DB}
Expand Down
2 changes: 1 addition & 1 deletion data/sql/customizations.sql
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ INSERT INTO "usage" VALUES('PROJ','OLD_EPSG_10508','grid_transformation','PROJ',
INSERT INTO "grid_transformation" VALUES('PROJ','OLD_EPSG_8362','ETRS89 to ETRS89 + EVRF2007 height (1)','Uses ETRS89 (realization ETRF2000) and quasigeoid model DMQSK2014E. 1 sigma = 29 mm (test performed on 93 independent points). Recommended as part of transformation between Baltic 1957 height and EVRF2007 height (see concatenated operation code 8363).','EPSG','1088','Geog3D to Geog2D+GravityRelatedHeight (gtx)','EPSG','4937','EPSG','7423',0.03,'EPSG','8666','Geoid (height correction) model file','Slovakia_ETRS89h_to_EVRF2007.gtx',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'EPSG','4258','UGKK-Svk',0);
INSERT INTO "usage" VALUES('PROJ','OLD_EPSG_10509','grid_transformation','PROJ','OLD_EPSG_8362','EPSG','1211','EPSG','1186');

-- Synthetize a concatenated operation for the pre-EPSG 12.048 EPSG:1647 "CH1903+ to ETRS89 (1)"
-- Synthesize a concatenated operation for the pre-EPSG 12.048 EPSG:1647 "CH1903+ to ETRS89 (1)"
-- that has now been changed to "CH1903+ to ETRS89-CHE [CHTRF95] (1)"

INSERT INTO "concatenated_operation" VALUES(
Expand Down
2 changes: 1 addition & 1 deletion scripts/releasenotes.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
The script outputs a section for the NEWS.md file. It's based on the title of
entries added to the specified GitHub milestone. The script tries to group the
entries into "updates" and "bug fixes" although it might not always be
succesful.
successful.

The output of the scripts should be edited before adding to NEWS.md. Less editing
is needed if PR's are given good titles when originally created.
Expand Down
4 changes: 2 additions & 2 deletions src/iso19111/operation/coordinateoperationfactory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,7 @@ struct PrecomputedOpCharacteristics {
bool isNullTransformation_ = false;

// 3 below tests are for ETRS89-XXX to ETRS89-YYY following
// recommandations of IOGP 373-07-7 to use ETRF2000 hub
// recommendations of IOGP 373-07-7 to use ETRF2000 hub
bool is_ETRS89_XXX_to_ETRS89_YYY_ = false;
bool uses_ETRF2000_ = false;
bool uses_ETRS89_to_ETRS89_XXX_generic_ = false;
Expand Down Expand Up @@ -1020,7 +1020,7 @@ struct SortFunction {
}
}

// Follow recommandations of IOGP 373-07-7 to use ETRF2000 hub if
// Follow recommendations of IOGP 373-07-7 to use ETRF2000 hub if
// no direct Transformation
if (iterA->second.is_ETRS89_XXX_to_ETRS89_YYY_ &&
iterB->second.is_ETRS89_XXX_to_ETRS89_YYY_) {
Expand Down
4 changes: 2 additions & 2 deletions src/latitudes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ double pj_authalic_lat_inverse(double beta, const double *APA, const PJ *P,
//
// constexpr int L = int(AuxLat::ORDER);
// // Managing the memory for the coefficient array is the
// // responibility of the calling routine.
// // responsibility of the calling routine.
// double F[L];
// // Fill F[] with coefficients to convert conformal to geographic
// pj_auxlat_coeffs(P->n, AuxLat::CONFORMAL, AuxLat::GEOGRAPHIC, F);
Expand All @@ -191,7 +191,7 @@ double pj_authalic_lat_inverse(double beta, const double *APA, const PJ *P,
// coefficient is given as a Taylor series in n truncated at order 6 (=
// AuxLat::ORDER). This suffices to give full double precision accuracy for
// |f| <= 1/150 and probably provide satisfactory results for |f| <= 1/50. The
// coefficients for these Taylor series are given by matrics listed in
// coefficients for these Taylor series are given by matrices listed in
// Eqs. (A1-A28) of this paper.
//
// These coefficients are bundled up into a single array coeffs in
Expand Down
2 changes: 1 addition & 1 deletion src/networkfilemanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2027,7 +2027,7 @@ static size_t pj_emscripten_read_range(PJ_CONTEXT *ctx,
// It is easier running all PROJ in the Web Worker (that is the test done).
// Documentation says compiling with pthread flag is needed.
// https://emscripten.org/docs/api_reference/fetch.html#synchronous-fetches
// We encapsulate the code related to empscripten_fetch in a lamda.
// We encapsulate the code related to empscripten_fetch in a lambda.
// Some tests running this lambda in a thread were partially successful.
size_t real_read = 0;
const std::string url = handle->m_url;
Expand Down
Loading