From 60baa12c9d987db823fa5ba9d70b82b3bc916b0c Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Wed, 15 Aug 2018 18:21:07 +0200
Subject: [PATCH] Ref T298, better ICAO family resolution

B737/DLH searched but B738/DLH present (same family but not same ICAO)
---
 src/blackcore/aircraftmatcher.cpp             | 49 ++++++++++++++-----
 .../simulation/simulatedaircraft.cpp          |  7 +++
 src/blackmisc/simulation/simulatedaircraft.h  |  3 ++
 3 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/src/blackcore/aircraftmatcher.cpp b/src/blackcore/aircraftmatcher.cpp
index 6a6ad7324..bff6cad61 100644
--- a/src/blackcore/aircraftmatcher.cpp
+++ b/src/blackcore/aircraftmatcher.cpp
@@ -828,25 +828,48 @@ namespace BlackCore
         reduced = false;
         if (mode.testFlag(CAircraftMatcherSetup::ByIcaoOrderAirlineFirst))
         {
-            bool r;
-            CAircraftModelList models = ifPossibleReduceByAirline(remoteAircraft, inList, "Reduce by airline first.", r, log);
-            models = ifPossibleReduceByAircraftOrFamily(remoteAircraft, models, setup, "Reduce by aircraft ICAO second.", r, log);
-            reduced = r;
+            bool r1 = false;
+            bool r2 = false;
+            CAircraftModelList models = ifPossibleReduceByAirline(remoteAircraft, inList, "Reduce by airline first.", r1, log);
+            models = ifPossibleReduceByAircraftOrFamily(remoteAircraft, models, setup, "Reduce by aircraft ICAO second.", r2, log);
+            reduced = r1 || r2;
             if (reduced) { return models; }
         }
         else if (mode.testFlag(CAircraftMatcherSetup::ByIcaoData))
         {
-            bool r;
-            CAircraftModelList models = ifPossibleReduceByAircraftOrFamily(remoteAircraft, inList, setup, "Reduce by aircraft ICAO first.", r, log);
-            models = ifPossibleReduceByAirline(remoteAircraft, models, "Reduce by airline second.", r, log);
-            reduced = r;
-            if (reduced) { return models; }
-        }
-        else
-        {
-            if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "No reduction by ICAO data", getLogCategories()); }
+            bool r1 = false;
+            bool r2 = false;
+            CAircraftModelList models = ifPossibleReduceByAircraftOrFamily(remoteAircraft, inList, setup, "Reduce by aircraft ICAO first.", r1, log);
+            models = ifPossibleReduceByAirline(remoteAircraft, models, "Reduce aircraft ICAO by airline second.", r2, log);
+
+            // not finding anything so far means we have no valid aircraft/airline ICAO combination
+            // but it can happen we found B738, and for DLH there is no B738 but B737, so we search again
+            if (!r2 && mode.testFlag(CAircraftMatcherSetup::ByFamily))
+            {
+                if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, QStringLiteral("No exact ICAO match of '") % remoteAircraft.getAirlineAndAircraftIcaoCodeDesignators() % QStringLiteral("', will try family combination"), getLogCategories()); }
+
+                bool r3 = false;
+                CAircraftModelList models2nd = ifPossibleReduceByFamily(remoteAircraft, inList, r3, log);
+                models2nd = ifPossibleReduceByAirline(remoteAircraft, models2nd, "Reduce family by airline second.", r3, log);
+                if (r3)
+                {
+                    // we found family / airline combination
+                    if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, QStringLiteral("Found aircraft family/airline '") % QStringLiteral("'combination"), getLogCategories()); }
+                    return models;
+                }
+            }
+
+            if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, QStringLiteral("Found aircraft family/airline '") % remoteAircraft.getAircraftIcaoCode().getFamily() % QStringLiteral("/") % remoteAircraft.getAirlineIcaoCodeDesignator() % QStringLiteral("'combination"), getLogCategories()); }
+
+            reduced = r1 || r2;
+            if (reduced)
+            {
+                if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, QStringLiteral("Reduced by aircraft ICAO: ") % boolToYesNo(r1) % QStringLiteral(" airline: ") % boolToYesNo(r2), getLogCategories()); }
+                return models;
+            }
         }
 
+        if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "No reduction by ICAO data", getLogCategories()); }
         return inList;
     }
 
diff --git a/src/blackmisc/simulation/simulatedaircraft.cpp b/src/blackmisc/simulation/simulatedaircraft.cpp
index 3cf8b7d3e..dba8a958d 100644
--- a/src/blackmisc/simulation/simulatedaircraft.cpp
+++ b/src/blackmisc/simulation/simulatedaircraft.cpp
@@ -141,6 +141,13 @@ namespace BlackMisc
             return getAircraftIcaoCode().getDesignator();
         }
 
+        QString CSimulatedAircraft::getAirlineAndAircraftIcaoCodeDesignators() const
+        {
+            if (this->hasAircraftAndAirlineDesignator()) { return this->getAircraftIcaoCodeDesignator() % QStringLiteral("/") % this->getAirlineIcaoCodeDesignator(); }
+            if (this->hasAirlineDesignator()) { return this->getAirlineIcaoCodeDesignator(); }
+            return this->getAircraftIcaoCodeDesignator();
+        }
+
         const QString &CSimulatedAircraft::getAircraftIcaoCombinedType() const
         {
             return getAircraftIcaoCode().getCombinedType();
diff --git a/src/blackmisc/simulation/simulatedaircraft.h b/src/blackmisc/simulation/simulatedaircraft.h
index 3524cdd9a..8ec3ff019 100644
--- a/src/blackmisc/simulation/simulatedaircraft.h
+++ b/src/blackmisc/simulation/simulatedaircraft.h
@@ -131,6 +131,9 @@ namespace BlackMisc
             //! Aircraft ICAO code designator
             const QString &getAircraftIcaoCodeDesignator() const;
 
+            //! Aircraft and Airline ICAO code designators
+            QString getAirlineAndAircraftIcaoCodeDesignators() const;
+
             //! Aircraft ICAO combined code
             const QString &getAircraftIcaoCombinedType() const;