From 1e606bc1830e216b1a5ab176d14b9502907cbfd0 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Sat, 12 Jun 1999 14:13:01 +0000
Subject: [PATCH] Tweaked the polygon type prioritization scheme just a bit.
 Fixed a bug (dumb test idea) that was throwing away ocean areas.

---
 Tools/Construct/Clipper/clipper.cxx | 9 ++++++---
 Tools/Lib/Polygon/names.hxx         | 8 ++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Tools/Construct/Clipper/clipper.cxx b/Tools/Construct/Clipper/clipper.cxx
index fc8ae0f5b..6f51394dc 100644
--- a/Tools/Construct/Clipper/clipper.cxx
+++ b/Tools/Construct/Clipper/clipper.cxx
@@ -135,9 +135,12 @@ bool FGClipper::load_polys(const string& path) {
     }
 
     int area = (int)poly_type;
-    if ( area == OceanArea ) {
-	// TEST - Ignore
-    } else if ( area < FG_MAX_AREA_TYPES ) {
+
+    // if ( area == OceanArea ) {
+    // TEST - Ignore
+    // } else 
+
+    if ( area < FG_MAX_AREA_TYPES ) {
 	polys_in.polys[area].push_back(poly);
     } else {
 	FG_LOG( FG_CLIPPER, FG_ALERT, "Polygon type out of range = " 
diff --git a/Tools/Lib/Polygon/names.hxx b/Tools/Lib/Polygon/names.hxx
index 97071f5fd..6c97c13ff 100644
--- a/Tools/Lib/Polygon/names.hxx
+++ b/Tools/Lib/Polygon/names.hxx
@@ -47,10 +47,10 @@ enum AreaType {
     StreamArea        = 8,
     CanalArea         = 9,
     GlacierArea       = 10,
-    UrbanArea         = 11,
-    MarshArea         = 12,
-    DefaultArea       = 13,
-    OceanArea         = 14,
+    OceanArea         = 11,
+    UrbanArea         = 12,
+    MarshArea         = 13,
+    DefaultArea       = 14,
     VoidArea          = 9997,
     NullArea          = 9998,
     UnknownArea       = 9999