瀏覽代碼

explicitly declare datum (and so ellipsoid too) [merge from devbr6]

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@31505 15284696-431f-4ddb-bdfa-cd5b030d7da7
Hamish Bowman 17 年之前
父節點
當前提交
365f5ae25a
共有 3 個文件被更改,包括 4 次插入4 次删除
  1. 2 2
      scripts/m.proj/m.proj
  2. 1 1
      scripts/v.in.garmin/v.in.garmin
  3. 1 1
      scripts/v.in.gpsbabel/v.in.gpsbabel

+ 2 - 2
scripts/m.proj/m.proj

@@ -132,7 +132,7 @@ fi
 
 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 @@ fi
 
 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

+ 1 - 1
scripts/v.in.garmin/v.in.garmin

@@ -240,7 +240,7 @@ elif [ $VERBOSE -eq 1 ] ; then
 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

+ 1 - 1
scripts/v.in.gpsbabel/v.in.gpsbabel

@@ -213,7 +213,7 @@ fi
 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" "`