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