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

List:       flightgear-cvs
Subject:    [Flightgear-cvslogs] CVS: source/src/Airports dynamicloader.cxx, 1.7,
From:       Durk Talsma <durk () baron ! flightgear ! org>
Date:       2009-08-30 14:39:14
Message-ID: 200908301439.n7UEdECd000440 () baron ! flightgear ! org
[Download RAW message or body]

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

Modified Files:
	dynamicloader.cxx groundnetwork.cxx xmlloader.cxx 
Log Message:
Two minor (codewise) fixes to ensure everything works as advertised:
 - Make sure to initialize the groundnetwork after succesful loading.
 - Ensure that the AI groundnetwork code proximity detection code used the
   correct values for bearing. (Note that detecting the proximity of the
   user aircraft appears still to be broken. I'll look into that later).


Index: dynamicloader.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/Airports/dynamicloader.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dynamicloader.cxx	21 Aug 2009 14:42:50 -0000	1.7
+++ dynamicloader.cxx	30 Aug 2009 14:39:04 -0000	1.8
@@ -25,7 +25,7 @@
     XMLVisitor(), _dynamics(dyn) {}
 
 void  FGAirportDynamicsXMLLoader::startXML () {
-  //cout << "Start XML" << endl;
+  //cout << "FGAirportDynamicsLoader::Start XML" << endl;
 }
 
 void  FGAirportDynamicsXMLLoader::endXML () {

Index: groundnetwork.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/Airports/groundnetwork.cxx,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- groundnetwork.cxx	21 Aug 2009 14:42:51 -0000	1.28
+++ groundnetwork.cxx	30 Aug 2009 14:39:05 -0000	1.29
@@ -606,7 +606,7 @@
       
         SGGeod other(SGGeod::fromDegM(i->getLongitude(),
           i->getLatitude(), i->getAltitude()));
-        SGGeodesy::inverse(other, curr, course, az2, dist);
+        SGGeodesy::inverse(curr, other, course, az2, dist);
         bearing = fabs(heading-course);
    	    if (bearing > 180)
    	      bearing = 360-bearing;
@@ -626,7 +626,7 @@
 	      //cerr << "Comparing " << current->getId() << " and " << i->getId() << endl;
 	      SGGeod other(SGGeod::fromDegM(i->getLongitude(),
           i->getLatitude(), i->getAltitude()));
-        SGGeodesy::inverse(other, curr, course, az2, dist);
+        SGGeodesy::inverse(curr, other, course, az2, dist);
         bearing = fabs(heading-course);
 	      if (bearing > 180)
           bearing = 360-bearing;

Index: xmlloader.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/Airports/xmlloader.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xmlloader.cxx	29 Aug 2009 18:26:55 -0000	1.11
+++ xmlloader.cxx	30 Aug 2009 14:39:06 -0000	1.12
@@ -49,7 +49,9 @@
        }
    }
   } else {
-    loadAirportXMLDataIntoVisitor(d->getId(), "groundnet", visitor);
+    if(loadAirportXMLDataIntoVisitor(d->getId(), "groundnet", visitor)) {
+        d->init();
+    }
   }
 }
 


------------------------------------------------------------------------------
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]