From 8de71d4956e1335764ad2e139b90d94dcdb86839 Mon Sep 17 00:00:00 2001 From: Bohaska <73286691+Bohaska@users.noreply.github.com> Date: Tue, 9 Nov 2021 12:39:11 +0800 Subject: [PATCH 01/11] add dash 7 for small airports. suggested by western airlines/city hopper, and data collected by western airlines/city hopper --- .../src/main/scala/com/patson/model/airplane/Model.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/airline-data/src/main/scala/com/patson/model/airplane/Model.scala b/airline-data/src/main/scala/com/patson/model/airplane/Model.scala index 16c7e3889..e42993e48 100644 --- a/airline-data/src/main/scala/com/patson/model/airplane/Model.scala +++ b/airline-data/src/main/scala/com/patson/model/airplane/Model.scala @@ -148,6 +148,7 @@ object Model { Model("Embraer ERJ140", "Embraer ERJ", capacity = 44, fuelBurn = (44 * 2.5).toInt, speed = 828, range = 2315, price = 15000000, lifespan = 30 * 52, constructionTime = 0, Manufacturer("Embraer", countryCode = "BR"), runwayRequirement = 1850, imageUrl = "https://www.norebbo.com/2018/05/embraer-erj-140-blank-illustration-templates/"), Model("Dornier 328JET", "Dornier 328", capacity = 44, fuelBurn = (44 * 1.9).toInt, speed = 740, range = 1665, price = 25000000, lifespan = 35 * 52, constructionTime = 0, Manufacturer("Dornier", countryCode = "DE"), runwayRequirement = 1367, imageUrl = "https://www.norebbo.com/2019/01/fairchild-dornier-328jet-illustrations/"), Model("ATR 42-600", "ATR-Regional", capacity = 48, fuelBurn = (48 * 1.6).toInt, speed = 556, range = 1326, price = 17000000, lifespan = 20 * 52, constructionTime = 0, Manufacturer("ATR", countryCode = "FR"), runwayRequirement = 1050, imageUrl = "https://www.norebbo.com/2018/06/atr-42-blank-illustration-templates/"), + Model("de Havilland Canada DHC-7-100", "Bombardier DHC-8", capacity = 50, fuelBurn = (50 * 1.5).toInt, speed = 428, range = 1280, price = 3900000 , lifespan = 35 * 52, constructionTime = 0, Manufacturer("Bombardier", countryCode = "CA"), runwayRequirement = 689, imageUrl = "") Model("Bombardier CRJ100", "Bombardier CRJ", capacity = 50, fuelBurn = (50 * 1.9).toInt, speed = 830, range = 2250, price = 28000000, lifespan = 35 * 52, constructionTime = 0, Manufacturer("Bombardier", countryCode = "CA"), runwayRequirement = 1920, imageUrl = "https://www.norebbo.com/2015/04/bombardier-canadair-regional-jet-200-blank-illustration-templates/"), Model("Bombardier CRJ200", "Bombardier CRJ", capacity = 50, fuelBurn = (50 * 1.9).toInt, speed = 830, range = 3150, price = 30000000, lifespan = 35 * 52, constructionTime = 0, Manufacturer("Bombardier", countryCode = "CA"), runwayRequirement = 1920, imageUrl = "https://www.norebbo.com/2015/04/bombardier-canadair-regional-jet-200-blank-illustration-templates/"), Model("Embraer ERJ145", "Embraer ERJ", capacity = 50, fuelBurn = (50 * 2.6).toInt, speed = 850, range = 2800, price = 20500000, lifespan = 30 * 52, constructionTime = 0, Manufacturer("Embraer", countryCode = "BR"), runwayRequirement = 1410, imageUrl = "https://www.norebbo.com/2018/04/embraer-erj-145-blank-illustration-templates/"), From 1ce4deeefa2612025ed9987183489e42f2a7bbc1 Mon Sep 17 00:00:00 2001 From: Bohaska <73286691+Bohaska@users.noreply.github.com> Date: Tue, 9 Nov 2021 17:36:06 +0800 Subject: [PATCH 02/11] add missing comma didn't realize at first sight. --- .../src/main/scala/com/patson/model/airplane/Model.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airline-data/src/main/scala/com/patson/model/airplane/Model.scala b/airline-data/src/main/scala/com/patson/model/airplane/Model.scala index e42993e48..43e8248b0 100644 --- a/airline-data/src/main/scala/com/patson/model/airplane/Model.scala +++ b/airline-data/src/main/scala/com/patson/model/airplane/Model.scala @@ -148,7 +148,7 @@ object Model { Model("Embraer ERJ140", "Embraer ERJ", capacity = 44, fuelBurn = (44 * 2.5).toInt, speed = 828, range = 2315, price = 15000000, lifespan = 30 * 52, constructionTime = 0, Manufacturer("Embraer", countryCode = "BR"), runwayRequirement = 1850, imageUrl = "https://www.norebbo.com/2018/05/embraer-erj-140-blank-illustration-templates/"), Model("Dornier 328JET", "Dornier 328", capacity = 44, fuelBurn = (44 * 1.9).toInt, speed = 740, range = 1665, price = 25000000, lifespan = 35 * 52, constructionTime = 0, Manufacturer("Dornier", countryCode = "DE"), runwayRequirement = 1367, imageUrl = "https://www.norebbo.com/2019/01/fairchild-dornier-328jet-illustrations/"), Model("ATR 42-600", "ATR-Regional", capacity = 48, fuelBurn = (48 * 1.6).toInt, speed = 556, range = 1326, price = 17000000, lifespan = 20 * 52, constructionTime = 0, Manufacturer("ATR", countryCode = "FR"), runwayRequirement = 1050, imageUrl = "https://www.norebbo.com/2018/06/atr-42-blank-illustration-templates/"), - Model("de Havilland Canada DHC-7-100", "Bombardier DHC-8", capacity = 50, fuelBurn = (50 * 1.5).toInt, speed = 428, range = 1280, price = 3900000 , lifespan = 35 * 52, constructionTime = 0, Manufacturer("Bombardier", countryCode = "CA"), runwayRequirement = 689, imageUrl = "") + Model("de Havilland Canada DHC-7-100", "Bombardier DHC-8", capacity = 50, fuelBurn = (50 * 1.5).toInt, speed = 428, range = 1280, price = 3900000 , lifespan = 35 * 52, constructionTime = 0, Manufacturer("Bombardier", countryCode = "CA"), runwayRequirement = 689, imageUrl = ""), Model("Bombardier CRJ100", "Bombardier CRJ", capacity = 50, fuelBurn = (50 * 1.9).toInt, speed = 830, range = 2250, price = 28000000, lifespan = 35 * 52, constructionTime = 0, Manufacturer("Bombardier", countryCode = "CA"), runwayRequirement = 1920, imageUrl = "https://www.norebbo.com/2015/04/bombardier-canadair-regional-jet-200-blank-illustration-templates/"), Model("Bombardier CRJ200", "Bombardier CRJ", capacity = 50, fuelBurn = (50 * 1.9).toInt, speed = 830, range = 3150, price = 30000000, lifespan = 35 * 52, constructionTime = 0, Manufacturer("Bombardier", countryCode = "CA"), runwayRequirement = 1920, imageUrl = "https://www.norebbo.com/2015/04/bombardier-canadair-regional-jet-200-blank-illustration-templates/"), Model("Embraer ERJ145", "Embraer ERJ", capacity = 50, fuelBurn = (50 * 2.6).toInt, speed = 850, range = 2800, price = 20500000, lifespan = 30 * 52, constructionTime = 0, Manufacturer("Embraer", countryCode = "BR"), runwayRequirement = 1410, imageUrl = "https://www.norebbo.com/2018/04/embraer-erj-145-blank-illustration-templates/"), From 52778084cf17f5b9a704c9458c33d23be389587e Mon Sep 17 00:00:00 2001 From: Bohaska <73286691+Bohaska@users.noreply.github.com> Date: Sun, 21 Nov 2021 15:16:38 +0800 Subject: [PATCH 03/11] update image attribution desc preparing for the dash 7 image --- airline-web/app/views/index.scala.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/airline-web/app/views/index.scala.html b/airline-web/app/views/index.scala.html index 06e3c1857..78af2f957 100644 --- a/airline-web/app/views/index.scala.html +++ b/airline-web/app/views/index.scala.html @@ -1642,7 +1642,7 @@
JC%&^si+$mhe&mXT{O7c?s?i-XvNLZOd(u4lHuJ_-_
zoxa03<2w{KxWA4dT^mx_`+m2zWb|Qvb6D>o)W*^>CqFkgceaH@$E%Z|X;LV~(hv@P
z5X{2z{zG0;d#f^^+(P$dguD&qL)AB!AtR{pY2zN^^=673gpI-6%BnL}NW~cb602il
zUTAsmWlyx^cf8pclBtV$jwW^w_pa^x_ZJ_hq!H{a5FXCU68)!=l9JqwrLRey7ddBc
ztxOqy`F7cTs*JyJ#?y!V%w2{`!0dWe*xBenH8^h~5&C0WQ}#!ZDJ*oh$0M1OL!rN}
zE}usfY44YH(SZKj0goTN%^t0PO;Wi(w>VFo!XA{n 4B!BIKffivl5wot;G4bu84r^)
z;g-53lY~z?6r{UJK2^IFNaLlWMYh6Tyv7t$L8n$K!3%^ksXwn!Er^TD@9&*A!>B_(
zVY-}8{%LAb-+-8Ff*1_|75++)XFad`Ei(J%aXD1LXF8S!1>68~U^gh4Z9ZW{?^D7k
z`THwb2G2OfpbfYSX1;sbl|bnLS9+9fcir(lgW>_Q^t>2Js+_x3$tj2Xg@Q=1+g2g-
z7TAt?3+!h* ;L{9;!ZVzmi${Gn{Ym;wGn8D_p^8u29jy33Q-zon=5rxLga1lO$W}QwB4Vx$
ztmF+SBWv)Awbo^6>Z-znUk^}Cjg4!`atvIG^dLrfTa1P!UuBO*a->|8Li2n|AeJ;6
z?=e+3zm#sI3y1p!=Hrwi2AaqUEZ9yZPonS1SEql3?bg;O8XI0o-Fo4ybPrT%vVt
z(nlB)FvIw?{gytI4qbnLKZGM5cmeW;Rsjxp<21@J;v3emsP^4G9sdCh^x>9$Y(q*C
zK{UJva&_uqZEL?JD^4)3Q}mcj=?7FUxJ5=1m6%2)?i5K-j+bQ+M~oo*nwwy4BY7#1
z$bWQ;qTa6AmXPJdOXadM;XC~WE$$P8b^>E{tjtw+%k<37a#L%F+fd{C+1 t8XO|xh>1C10X_(zc-bf;9Ek?-`F>@GqSq{BN@+-HBRXo#gIWj
zf8E|Mh6yzV;CpV0=f~^~!JxmpOHK}2<;3X+ik};pUcQy%;|@V*DvkIVZeQk
3b~8Y7L7Ha8&St{F&9YwTIUPImRq=
zQK4V{fvKt~AQt93;}vX;qE@D2{tP*MJWbn%MkDnpc{nwafq4E$TsFDZ_AUB4d*ihy
z1-1V9_Vnt|^mqq?HPgva&
V7;x#RcAiPH>E;B8zNr&xZ=YEfR+qjs!6UVa5xtGcy(
zZ2tW6z%%D9?I30Nui?$_J3`StPk2J>X*%v-F3d(Edpi2I+Pd%IL+C{a9i)X&Z4^<8lmG?+K@hPa
zNL5fliu9V$G&B)G1*HfU1f+@d5_*#&iu8_Bq}K!zl6P}||1sY2+&cygJ|!R6=j^rC
zoO8|j2Xhx$VN8~>zgi*)+0@(SM;dr$*jq*B#@ApdaIm2H&d$1pdW8C)U1qIz5M6KB?2;5nM
z0c%1&pr-3kXa(DT*kk!h(wy!F_O`q8El8S(t8_4x?p?dx`;*Dw{*BN?oG&U7#L=)X
zd70D;w{--Qs(m}MFZTyZ=*BrL%@>N!CE%!m;z$kAcwoI+jK8{J