[GRASS-SVN] r31505 - in grass/trunk/scripts: m.proj v.in.garmin v.in.gpsbabel

[svn_grass at osgeo.org]

Author: hamish
Date: 2008-05-24 01:44:09 -0400 (Sat, 24 May 2008)
New Revision: 31505

Modified:
   grass/trunk/scripts/m.proj/m.proj
   grass/trunk/scripts/v.in.garmin/v.in.garmin
   grass/trunk/scripts/v.in.gpsbabel/v.in.gpsbabel
Log:
explicitly declare datum (and so ellipsoid too) [merge from devbr6]

Modified: grass/trunk/scripts/m.proj/m.proj
===================================================================
--- grass/trunk/scripts/m.proj/m.proj	2008-05-24 05:37:43 UTC (rev 31504)
+++ grass/trunk/scripts/m.proj/m.proj	2008-05-24 05:44:09 UTC (rev 31505)
@@ -132,7 +132,7 @@
 
 unset IN_PROJ
 if [ $GIS_FLAG_I -eq 1 ] ; then
-   IN_PROJ="+proj=longlat +towgs84=0.000,0.000,0.000"
+   IN_PROJ="+proj=longlat +datum=WGS84"
    if [ $GIS_FLAG_V -eq 1 ] ; then
      g.message "Assuming LL WGS84 as input, current projection as output."
    fi
@@ -151,7 +151,7 @@
 
 unset OUT_PROJ
 if [ $GIS_FLAG_O -eq 1 ] ; then
-   OUT_PROJ="+proj=longlat +towgs84=0.000,0.000,0.000"
+   OUT_PROJ="+proj=longlat +datum=WGS84"
    if [ $GIS_FLAG_V -eq 1 ] ; then
      g.message "Assuming current projection as input, LL WGS84 as output."
    fi

Modified: grass/trunk/scripts/v.in.garmin/v.in.garmin
===================================================================
--- grass/trunk/scripts/v.in.garmin/v.in.garmin	2008-05-24 05:37:43 UTC (rev 31504)
+++ grass/trunk/scripts/v.in.garmin/v.in.garmin	2008-05-24 05:44:09 UTC (rev 31505)
@@ -240,7 +240,7 @@
 fi
 
 #### set up projection info
-IN_PROJ="+proj=longlat +towgs84=0.000,0.000,0.000"
+IN_PROJ="+proj=longlat +datum=WGS84"
 OUT_PROJ="`g.proj -jf`"
 PROJ_TYPE=`g.region -p | grep 'projection' | cut -f2 -d" "`
 if [ $PROJ_TYPE -eq 0 ] && [ $KEEP_WGS84 -ne 1 ] ; then

Modified: grass/trunk/scripts/v.in.gpsbabel/v.in.gpsbabel
===================================================================
--- grass/trunk/scripts/v.in.gpsbabel/v.in.gpsbabel	2008-05-24 05:37:43 UTC (rev 31504)
+++ grass/trunk/scripts/v.in.gpsbabel/v.in.gpsbabel	2008-05-24 05:44:09 UTC (rev 31505)
@@ -213,7 +213,7 @@
 if [ -n "$GIS_OPT_PROJ" ] ; then
     IN_PROJ="$GIS_OPT_PROJ"
 else
-    IN_PROJ="+proj=longlat +towgs84=0.000,0.000,0.000"
+    IN_PROJ="+proj=longlat +datum=WGS84"
 fi
 OUT_PROJ="`g.proj -jf`"
 PROJ_TYPE=`g.region -p | grep 'projection' | cut -f2 -d" "`