Reserve a special FGPositionned type for pavements

diff --git a/src/Airports/pavement.cxx b/src/Airports/pavement.cxx
index e89d5ad92d928eeabd5f333231818c72e5485022..7e5f607636e4bfbfa0a2cae52a08a03f4231e777 100755 (executable)
--- a/src/Airports/pavement.cxx
+++ b/src/Airports/pavement.cxx
@@ -25,7 +25,7 @@
 #include "pavement.hxx"
 
 FGPavement::FGPavement(const std::string& aIdent, const SGGeod& aPos) :
-  FGPositioned(TAXIWAY, aIdent, aPos, false)
+  FGPositioned(PAVEMENT, aIdent, aPos, false)
 {
 }
 

diff --git a/src/Navaids/positioned.cxx b/src/Navaids/positioned.cxx
index 465bb5c187848ee611641570e0554d8ce95aa41f..f43e4b82f2eb9ced5192bf31837cbac1a3633f54 100644 (file)
--- a/src/Navaids/positioned.cxx
+++ b/src/Navaids/positioned.cxx
@@ -447,7 +447,7 @@ FGPositioned::FGPositioned(Type ty, const std::string& aIdent, const SGGeod& aPo
   SGReferenced::get(this); // hold an owning ref, for the moment
   
   if (aIndexed) {
-    assert(ty != TAXIWAY);
+    assert(ty != TAXIWAY && ty != PAVEMENT);
     addToIndices(this);
   }
 }
@@ -475,6 +475,7 @@ const char* FGPositioned::nameForType(Type aTy)
  switch (aTy) {
  case RUNWAY: return "runway";
  case TAXIWAY: return "taxiway";
+ case PAVEMENT: return "pavement";
  case PARK_STAND: return "parking stand";
  case FIX: return "fix";
  case VOR: return "VOR";

diff --git a/src/Navaids/positioned.hxx b/src/Navaids/positioned.hxx
index 088955fdca8c0c5a9586b63881e66346b83b238c..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,