Merge pull request #1810 from srcejon/fix_1805

Distinguish between China and Taiwan aircraft registrations in ADS-B Demod

sdrbase/util/osndb.cpp

@@ -457,11 +457,23 @@ QString AircraftInformation::getFlag() const
             {
                 // Try letters before '-'
                 prefix = m_registration.left(idx);
+                // Both China and Taiwan use B prefix. China regs are <= 4 digits, with Taiwan 5
+                if (prefix == "B")
+                {
+                    if (m_registration.size() >= 7) {
+                        flag = "taiwan";
+                    } else {
+                        flag = "china";
+                    }
+                }
+                else
+                {
                     if (m_prefixMap->contains(prefix)) {
                         flag = m_prefixMap->value(prefix);
                     }
                 }
             }
+        }
         else
         {
             // No '-' Could be one of a few countries or military.