MapWidget: make use of the new POI system and display cities on the map.

[flightgear.git] / src / Navaids / markerbeacon.cxx

diff --git a/src/Navaids/markerbeacon.cxx b/src/Navaids/markerbeacon.cxx
index 9eaeff2cd27dac67395fa29fad514911f94fedbe..769eda40a0d6399632539f96b31586104a0708c9 100644 (file)
--- a/src/Navaids/markerbeacon.cxx
+++ b/src/Navaids/markerbeacon.cxx
@@ -24,45 +24,13 @@
   #include "config.h"
 #endif
 
-#include <simgear/structure/exception.hxx>
-#include <simgear/debug/logstream.hxx>
-
-#include "Navaids/markerbeacon.hxx"
-#include "Airports/runways.hxx"
-#include "Navaids/navdb.hxx"
+#include <Navaids/markerbeacon.hxx>
 
 using std::string;
 
-FGPositioned::Type
-FGMarkerBeacon::mapType(int aTy)
-{
-  switch (aTy) {
-  case 7: return FGPositioned::OM;
-  case 8: return FGPositioned::MM;
-  case 9: return FGPositioned::IM;
-  default:
-    throw sg_range_exception("Got a non-marker-beacon-type", 
-      "FGMarkerBeacon::mapType");
-  }
-}
-
-FGMarkerBeacon*
-FGMarkerBeacon::create(int aTy, const string& aName, const SGGeod& aPos)
-{
-  Type fgpTy = mapType(aTy);
-  FGRunway* runway = getRunwayFromName(aName);
-  SGGeod pos(aPos);
-  // fudge elevation to the runway elevation if it's not specified
-  if (fabs(pos.getElevationFt()) < 0.01) {
-    pos.setElevationFt(runway->elevation());
-  }
-  
-  return new FGMarkerBeacon(fgpTy, runway, pos);
-}
-
-
-FGMarkerBeacon::FGMarkerBeacon(Type aTy, FGRunway* aRunway, const SGGeod& aPos) :
-  FGPositioned(aTy, string(), aPos),
+FGMarkerBeaconRecord::FGMarkerBeaconRecord(PositionedID aGuid, Type aTy,
+                                           PositionedID aRunway, const SGGeod& aPos) :
+  FGPositioned(aGuid, aTy, string(), aPos),
   _runway(aRunway)
 {
 }