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

[svn_grass at osgeo.org]

Author: neteler
Date: 2016-04-24 15:02:47 -0700 (Sun, 24 Apr 2016)
New Revision: 68305

Modified:
   grass/trunk/lib/proj/convert.c
   grass/trunk/lib/proj/datum.c
Log:
libproj: debug statements added for datum

Modified: grass/trunk/lib/proj/convert.c
===================================================================
--- grass/trunk/lib/proj/convert.c	2016-04-24 16:51:23 UTC (rev 68304)
+++ grass/trunk/lib/proj/convert.c	2016-04-24 22:02:47 UTC (rev 68305)
@@ -171,6 +171,7 @@
 	    ellps = G_store(dstruct.ellps);
 	GPJ_free_datum(&dstruct);
     }
+    G_debug(3, "GPJ_grass_to_osr: datum: <%s>", datum);
     G_free(datum);
     if (GPJ_get_ellipsoid_by_name(ellps, &estruct) > 0) {
 	ellpslong = G_store(estruct.longname);
@@ -434,6 +435,7 @@
 
 	    pszDatumName = G_store(pszDatumNameConst);
 	    DatumNameMassage(&pszDatumName);
+	    G_debug(3, "GPJ_osr_to_grass: pszDatumNameConst: <%s>", pszDatumName);
 
 	    list = listhead = read_datum_table();
 
@@ -805,6 +807,7 @@
     int i, j;
     char *pszDatum = *ppszDatum;
 
+    G_debug(3, "DatumNameMassage: Raw string found <%s>", (char *)pszDatum);
     /* -------------------------------------------------------------------- */
     /*      Translate non-alphanumeric values to underscores.               */
     /* -------------------------------------------------------------------- */
@@ -834,6 +837,7 @@
     /*      Search for datum equivalences.  Specific massaged names get     */
     /*      mapped to OpenGIS specified names.                              */
     /* -------------------------------------------------------------------- */
+    G_debug(3, "DatumNameMassage: Search for datum equivalences of <%s>", (char *)pszDatum);
     for (i = 0; papszDatumEquiv[i] != NULL; i += 2) {
 	if (EQUAL(*ppszDatum, papszDatumEquiv[i])) {
 	    G_free(*ppszDatum);

Modified: grass/trunk/lib/proj/datum.c
===================================================================
--- grass/trunk/lib/proj/datum.c	2016-04-24 16:51:23 UTC (rev 68304)
+++ grass/trunk/lib/proj/datum.c	2016-04-24 22:02:47 UTC (rev 68305)
@@ -177,6 +177,7 @@
 
     if (NULL != G_find_key_value("datum", projinfo)) {
 	*datumname = G_store(G_find_key_value("datum", projinfo));
+	G_debug(3, "GPJ__get_datum_params: datumname: <%s>", (char *)datumname);
 	returnval = 1;
     }
     else
@@ -184,6 +185,7 @@
 
     if (G_find_key_value("datumparams", projinfo) != NULL) {
 	*params = G_store(G_find_key_value("datumparams", projinfo));
+	G_debug(3, "GPJ__get_datum_params: datumparams: <%s>", (char *)params);
 	returnval = 2;
     }
     else if (G_find_key_value("nadgrids", projinfo) != NULL) {