libgis: G__projection_units() -> G_projection_units()

        G__projection_name() -> G_projection_name()
        (merge r63834-5 from trunk)


git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@63836 15284696-431f-4ddb-bdfa-cd5b030d7da7

display/d.geodesic/main.c

@@ -76,7 +76,7 @@ int main(int argc, char *argv[])
 
     if (G_projection() != PROJECTION_LL)
 	G_fatal_error(_("Location is not %s"),
-		      G__projection_name(PROJECTION_LL));
+		      G_projection_name(PROJECTION_LL));
 
     /* get conversion factor and unit name */
     unit_id = G_units(parm.units->answer);

display/d.rhumbline/main.c

@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
 
     if (G_projection() != PROJECTION_LL)
 	G_fatal_error(_("Location is not %s"),
-		      G__projection_name(PROJECTION_LL));
+		      G_projection_name(PROJECTION_LL));
 
 #ifdef CAN_DO_DISTANCES
     /* get conversion factor and unit name */

general/g.setproj/main.c

@@ -161,19 +161,19 @@ int main(int argc, char *argv[])
 	}
     case PROJECTION_UTM:
 	if (!exist) {
-	    sprintf(proj_name, "%s", G__projection_name(PROJECTION_UTM));
+	    sprintf(proj_name, "%s", G_projection_name(PROJECTION_UTM));
 	    sprintf(proj_out, "utm");
 	    break;
 	}
     case PROJECTION_SP:
 	if (!exist) {
-	    sprintf(proj_name, "%s", G__projection_name(PROJECTION_SP));
+	    sprintf(proj_name, "%s", G_projection_name(PROJECTION_SP));
 	    sprintf(proj_out, "stp");
 	    break;
 	}
     case PROJECTION_LL:
 	if (!exist) {
-	    sprintf(proj_name, "%s", G__projection_name(PROJECTION_LL));
+	    sprintf(proj_name, "%s", G_projection_name(PROJECTION_LL));
 	    sprintf(proj_out, "ll");
 	    break;
 	}

include/defs/gis.h

@@ -575,8 +575,8 @@ void G_set_program_name(const char *);
 int G_projection(void);
 
 /* proj2.c */
-int G__projection_units(int);
-const char *G__projection_name(int);
+int G_projection_units(int);
+const char *G_projection_name(int);
 
 /* proj3.c */
 const char *G_database_unit_name(int);

lib/gis/proj2.c

@@ -29,7 +29,7 @@
   \return units code (see gis.h)
   \return U_UNDEFINED if not defined
 */
-int G__projection_units(int n)
+int G_projection_units(int n)
 {
     switch (n) {
     case PROJECTION_XY:
@@ -52,7 +52,7 @@ int G__projection_units(int n)
   \return projection name
   \return NULL on error
 */
-const char *G__projection_name(int n)
+const char *G_projection_name(int n)
 {
     switch (n) {
     case PROJECTION_XY:

lib/gis/proj3.c

@@ -52,7 +52,7 @@ const char *G_database_unit_name(int plural)
     int units;
     const char *name;
     
-    units = G__projection_units(G_projection());
+    units = G_projection_units(G_projection());
     
     if (units == U_UNDEFINED) {
 	name = lookup_units(plural ? "units" : "unit");
@@ -102,7 +102,7 @@ const char *G_database_projection_name(void)
     case PROJECTION_XY:
     case PROJECTION_UTM:
     case PROJECTION_LL:
-	return G__projection_name(n);
+	return G_projection_name(n);
     }
 
     name = lookup_proj("name");

lib/raster/open.c

@@ -219,8 +219,8 @@ int Rast__open_old(const char *name, const char *mapset)
 	G_fatal_error(_("Raster map <%s> is in different projection than current region. "
 			"Found <%s>, should be <%s>."),
 		      G_fully_qualified_name(name, mapset),
-		      G__projection_name(cellhd.proj),
-		      G__projection_name(R__.rd_window.proj));
+		      G_projection_name(cellhd.proj),
+		      G_projection_name(R__.rd_window.proj));
 
     if (cellhd.zone != R__.rd_window.zone)
 	G_fatal_error(_("Raster map <%s> is in different zone (%d) than current region (%d)"),

lib/vector/Vlib/header.c

@@ -539,7 +539,7 @@ const char *Vect_get_proj_name(const struct Map_info *Map)
     case PROJECTION_XY:
     case PROJECTION_UTM:
     case PROJECTION_LL:
-	return G__projection_name(n);
+	return G_projection_name(n);
     case PROJECTION_OTHER:
 	/* this won't protect against differing "other" projections, so
 	   better to just include P_OTHER in the above list so we return the