Dynamically update "error" until the resulting tile data scales within

[flightgear.git] / Polygon / names.cxx

diff --git a/Polygon/names.cxx b/Polygon/names.cxx
index eabd8697efcd9beb2fb554d5457460f7219843c4..2633d19a6b39dd66a9d88d4afef136316058b28c 100644 (file)
--- a/Polygon/names.cxx
+++ b/Polygon/names.cxx
@@ -30,7 +30,9 @@
 
 // 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;
@@ -42,14 +44,16 @@ AreaType get_area_type( string area ) {
        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") ) {
        return IntLakeArea;
     } else if ( area == "Reservoir" ) {
        return ReservoirArea;
-    } else if ( area == "Reservoir   Intermittent" ) {
+    } else if ( (area == "Reservoir   Intermittent")
+               || (area == "IntermittentReservoir") ) {
        return IntReservoirArea;
     } else if ( area == "Stream" ) {
        return StreamArea;
@@ -74,7 +78,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";
@@ -110,6 +116,15 @@ string get_area_name( AreaType area ) {
 
 
 // $Log$
+// Revision 1.7  1999/04/01 13:52:13  curt
+// Version 0.6.0
+// Shape name tweak.
+// Removing tool: FixNode
+//
+// 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/