//
// 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$
#include <simgear/math/sg_geodesy.hxx>
#include "fixlist.hxx"
+SG_USING_STD(pair);
// Constructor
<< ", lat=" << fix.get_lat()
<< ", lon=" << fix.get_lon() << endl; */
- fixlist[fix.get_ident()] = fix;
+ fixlist.insert(pair<string, FGFix>(fix.get_ident(), fix));
in >> skipcomment;
}
return true;
// query the database for the specified fix, lon and lat are in
// degrees, elev is in meters
bool FGFixList::query( const string& ident, FGFix *fix ) {
- *fix = fixlist[ident];
- if ( ! fix->get_ident().empty() ) {
- return true;
+ fix_map_const_iterator it = fixlist.find(ident);
+ if ( it != fixlist.end() ) {
+ *fix = it->second;
+ return true;
} else {
return false;
}
double elev, FGFix *fix, double *heading,
double *dist )
{
- *fix = fixlist[ident];
- if ( fix->get_ident().empty() ) {
- return false;
+ pair<fix_map_const_iterator, fix_map_const_iterator> range = fixlist.equal_range(ident);
+
+ if (range.first == range.second) {
+ return false;
+ }
+
+ double min_s = -1.0;
+ for (fix_map_const_iterator current = range.first; current != range.second; ++current) {
+ double az1, az2, s;
+ geo_inverse_wgs_84( elev, lat, lon,
+ current->second.get_lat(), current->second.get_lon(),
+ &az1, &az2, &s );
+ // cout << " dist = " << s << endl;
+ if (min_s < 0 || s < min_s) {
+ *heading = az2;
+ *dist = s;
+ min_s = s;
+ *fix = current->second;
+ }
}
- double az1, az2, s;
- geo_inverse_wgs_84( elev, lat, lon,
- fix->get_lat(), fix->get_lon(),
- &az1, &az2, &s );
- // cout << " dist = " << s << endl;
- *heading = az2;
- *dist = s;
return true;
}