Checkpoint - ground-net skips the cache

[flightgear.git] / src / Scripting / NasalPositioned.cxx

diff --git a/src/Scripting/NasalPositioned.cxx b/src/Scripting/NasalPositioned.cxx
index 9d1260bd36cb21c85776e828f73eb6889a7540cd..275929de2cf38b62204906126312eb08f861a062 100644 (file)
--- a/src/Scripting/NasalPositioned.cxx
+++ b/src/Scripting/NasalPositioned.cxx
@@ -443,6 +443,8 @@ static const char* waypointCommonGetMember(naContext c, Waypt* wpt, const char*
     } else {
       *out = stringToNasal(c, wpt->flag(WPT_OVERFLIGHT) ? "flyOver" : "flyBy");
     }
+  } else if (!strcmp(fieldName, "heading_course")) {
+      *out = naNum(wpt->headingRadialDeg());
   } else {
     return NULL; // member not found
   }
@@ -461,6 +463,10 @@ static void waypointCommonSetMember(naContext c, Waypt* wpt, const char* fieldNa
     }
     
     wpt->setFlag(f, true);
+  } else if (!strcmp(fieldName, "fly_type")) {
+      if (!naIsString(value)) naRuntimeError(c, "fly_type must be a string");
+      bool flyOver = (strcmp(naStr_data(value), "flyOver") == 0);
+      wpt->setFlag(WPT_OVERFLIGHT, flyOver);
   }
 }
 
@@ -567,6 +573,8 @@ static const char* flightplanGhostGetMember(naContext c, void* g, naRef field, n
   else if (!strcmp(fieldName, "star_trans")) *out = ghostForProcedure(c, fp->starTransition());
   else if (!strcmp(fieldName, "approach")) *out = ghostForProcedure(c, fp->approach());
   else if (!strcmp(fieldName, "current")) *out = naNum(fp->currentIndex());
+    else if (!strcmp(fieldName, "aircraftCategory")) *out = stringToNasal(c, fp->icaoAircraftCategory());
+    else if (!strcmp(fieldName, "followLegTrackToFix")) *out = naNum(fp->followLegTrackToFixes());
   else {
     return 0;
   }
@@ -689,6 +697,12 @@ static void flightplanGhostSetMember(naContext c, void* g, naRef field, naRef va
     }
     
     naRuntimeError(c, "bad argument type setting approach");
+  } else if (!strcmp(fieldName, "aircraftCategory")) {
+      if (!naIsString(value)) naRuntimeError(c, "aircraftCategory must be a string");
+      fp->setIcaoAircraftCategory(naStr_data(value));
+  } else if (!strcmp(fieldName, "followLegTrackToFix")) {
+      int b = (int) value.num;
+      fp->setFollowLegTrackToFixes(b);
   }
 }
 
@@ -1338,20 +1352,10 @@ static naRef f_airport_parking(naContext c, naRef me, int argc, naRef* args)
   }
   
   FGAirportDynamics* dynamics = apt->getDynamics();
-  PositionedIDVec parkings = flightgear::NavDataCache::instance()->airportItemsOfType(apt->guid(),
-                                                                                      FGPositioned::PARKING);
-  
-  BOOST_FOREACH(PositionedID parking, parkings) {
-    // filter out based on availability and type
-    if (onlyAvailable && !dynamics->isParkingAvailable(parking)) {
-      continue;
-    }
-    
-    FGParking* park = dynamics->getParking(parking);
-    if (!type.empty() && (park->getType() != type)) {
-      continue;
-    }
-    
+  FGParkingList parkings = dynamics->getParkings(onlyAvailable, type);
+  FGParkingList::const_iterator it;
+  for (it = parkings.begin(); it != parkings.end(); ++it) {
+    FGParkingRef park = *it;
     const SGGeod& parkLoc = park->geod();
     naRef ph = naNewHash(c);
     hashset(c, ph, "name", stringToNasal(c, park->getName()));
@@ -1793,6 +1797,11 @@ public:
   {
     callDelegateMethod("endOfFlightPlan");
   }
+
+  virtual void activated()
+  {
+    callDelegateMethod("activated");
+  }
 private:
   
   void callDelegateMethod(const char* method)
@@ -2406,7 +2415,6 @@ static naRef f_procedure_route(naContext c, naRef me, int argc, naRef* args)
     WayptVec r;
     Approach* app = (Approach*) proc;
     if (!app->route(iaf, r)) {
-      SG_LOG(SG_NASAL, SG_WARN, "procedure.route failed for Approach somehow");
       return naNil();
     }