aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2018-11-21createFromUserInput("authname:code"): make it case insensitive regarding ↵Even Rouault
authname
2018-11-19Assorted set of fixes for PROJString to ISO19111 model:Even Rouault
- createFromPROJString(): take into account axisswap step for Krovak and Transverse Mercator (South Orientated) - Geocentric export to PROJ4: use datum when possible, and add explicit units=m - ESRI WKT parser: make it case insensitive to parameter and projection names, and more tolerant about possible parameter name aliases - import from WKT1 for Polar_Stereographic: don't be case sensitive - importFromPROJString: allow pm to override datum - Equidistant cylindrical: add support for non-standard latitude of natural origin, used in a GDAL test case - tmerc export to PROJString: use 'k' instead of 'k_0' - pj_ellps: use official value from EPSG for reverse flattening of Airy ellipsoid - GDAL compatibility: add support for importing odd formulations of Mercator as WKT1, but rejecting them when exporting to PROJ - Add export of 'Geostationary Satellite (Sweep X)' to WKT1_GDAL via EXTENSION.PROJ4 node - importFromPROJString: add support for +f - WKT1 / PROJ4: add support for EXTENSION.PROJ4 nodes and +wktext - exportToWKT: change way we deal with AXIS by default for WKT1_GDAL - Improve etmerc handling - Fix WKT import of peg_point_heading for Spherical_Cross_Track_Height - International Map of the World Polyconic: change parameter mapping - exportToPROJ: add alpha parameter - Hotine_Oblique_Mercator_Two_Point_Natural_Origin: GDAL_WKT1 related fix - GDAL compatibility improvements in import from PROJ4 / WKT1 for polar stereographic - Add support for +towgs84 when importing a +proj=geocent - import from WKT1: add support for an odd Mercator_1SP formulation handled by GDAL - export to proj4 strings: add +units=m to projected CRS for better GDAL compatibility - export to proj4 strings: add +no_defs to CRS for better GDAL compatibility
2018-11-15Fix clang warningsEven Rouault
2018-11-14Implement RFC 2: Initial integration of "GDAL SRS barn" workEven Rouault
This work mostly consists of: - a C++ implementation of the ISO-19111:2018 / OGC Topic 2 "Referencing by coordinates" classes to represent Datums, Coordinate systems, CRSs (Coordinate Reference Systems) and Coordinate Operations. - methods to convert between this C++ modeling and WKT1, WKT2 and PROJ string representations of those objects - management and query of a SQLite3 database of CRS and Coordinate Operation definition - a C API binding part of those capabilities This is all-in-one squashed commit of the work of https://github.com/OSGeo/proj.4/pull/1040
2018-11-10Remove unused struct from projects.hKristian Evers
2018-11-10Remove proj_geocentric_latitude from public APIKristian Evers
Closes #1107
2018-11-10Merge pull request #1162 from kbevers/proj-output-unitsKristian Evers
Disallow use of non-projection operations in proj (was: Don't convert non-angular inputs to proj to radians)
2018-11-10Disallow use of non-projection operations in projKristian Evers
Since the introduction of other operations types than projections it has been unclear how proj should treat those. This commit sets record straight once and for all: proj is only allowed to initialize operations that take angular input and produces non-angular output, i.e. projections. This is true to the version of proj before the introduction of the pipeline and other non-projection operations. Users can still initiliaze pipelines with proj as long as the resulting concatenated operation requires angular input and outputs non-angular output.
2018-10-27Implement Molodensky-Badekas transform (fixes #1160)Even Rouault
2018-10-17No longer declare pj_prime_meridians, pj_ellps and pj_units as extern C, but ↵Even Rouault
static'ify them
2018-10-16Merge pull request #1148 from kbevers/lists-to-proj.hiso19111_devKristian Evers
Move struct definitions for proj_list_* functions to proj.h
2018-10-16Move struct definitions for proj_list_* functions to proj.hKristian Evers
With projects.h not being available to outside users anymore we need to define PJ_UNITS, PJ_ELLPS, PJ_PRIME_MERIDIANS and PJ_OPERATIONS elsewhere. Related pj_get_*_ref() functions have been removed in favour of their proj_ namespaced counterparts. char pointers have been changed to const char pointers. Resolves #983 Resolved #1147 Make char pointers const
2018-10-16Change pj_mkparam to take const char pointerKristian Evers
pj_mkparam() and pj_mkparam_ws() doesn't alter the input string should therefore be const. This will be useful when making other changes to the code base later.
2018-10-15Add Tobler-Mercator projectionIvan Veselov
2018-10-11Merge pull request #1133 from Fil/bertin1953Kristian Evers
the Bertin 1953 projection
2018-10-11Merge remote-tracking branch 'osgeo/master' into bertin1953Kristian Evers
2018-10-11Merge pull request #1144 from rouault/ntv1_fixKristian Evers
NTv1 grid shift: fix file offset for reading of shift values in ntv1_can.dat
2018-10-11Merge pull request #1142 from sphynx/proj-lcc-2sp-michiganKristian Evers
Add Lambert Conic Conformal (2SP Michigan) projection
2018-10-11Support LCC 2SP Michigan projectionIvan Veselov
2018-10-09Fix typosEven Rouault
2018-10-08Merge pull request #1137 from rouault/drop_nmakeKristian Evers
Remove nmake build system
2018-10-08NTv1 grid shift: fix file offset for reading of shift values in ntv1_can.datEven Rouault
When investigating the format of NTv1 and comparing PROJ code with the actual header of ntv1_can.dat, I discovered that the longitude & latitude shift values started at offset 192, whereas PROJ assumed that the header was 176 bytes only. This caused PROJ to use the wrong offsets values (shift of one grid sample by longitude). So the effect was moderately visible, especially on the latitude, but when comparing with NTv2, one can see that the longitude value after the fix seems to closer to NTv2. old: echo "60.5 -100.5 0" | PROJ_LIB=/usr/share/proj src/cct -d 8 +proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=hgridshift +grids=ntv1_can.dat +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1 60.50022624 -100.50040292 0.00000000 inf new: echo "60.5 -100.5 0" | PROJ_LIB=/usr/share/proj src/cct -d 8 +proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=hgridshift +grids=ntv1_can.dat +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1 60.50022403 -100.50041841 0.00000000 inf echo "60.5 -100.5 0" | PROJ_LIB=/usr/share/proj src/cct -d 8 +proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=hgridshift +grids=$HOME/proj/proj-datumgrid/north-america/ntv2_0.gsb +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1 60.50022348 -100.50041978 0.00000000 inf old: $ echo "80.1 -70.9 0" | PROJ_LIB=/usr/share/proj src/cct -d 8 +proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=hgridshift +grids=ntv1_can.dat +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1 80.10096789 -70.89746834 0.00000000 inf new: $ echo "80.1 -70.9 0" | PROJ_LIB=/usr/share/proj src/cct -d 8 +proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=hgridshift +grids=ntv1_can.dat +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1 80.10096858 -70.89749190 0.00000000 inf $ echo "80.1 -70.9 0" | PROJ_LIB=/usr/share/proj src/cct -d 8 +proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=hgridshift +grids=$HOME/proj/proj-datumgrid/north-america/ntv2_0.gsb +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1 80.10096782 -70.89749276 0.00000000 inf
2018-10-06Make PROJ_HEAD descriptions more uniformIvan Veselov
Before that, approximately half of the descriptions had a period at the end, e.g. 'Cyl.' or 'Sph.' and the other half did not have those periods. This commit drops all the dots in PROJ_HEAD descriptions.
2018-10-03Remove nmake build systemEven Rouault
2018-10-01Add a affine transformation method, and make geogoffset as a particular case ↵Even Rouault
of it (fixes #535)
2018-10-01Add geographic offset transformation method.Even Rouault
The Geographic offsets transformation adds an offset to the geographic longitude, latitude coordinates, and an offset to the ellipsoidal height. This method is normally only used when low accuracy is tolerated. It is documented as coordinate operation method code 9619 (for geographic 2D) and 9660 (for geographic 3D) in the EPSG dataset. It can also be used to implement the method Geographic2D with Height Offsets (code 9618) by noting that the input vertical component is a gravity-related height and the output vertical component is the ellispoid height (dh being the geoid undulation). It can also be used to implement the method Vertical offset (code 9616) It is used for example to transform: - from the old Greek geographic 2D CRS to the newer GGRS87 CRS - from Tokyo + JSLD69 height to WGS 84 - from Baltic 1977 height to Black Sea height It is also useful to document the implicit zero-offset transformation we do in pipelines such as +proj=pipeline +step +inv +proj=longlat +ellps=A +step +proj=longlat +ellps=B that can be explicited as +proj=pipeline +step +inv +proj=longlat +ellps=A +step +proj=geogoffset [+dlon=0 +dlat=0 +dh=0] +step +proj=longlat +ellps=B
2018-09-27cs2cs_emulation_setup: fix issue with non C-localeEven Rouault
in +towgs84 case, we use sprintf() with floating-point formatter to output the ellipsoid parameters. For a locale with decimal separtor != dot, the resulting string will not be parsed correctly by proj_atof(), leading to wrong numeric result. The fix is similar to the one done in pj_latlong_from_proj() Note for later: if using C++, we could use a locale-independent formatting solution to avoid such issue.
2018-09-24snake casePhilippe Rivière
2018-09-24Req. changes for Bertin1953:Philippe Rivière
- classification - tests - coding style
2018-09-23Fix mistakes in function commentsIvan Veselov
2018-09-22Merge pull request #1131 from kbevers/remove-misspelled-constantKristian Evers
Remove misspelled-constant PJD_ERR_UNKNOW_UNIT_ID
2018-09-22Merge pull request #1130 from kbevers/refactor-projKristian Evers
Refactor proj
2018-09-22Fix typo in Plate Carree projection name (#1132)Philippe Rivière
2018-09-21coding style (https://travis-ci.com/OSGeo/proj.4/jobs/147225960 & ↵Philippe Rivière
https://travis-ci.com/OSGeo/proj.4/jobs/147274068)
2018-09-21the Bertin 1953 projectionPhilippe Rivière
2018-09-21Remove misspelled-constant PJD_ERR_UNKNOW_UNIT_IDKristian Evers
Closes #853
2018-09-21Replace calls to pj_factors with proj_factorsKristian Evers
2018-09-21Replace calls to rtodms/dmstor with proj.h equivalentsKristian Evers
2018-09-19Merge pull request #1125 from rouault/rename_nad_as_dataKristian Evers
Rename nad/ as data/ and move nad/test* to test/old/*
2018-09-18Rename nad/ directory as data/Even Rouault
2018-09-18Only allow usage of proj_api.h if explicit consent was givenKristian Evers
We want to flag that proj_api_h is now deprecated. With this commit it is now mandatory to #define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H before proj_api.h can be included. proj_api.h is used internally a bunch of places. Therefore ACCEPT_USE_OF_DEPRECATED_PROJ_API_H has been defined in projects.h and a few other necessary files to ensure that PROJ compiles. Closes #836
2018-09-18Do not install projects.hKristian Evers
In version 6 we stop exposing the deprecated projects.h API to the world outside PROJ. Closes #835
2018-09-15Bump version numbers after 5.2.0 releaseKristian Evers
2018-09-11Update release dateKristian Evers
2018-09-11Fix SONAME decrement from libproj.so.13 to libproj.so.12.Bas Couwenberg
Increment age instead of revision for added interfaces, see: https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
2018-09-10Update ABI version for 5.2 releaseKristian Evers
2018-09-07cs2cs: Always convert to degrees when angular output is received (#1112)Kristian Evers
Previous to this commit cs2cs did not convert angular output to degrees when using operations setting PJ->right = PJ_IO_UNITS_ANGULAR. This commit adopts the conventions used after the introduction of pipelines. In practice, this allows the following and similar transformations to output in degrees and not radians: ``` echo 37.3916666667 -6.9325000 | cs2cs +proj=latlong +ellps=clrk80 \ +to +proj=molodensky +ellps=clrk80 +da=-112.145 +df=-0.54750714e-4 \ +dx=-175 +dy=-23 +dz=-303 37.39 -6.93 -8.2 ```
2018-09-07cct: forward comments to outputKristian Evers
Any text written after the coordinate input will automatically be forwarded to the output stream. Text in columns before the coordinate input is discarded in the output. This works for any combination of -c, -t and -z parameters: $ echo 12 56 100 2018.0 comment comment | cct +proj=merc 1335833.8895 7522963.2411 100.0000 2018.0000 comment commen $ echo text 12 56 100 2018.0 comment | cct -c 2,3,4,5 +proj=merc 1335833.8895 7522963.2411 100.0000 2018.0000 comment $ echo text 12 56 comment | cct -c 2,3 -t0 -z0 +proj=merc 1335833.8895 7522963.2411 0.0000 0.0000 comment $ echo 12 56 comment | cct -t0 -z0 +proj=merc 1335833.8895 7522963.2411 0.0000 0.0000 comment Closes #918
2018-09-05Add -d option to proj, cs2cs and cct (#1109)Søren Holm
Specify number of decimals to display when transforming coordinates with either proj, cs2cs or cct.
2018-08-294D API: honour vto_meter / vunits for proj=longlatEven Rouault
This worked for cs2cs / pj_transform(), but not the new API
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-01 17:52:12 +0000