[GRASS-SVN] r68095 - grass/trunk/scripts/m.proj

[svn_grass at osgeo.org]

Author: wenzeslaus
Date: 2016-03-21 06:39:40 -0700 (Mon, 21 Mar 2016)
New Revision: 68095

Modified:
   grass/trunk/scripts/m.proj/m.proj.py
Log:
m.proj: add test for the presence of + in proj_in string (author: Rob Parsons)

Change for proj_out already in r68094 by mistake.


Modified: grass/trunk/scripts/m.proj/m.proj.py
===================================================================
--- grass/trunk/scripts/m.proj/m.proj.py	2016-03-21 13:27:54 UTC (rev 68094)
+++ grass/trunk/scripts/m.proj/m.proj.py	2016-03-21 13:39:40 UTC (rev 68095)
@@ -185,7 +185,10 @@
         in_proj = grass.read_command('g.proj', flags='jf')
 
     if proj_in:
-        in_proj = proj_in
+        if '+' in proj_in:
+            in_proj = proj_in
+        else:
+            grass.fatal(_("Invalid PROJ.4 input specification"))
 
     if not in_proj:
         grass.verbose("Assuming current location as input")