[GRASS-SVN] r42947 - in grass/branches/develbranch_6/scripts: m.proj v.in.garmin v.in.gpsbabel

[svn_grass at osgeo.org]

Author: hamish
Date: 2010-07-29 15:54:50 +0000 (Thu, 29 Jul 2010)
New Revision: 42947

Modified:
   grass/branches/develbranch_6/scripts/m.proj/m.proj
   grass/branches/develbranch_6/scripts/v.in.garmin/v.in.garmin
   grass/branches/develbranch_6/scripts/v.in.gpsbabel/v.in.gpsbabel
Log:
quote +proj terms for cs2cs in case +nadgrids has a space in the path name

Modified: grass/branches/develbranch_6/scripts/m.proj/m.proj
===================================================================
--- grass/branches/develbranch_6/scripts/m.proj/m.proj	2010-07-29 15:24:48 UTC (rev 42946)
+++ grass/branches/develbranch_6/scripts/m.proj/m.proj	2010-07-29 15:54:50 UTC (rev 42947)
@@ -157,7 +157,13 @@
    g.message -v "Assuming LL WGS84 as input, current projection as output."
 fi
 if [ $GIS_FLAG_O -eq 1 ] ; then
-   IN_PROJ="`g.proj -jf`"
+   IN_PROJ=`g.proj -j | (
+       IN_PROJ=
+       while read line ; do
+           IN_PROJ="$IN_PROJ '$line'"
+       done
+       echo "$IN_PROJ"
+   )`
 fi
 if [ -n "$GIS_OPT_PROJ_IN" ] ; then
    IN_PROJ="$GIS_OPT_PROJ_IN"
@@ -173,7 +179,13 @@
    g.message -v "Assuming current projection as input, LL WGS84 as output."
 fi
 if [ $GIS_FLAG_I -eq 1 ] ; then
-   OUT_PROJ="`g.proj -jf`"
+   OUT_PROJ=`g.proj -j | (
+       OUT_PROJ=
+       while read line ; do
+           OUT_PROJ="$OUT_PROJ '$line'"
+       done
+       echo "$OUT_PROJ"
+   )`
 fi
 if [ -n "$GIS_OPT_PROJ_OUT" ] ; then
    OUT_PROJ="$GIS_OPT_PROJ_OUT"

Modified: grass/branches/develbranch_6/scripts/v.in.garmin/v.in.garmin
===================================================================
--- grass/branches/develbranch_6/scripts/v.in.garmin/v.in.garmin	2010-07-29 15:24:48 UTC (rev 42946)
+++ grass/branches/develbranch_6/scripts/v.in.garmin/v.in.garmin	2010-07-29 15:54:50 UTC (rev 42947)
@@ -241,7 +241,15 @@
 
 #### set up projection info
 IN_PROJ="+proj=longlat +datum=WGS84"
-OUT_PROJ="`g.proj -jf`"
+
+OUT_PROJ=`g.proj -j | (
+    OUT_PROJ=
+    while read line ; do
+	OUT_PROJ="$OUT_PROJ '$line'"
+    done
+    echo "$OUT_PROJ"
+)`
+
 PROJ_TYPE=`g.region -p | grep 'projection' | cut -f2 -d" "`
 if [ $PROJ_TYPE -eq 0 ] && [ $KEEP_WGS84 -ne 1 ] ; then
     g.message -e "Cannot project to a XY location."

Modified: grass/branches/develbranch_6/scripts/v.in.gpsbabel/v.in.gpsbabel
===================================================================
--- grass/branches/develbranch_6/scripts/v.in.gpsbabel/v.in.gpsbabel	2010-07-29 15:24:48 UTC (rev 42946)
+++ grass/branches/develbranch_6/scripts/v.in.gpsbabel/v.in.gpsbabel	2010-07-29 15:54:50 UTC (rev 42947)
@@ -223,7 +223,15 @@
 else
     IN_PROJ="+proj=longlat +datum=WGS84"
 fi
-OUT_PROJ="`g.proj -jf`"
+
+OUT_PROJ=`g.proj -j | (
+    OUT_PROJ=
+    while read line ; do
+	OUT_PROJ="$OUT_PROJ '$line'"
+    done
+    echo "$OUT_PROJ"
+)`
+
 PROJ_TYPE=`g.region -p | grep 'projection' | cut -f2 -d" "`
 
 if [ $PROJ_TYPE -eq 0 ] && [ $KEEP_WGS84 -ne 1 ] ; then