From bc882d259d8bb2f6c07108d9e8f17fad91fe2800 Mon Sep 17 00:00:00 2001
From: david <david>
Date: Sun, 30 Dec 2001 02:21:23 +0000
Subject: [PATCH] Added new area types Bog, Sand, Lava, FloodLand,
 IntermittentStream, and PackIce, to support vmap0.

---
 src/Lib/Polygon/names.cxx |  6 ++++++
 src/Lib/Polygon/names.hxx | 18 +++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/Lib/Polygon/names.cxx b/src/Lib/Polygon/names.cxx
index 1a34d7dc..94c79dc5 100644
--- a/src/Lib/Polygon/names.cxx
+++ b/src/Lib/Polygon/names.cxx
@@ -64,6 +64,10 @@ inline static void init ()
   set_area("Pond", PondArea);
   set_area("Swamp or Marsh", MarshArea);
   set_area("Marsh", MarshArea);
+  set_area("Bog", BogArea);
+  set_area("Sand", SandArea);
+  set_area("Lava", LavaArea);
+  set_area("FloodLand", FloodLandArea);
   set_area("Lake", LakeArea);
   set_area("Lake   Dry", DryLakeArea);
   set_area("DryLake", DryLakeArea);
@@ -76,8 +80,10 @@ inline static void init ()
   set_area("Road", RoadArea);
   set_area("Railroad", RailroadArea);
   set_area("Stream", StreamArea);
+  set_area("IntermittentStream", IntStreamArea);
   set_area("Canal", CanalArea);
   set_area("Glacier", GlacierArea);
+  set_area("PackIce", PackIceArea);
   set_area("Urban", UrbanArea);
   set_area("Town", TownArea);
   set_area("BuiltUpCover", BuiltUpCover);
diff --git a/src/Lib/Polygon/names.hxx b/src/Lib/Polygon/names.hxx
index 358de402..aafc77b3 100644
--- a/src/Lib/Polygon/names.hxx
+++ b/src/Lib/Polygon/names.hxx
@@ -48,11 +48,18 @@ enum AreaType {
     ReservoirArea,
     IntReservoirArea,
     StreamArea,
+    IntStreamArea,
     CanalArea,
-    GlacierArea,
+    GlacierArea,		// Any solid ice/snow
+    PackIceArea,		// Water with ice packs
     OceanArea,
-    UrbanArea,
-    TownArea,
+    UrbanArea,			// Densely-populated city or large town
+    TownArea,			// Small town or village
+    FloodLandArea,		// Land subject to flooding
+    BogArea,			// Bog
+    MarshArea,			// Marshland or swamp
+    SandArea,			// Sand-covered area
+    LavaArea,			// Lava-covered area
 
     // USGS Land Covers
     // These are low-priority, since known polygons should always win.
@@ -82,11 +89,8 @@ enum AreaType {
     BareTundraCover,		// Bare Ground Tundra
     SnowCover,			// Snow or Ice
 
-    MarshArea,			// this is put at the end because I'd
-				// rather have the USGS land cover data than
-				// large expansive marshes
 
-    IslandArea,			// any remaining land area not covered otherwise
+    IslandArea,			// any island area not covered otherwise
     DefaultArea,		// any land area not covered otherwise
 
     VoidArea,