Update/simplify for SimGear changes.

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

diff --git a/src/Scripting/NasalPositioned_cppbind.cxx b/src/Scripting/NasalPositioned_cppbind.cxx
index eb9a14158b88e3e79890d775187bbb0c25ea560e..8d51624a88ea46daed72e174daca23e53841fb9c 100644 (file)
--- a/src/Scripting/NasalPositioned_cppbind.cxx
+++ b/src/Scripting/NasalPositioned_cppbind.cxx
@@ -395,13 +395,10 @@ static naRef f_findWithinRange(nasal::CallContext ctx)
 {
   SGGeod pos = getPosition(ctx);
   double range_nm = ctx.requireArg<double>(0);
-  
-    FGPositioned::Type ty = FGPositioned::typeFromName(ctx.getArg<std::string>(1));
-    if (ty == FGPositioned::INVALID)
-        naRuntimeError(ctx.c, "invalid filter type specification");
+
+    std::string typeSpec = ctx.getArg<std::string>(1);
+    FGPositioned::TypeFilter filter(FGPositioned::TypeFilter::fromString(typeSpec));
     
-  FGPositioned::TypeFilter filter(ty);
-  
   FGPositionedList items = FGPositioned::findWithinRange(pos, range_nm, &filter);
   FGPositioned::sortByRange(items, pos);
   return ctx.to_nasal(items);
@@ -460,7 +457,7 @@ static naRef f_sortByRange(nasal::CallContext ctx)
 }
 
 //------------------------------------------------------------------------------
-naRef initNasalPositioned_cppbind(naRef globalsRef, naContext c, naRef gcSave)
+naRef initNasalPositioned_cppbind(naRef globalsRef, naContext c)
 {
   NasalPositioned::init("Positioned")
     .member("id", &FGPositioned::ident)