Version 0.6.0

[flightgear.git] / Polygon / names.hxx

diff --git a/Polygon/names.hxx b/Polygon/names.hxx
index 168df64d86c9a1b066d1337503a30020a4943b85..0a919a5ed8bbaa90393c8a82ace07aaf42efb999 100644 (file)
--- a/Polygon/names.hxx
+++ b/Polygon/names.hxx
@@ -26,42 +26,36 @@
 #define _NAMES_HXX
 
 
-// libgfc.a includes need this bit o' strangeness
-#if defined ( linux )
-#  define _LINUX_
-#endif
-#include <gfc/gadt_polygon.h>
-#include <gfc/gdbf.h>
-#undef E
-#undef DEG_TO_RAD
-#undef RAD_TO_DEG
+#include <Include/compiler.h>
+
+#include STL_STRING
+
+FG_USING_STD(string);
 
 
 // Posible shape file types.  Note the order of these is important and
 // defines the priority of these shapes if they should intersect.  The
 // smaller the number, the higher the priority.
 enum AreaType {
-    AirportKeepArea   = 0,
-    AirportIgnoreArea = 1,
-    OceanArea         = 2,
-    LakeArea          = 3,
-    DryLakeArea       = 4,
-    IntLakeArea       = 5,
-    ReservoirArea     = 6,
-    IntReservoirArea  = 7,
-    StreamArea        = 8,
-    CanalArea         = 9,
-    GlacierArea       = 10,
-    MarshArea         = 11,
+    DefaultArea       = 0,
+    AirportKeepArea   = 1,
+    AirportIgnoreArea = 2,
+    OceanArea         = 3,
+    LakeArea          = 4,
+    DryLakeArea       = 5,
+    IntLakeArea       = 6,
+    ReservoirArea     = 7,
+    IntReservoirArea  = 8,
+    StreamArea        = 9,
+    CanalArea         = 10,
+    GlacierArea       = 11,
+    MarshArea         = 12,
     VoidArea          = 9997,
     NullArea          = 9998,
     UnknownArea       = 9999
 };
 
 
-// return the type of the shapefile record
-AreaType get_shapefile_type(GDBFile *dbf, int rec);
-
 // return area type from text name
 AreaType get_area_type( string area );
 
@@ -73,6 +67,14 @@ string get_area_name( AreaType area );
 
 
 // $Log$
+// Revision 1.5  1999/03/27 05:31:25  curt
+// Make 0 the default area type since this corresponds well with the conventions
+//   used by the triangulator.
+//
+// Revision 1.4  1999/03/22 23:49:30  curt
+// Moved AreaType get_shapefile_type(GDBFile *dbf, int rec) to where it
+// belongs in ShapeFile/
+//
 // Revision 1.3  1999/03/01 15:35:53  curt
 // Generalized the routines a bit to make them more useful.
 //