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

[svn_grass at osgeo.org]

Author: mmetz
Date: 2013-10-11 05:02:24 -0700 (Fri, 11 Oct 2013)
New Revision: 57981

Modified:
   grass/trunk/lib/proj/convert.c
Log:
libproj: GRASS expects meter not metre

Modified: grass/trunk/lib/proj/convert.c
===================================================================
--- grass/trunk/lib/proj/convert.c	2013-10-11 11:58:05 UTC (rev 57980)
+++ grass/trunk/lib/proj/convert.c	2013-10-11 12:02:24 UTC (rev 57981)
@@ -608,6 +608,11 @@
 	    (dfToMeters == 1.))
 	    G_asprintf(&pszUnitsName, "meter");
 
+	if ((G_strcasecmp(pszUnitsName, "metre") == 0))
+	    G_asprintf(&pszUnitsName, "meter");
+	if ((G_strcasecmp(pszUnitsName, "kilometre") == 0))
+	    G_asprintf(&pszUnitsName, "kilometer");
+
 	G_set_key_value("unit", pszUnitsName, *projunits);
 
 	/* Attempt at plural formation (WKT format doesn't store plural