From b4e17ed0917197a6e3b9ecc239185b2fcb15f040 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Mon, 3 Sep 2018 13:37:01 +0200
Subject: [PATCH] Ref T322, renamings

---
 src/blackcore/airspacemonitor.cpp                      | 2 +-
 src/blackmisc/geo/geoobjectlist.cpp                    | 6 +++---
 src/blackmisc/geo/geoobjectlist.h                      | 7 ++++---
 src/blackmisc/simulation/airspaceaircraftsnapshot.cpp  | 2 +-
 src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp
index a9e54c230..2c9b4ab30 100644
--- a/src/blackcore/airspacemonitor.cpp
+++ b/src/blackcore/airspacemonitor.cpp
@@ -263,7 +263,7 @@ namespace BlackCore
         CAtcStation station;
         CAtcStationList stations = m_atcStationsOnline.findIfComUnitTunedIn25KHz(comSystem);
         if (stations.isEmpty()) { return station; }
-        stations.sortByDistanceToOwnAircraft();
+        stations.sortByDistanceToReferencePosition();
         return stations.front();
     }
 
diff --git a/src/blackmisc/geo/geoobjectlist.cpp b/src/blackmisc/geo/geoobjectlist.cpp
index 01060f2e7..4ce478087 100644
--- a/src/blackmisc/geo/geoobjectlist.cpp
+++ b/src/blackmisc/geo/geoobjectlist.cpp
@@ -221,13 +221,13 @@ namespace BlackMisc
         }
 
         template <class OBJ, class CONTAINER>
-        void IGeoObjectWithRelativePositionList<OBJ, CONTAINER>::sortByDistanceToOwnAircraft()
+        void IGeoObjectWithRelativePositionList<OBJ, CONTAINER>::sortByDistanceToReferencePosition()
         {
             this->container().sort([ & ](const OBJ & a, const OBJ & b) { return a.getRelativeDistance() < b.getRelativeDistance(); });
         }
 
         template <class OBJ, class CONTAINER>
-        void IGeoObjectWithRelativePositionList<OBJ, CONTAINER>::partiallySortByDistanceToOwnAircraft(int number)
+        void IGeoObjectWithRelativePositionList<OBJ, CONTAINER>::partiallySortByDistanceToReferencePosition(int number)
         {
             this->container().partiallySort(number, [ & ](const OBJ & a, const OBJ & b) { return a.getRelativeDistance() < b.getRelativeDistance(); });
         }
@@ -238,7 +238,7 @@ namespace BlackMisc
             if (number < 1) { return CONTAINER(); }
             if (this->container().size() >= number) { return (this->container()); }
             CONTAINER closest(this->container());
-            closest.partiallySortByDistanceToOwnAircraft(number);
+            closest.partiallySortByDistanceToReferencePosition(number);
             Q_ASSERT_X(closest.size() <= number, Q_FUNC_INFO, "size exceeded");
             return closest;
         }
diff --git a/src/blackmisc/geo/geoobjectlist.h b/src/blackmisc/geo/geoobjectlist.h
index f44369416..7d17a3d39 100644
--- a/src/blackmisc/geo/geoobjectlist.h
+++ b/src/blackmisc/geo/geoobjectlist.h
@@ -127,11 +127,12 @@ namespace BlackMisc
             //! Calculate distances, then sort by range
             void sortByRange(const ICoordinateGeodetic &position, bool updateValues);
 
-            //! If distance is already set, just sort
-            void sortByDistanceToOwnAircraft();
+            //! If distance is already set, just sort container
+            //! \remark requires calculcateAndUpdateRelativeDistanceAndBearing
+            void sortByDistanceToReferencePosition();
 
             //! Sort the first n closest objects
-            void partiallySortByDistanceToOwnAircraft(int number);
+            void partiallySortByDistanceToReferencePosition(int number);
 
             //! Get n closest objects
             CONTAINER getClosestObjects(int number) const;
diff --git a/src/blackmisc/simulation/airspaceaircraftsnapshot.cpp b/src/blackmisc/simulation/airspaceaircraftsnapshot.cpp
index 89ea20d11..4b204f9e1 100644
--- a/src/blackmisc/simulation/airspaceaircraftsnapshot.cpp
+++ b/src/blackmisc/simulation/airspaceaircraftsnapshot.cpp
@@ -36,7 +36,7 @@ namespace BlackMisc
             if (allAircraft.isEmpty()) { return; }
 
             CSimulatedAircraftList aircraft(allAircraft);
-            aircraft.sortByDistanceToOwnAircraft();
+            aircraft.sortByDistanceToReferencePosition();
             int numberAll = aircraft.size();
             Q_ASSERT_X(numberAll == allAircraft.size(), Q_FUNC_INFO, "aircraft got lost");
             CSimulatedAircraftList vtolAircraft(aircraft.findByVtol(true));
diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
index 9a52fbe97..d154bbc3f 100644
--- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
+++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
@@ -1547,7 +1547,7 @@ namespace BlackSimPlugin
                 m_airportsInRangeFromSimulator.replaceOrAddByIcao(consolidatedAirport);
                 if (m_airportsInRangeFromSimulator.size() > this->maxAirportsInRange())
                 {
-                    m_airportsInRangeFromSimulator.sortByDistanceToOwnAircraft();
+                    m_airportsInRangeFromSimulator.sortByDistanceToReferencePosition();
                     m_airportsInRangeFromSimulator.truncate(this->maxAirportsInRange());
                 }
             }