[GRASS-SVN] r62178 - in grass/branches/releasebranch_7_0: . lib/gis lib/vector/Vlib raster/r.in.gdal raster/r.in.lidar vector/v.in.lidar vector/v.in.ogr
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Oct 4 12:16:52 PDT 2014
Author: annakrat
Date: 2014-10-04 12:16:52 -0700 (Sat, 04 Oct 2014)
New Revision: 62178
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/lib/gis/proj1.c
grass/branches/releasebranch_7_0/lib/gis/proj2.c
grass/branches/releasebranch_7_0/lib/gis/proj3.c
grass/branches/releasebranch_7_0/lib/gis/wind_scan.c
grass/branches/releasebranch_7_0/lib/vector/Vlib/header.c
grass/branches/releasebranch_7_0/raster/r.in.gdal/main.c
grass/branches/releasebranch_7_0/raster/r.in.lidar/main.c
grass/branches/releasebranch_7_0/vector/v.in.lidar/main.c
grass/branches/releasebranch_7_0/vector/v.in.ogr/main.c
Log:
remove unused PROJECTION_SP (merge from trunk, r62061)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60289,60696,61269,61380,61420,61422,61480,61500,61764,61793,61808,61829,61831,61840,61851-61854,61858,61888,61891,61905,61907,61913-61914,61916,61918,61920-61921,61938,61967-61968,61975,61980,61986,61993,62005,62035,62046,62060,62095,62099,62114,62122,62128,62131,62148,62170,62174
+ /grass/trunk:60289,60696,61269,61380,61420,61422,61480,61500,61764,61793,61808,61829,61831,61840,61851-61854,61858,61888,61891,61905,61907,61913-61914,61916,61918,61920-61921,61938,61967-61968,61975,61980,61986,61993,62005,62035,62046,62060-62061,62095,62099,62114,62122,62128,62131,62148,62170,62174
Modified: grass/branches/releasebranch_7_0/lib/gis/proj1.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/proj1.c 2014-10-04 19:14:57 UTC (rev 62177)
+++ grass/branches/releasebranch_7_0/lib/gis/proj1.c 2014-10-04 19:16:52 UTC (rev 62178)
@@ -21,7 +21,7 @@
- PROJECTION_XY 0 - x,y (Raw imagery)
- PROJECTION_UTM 1 - UTM Universal Transverse Mercator
- - PROJECTION_SP 2 - State Plane (in feet)
+ - PROJECTION_SP 2 - State Plane (in feet) - not used, removed
- PROJECTION_LL 3 - Latitude-Longitude
- PROJECTION_OTHER 99 - others
Modified: grass/branches/releasebranch_7_0/lib/gis/proj2.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/proj2.c 2014-10-04 19:14:57 UTC (rev 62177)
+++ grass/branches/releasebranch_7_0/lib/gis/proj2.c 2014-10-04 19:16:52 UTC (rev 62178)
@@ -36,8 +36,6 @@
return U_UNKNOWN;
case PROJECTION_UTM:
return U_METERS;
- case PROJECTION_SP:
- return U_FEET; /* TODO: what if U_USFEET as in CA and NC ? */
case PROJECTION_LL:
return U_DEGREES;
default:
@@ -61,8 +59,6 @@
return "x,y";
case PROJECTION_UTM:
return "UTM";
- case PROJECTION_SP:
- return _("State Plane");
case PROJECTION_LL:
return _("Latitude-Longitude");
case PROJECTION_OTHER:
Modified: grass/branches/releasebranch_7_0/lib/gis/proj3.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/proj3.c 2014-10-04 19:14:57 UTC (rev 62177)
+++ grass/branches/releasebranch_7_0/lib/gis/proj3.c 2014-10-04 19:16:52 UTC (rev 62178)
@@ -102,7 +102,6 @@
case PROJECTION_XY:
case PROJECTION_UTM:
case PROJECTION_LL:
- case PROJECTION_SP:
return G__projection_name(n);
}
Modified: grass/branches/releasebranch_7_0/lib/gis/wind_scan.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/wind_scan.c 2014-10-04 19:14:57 UTC (rev 62177)
+++ grass/branches/releasebranch_7_0/lib/gis/wind_scan.c 2014-10-04 19:16:52 UTC (rev 62178)
@@ -25,7 +25,6 @@
Supported projection codes (see gis.h):
- PROJECTION_XY
- PROJECTION_UTM
- - PROJECTION_SP
- PROJECTION_LL
- PROJECTION_OTHER
@@ -59,7 +58,6 @@
Supported projection codes (see gis.h):
- PROJECTION_XY
- PROJECTION_UTM
- - PROJECTION_SP
- PROJECTION_LL
- PROJECTION_OTHER
@@ -97,7 +95,6 @@
Supported projection codes (see gis.h):
- PROJECTION_XY
- PROJECTION_UTM
- - PROJECTION_SP
- PROJECTION_LL
- PROJECTION_OTHER
Modified: grass/branches/releasebranch_7_0/lib/vector/Vlib/header.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/vector/Vlib/header.c 2014-10-04 19:14:57 UTC (rev 62177)
+++ grass/branches/releasebranch_7_0/lib/vector/Vlib/header.c 2014-10-04 19:16:52 UTC (rev 62178)
@@ -490,7 +490,6 @@
Supported projections:
- PROJECTION_XY 0 - x,y (Raw imagery),
- PROJECTION_UTM 1 - UTM Universal Transverse Mercator,
- - PROJECTION_SP 2 - State Plane (in feet),
- PROJECTION_LL 3 - Latitude-Longitude
\param Map pointer to Map_info structure
@@ -512,7 +511,6 @@
\return PROJECTION_XY 0 - x,y (Raw imagery),
\return PROJECTION_UTM 1 - UTM Universal Transverse Mercator,
- \return PROJECTION_SP 2 - State Plane (in feet),
\return PROJECTION_LL 3 - Latitude-Longitude
*/
int Vect_get_proj(const struct Map_info *Map)
@@ -541,7 +539,6 @@
case PROJECTION_XY:
case PROJECTION_UTM:
case PROJECTION_LL:
- case PROJECTION_SP:
return G__projection_name(n);
case PROJECTION_OTHER:
/* this won't protect against differing "other" projections, so
Modified: grass/branches/releasebranch_7_0/raster/r.in.gdal/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.in.gdal/main.c 2014-10-04 19:14:57 UTC (rev 62177)
+++ grass/branches/releasebranch_7_0/raster/r.in.gdal/main.c 2014-10-04 19:16:52 UTC (rev 62178)
@@ -465,10 +465,6 @@
sprintf(error_msg + strlen(error_msg),
"cellhd.proj = %d (UTM), zone = %d\n",
cellhd.proj, cellhd.zone);
- else if (cellhd.proj == PROJECTION_SP)
- sprintf(error_msg + strlen(error_msg),
- "cellhd.proj = %d (State Plane), zone = %d\n",
- cellhd.proj, cellhd.zone);
else
sprintf(error_msg + strlen(error_msg),
"cellhd.proj = %d (unknown), zone = %d\n",
Modified: grass/branches/releasebranch_7_0/raster/r.in.lidar/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.in.lidar/main.c 2014-10-04 19:14:57 UTC (rev 62177)
+++ grass/branches/releasebranch_7_0/raster/r.in.lidar/main.c 2014-10-04 19:16:52 UTC (rev 62178)
@@ -419,10 +419,6 @@
sprintf(error_msg + strlen(error_msg),
"Dataset proj = %d (UTM), zone = %d\n",
cellhd.proj, cellhd.zone);
- else if (cellhd.proj == PROJECTION_SP)
- sprintf(error_msg + strlen(error_msg),
- "Dataset proj = %d (State Plane), zone = %d\n",
- cellhd.proj, cellhd.zone);
else
sprintf(error_msg + strlen(error_msg),
"Dataset proj = %d (unknown), zone = %d\n",
Modified: grass/branches/releasebranch_7_0/vector/v.in.lidar/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.in.lidar/main.c 2014-10-04 19:14:57 UTC (rev 62177)
+++ grass/branches/releasebranch_7_0/vector/v.in.lidar/main.c 2014-10-04 19:16:52 UTC (rev 62178)
@@ -439,10 +439,6 @@
sprintf(error_msg + strlen(error_msg),
"Dataset proj = %d (UTM), zone = %d\n",
cellhd.proj, cellhd.zone);
- else if (cellhd.proj == PROJECTION_SP)
- sprintf(error_msg + strlen(error_msg),
- "Dataset proj = %d (State Plane), zone = %d\n",
- cellhd.proj, cellhd.zone);
else
sprintf(error_msg + strlen(error_msg),
"Dataset proj = %d (unknown), zone = %d\n",
Modified: grass/branches/releasebranch_7_0/vector/v.in.ogr/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.in.ogr/main.c 2014-10-04 19:14:57 UTC (rev 62177)
+++ grass/branches/releasebranch_7_0/vector/v.in.ogr/main.c 2014-10-04 19:16:52 UTC (rev 62178)
@@ -768,10 +768,6 @@
sprintf(error_msg + strlen(error_msg),
"Dataset proj = %d (UTM), zone = %d\n",
cellhd.proj, cellhd.zone);
- else if (cellhd.proj == PROJECTION_SP)
- sprintf(error_msg + strlen(error_msg),
- "Dataset proj = %d (State Plane), zone = %d\n",
- cellhd.proj, cellhd.zone);
else
sprintf(error_msg + strlen(error_msg),
"Dataset proj = %d (unknown), zone = %d\n",
More information about the grass-commit
mailing list