Browse Source

remove unused PROJECTION_SP

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@62061 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 10 years ago
parent
commit
3fc17c1072

+ 1 - 1
lib/gis/proj1.c

@@ -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
 

+ 0 - 4
lib/gis/proj2.c

@@ -36,8 +36,6 @@ int G__projection_units(int n)
 	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 @@ const char *G__projection_name(int n)
 	return "x,y";
     case PROJECTION_UTM:
 	return "UTM";
-    case PROJECTION_SP:
-	return _("State Plane");
     case PROJECTION_LL:
 	return _("Latitude-Longitude");
     case PROJECTION_OTHER:

+ 0 - 1
lib/gis/proj3.c

@@ -102,7 +102,6 @@ const char *G_database_projection_name(void)
     case PROJECTION_XY:
     case PROJECTION_UTM:
     case PROJECTION_LL:
-    case PROJECTION_SP:
 	return G__projection_name(n);
     }
 

+ 0 - 3
lib/gis/wind_scan.c

@@ -25,7 +25,6 @@ static int scan_double(const char *, double *);
   Supported projection codes (see gis.h):
    - PROJECTION_XY
    - PROJECTION_UTM
-   - PROJECTION_SP
    - PROJECTION_LL
    - PROJECTION_OTHER
 
@@ -59,7 +58,6 @@ int G_scan_northing(const char *buf, double *northing, int projection)
   Supported projection codes (see gis.h):
    - PROJECTION_XY
    - PROJECTION_UTM
-   - PROJECTION_SP
    - PROJECTION_LL
    - PROJECTION_OTHER
   
@@ -97,7 +95,6 @@ int G_scan_easting(const char *buf, double *easting, int projection)
   Supported projection codes (see gis.h):
    - PROJECTION_XY
    - PROJECTION_UTM
-   - PROJECTION_SP
    - PROJECTION_LL
    - PROJECTION_OTHER
   

+ 0 - 3
lib/vector/Vlib/header.c

@@ -490,7 +490,6 @@ int Vect_get_zone(const struct Map_info *Map)
    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 @@ int Vect_set_proj(struct Map_info *Map, int proj)
 
    \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 @@ const char *Vect_get_proj_name(const struct Map_info *Map)
     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

+ 0 - 4
raster/r.in.gdal/main.c

@@ -465,10 +465,6 @@ int main(int argc, char *argv[])
 			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",

+ 0 - 4
raster/r.in.lidar/main.c

@@ -419,10 +419,6 @@ int main(int argc, char *argv[])
 			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",

+ 0 - 4
vector/v.in.lidar/main.c

@@ -439,10 +439,6 @@ int main(int argc, char *argv[])
 			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",

+ 0 - 4
vector/v.in.ogr/main.c

@@ -768,10 +768,6 @@ int main(int argc, char *argv[])
 			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",