From ff154397f89d769eb91650e33e38234f90b894d5 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Fri, 11 Jun 1999 00:25:18 +0000
Subject: [PATCH] Added an urban area type.

---
 Tools/Lib/Polygon/names.cxx | 14 +++++++++-----
 Tools/Lib/Polygon/names.hxx |  7 ++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Tools/Lib/Polygon/names.cxx b/Tools/Lib/Polygon/names.cxx
index de0f29e45..8534b0bdf 100644
--- a/Tools/Lib/Polygon/names.cxx
+++ b/Tools/Lib/Polygon/names.cxx
@@ -38,9 +38,6 @@ AreaType get_area_type( string area ) {
     } else if ( (area == "Swamp or Marsh")
 		|| (area == "Marsh") ) {
 	return MarshArea;
-    } else if ( (area == "Bay  Estuary or Ocean")
-                || (area == "Ocean") ) {
-	return OceanArea;
     } else if ( area == "Lake" ) {
 	return LakeArea;
     } else if ( (area == "Lake   Dry")
@@ -60,8 +57,13 @@ AreaType get_area_type( string area ) {
 	return CanalArea;
     } else if ( area == "Glacier" ) {
 	return GlacierArea;
+    } else if ( area == "Urban" ) {
+	return UrbanArea;
     } else if ( area == "Default" ) {
 	return DefaultArea;
+    } else if ( (area == "Bay  Estuary or Ocean")
+                || (area == "Ocean") ) {
+	return OceanArea;
     } else if ( area == "Void Area" ) {
 	return VoidArea;
     } else if ( area == "Null" ) {
@@ -87,8 +89,6 @@ string get_area_name( AreaType area ) {
 	return "AirportIgnore";
     } else if ( area == MarshArea ) {
 	return "Marsh";
-    } else if ( area == OceanArea ) {
-	return "Ocean";
     } else if ( area == LakeArea ) {
 	return "Lake";
     } else if ( area == DryLakeArea ) {
@@ -105,6 +105,10 @@ string get_area_name( AreaType area ) {
 	return "Canal";
     } else if ( area == GlacierArea ) {
 	return "Glacier";
+    } else if ( area == UrbanArea ) {
+	return "Urban";
+    } else if ( area == OceanArea ) {
+	return "Ocean";
     } else if ( area == VoidArea ) {
 	return "VoidArea";
     } else if ( area == NullArea ) {
diff --git a/Tools/Lib/Polygon/names.hxx b/Tools/Lib/Polygon/names.hxx
index 0b7f96bea..97071f5fd 100644
--- a/Tools/Lib/Polygon/names.hxx
+++ b/Tools/Lib/Polygon/names.hxx
@@ -47,9 +47,10 @@ enum AreaType {
     StreamArea        = 8,
     CanalArea         = 9,
     GlacierArea       = 10,
-    MarshArea         = 11,
-    DefaultArea       = 12,
-    OceanArea         = 13,
+    UrbanArea         = 11,
+    MarshArea         = 12,
+    DefaultArea       = 13,
+    OceanArea         = 14,
     VoidArea          = 9997,
     NullArea          = 9998,
     UnknownArea       = 9999
-- 
2.39.5