fly/flightgear
1
0
Fork 0
Code Activity

Added an urban area type.

Browse source
This commit is contained in:
curt 1999-06-11 00:25:18 +00:00
parent c79bc6756a
commit ff154397f8
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Tools/Lib/Polygon/names.cxx
View file

@ -38,9 +38,6 @@ AreaType get_area_type( string area ) {
} else if ( (area == "Swamp or Marsh") } else if ( (area == "Swamp or Marsh")
|| (area == "Marsh") ) { || (area == "Marsh") ) {
return MarshArea; return MarshArea;
} else if ( (area == "Bay Estuary or Ocean")
|| (area == "Ocean") ) {
return OceanArea;
} else if ( area == "Lake" ) { } else if ( area == "Lake" ) {
return LakeArea; return LakeArea;
} else if ( (area == "Lake Dry") } else if ( (area == "Lake Dry")
@ -60,8 +57,13 @@ AreaType get_area_type( string area ) {
return CanalArea; return CanalArea;
} else if ( area == "Glacier" ) { } else if ( area == "Glacier" ) {
return GlacierArea; return GlacierArea;
} else if ( area == "Urban" ) {
return UrbanArea;
} else if ( area == "Default" ) { } else if ( area == "Default" ) {
return DefaultArea; return DefaultArea;
} else if ( (area == "Bay Estuary or Ocean")
|| (area == "Ocean") ) {
return OceanArea;
} else if ( area == "Void Area" ) { } else if ( area == "Void Area" ) {
return VoidArea; return VoidArea;
} else if ( area == "Null" ) { } else if ( area == "Null" ) {
@ -87,8 +89,6 @@ string get_area_name( AreaType area ) {
return "AirportIgnore"; return "AirportIgnore";
} else if ( area == MarshArea ) { } else if ( area == MarshArea ) {
return "Marsh"; return "Marsh";
} else if ( area == OceanArea ) {
return "Ocean";
} else if ( area == LakeArea ) { } else if ( area == LakeArea ) {
return "Lake"; return "Lake";
} else if ( area == DryLakeArea ) { } else if ( area == DryLakeArea ) {
@ -105,6 +105,10 @@ string get_area_name( AreaType area ) {
return "Canal"; return "Canal";
} else if ( area == GlacierArea ) { } else if ( area == GlacierArea ) {
return "Glacier"; return "Glacier";
} else if ( area == UrbanArea ) {
return "Urban";
} else if ( area == OceanArea ) {
return "Ocean";
} else if ( area == VoidArea ) { } else if ( area == VoidArea ) {
return "VoidArea"; return "VoidArea";
} else if ( area == NullArea ) { } else if ( area == NullArea ) {

7
Tools/Lib/Polygon/names.hxx
View file

@ -47,9 +47,10 @@ enum AreaType {
StreamArea = 8, StreamArea = 8,
CanalArea = 9, CanalArea = 9,
GlacierArea = 10, GlacierArea = 10,
MarshArea = 11, UrbanArea = 11,
DefaultArea = 12, MarshArea = 12,
OceanArea = 13, DefaultArea = 13,
OceanArea = 14,
VoidArea = 9997, VoidArea = 9997,
NullArea = 9998, NullArea = 9998,
UnknownArea = 9999 UnknownArea = 9999