Make 0 the default area type since this corresponds well with the conventions

[flightgear.git] / Polygon / names.cxx

diff --git a/Polygon/names.cxx b/Polygon/names.cxx
index 6d94f88c1b5b0842961e33a15d3f325fdb107a34..d3d190612553b766a61822e2f2a70111dd5f34f2 100644 (file)
--- a/Polygon/names.cxx
+++ b/Polygon/names.cxx
@@ -28,61 +28,24 @@
 #include "names.hxx"
 
 
-// return the type of the shapefile record
-AreaType get_shapefile_type(GDBFile *dbf, int rec) {
-    GDBFieldDesc *fdesc[128];  // 128 is an arbitrary number here
-    GDBFValue *fields;         //an array of field values
-    char* dbf_rec;             //a record containing all the fields
-
-    // grab the meta-information for all the fields
-    // this applies to all the records in the DBF file.
-    // for ( int i = 0; i < dbf->numFields(); i++ ) {
-    //   fdesc[i] = dbf->getFieldDesc(i);
-    //   cout << i << ") " << fdesc[i]->name << endl;
-    // }
-
-    // this is the whole name record
-    dbf_rec = dbf->getRecord( rec );
-
-    // parse it into individual fields
-    if ( dbf_rec ) {
-       fields = dbf->recordDeform( dbf_rec );
-    } else {
-       return UnknownArea;
-    }
-
-    string area = fields[4].str_v;
-    // strip leading spaces
-    while ( area[0] == ' ' ) {
-       area = area.substr(1, area.length() - 1);
-    }
-    // strip trailing spaces
-    while ( area[area.length() - 1] == ' ' ) {
-       area = area.substr(0, area.length() - 1);
-    }
-    // strip other junk encountered
-    while ( (int)area[area.length() - 1] == 9 ) {
-       area = area.substr(0, area.length() - 1);
-    }
-
-    return get_area_type( area );
-}
-
-
 // return area type from text name
 AreaType get_area_type( string area ) {
-    if ( area == "AirportKeep" ) {
+    if ( area == "Default" ) {
+       return DefaultArea;
+    } else if ( area == "AirportKeep" ) {
        return AirportKeepArea;
     } else if ( area == "AirportIgnore" ) {
        return AirportIgnoreArea;
     } else if ( (area == "Swamp or Marsh")
                || (area == "Marsh") ) {
        return MarshArea;
-    } else if ( area == "Bay  Estuary or Ocean" ) {
+    } else if ( (area == "Bay  Estuary or Ocean")
+                || (area == "Ocean") ) {
        return OceanArea;
     } else if ( area == "Lake" ) {
        return LakeArea;
-    } else if ( area == "Lake   Dry" ) {
+    } else if ( (area == "Lake   Dry")
+               || (area == "DryLake") ) {
        return DryLakeArea;
     } else if ( (area == "Lake   Intermittent")
                || (area == "IntermittentLake") ) {
@@ -114,7 +77,9 @@ AreaType get_area_type( string area ) {
 
 // return text from of area name
 string get_area_name( AreaType area ) {
-    if ( area == AirportKeepArea ) {
+    if ( area == DefaultArea ) {
+       return "Default";
+    } else if ( area == AirportKeepArea ) {
        return "AirportKeep";
     } else if ( area == AirportIgnoreArea ) {
        return "AirportIgnore";
@@ -150,6 +115,20 @@ string get_area_name( AreaType area ) {
 
 
 // $Log$
+// Revision 1.6  1999/03/27 05:31:24  curt
+// Make 0 the default area type since this corresponds well with the conventions
+//   used by the triangulator.
+//
+// Revision 1.5  1999/03/22 23:49:29  curt
+// Moved AreaType get_shapefile_type(GDBFile *dbf, int rec) to where it
+// belongs in ShapeFile/
+//
+// Revision 1.4  1999/03/13 18:47:04  curt
+// Removed an unused variable.
+//
+// Revision 1.3  1999/03/02 01:03:58  curt
+// Added more reverse lookup support.
+//
 // Revision 1.2  1999/03/01 15:35:52  curt
 // Generalized the routines a bit to make them more useful.
 //