Whoops, work-around for #926 correctly.

[flightgear.git] / src / Navaids / positioned.cxx

diff --git a/src/Navaids/positioned.cxx b/src/Navaids/positioned.cxx
index 8c47ea46b06a311492bfa17f91c9a83576da8d8b..bced11728b6064a703689c3fb499dbddb75c5e30 100644 (file)
--- a/src/Navaids/positioned.cxx
+++ b/src/Navaids/positioned.cxx
@@ -33,8 +33,6 @@
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 
-#include <osg/Math> // for osg::isNaN
-
 #include <simgear/timing/timestamp.hxx>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/structure/exception.hxx>
@@ -48,8 +46,8 @@ using namespace flightgear;
 
 static void validateSGGeod(const SGGeod& geod)
 {
-  if (osg::isNaN(geod.getLatitudeDeg()) ||
-      osg::isNaN(geod.getLongitudeDeg()))
+  if (SGMisc<double>::isNaN(geod.getLatitudeDeg()) ||
+      SGMisc<double>::isNaN(geod.getLongitudeDeg()))
   {
     throw sg_range_exception("position is invalid, NaNs");
   }
@@ -133,7 +131,7 @@ FGPositioned::Type FGPositioned::typeFromName(const std::string& aName)
     }
   }
   
-  SG_LOG(SG_GENERAL, SG_WARN, "FGPositioned::typeFromName: couldn't match:" << aName);
+  SG_LOG(SG_NAVAID, SG_WARN, "FGPositioned::typeFromName: couldn't match:" << aName);
   return INVALID;
 }
 
@@ -143,7 +141,7 @@ const char* FGPositioned::nameForType(Type aTy)
  case RUNWAY: return "runway";
  case TAXIWAY: return "taxiway";
  case PAVEMENT: return "pavement";
- case PARK_STAND: return "parking stand";
+ case PARKING: return "parking stand";
  case FIX: return "fix";
  case VOR: return "VOR";
  case NDB: return "NDB";
@@ -166,6 +164,7 @@ const char* FGPositioned::nameForType(Type aTy)
  case FREQ_CLEARANCE: return "clearance";
  case FREQ_UNICOM: return "unicom";
  case FREQ_APP_DEP: return "approach-departure";
+ case TAXI_NODE: return "taxi-node";
  default:
   return "unknown";
  }