Additional checks, for waypoint role setting.

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

diff --git a/src/Navaids/waypoint.cxx b/src/Navaids/waypoint.cxx
index ede0f026d5d6ae8504a028a35d36f06117a1ba4d..5d2d761016148bde57b02a15e0be19c59f8dd347 100644 (file)
--- a/src/Navaids/waypoint.cxx
+++ b/src/Navaids/waypoint.cxx
@@ -25,7 +25,7 @@
 
 #include <simgear/structure/exception.hxx>
 
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/runways.hxx>
 
 using std::string;
@@ -38,9 +38,6 @@ BasicWaypt::BasicWaypt(const SGGeod& aPos, const string& aIdent, RouteBase* aOwn
   _pos(aPos),
   _ident(aIdent)
 {
-  if (aPos.getElevationFt() > -999.0) {
-    setAltitude(aPos.getElevationFt(), RESTRICT_AT);
-  }
 }
 
 BasicWaypt::BasicWaypt(RouteBase* aOwner) :
@@ -78,7 +75,7 @@ NavaidWaypoint::NavaidWaypoint(FGPositioned* aPos, RouteBase* aOwner) :
   _navaid(aPos)
 {
   if (aPos->type() == FGPositioned::RUNWAY) {
-      SG_LOG(SG_GENERAL, SG_WARN, "sure you don't want to be building a runway waypt here?");
+      SG_LOG(SG_NAVAID, SG_WARN, "sure you don't want to be building a runway waypt here?");
   }
 }