Bugfix: Change the point where leg numbers recycle, in order to avoid hitting the...

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

diff --git a/src/Navaids/positioned.cxx b/src/Navaids/positioned.cxx
index 045839da3398229236db5bd3b3f83147730aabbd..7aa183eba02be4a831f782f39b433c4871b210fc 100644 (file)
--- a/src/Navaids/positioned.cxx
+++ b/src/Navaids/positioned.cxx
@@ -28,6 +28,7 @@
 #include <set>
 #include <algorithm> // for sort
 #include <queue>
+#include <memory>
 
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string/predicate.hpp>
@@ -840,7 +841,7 @@ FGPositioned::sortByRange(List& aResult, const SGGeod& aPos)
 
 FGPositioned::Filter* createSearchFilter(const SGPropertyNode* arg)
 {
-    string sty(arg->getStringValue("type", 0));
+    string sty(arg->getStringValue("type", "any"));
     FGPositioned::Type ty = FGPositioned::typeFromName(sty);
     double minRunwayLenFt = arg->getDoubleValue("min-runway-length-ft", -1.0);
     
@@ -860,7 +861,7 @@ FGPositioned::Filter* createSearchFilter(const SGPropertyNode* arg)
     return NULL;
 }
 
-SGGeod commandSearchPos(const SGPropertyNode* arg)
+static SGGeod commandSearchPos(const SGPropertyNode* arg)
 {
     if (arg->hasChild("longitude-deg") && arg->hasChild("latitude-deg")) {
         return SGGeod::fromDeg(arg->getDoubleValue("longitude-deg"),
@@ -931,7 +932,7 @@ bool commandFindByIdent(const SGPropertyNode* arg)
     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);
+        results = FGPositioned::findAllWithIdent(arg->getStringValue("ident"), filt.get(), exact);
     } else {
         SG_LOG(SG_GENERAL, SG_WARN, "commandFindByIdent: no search term defined");
         return false;