[GRASS-SVN] r68435 - grass/trunk/lib/proj

[svn_grass at osgeo.org]

Author: neteler
Date: 2016-05-15 14:45:42 -0700 (Sun, 15 May 2016)
New Revision: 68435

Modified:
   grass/trunk/lib/proj/
   grass/trunk/lib/proj/README.txt
   grass/trunk/lib/proj/projlib.dox
Log:
libproj: TODO pj_set_finder() should be removed so that PROJ uses its own datum shift grid files


Property changes on: grass/trunk/lib/proj
___________________________________________________________________
Modified: svn:ignore
   - OBJ.*
latex
html
doxygen_sqlite3.db

   + OBJ.*
*.tmp.html


Modified: grass/trunk/lib/proj/README.txt
===================================================================
--- grass/trunk/lib/proj/README.txt	2016-05-15 12:43:14 UTC (rev 68434)
+++ grass/trunk/lib/proj/README.txt	2016-05-15 21:45:42 UTC (rev 68435)
@@ -4,5 +4,18 @@
 according to this procedure:
 http://svn.osgeo.org/metacrs/geotiff/trunk/libgeotiff/csv/README
 
-The CSV files are used via GDAL/OGR API from
+The EPSG CSV files are used via GDAL/OGR API from
 gdal-config --datadir
+
+The datum shift grids are partially included here.
+See https://github.com/OSGeo/proj.4/wiki
+    --> Datum shift grids
+
+
+TODO: It is recommended to rely on PROJ4's proj-nad package. For doing so, 
+      there would be some changes needed to lib/proj/get_proj.c - the call
+      to pj_set_finder() should be removed so that PROJ looks in its default
+      locations for the files. Also changes needed to lib/proj/Makefile so 
+      it no longer creates the /etc/proj and /etc/proj/nad directories within
+      a GRASS installation nor installs the files there.
+

Modified: grass/trunk/lib/proj/projlib.dox
===================================================================
--- grass/trunk/lib/proj/projlib.dox	2016-05-15 12:43:14 UTC (rev 68434)
+++ grass/trunk/lib/proj/projlib.dox	2016-05-15 21:45:42 UTC (rev 68435)
@@ -7,9 +7,9 @@
 
 http://grass.osgeo.org
 
-\section projintro GRASS and the PROJ4 projection library
+\section projintro GRASS GIS and the PROJ4 projection library
 
-GRASS utilizes the PROJ4 library (<a
+GRASS GIS utilizes the PROJ4 library (<a
 href="http://proj.osgeo.org">http://proj.osgeo.org</a>) originally
 developed by Gerald Evenden/USGS (Cartographic Projection Procedures
 for the UNIX Environment -- A User's Manual, Evenden, 1990, Open-file
@@ -22,8 +22,7 @@
 
 This is transparent for the user as input and output parameters are
 either read from PROJ_INFO and PROJ_UNITS files (<tt>g.proj</tt>,
-<tt>v.proj</tt>, <tt>r.proj</tt>) or read from user prompts (<tt>g.proj</tt>
-and <tt>g.setproj</tt>).
+<tt>v.proj</tt>, <tt>r.proj</tt>).
 
 In GRASS the wrapper functions in lib/proj/get_proj.c makes the
 preparations to set up the parameter strings and init the info-structures,
@@ -43,18 +42,24 @@
 
 GRASS generally supports datum transformation (3 parameters, 7 parameters
 and grid).
-<P>
+<p>
 
 If a warning appears that a certain datum is not recognised by GRASS and
 no parameters found, the datum transformation parameters have to be
 added to $GISBASE/etc/proj/datum.table (and also $GISBASE/etc/proj/datumtransform.table
 if you have 7-parameter transformation parameters). No need to re-compile
 though. When adding to SVN, currently these files are still in lib/gis/. 
+<p>
 
+A list of datum equivalents is included in convert.c for geospatial files that
+use a non-standard name for a datum that is already supported in GRASS.
+<p>
+Hint: use GDAL's "testepsg" to identify the canonical name, e.g.
+      testepsg epsg:4674
 
 \subsection Makefile_Example Makefile Example
 
-<P>
+<p>
 The following code demonstrates the Makefile.
 
 \verbatim