From d0308be073e40844763a45cb6b28fd98b964c231 Mon Sep 17 00:00:00 2001
From: mfranz <mfranz>
Date: Fri, 5 Oct 2007 22:15:55 +0000
Subject: [PATCH] use airport search filter to only search for "regular"
 airports (no seaports or heliports, as they aren't rendered at the moment,
 anyway). This shall later be made configurable via argument.

---
 src/Scripting/NasalSys.cxx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Scripting/NasalSys.cxx b/src/Scripting/NasalSys.cxx
index 423935d34..c2d6d4295 100644
--- a/src/Scripting/NasalSys.cxx
+++ b/src/Scripting/NasalSys.cxx
@@ -483,6 +483,11 @@ static naRef f_geodinfo(naContext c, naRef me, int argc, naRef* args)
 #undef HASHSET
 }
 
+
+class airport_filter : public FGAirportSearchFilter {
+    virtual bool acceptable(FGAirport *a) { return a->isAirport(); }
+} airport;
+
 // Returns airport data for given airport id ("KSFO"), or for the airport
 // nearest to a given lat/lon pair, or without arguments, to the current
 // aircraft position. Returns nil on error. Only one side of each runway is
@@ -496,11 +501,11 @@ static naRef f_airportinfo(naContext c, naRef me, int argc, naRef* args)
     FGAirportList *aptlst = globals->get_airports();
     FGAirport *apt;
     if(argc == 0)
-        apt = aptlst->search(lon->getDoubleValue(), lat->getDoubleValue());
+        apt = aptlst->search(lon->getDoubleValue(), lat->getDoubleValue(), airport);
     else if(argc == 1 && naIsString(args[0]))
         apt = aptlst->search(naStr_data(args[0]));
     else if(argc == 2 && naIsNum(args[0]) && naIsNum(args[1]))
-        apt = aptlst->search(args[1].num, args[0].num);
+        apt = aptlst->search(args[1].num, args[0].num, airport);
     else {
         naRuntimeError(c, "airportinfo() with invalid function arguments");
         return naNil();
@@ -520,7 +525,7 @@ static naRef f_airportinfo(naContext c, naRef me, int argc, naRef* args)
     if(rwylst->search(id, &rwy)) {
         do {
             if(rwy._id != id) break;
-            if(rwy._type != "runway") continue;
+            if(rwy._type[0] != 'r') continue;
 
             naRef rwydata = naNewHash(c);
 #define HASHSET(s,l,n) naHash_set(rwydata, naStr_fromdata(naNewString(c),s,l),n)
-- 
2.39.2