Merge branch 'next' of gitorious.org:fg/flightgear into next

[flightgear.git] / src / Airports / parking.cxx

diff --git a/src/Airports/parking.cxx b/src/Airports/parking.cxx
index 4e4b36a00cfba5dccce000a780c6844dd21b8521..d1fb6512f5978c4d78c09b7a940807f76931beab 100644 (file)
--- a/src/Airports/parking.cxx
+++ b/src/Airports/parking.cxx
@@ -18,7 +18,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -26,73 +26,31 @@
 #  include <config.h>
 #endif
 
-//#include <algorithm>
-
 #include <simgear/compiler.h>
 
-//#include <plib/sg.h>
-//#include <plib/ul.h>
-
-//#include <Environment/environment_mgr.hxx>
-//#include <Environment/environment.hxx>
-//#include <simgear/misc/sg_path.hxx>
-//#include <simgear/props/props.hxx>
-//#include <simgear/structure/subsystem_mgr.hxx>
-//#include <simgear/debug/logstream.hxx>
-//#include <Main/globals.hxx>
-//#include <Main/fg_props.hxx>
-//#include <Airports/runways.hxx>
-
-#include STL_STRING
+#include <string>
 
 #include "parking.hxx"
-
-
-/*****************************************************************************
- * Helper function for parsing position string
- ****************************************************************************/
-double processPosition(const string &pos)
-{
-  string prefix;
-  string subs;
-  string degree;
-  string decimal;
-  int sign = 1;
-  double value;
-  subs = pos;
-  prefix= subs.substr(0,1);
-  if (prefix == string("S") || (prefix == string("W")))
-    sign = -1;
-  subs    = subs.substr(1, subs.length());
-  degree  = subs.substr(0, subs.find(" ",0));
-  decimal = subs.substr(subs.find(" ",0), subs.length());
-  
-             
-  //cerr << sign << " "<< degree << " " << decimal << endl;
-  value = sign * (atof(degree.c_str()) + atof(decimal.c_str())/60.0);
-  //cerr << value <<endl;
-  //exit(1);
-  return value;
-}
-
+#include "groundnetwork.hxx"
 
 /*********************************************************************************
  * FGParking
  ********************************************************************************/
-FGParking::FGParking(double lat,
-                    double lon,
-                    double hdg,
-                    double rad,
-                    int idx,
-                    const string &name,
-                    const string &tpe,
-                    const string &codes)
-{
-  latitude     = lat;
-  longitude    = lon;
-  heading      = hdg;
-  parkingName  = name;
-  index        = idx;
-  type         = tpe;
-  airlineCodes = codes;
+// FGParking::FGParking(double lat,
+//                  double lon,
+//                  double hdg,
+//                  double rad,
+//                  int idx,
+//                  const string &name,
+//                  const string &tpe,
+//                  const string &codes)
+//   : FGTaxiNode(lat,lon,idx)
+// {
+//   heading      = hdg;
+//   parkingName  = name;
+//   type         = tpe;
+//   airlineCodes = codes;
+// }
+FGParking::~FGParking() {
+     delete pushBackRoute; 
 }