From f91cf3bbf3cbc1200099b1f646f08a10a61a96f6 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Thu, 25 Aug 2016 19:18:43 +0200
Subject: [PATCH] refs #734, added NAVY/MARINES as 2 letter codes * adjustement
 for 2 letter codes * icons

---
 resources/share/images/airlines/vm.png     | Bin 0 -> 956 bytes
 resources/share/images/airlines/vv.png     | Bin 0 -> 1022 bytes
 src/blackmisc/aviation/airlineicaocode.cpp |  11 +++++++++--
 src/blackmisc/aviation/airlineicaocode.h   |   3 +++
 4 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 resources/share/images/airlines/vm.png
 create mode 100644 resources/share/images/airlines/vv.png

diff --git a/resources/share/images/airlines/vm.png b/resources/share/images/airlines/vm.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8d9d48c88d16773e62221812b1ea8b362d38520
GIT binary patch
literal 956
zcmV;t14I0YP)<h;3K|Lk000e1NJLTq0015U000sQ0ssI2!;txo00006VoOIv0RI60
z0RN!9r;`8x193@2K~y-6tyN2J8&woOcYHk$KjQH#PVAI84UJ9R7Sx1Cc?c2Gs$B$V
zB^DIAL8TkI1&JTP7O7$bs<J^;rJ%AY2oMEVk<t_;N=azsq#-mxPHm4p&dk`JiN|;5
zvWN*OirpY_R_ESx&Zke`Irm&NE%w4Li~!Xs-Sk;NJVFmG!Mni)fZyIcS>v26%NfN|
zB7L)~to=XG%V9mcbg@V~BT(ql@!c>I6_K|eLL9Xb#0FRt^-MyoM$BprSSN>U(<X>8
zHe))Tkld*Sp9h#$<&JZ_*eWKoWbJVcTPT?0S<`W^W>!q<uCN1DAtoXf6CLcR#<wbO
zCrHS|p_}1Nf6Y^0dQ7TX@Te0<mIP&mdb*PJh-79rSh}+^?O1P`NvR2tc}58w3?tWw
z=IqOJLgMrvC9W(*dOOyNqT&3{tO=qs!;&LuF5Y@><dpaLlk=A*BJS|9+1c4l-g4Lr
zU4?3|EVL?b*#rQ%5erxeT$|$k&kq}(_b-p1XfP?S*PBYE>}jD;>D!pgwwaP9G{ZyW
zY<znl$6;ll(`Nf+ZP3ASyelO3o(KJBcWG3*|7%!QUmnjLq-+~zP3Yv8uX&F>AQ_98
znm-ieBx^6D=5KX(cSobqp2V5`{fu0c`wHc_!F5aj9uMRIEH)o)vyFQ`d=Gad%U`8!
zy%}&3YhfRL_pLjWL)jbTcct#}`PR#&A0`;)>$$_4u_MoYV=rMrtIiof|At18VF!Ig
zSu$?dw=(Yq!VT6)K9ZZCibp2CUoQNZo0%T`CVN=bcT`}{r+dX0kCH-3xt@ou39)q!
z>8HrbH2`%h^~B`eG=BP*1!?H$q%5N-yY9UjjG69M;x-BnCU{o4{>kRC37x-qM>zDk
zfAkf7Zmdxx0KoR(*z1SR#ezf=%2!L)V$}sGKrjG!hXnVL0mQQU%(9v;H<fi$S72D5
zx}=V)00_445LZeFzjGd}8c{R;;S@0j&DB-pRIu2yv8rSLpN*AyYBT(SBj$Y{wN!>@
zNd<R2%W2oXAX;76KSZ>U_T6Xdq|$8Z_VwgG;0m5Oj+j8l3-L<&r?rp98%2xZq4RV~
zJo&2osS(?#OCMjT7c%nYRcb?EG#>rnZ7%Uf{=%5h-&ntLMgBJX&$R6FD`;cbZ#e{N
e7BICQxc>`Tt#cH&VkI>I0000<MNUMnLSTXi9L4+q

literal 0
HcmV?d00001

diff --git a/resources/share/images/airlines/vv.png b/resources/share/images/airlines/vv.png
new file mode 100644
index 0000000000000000000000000000000000000000..83e72828a98c0e13f38229d0d1836d93b77be053
GIT binary patch
literal 1022
zcmV<a0|ESrP)<h;3K|Lk000e1NJLTq0015U000vR1^@s6hpxSR00006VoOIv0RI60
z0RN!9r;`8x1G7m)K~zYI#g*MpTV))_KTpqTIi=;LrL=T(K!NcxYr-sZ=#Uwc4PUY?
z#KfrCjhgJ%8@(_R^bc@e&BVnEy)z3&nPHnU=N95zvXRMq0T~GL-uARm3hn7B^}-8{
zY*53Dzsu+OKHpEizkHKN(9)6Ne;E1SKJeHDZO{6s@p_QO7PCtszPT~T*nH~00n3IA
z?Qb5%RZ@<(teE&v07s*bV$TN89Y0QBc!2g#uClg~ou45)nc$<hpXcc#N09UcMTte~
zd~R~X(}brcPz*Y?k2mny2WQANWoMa{>g=g{>KhJW-i&ej2{#oED+T!qc5?>b0XN1}
z8~{s!jgGS|j|Oa%;M9p@$XXJ~R){)1&g#k>*T<qPr>r=VLCkubbYzlDaFjz0eoF1T
z_jOlr)4_aX#Yjdr;7Y4ljS@wb4Jex-0)xZ+I2uOZm}aK?Q!v@UWa6df$94tpTCV!4
z{UD5}-@lLIwWAa_(tG&|Mxeg2iE=r{y@6|Nh9zXX2Y||QH!!-l#B71VXrij_B;z;3
z-0iteYil9?ngnGQ1GZu}5#52Fn~yN&03d|ed*Z;<EIA^LoTK1vZe`*|7u^?oaNDaX
zneQR68f11Ph_mi6Mp;4tlQRo@2lq`xSx{BhTs{(!A22zsgu-?r>j_4dMo8wGvFHiL
zoR##2HH@1oS9*6|^FzUkNhhKGd9|rYeEHoq#{8!d;wfIMh~d0HNy>SU4Rx8KidrQ9
z3A)2M5Yl*ZevtXdUtUFdn}lQLZ48O>V;}zW@Z4KHEQIs$IAWx9iJ?H87i$Hoy^@e{
zQMR>=vslK~_yW~sIxBJ+<0*kJI>EPJ+(a>HRJkLRJ6Cz9?KYS1)?}BsvLwpD`3nHV
zlSZ1~eS?di-{O_m<BXU3xmWQFX|Y8rQOHS4Bb~tn6;pS()H#H!V3q#!7qBWC0Cy%z
zAGqoVCf0O`>17+ghYE<Sn^9wC`tI+ezdwjJIDkz`V-g0WSdhWt0F#%l(tB$OP0vtM
z8o}dOV>xQ&>!0iCx?RW6Z?0`%vD3FG1bp>gCyQY#UU!6<l|uS{-ADhFiv=~0WJ)IA
zoTSvTMpNw^{^~_aY;gn`&YWvwLCt%Z_0Fx%WZ>hjCSE=ozyPT03RP~E_E&rPWvT>`
z$q-t%kWPb9+G1tZLcT?#cesp5e0!m?PW<;#Oge`TEKuhO;Vp?`Q8cuaL~c%sm8gYz
sHJ_hG_A@r;$i@yqOUG7L%11nZ0E9<n7+I1E{Qv*}07*qoM6N<$f^EX^1poj5

literal 0
HcmV?d00001

diff --git a/src/blackmisc/aviation/airlineicaocode.cpp b/src/blackmisc/aviation/airlineicaocode.cpp
index 25a5d032d..66c7c6576 100644
--- a/src/blackmisc/aviation/airlineicaocode.cpp
+++ b/src/blackmisc/aviation/airlineicaocode.cpp
@@ -147,7 +147,7 @@ namespace BlackMisc
 
         CIcon CAirlineIcaoCode::toIcon() const
         {
-            if (this->m_designator.length() > 2)
+            if (hasValidDesignator())
             {
                 // relative to images
                 return CIcon("airlines/" + m_designator.toLower() + ".png", this->convertToQString());
@@ -285,16 +285,23 @@ namespace BlackMisc
 
         bool CAirlineIcaoCode::isValidAirlineDesignator(const QString &airline)
         {
+            // allow 2 chars for IATA
             if (airline.length() < 2 || airline.length() > 5) return false;
             auto chars = makeRange(airline.begin(), airline.end());
             if (chars.containsBy([](QChar c) { return !c.isUpper() && !c.isDigit(); })) { return false; }
             return true;
         }
 
+        QSet<QString> CAirlineIcaoCode::specialValidDesignators()
+        {
+            static const QSet<QString> valid({ "VV", "VM"});
+            return valid;
+        }
+
         QString CAirlineIcaoCode::normalizeDesignator(const QString candidate)
         {
             QString n(candidate.trimmed().toUpper());
-            if (n.contains(' ')) { n = n.left(n.indexOf(' ')); } // cutoff as first space
+            if (n.contains(' ')) { n = n.left(n.indexOf(' ')); } // cutoff at first space
             if (n.isEmpty()) { return n; }
 
             static QThreadStorage<QRegularExpression> tsRegex;
diff --git a/src/blackmisc/aviation/airlineicaocode.h b/src/blackmisc/aviation/airlineicaocode.h
index 46f02dc95..775a8939c 100644
--- a/src/blackmisc/aviation/airlineicaocode.h
+++ b/src/blackmisc/aviation/airlineicaocode.h
@@ -194,6 +194,9 @@ namespace BlackMisc
             //! Valid designator?
             static bool isValidAirlineDesignator(const QString &airline);
 
+            //! Some special valid designator which do not fit standard rule (e.g. 3-letter code)
+            static QSet<QString> specialValidDesignators();
+
             //! Normalize string as airline designator
             static QString normalizeDesignator(const QString candidate);