[prev in list] [next in list] [prev in thread] [next in thread] 

List:       flightgear-cvs
Subject:    [Flightgear-cvslogs] CVS: source/src/Navaids navrecord.cxx, 1.7,
From:       James Turner <jmt () baron ! flightgear ! org>
Date:       2009-08-30 17:14:02
Message-ID: 200908301714.n7UHE11i005184 () baron ! flightgear ! org
[Download RAW message or body]

Update of /var/cvs/FlightGear-0.9/source/src/Navaids
In directory baron.flightgear.org:/tmp/cvs-serv5176/src/Navaids

Modified Files:
	navrecord.cxx navrecord.hxx 
Log Message:
Add support for processing the ICAO.ils.xml scenery data into ILS/LOC nav records.


Index: navrecord.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/Navaids/navrecord.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- navrecord.cxx	11 Jun 2009 21:55:00 -0000	1.7
+++ navrecord.cxx	30 Aug 2009 17:13:53 -0000	1.8
@@ -27,13 +27,19 @@
 #include <istream>
 
 #include <simgear/misc/sgstream.hxx>
+#include <simgear/misc/sg_path.hxx>
 #include <simgear/structure/exception.hxx>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/sg_inlines.h>
+#include <simgear/props/props.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include <Navaids/navrecord.hxx>
 #include <Navaids/navdb.hxx>
 #include <Airports/runways.hxx>
+#include <Airports/simple.hxx>
+#include <Airports/xmlloader.hxx>
+
 #include <Main/fg_props.hxx>
 
 FGNavRecord::FGNavRecord(Type aTy, const std::string& aIdent, 
@@ -84,7 +90,12 @@
     return; // not airport-located
   }
   
-  mRunway = getRunwayFromName(_name);    
+  mRunway = getRunwayFromName(_name);  
+  
+  if (type() != GS) {
+    readAirportSceneryData();
+  }
+        
   // fudge elevation to the runway elevation if it's not specified
   if (fabs(elevation()) < 0.01) {
     mPosition.setElevationFt(mRunway->elevation());
@@ -106,6 +117,44 @@
   }
 }
 
+void FGNavRecord::readAirportSceneryData()
+{
+  // allow users to disable the scenery data in the short-term
+  // longer term, this option can probably disappear
+  if (!fgGetBool("/sim/use-scenery-airport-data")) {
+    return; 
+  }
+  
+  SGPath path;
+  SGPropertyNode_ptr rootNode = new SGPropertyNode;
+  if (!XMLLoader::findAirportData(mRunway->airport()->ident(), "ils", path)) {
+    return;
+  }
+  
+  readProperties(path.str(), rootNode);
+  SGPropertyNode* runwayNode, *ilsNode;
+  for (int i=0; (runwayNode = rootNode->getChild("runway", i)) != NULL; ++i) {
+    for (int j=0; (ilsNode = runwayNode->getChild("ils", j)) != NULL; ++j) {
+      if (ilsNode->getStringValue("nav-id") == ident()) {
+        processSceneryILS(ilsNode);
+        return;
+      }
+    } // of ILS iteration
+  } // of runway iteration
+}
+
+void FGNavRecord::processSceneryILS(SGPropertyNode* aILSNode)
+{
+  assert(aILSNode->getStringValue("rwy") == mRunway->ident());
+  double hdgDeg = aILSNode->getDoubleValue("hdg-deg"),
+    lon = aILSNode->getDoubleValue("lon"),
+    lat = aILSNode->getDoubleValue("lat"),
+    elevM = aILSNode->getDoubleValue("elev-m");
+    
+  mPosition = SGGeod::fromDegM(lon, lat, elevM);
+  multiuse = hdgDeg;
+}
+
 void FGNavRecord::alignLocaliserWithRunway(double aThreshold)
 {
 // find the distance from the threshold to the localizer

Index: navrecord.hxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/Navaids/navrecord.hxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- navrecord.hxx	11 Jun 2009 21:55:08 -0000	1.22
+++ navrecord.hxx	30 Aug 2009 17:13:54 -0000	1.23
@@ -43,6 +43,7 @@
 
 // forward decls
 class FGRunway;
+class SGPropertyNode;
 
 class FGNavRecord : public FGPositioned 
 {
@@ -65,6 +66,9 @@
   void initAirportRelation();
   
   void alignLocaliserWithRunway(double aThreshold);
+  
+  void readAirportSceneryData();
+  void processSceneryILS(SGPropertyNode* aILSNode);
 public:
   inline ~FGNavRecord(void) {}
 


------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Flightgear-cvslogs mailing list
Flightgear-cvslogs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-cvslogs
[prev in list] [next in list] [prev in thread] [next in thread]