Added an urban area type.

diff --git a/Tools/Lib/Polygon/names.cxx b/Tools/Lib/Polygon/names.cxx
index de0f29e45f4735507416ff483774d7dd7bb32260..8534b0bdfe70123228351e458911af164e3d915f 100644 (file)
--- 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 0b7f96bea238527dd69a515e8aa4125b925ea52d..97071f5fdfb8038a38d9044ed674c9ccfba1f577 100644 (file)
--- 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