Merge branch 'topic/gcintersect' into next

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

diff --git a/src/Navaids/positioned.cxx b/src/Navaids/positioned.cxx
index 133dc7a4150c51bcb0d09b1cc36c981f3afe8ea3..d1e34373e0017c1e2d2cd9ab68192f9b264c67af 100644 (file)
--- a/src/Navaids/positioned.cxx
+++ b/src/Navaids/positioned.cxx
@@ -554,8 +554,14 @@ FGPositioned::findNextWithPartialId(FGPositionedRef aCur, const std::string& aId
       continue;
     }
     
-    if (aFilter && !aFilter->pass(candidate)) {
-      continue;
+    if (aFilter) {
+      if (aFilter->hasTypeRange() && !aFilter->passType(candidate->type())) {
+        continue;
+      }
+
+      if(!aFilter->pass(candidate)) {
+        continue;
+      }
     }
   
     if (!aCur) {