Prepare and implement reinit methods for instruments

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

diff --git a/src/Navaids/positioned.cxx b/src/Navaids/positioned.cxx
index 88613881bf96e88aa7b30f462488286cb69464d3..a3f93bf757bf95668e3cf39e6c2266cbf2374cd9 100644 (file)
--- a/src/Navaids/positioned.cxx
+++ b/src/Navaids/positioned.cxx
@@ -43,7 +43,6 @@
 #include <simgear/sg_inlines.h>
 #include <simgear/structure/commands.hxx>
 
-#include "PositionedBinding.hxx"
 #include "Airports/simple.hxx"
 #include "Main/fg_props.hxx"
 
@@ -629,6 +628,9 @@ FGPositioned::Type FGPositioned::typeFromName(const std::string& aName)
   const NameTypeEntry names[] = {
     {"airport", AIRPORT},
     {"vor", VOR},
+    {"loc", LOC},
+    {"ils", ILS},
+    {"gs", GS},
     {"ndb", NDB},
     {"wpt", WAYPOINT},
     {"fix", FIX},
@@ -698,12 +700,6 @@ const char* FGPositioned::nameForType(Type aTy)
  }
 }
 
-flightgear::PositionedBinding*
-FGPositioned::createBinding(SGPropertyNode* node) const
-{
-    return new flightgear::PositionedBinding(this, node);
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // search / query functions
 
@@ -839,138 +835,28 @@ FGPositioned::sortByRange(List& aResult, const SGGeod& aPos)
   }
 }
 
-FGPositioned::Filter* createSearchFilter(const SGPropertyNode* arg)
-{
-    string sty(arg->getStringValue("type", 0));
-    FGPositioned::Type ty = FGPositioned::typeFromName(sty);
-    double minRunwayLenFt = arg->getDoubleValue("min-runway-length-ft", -1.0);
-    
-    if ((ty == FGPositioned::AIRPORT) && (minRunwayLenFt > 0.0)) {
-        return new FGAirport::HardSurfaceFilter(minRunwayLenFt);
-    } else if (ty != FGPositioned::INVALID) {
-        FGPositioned::TypeFilter* tf = new FGPositioned::TypeFilter(ty);
-        
-        for (int t=1; arg->hasChild("type", t); ++t) {
-            sty = arg->getChild("type", t)->getStringValue();
-            tf->addType(FGPositioned::typeFromName(sty));
-        }
-        
-        return tf;
-    }
-    
-    return NULL;
-}
-
-static SGGeod commandSearchPos(const SGPropertyNode* arg)
-{
-    if (arg->hasChild("longitude-deg") && arg->hasChild("latitude-deg")) {
-        return SGGeod::fromDeg(arg->getDoubleValue("longitude-deg"),
-            arg->getDoubleValue("latitude-deg"));
-    }
-    
-    // use current viewer/aircraft position
-    return SGGeod::fromDeg(fgGetDouble("/position/longitude-deg"), 
-            fgGetDouble("/position/latitude-deg"));
-}
-
-void commandClearExisting(const SGPropertyNode* arg)
-{
-    if (arg->getBoolValue("clear", true)) {
-    // delete all existing result children from their parent
-        string resultPath = arg->getStringValue("results");
-        SGPropertyNode* n = fgGetNode(resultPath.c_str(), 0, true);
-        SGPropertyNode* pr = n->getParent();
-        pr->removeChildren(n->getName(), false /* keep=false, i.e delete nodes */);
-    }
-}
-
-bool commandFindClosest(const SGPropertyNode* arg)
-{
-    int n = arg->getIntValue("max-results", 1);
-    if ((n < 1) || (n > 100)) {
-        SG_LOG(SG_GENERAL, SG_WARN, "commandFindClosest: max-results invalid:" << n);
-        return false;
-    }
-    
-    string resultPath = arg->getStringValue("results");
-    if (resultPath.empty()) {
-        SG_LOG(SG_GENERAL, SG_WARN, "commandFindClosest: no results path defined");
-        return false;
-    }
-
-    std::auto_ptr<FGPositioned::Filter> filt(createSearchFilter(arg));    
-// cap search range, since huge ranges will overload everything
-    double cutoff = arg->getDoubleValue("cutoff-nm", 400.0);
-    SG_CLAMP_RANGE(cutoff, 0.0, 1000.0);
-    
-    SGGeod pos = commandSearchPos(arg);
-    commandClearExisting(arg);
-    
-    FGPositioned::List results = FGPositioned::findClosestN(pos, n, cutoff, filt.get());
-    for (unsigned int i=0; i<results.size(); ++i) {
-       SGPropertyNode* resultsNode = fgGetNode(resultPath.c_str(), i, true);
-       flightgear::PositionedBinding::bind(results[i], resultsNode);
-    }
-    
-    return true;
-}
-
-bool commandFindByIdent(const SGPropertyNode* arg)
-{
-    string resultPath = arg->getStringValue("results");
-    if (resultPath.empty()) {
-        SG_LOG(SG_GENERAL, SG_WARN, "commandFindByIdent: no results path defined");
-        return false;
-    }
-    
-    std::auto_ptr<FGPositioned::Filter> filt(createSearchFilter(arg));    
-    SGGeod pos = commandSearchPos(arg);
-    commandClearExisting(arg);
-    
-    FGPositioned::List results;
-    bool exact = arg->getBoolValue("exact", true);
-    if (arg->hasChild("name")) {
-        results = FGPositioned::findAllWithName(arg->getStringValue("name"), filt.get(), exact);
-    } else if (arg->hasChild("ident")) {
-        results = FGPositioned::findAllWithName(arg->getStringValue("ident"), filt.get(), exact);
-    } else {
-        SG_LOG(SG_GENERAL, SG_WARN, "commandFindByIdent: no search term defined");
-        return false;
-    }
-    
-    bool orderByRange = arg->getBoolValue("order-by-distance", true);
-    if (orderByRange) {
-        FGPositioned::sortByRange(results, pos);
-    }
-      
-    for (unsigned int i=0; i<results.size(); ++i) {
-       SGPropertyNode* resultsNode = fgGetNode(resultPath.c_str(), i, true);
-       flightgear::PositionedBinding::bind(results[i], resultsNode);
-    }
-      
-    return true;
-}
-
-void
-FGPositioned::installCommands()
-{
-    SGCommandMgr::instance()->addCommand("find-nearest", commandFindClosest);
-    SGCommandMgr::instance()->addCommand("find-by-ident", commandFindByIdent);
-}
-
 FGPositioned::TypeFilter::TypeFilter(Type aTy)
 {
-    types.push_back(aTy);
+  addType(aTy);
 }
 
 void FGPositioned::TypeFilter::addType(Type aTy)
 {
-    types.push_back(aTy);
+  if (aTy == INVALID) {
+    return;
+    
+  }
+  
+  types.push_back(aTy);
 }
 
 bool
 FGPositioned::TypeFilter::pass(FGPositioned* aPos) const
 {
+  if (types.empty()) {
+    return true;
+  }
+  
     std::vector<Type>::const_iterator it = types.begin(),
         end = types.end();
     for (; it != end; ++it) {