Browse Source

Suppress warnings for xy locations (trac https://trac.osgeo.org/grass/ticket/492)
Minor Doxygen updates


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@37590 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa 16 years ago
parent
commit
de5c6b1d68
2 changed files with 32 additions and 30 deletions
  1. 8 4
      lib/gis/get_projinfo.c
  2. 24 26
      lib/gis/proj1.c

+ 8 - 4
lib/gis/get_projinfo.c

@@ -30,8 +30,10 @@ struct Key_Value *G_get_projunits(void)
 
     G__file_name(path, "", UNIT_FILE, PERMANENT);
     if (access(path, 0) != 0) {
-	G_warning(_("<%s> file not found for location <%s>"),
-		  UNIT_FILE, G_location());
+	if (G_projection() != PROJECTION_XY) {
+	    G_warning(_("<%s> file not found for location <%s>"),
+		      UNIT_FILE, G_location());
+	}
 	return NULL;
     }
     in_units_keys = G_read_key_value_file(path, &stat);
@@ -57,8 +59,10 @@ struct Key_Value *G_get_projinfo(void)
 
     G__file_name(path, "", PROJECTION_FILE, PERMANENT);
     if (access(path, 0) != 0) {
-	G_warning(_("<%s> file not found for location <%s>"),
-		  PROJECTION_FILE, G_location());
+	if (G_projection() != PROJECTION_XY) {
+	    G_warning(_("<%s> file not found for location <%s>"),
+		      PROJECTION_FILE, G_location());
+	}
 	return NULL;
     }
     in_proj_keys = G_read_key_value_file(path, &stat);

+ 24 - 26
lib/gis/proj1.c

@@ -1,35 +1,33 @@
+/*!
+  \file proj1.c
 
-/**********************************************************************
- *  G_projection()
- *
- *  Returns the projection type of the currently set window.
- *  (Note this is really the coordinate system, not the projection)
- *    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
- *
- **********************************************************************/
+  \brief GIS Library - Get projection info
+  
+  (C) 1999-2009 by the GRASS Development Team
+  
+  This program is free software under the GNU General Public License
+  (>=v2). Read the file COPYING that comes with GRASS for details.
 
-#include <grass/gis.h>
+  \author Original author CERL
+*/
 
+#include <grass/gis.h>
 
 /*!
- * \brief query cartographic projection
- *
- * This routine returns a code indicating the projection for the active region.  The current
- * values are:
- * 0 unreferenced x,y (imagery data)
- * 1 UTM
- * 2 State Plane
- * 3 Latitude-Longitude\remarks{Latitude-Longitude is not yet fully supported in
- * GRASS.}
- * Others may be added in the future. HINT GRASS 5: 121 projections!!
- *
- *  \param void
- *  \return int
- */
+  \brief Query cartographic projection
+  
+  This routine returns a code indicating the projection for the active region.  The current
+  values are:
+
+   - 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
+
+   Others may be added in the future.
 
+   \return projection code (see above)
+*/
 int G_projection(void)
 {
     struct Cell_head window;