Merge branch 'master' into next

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

diff --git a/src/Navaids/positioned.hxx b/src/Navaids/positioned.hxx
index 1c275dcf4db30ddcefe52340fcd23d5247394dad..93e4f6bbfee60ddf4da6ad03c54377bd1cb9e016 100644 (file)
--- a/src/Navaids/positioned.hxx
+++ b/src/Navaids/positioned.hxx
@@ -41,6 +41,7 @@ public:
     SEAPORT,
     RUNWAY,
     TAXIWAY,
+    PAVEMENT,
     PARK_STAND,
     FIX,
     VOR,
@@ -113,6 +114,22 @@ public:
     virtual bool pass(FGPositioned* aPos) const
     { return true; }
     
+    virtual Type minType() const
+    { return INVALID; }
+    
+    virtual Type maxType() const
+    { return INVALID; }
+    
+    /**
+     * Test if this filter has a non-empty type range
+     */
+    bool hasTypeRange() const;
+    
+    /**
+     * Assuming hasTypeRange is true, test if a given type passes the range
+     */
+    bool passType(Type aTy) const;
+    
     bool operator()(FGPositioned* aPos) const
     { return pass(aPos); }
   };