[GRASS-SVN] r59975 - grass-addons/grass6/vector/v.in.gshhs

[svn_grass at osgeo.org]

Author: hamish
Date: 2014-04-30 03:23:09 -0700 (Wed, 30 Apr 2014)
New Revision: 59975

Modified:
   grass-addons/grass6/vector/v.in.gshhs/description.html
   grass-addons/grass6/vector/v.in.gshhs/gshhs.h
   grass-addons/grass6/vector/v.in.gshhs/main.c
Log:
update to GSHHS (now renamed GSHHG) version 2.3.0

Modified: grass-addons/grass6/vector/v.in.gshhs/description.html
===================================================================
--- grass-addons/grass6/vector/v.in.gshhs/description.html	2014-04-29 20:39:19 UTC (rev 59974)
+++ grass-addons/grass6/vector/v.in.gshhs/description.html	2014-04-30 10:23:09 UTC (rev 59975)
@@ -25,7 +25,11 @@
 full dataset is imported. With the -r flag, any line that falls into or
 overlaps with the current region is imported. Lines are not cropped.
 
+<p>
+As of July 2012 GSHHS has been renamed GSHHG, as they provide more than
+just shorelines.
 
+
 <h2>NOTES</h2>
 
 The GSHHS shorelines are in files named <tt>gshhs_[f|h|i|l|c].b</tt> where 
@@ -60,6 +64,7 @@
 is currently not supported but works, just ignore the attribute table.
 These world borders and rivers may be not very accurate.
 
+
 <h2>SEE ALSO</h2>
 
 <em>
@@ -68,6 +73,7 @@
 <a href="v.type.html">v.type</a>,
 </em>
 
+
 <h2>REFERENCES</h2>
 
 The processing and assembly of the GSHHS data is described in
@@ -75,7 +81,9 @@
 Wessel, P., and W. H. F. Smith, 1996. A Global Self-consistent, Hierarchical, 
 High-resolution Shoreline Database. J. Geophys. Res., 101(B4), 8741-8743. 
 
+
 <h2>AUTHORS</h2>
+
 The gshhstograss tool was written by Simon Cox and Paul Wessel.<br>
 The original version of v.in.gshhs was written by Bob Covill based on gshhstograss.<br> 
 Modifications and updates by Markus Neteler and Markus Metz.

Modified: grass-addons/grass6/vector/v.in.gshhs/gshhs.h
===================================================================
--- grass-addons/grass6/vector/v.in.gshhs/gshhs.h	2014-04-29 20:39:19 UTC (rev 59974)
+++ grass-addons/grass6/vector/v.in.gshhs/gshhs.h	2014-04-30 10:23:09 UTC (rev 59975)
@@ -57,11 +57,11 @@
 #define SEEK_CUR 1
 #endif
 
-#define GSHHS_DATA_RELEASE	9	/* For v2.2.0 data set */
-#define GSHHS_DATA_VERSION	"2.2.0"	/* For v2.2.0 data set */
+#define GSHHS_DATA_RELEASE	13	/* For v2.3.0 data set */
+#define GSHHS_DATA_VERSION	"2.3.0"	/* For v2.3.0 data set */
 #define GSHHS_PROG_VERSION	"1.13"
 
-#define GSHHS_SCL	1.0e-6	/* COnvert micro-degrees to degrees */
+#define GSHHS_SCL	1.0e-6	/* Convert micro-degrees to degrees */
 
 /* For byte swapping on little-endian systems (GSHHS is defined to be bigendian) */
 

Modified: grass-addons/grass6/vector/v.in.gshhs/main.c
===================================================================
--- grass-addons/grass6/vector/v.in.gshhs/main.c	2014-04-29 20:39:19 UTC (rev 59974)
+++ grass-addons/grass6/vector/v.in.gshhs/main.c	2014-04-30 10:23:09 UTC (rev 59975)
@@ -113,7 +113,7 @@
     parm.input->required = YES;
     parm.input->gisprompt = "old_file,file,gshhs";
     parm.input->description =
-	_("Name of GSHHS shoreline file: gshhs_[f|h|i|l|c].b");
+	_("Name of GSHHG/GSHHS shoreline file: gshhs_[f|h|i|l|c].b");
 
     parm.output = G_define_standard_option(G_OPT_V_OUTPUT);
 
@@ -285,9 +285,11 @@
 
     /* check version support */
     if (version < 4)  /* not sure if that check works... */
-	G_fatal_error("Trying to import version %d, only GSHHS versions 4 to %d (2.2) are supported.", version, (int)GSHHS_DATA_RELEASE);
+	G_fatal_error("Trying to import version %d, only GSHHS versions 4 to %d (%s) are supported.",
+		      version, (int)GSHHS_DATA_RELEASE, GSHHS_DATA_VERSION);
     if (version > GSHHS_DATA_RELEASE)
-	G_fatal_error("Import of version %d not yet supported, highest supported version is GSHHS version 7 (2.0).", version);
+	G_fatal_error("Import of version %d not yet supported, highest supported version is GSHHS version %d (%s).",
+		      version, (int)GSHHS_DATA_RELEASE, GSHHS_DATA_VERSION);
 
     rewind(fp);