Traffic improvements.

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

diff --git a/src/Navaids/navrecord.cxx b/src/Navaids/navrecord.cxx
index 8c01c6a1025a5535c21ce23c0e2abf03fa25940d..c73e04b8fcb6a93ea1be64e40a9b849e1833d195 100644 (file)
--- a/src/Navaids/navrecord.cxx
+++ b/src/Navaids/navrecord.cxx
@@ -39,121 +39,25 @@
 #include <Airports/runways.hxx>
 #include <Airports/simple.hxx>
 #include <Airports/xmlloader.hxx>
-
 #include <Main/fg_props.hxx>
-#include <Navaids/PositionedBinding.hxx>
+#include <Navaids/NavDataCache.hxx>
 
-FGNavRecord::FGNavRecord(Type aTy, const std::string& aIdent, 
+FGNavRecord::FGNavRecord(PositionedID aGuid, Type aTy, const std::string& aIdent,
   const std::string& aName, const SGGeod& aPos,
-  int aFreq, int aRange, double aMultiuse) :
-  FGPositioned(aTy, aIdent, aPos),
+  int aFreq, int aRange, double aMultiuse, PositionedID aRunway) :
+  FGPositioned(aGuid, aTy, aIdent, aPos),
   freq(aFreq),
   range(aRange),
   multiuse(aMultiuse),
-  _name(aName),
-  mRunway(NULL),
-  serviceable(true),
-  trans_ident(aIdent)
+  mName(aName),
+  mRunway(aRunway),
+  serviceable(true)
 { 
-  initAirportRelation();
-
-  // Ranges are included with the latest data format, no need to
-  // assign our own defaults, unless the range is not set for some
-  // reason.
-  if (range < 0.1) {
-    SG_LOG(SG_GENERAL, SG_DEBUG, "navaid " << ident() << " has no range set, using defaults");
-    switch (type()) {
-    case NDB:
-    case VOR:
-      range = FG_NAV_DEFAULT_RANGE;
-      break;
-    
-    case LOC:
-    case ILS:
-    case GS:
-      range = FG_LOC_DEFAULT_RANGE;
-      break;
-      
-    case DME:
-      range = FG_DME_DEFAULT_RANGE;
-      break;
-    
-    default:
-      range = FG_LOC_DEFAULT_RANGE;
-    }
-  }
-  
-  init(true); // init FGPositioned (now position is adjusted)
 }
 
-void FGNavRecord::initAirportRelation()
+FGRunway* FGNavRecord::runway() const
 {
-  if ((type() < ILS) || (type() > GS)) {
-    return; // not airport-located
-  }
-  
-  mRunway = getRunwayFromName(_name);  
-  if (!mRunway) {
-    return;
-  }
-  
-  if (type() != GS) {
-    SGPropertyNode* ilsData = ilsDataForRunwayAndNavaid(mRunway, ident());
-    if (ilsData) {
-      processSceneryILS(ilsData);
-    }
-  }
-        
-  // fudge elevation to the runway elevation if it's not specified
-  if (fabs(elevation()) < 0.01) {
-    mPosition.setElevationFt(mRunway->elevation());
-  }
-  
-  if (type() == ILS || type() == LOC) {
-    mRunway->setILS(this);
-  }
-  
-  // align localizers with their runway
-  if ((type() == ILS) || (type() == LOC)) {
-    if (!fgGetBool("/sim/navdb/localizers/auto-align", true)) {
-      return;
-    }
-    
-   double threshold 
-     = fgGetDouble( "/sim/navdb/localizers/auto-align-threshold-deg", 5.0 );
-    alignLocaliserWithRunway(threshold);
-  }
-}
-
-void FGNavRecord::processSceneryILS(SGPropertyNode* aILSNode)
-{
-  double hdgDeg = aILSNode->getDoubleValue("hdg-deg"),
-    lon = aILSNode->getDoubleValue("lon"),
-    lat = aILSNode->getDoubleValue("lat"),
-    elevM = aILSNode->getDoubleValue("elev-m");
-    
-  mPosition = SGGeod::fromDegM(lon, lat, elevM);
-  multiuse = hdgDeg;
-}
-
-void FGNavRecord::alignLocaliserWithRunway(double aThreshold)
-{
-// find the distance from the threshold to the localizer
-  double dist = SGGeodesy::distanceM(mPosition, mRunway->threshold());
-
-// back project that distance along the runway center line
-  SGGeod newPos = mRunway->pointOnCenterline(dist);
-
-  double hdg_diff = get_multiuse() - mRunway->headingDeg();
-  SG_NORMALIZE_RANGE(hdg_diff, -180.0, 180.0);
-
-  if ( fabs(hdg_diff) <= aThreshold ) {
-    mPosition = SGGeod::fromGeodFt(newPos, mPosition.getElevationFt());
-    set_multiuse( mRunway->headingDeg() );
-  } else {
-    SG_LOG(SG_GENERAL, SG_DEBUG, "localizer:" << ident() << ", aligning with runway " 
-      << mRunway->ident() << " exceeded heading threshold");
-  }
+  return (FGRunway*) flightgear::NavDataCache::instance()->loadById(mRunway);
 }
 
 double FGNavRecord::localizerWidth() const
@@ -162,9 +66,10 @@ double FGNavRecord::localizerWidth() const
     return 6.0;
   }
   
-  SGVec3d thresholdCart(SGVec3d::fromGeod(mRunway->threshold()));
+  FGRunway* rwy = runway();
+  SGVec3d thresholdCart(SGVec3d::fromGeod(rwy->threshold()));
   double axisLength = dist(cart(), thresholdCart);
-  double landingLength = dist(thresholdCart, SGVec3d::fromGeod(mRunway->end()));
+  double landingLength = dist(thresholdCart, SGVec3d::fromGeod(rwy->end()));
   
 // Reference: http://dcaa.slv.dk:8000/icaodocs/
 // ICAO standard width at threshold is 210 m = 689 feet = approx 700 feet.
@@ -188,13 +93,6 @@ double FGNavRecord::localizerWidth() const
 
 }
 
-flightgear::PositionedBinding*
-FGNavRecord::createBinding(SGPropertyNode* nd) const
-{
-    return new flightgear::NavaidBinding(this, nd);
-}
-
-
 FGTACANRecord::FGTACANRecord(void) :
     channel(""),
     freq(0)