aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-06-03Merge pull request #2251 from kbevers/doc-deformationKristian Evers
Docs: Use +grids and tif file for deformation examples
2020-06-02Docs: Use +grids and tif file for deformation examplesKristian Evers
2020-06-02Database: register geoid file for UK added in OSGeo/PROJ-data#25Andrei Marshalov
2020-05-31projsync.cpp: fix -Wrange-loop-construct clang10 warningsEven Rouault
2020-05-31filemanager.cpp: code reformattingEven Rouault
2020-05-30Database: add concatenated operations for NZGD2000 -> ITRF97/2000/2005/2008/2014Even Rouault
2020-05-30Database: register NZGD2000 -> ITRF96 transformation for NZGD2000 databaseEven Rouault
Related to https://github.com/OSGeo/PROJ-data/pull/22 An entry is added in the ``other_transformation`` table, using a raw PROJ string. Later, once the deformation model has been registered in EPSG, we'll have to add code to map the EPSG transformation method and parameters to +proj=defmodel In the meantime, this works pretty well: ``` $ src/projinfo -s EPSG:4959 -t EPSG:7907 Candidate operations found: 1 ------------------------------------- Operation No. 1: PROJ:NZGD2000-20180701, NZGD2000 to ITRF96 deformation model, unknown accuracy, New Zealand PROJ string: +proj=pipeline +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=axisswap +order=2,1 +step +proj=defmodel +model=nz_linz_nzgd2000-20180701.json +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=rad +xy_out=deg WKT2:2019 string: COORDINATEOPERATION["NZGD2000 to ITRF96 deformation model", VERSION["20180701"], SOURCECRS[ GEOGCRS["NZGD2000", DATUM["New Zealand Geodetic Datum 2000", ELLIPSOID["GRS 1980",6378137,298.257222101, LENGTHUNIT["metre",1]]], PRIMEM["Greenwich",0, ANGLEUNIT["degree",0.0174532925199433]], CS[ellipsoidal,3], AXIS["geodetic latitude (Lat)",north, ORDER[1], ANGLEUNIT["degree",0.0174532925199433]], AXIS["geodetic longitude (Lon)",east, ORDER[2], ANGLEUNIT["degree",0.0174532925199433]], AXIS["ellipsoidal height (h)",up, ORDER[3], LENGTHUNIT["metre",1]], ID["EPSG",4959]]], TARGETCRS[ GEOGCRS["ITRF96", DATUM["International Terrestrial Reference Frame 1996", ELLIPSOID["GRS 1980",6378137,298.257222101, LENGTHUNIT["metre",1]]], PRIMEM["Greenwich",0, ANGLEUNIT["degree",0.0174532925199433]], CS[ellipsoidal,3], AXIS["geodetic latitude (Lat)",north, ORDER[1], ANGLEUNIT["degree",0.0174532925199433]], AXIS["geodetic longitude (Lon)",east, ORDER[2], ANGLEUNIT["degree",0.0174532925199433]], AXIS["ellipsoidal height (h)",up, ORDER[3], LENGTHUNIT["metre",1]], ID["EPSG",7907]]], METHOD["PROJ-based operation method: +proj=pipeline +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=axisswap +order=2,1 +step +proj=defmodel +model=nz_linz_nzgd2000-20180701.json +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=rad +xy_out=deg"], USAGE[ SCOPE["unknown"], AREA["New Zealand"], BBOX[-55.95,160.6,-25.88,-171.2]], ID["PROJ","NZGD2000-20180701"], REMARK["New Zealand Deformation Model. Defines the secular model (National Deformation Model) and patches for significant deformation events since 2000"]] ``` ``` $ echo "-41 173 0 2016.5" | PROJ_NETWORK=ON src/cct -d 8 +proj=pipeline +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=axisswap +order=2,1 +step +proj=defmodel +model=nz_linz_nzgd2000-20180701.json +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=rad +xy_out=deg -40.99999402 172.99999938 0.00130333 2016.5000 ``` ``` $ echo "-41 173 0 2016.5" | PROJ_NETWORK=ON src/cs2cs -f "%.8f" EPSG:4959 EPSG:7907 -40.99999402 172.99999938 0.00130333 2016.5 ```
2020-05-30.travis.yml: disable s390x target since Travis-CI infra is KO regarding thisEven Rouault
2020-05-29filemanager.cpp: use non-deprecated SHGetKnownFolderPath() function to get ↵chrodger
the user writable directory on Windows (#2246) Fixes #2245
2020-05-29Merge pull request #2243 from rouault/inverse_wink2Even Rouault
Implement wink2 inverse by generic inversion of forward method
2020-05-28Implement wink2 inverse by generic inversion of forward methodEven Rouault
- Move the generic method initiated from adams_ws2 to a pj_generic_inverse_2d() method - Use it in adams_ws2 - Use it in wink2 Fixes https://github.com/qgis/QGIS/issues/35512
2020-05-25Merge pull request #2240 from rouault/fix_identification_epsg_3035Even Rouault
Fix identification of (one of the) ESRI WKT formulations of EPSG:3035
2020-05-25Merge pull request #2239 from rouault/register_nc_dittt_Ranc08_CirceEven Rouault
Database: add entry for Ranc08_Circe.mnt grid (New Caledonia)
2020-05-25Fix identification of (one of the) ESRI WKT formulations of EPSG:3035Even Rouault
Fixes https://github.com/qgis/QGIS/issues/36111
2020-05-25Database: add entry for Ranc08_Circe.mnt grid (New Caledonia)Even Rouault
This geoid was added in EPSG 9.8.11 and has been added in PROJ-data per https://github.com/OSGeo/PROJ-data/pull/21
2020-05-25Merge pull request #2238 from rouault/update_to_epsg_9_8_11Even Rouault
Update to EPSG 9.8.11, ESRI 10.8.1 and import scope and remarks for conversion
2020-05-24Database: import scope and remarks for conversion (fixes #2237)Even Rouault
2020-05-24Database: update ESRI content to ArcMap 10.8.1Even Rouault
2020-05-24Database: update to EPSG v9.8.11Even Rouault
2020-05-24Database: add a same_source_target_crs column to supersession tableEven Rouault
This is in preparation for EPSG 9.8.11 import that supersedes a number of grid transformation for US transformations, but the superseded and replacement transformations don't operate on the same (source_crs, target_crs), which is a bit weird. So in that situation, ignores the supersession.
2020-05-24Merge pull request #2230 from rouault/limit_peirce_q_to_northern_hemisphereEven Rouault
Limit peirce_q to northern hemisphere, and fix images for adams_hemi, guyou and peirce_q
2020-05-19.travis.yml: enable commit notifications into dedicated 'proj-activity' IRC ↵Jeff McKenna
channel (#2236)
2020-05-19Merge pull request #2235 from rouault/check_sqlite3_runtimeEven Rouault
Add runtime checking that sqlite3 is >= 3.11
2020-05-19Add runtime checking that sqlite3 is >= 3.11Even Rouault
``` $ LD_LIBRARY_PATH=$HOME/install-sqlite-3.8.2/lib PROJ_DEBUG=1 src/projinfo -s @in.wkt -t @out.wkt --spatial-test intersects >/dev/null SQLite3 version is 3.8.2, whereas at least 3.11 should be used ```
2020-05-19Zone Definition Fixes for igh_o projection (#2233)John Krasting
- Central lon for zone 2 should be -d10, not d10 - Extra lobe was missing for zone 11 - New figure generated - New test suite values generated
2020-05-19Merge pull request #2234 from rouault/fix_2232Even Rouault
Many fixes regarding BoundCRS, CompoundCRS, Geographic3D CRS with non-metre units
2020-05-19createOperations(): fix bug when transforming between CompoundCRS and ↵Even Rouault
BoundCRS in the general case let to 0 result (contributes to fixes #2232)
2020-05-19createOperations(): optimization in generated pipeline in a case involving ↵Even Rouault
vertical unit change
2020-05-19createOperations(): take correctly into account vertical unit change in a ↵Even Rouault
case of transformation between Compound of BoundVerticalCRS to GeographicCRS (contributes to fixes #2232)
2020-05-19createOperations(): fix wrong optimization in some instances of transforming ↵Even Rouault
a BoundCRS to a GeographicCRS (contributes to fixes #2232)
2020-05-19WKT1 ingestion: fix ingestion of COMPD_CS with ellipsoidal vertical datum ↵Even Rouault
and non metre units (contributes to fixes #2232)
2020-05-19createOperations(): speed optimizations for transforming between a BoundCRS ↵Even Rouault
of a datum and the same datum (relates to #2232)
2020-05-19createOperationsWithDatumPivot(): remove useless codeEven Rouault
2020-05-19createOperations(): fix 'caching' bugs causing potential exception about ↵Even Rouault
Inconsistent chainging of CRS (fixes #2232)
2020-05-19Implemented IGH Oceanic View (#2226)John Krasting
- The current implementation of the Interrupted Goode Homolosine projection emphasizes land area. This is a compliment projection that emphasizes ocean area. - A value of lon0=-160 produces a reasonable real-world map.
2020-05-17Address warnings raised by recent cppcheckEven Rouault
2020-05-17Merge pull request #2206 from rouault/deformation_model_for_mergeEven Rouault
Add a +proj=defmodel transformation for multi-component time-based deformation models
2020-05-17Merge pull request #2229 from rouault/fix_2228Even Rouault
Allow importing WKT1 COMPD_CS with a VERT_DATUM[Ellipsoid,2002]
2020-05-16geodetictiffgrids.rst: update with deformation modelEven Rouault
2020-05-16Add a +proj=defmodel transformation for multi-component time-based ↵Even Rouault
deformation models Fixes #1001 Co-authored-by: Chris Crook <ccrook@linz.govt.nz>
2020-05-16gie: fix loss of precision when parsing big values such as in projected ↵Even Rouault
coordinates
2020-05-16pj_bilinear_interpolation_three_samples(): add commentsEven Rouault
2020-05-16plotdefs.json: update validty area for adams_hemi, guyou and peirce_q, and ↵Even Rouault
regenerate associated images
2020-05-16plot.py: make path to 'proj' executable configurable with PROJ_EXE ↵Even Rouault
environment variable
2020-05-16peirce_q: limit input to positive latitudesEven Rouault
Otherwise it returns junk (negative latitudes are mapped to the same location as positive latitudes) I'm a bit confused by PROJ peirce_q implementation. Looking at the projection of the world, it looks like this matches the diamond formulation of the right map shown at https://desktop.arcgis.com/en/arcmap/latest/map/projections/peirce-quincuncial.htm, but limited to the inner square of this diamond (which corresponds to the northern hemisphere). We lack the 4 triangles on left, top, right and bottom for the southern hemisphere. Furthermore, this formulation of peirce_q does not seem to have the quincuncial property of the square formulation (left images of the above ESRI doc), or the one at https://en.wikipedia.org/wiki/Peirce_quincuncial_projection ...
2020-05-16Merge pull request #2227 from rouault/fix_2225Even Rouault
createOperations(): when converting CompoundCRS<-->Geographic3DCrs, do not use discard change of ellipsoidal height if a Helmert transformation is involved
2020-05-16Adjustments to deal with non-conformant WKT1 LAS COMPD_CS[] (refs #2171)Even Rouault
2020-05-16Allow importing WKT1 COMPD_CS with a VERT_DATUM[Ellipsoid,2002], and ↵Even Rouault
exporting it back as such (on the same object) (fixes #2228)
2020-05-16test: improve formatting of expected resultEven Rouault
2020-05-16createOperations(): improve operation name when inverting a 'axis order ↵Even Rouault
change (geographic3D horizontal)' operation