diff --git a/data/flights.txt b/data/flights.txt index 042315e..7c28c55 100644 --- a/data/flights.txt +++ b/data/flights.txt @@ -1,14 +1,14 @@ -date=20241007,desig=QF,number=1556,mkt_cxr=QantasLink,adm_cxr=National Jet Systems,route=HBA-MEL,type2=717-200,type3=717-200,registration=VH-YQS,manufacturer=Boeing,std=1745,sta=1905,seat=5A,seat_type=W,cabin=Y,msn=55178,ln=5128,trip_pics=20241007_205546.jpg +date=20241007,desig=QF,number=1556,mkt_cxr=QantasLink,adm_cxr=National Jet Systems,route=HBA-MEL,type2=717-200,type3=717-200,registration=VH-YQS,manufacturer=Boeing,std=1745,sta=1905,seat=5A,seat_type=W,cabin=Y,msn=55178,ln=5128,trip_pics=20241007_191426.jpg date=20241006,desig=QF,number=7945,mkt_cxr=QantasLink,adm_cxr=Eastern Australia Airlines,route=MEL-LST,type2=Dash 8-300,type3=Dash 8-300,registration=VH-SBG,manufacturer=Bombardier,std=0900,sta=1025,seat=12A,seat_type=W,cabin=Y,msn=575,trip_pics=20241007_205444.jpg;20241007_205642.jpg;20241006_174437.jpg;20241007_141814.jpg date=20240918,desig=HA,number=451,mkt_cxr=Hawaiian Airlines,route=HNL-SYD,type2=A330-200,type3=A330-200,registration=N396HA,manufacturer=Airbus,std=1300,sta=1945+1,seat=19B,seat_type=A,cabin=Y+,msn=1488 date=20240918,desig=HA,number=151,mkt_cxr=Hawaiian Airlines,route=ITO-HNL,type2=717-200,type3=717-200,registration=N484HA,manufacturer=Boeing,std=0850,sta=0950,seat=22A,seat_type=W,cabin=Y,msn=55129,ln=5080,trip_pics=20240918_081833.jpg date=20240915,desig=HA,number=362,mkt_cxr=Hawaiian Airlines,route=HNL-ITO,type2=717-200,type3=717-200,registration=N478HA,manufacturer=Boeing,std=1520,sta=1614,seat=8A,seat_type=W,cabin=Y,msn=55123,ln=5064,trip_pics=20240915_150446.jpg;20240916_143134.jpg;20240917_185543.jpg;20240917_131949.jpg -date=20240915,desig=UA,number=1175,mkt_cxr=United Airlines,route=SFO-HNL,type2=777-300,type3=777-300ER,registration=N2140U,manufacturer=Boeing,std=0925,sta=1147,seat=36D,seat_type=A,cabin=Y -date=20240824,desig=UA,number=1301,mkt_cxr=United Airlines,route=ORD-ICT,type2=737-700,type3=737-700,registration=N17719,manufacturer=Boeing,std=2007,sta=2209,seat=3A,seat_type=W,cabin=F -date=20240824,desig=UA,number=928,mkt_cxr=United Airlines,route=LHR-ORD,type2=767-300,type3=767-300ER,registration=N686UA,manufacturer=Boeing,std=1305,sta=1600,seat=3A,seat_type=WA,cabin=J,trip_pics=20240824_212122.jpg;20240828_161519.jpg;20240830_144731.jpg;20240830_152423.jpg;20240831_135526.jpg;20240831_190245.jpg;20240901_180852.jpg;20240904_194641.jpg;20240907_165743.jpg;20240907_192303.jpg;20240908_151033.jpg;20240908_161438.jpg;20240908_171650.jpg;20240910_150212.jpg;20240912_162629.jpg;20240913_180115.jpg -date=20240630,desig=FR,number=9047,mkt_cxr=Ryanair,adm_cxr=Ryanair UK,route=TPS-MAN,type2=737-800,type3=737-800,registration=G-RUKL,manufacturer=Boeing,seat=9F,cabin=Y,seat_type=W,std=1155,sta=1405 -date=20240628,desig=AZ,number=1161,mkt_cxr=ITA Airways,route=FCO-REG,type2=A320neo,type3=A320-200N,registration=EI-HOE,manufacturer=Airbus,trip_pics=20240629_114935.jpg;20240629_142003.jpg;20240629_143211.jpg;20240629_205003.jpg -date=20240628,desig=AZ,number=213,mkt_cxr=ITA Airways,route=LCY-FCO,type2=CS100,type3=CS100,registration=EI-HLA,manufacturer=Bombardier +date=20240915,desig=UA,number=1175,mkt_cxr=United Airlines,route=SFO-HNL,type2=777-300,type3=777-300ER,registration=N2140U,manufacturer=Boeing,std=0925,sta=1147,seat=36D,seat_type=A,cabin=Y,msn=62651,ln=1489 +date=20240824,desig=UA,number=1301,mkt_cxr=United Airlines,route=ORD-ICT,type2=737-700,type3=737-700,registration=N17719,manufacturer=Boeing,std=2007,sta=2209,seat=3A,seat_type=W,cabin=F,msn=28938,ln=195 +date=20240824,desig=UA,number=928,mkt_cxr=United Airlines,route=LHR-ORD,type2=767-300,type3=767-300ER,registration=N686UA,manufacturer=Boeing,std=1305,sta=1600,seat=3A,seat_type=WA,cabin=J,trip_pics=20240824_212122.jpg;20240828_161519.jpg;20240830_144731.jpg;20240830_152423.jpg;20240831_135526.jpg;20240831_190245.jpg;20240901_180852.jpg;20240904_194641.jpg;20240907_165743.jpg;20240907_192303.jpg;20240908_151033.jpg;20240908_161438.jpg;20240908_171650.jpg;20240910_150212.jpg;20240912_162629.jpg;20240913_180115.jpg,msn=33468,ln=898 +date=20240630,desig=FR,number=9047,mkt_cxr=Ryanair,adm_cxr=Ryanair UK,route=TPS-MAN,type2=737-800,type3=737-800,registration=G-RUKL,manufacturer=Boeing,seat=9F,cabin=Y,seat_type=W,std=1155,sta=1405,msn=33572,ln=1652 +date=20240628,desig=AZ,number=1161,mkt_cxr=ITA Airways,route=FCO-REG,type2=A320neo,type3=A320-200N,registration=EI-HOE,manufacturer=Airbus,trip_pics=20240629_114935.jpg;20240629_142003.jpg;20240629_143211.jpg;20240629_205003.jpg,msn=11647 +date=20240628,desig=AZ,number=213,mkt_cxr=ITA Airways,route=LCY-FCO,type2=CS100,type3=CS100,registration=EI-HLA,manufacturer=Bombardier,msn=50068 date=20240617,desig=SK,number=1507,mkt_cxr=Scandinavian Airlines,adm_cxr=SAS Connect,route=CPH-LHR,type2=A320neo,type3=A320-200N,registration=EI-SIK,manufacturer=Airbus date=20240617,desig=SK,number=778,mkt_cxr=Scandinavian Airlines,adm_cxr=SAS Connect,route=ATH-CPH,type2=A320neo,type3=A320-200N,registration=EI-SIF,manufacturer=Airbus date=20240612,desig=LX,number=1830,mkt_cxr=Swiss International Air Lines,route=ZRH-ATH,type2=A320neo,type3=A320-200N,registration=HB-JDA,manufacturer=Airbus,trip_pics=20240613_124057.jpg;20240613_174117.jpg;20240615_134507.jpg;20240615_142247.jpg;20240615_143350.jpg;20240615_171918.jpg;20240615_180925.jpg;20240616_151025.jpg;20240616_182742.jpg;20240616_183516.jpg;20240615_185535.jpg;20240616_192234.jpg diff --git a/maps/plot.py b/maps/plot.py index 114a414..f9f7192 100644 --- a/maps/plot.py +++ b/maps/plot.py @@ -115,11 +115,11 @@ def plot_map(flights, bounds = (-180, 180, -90, 90) - ax.add_feature(cartopy.feature.LAND, color='#fad9ae', zorder=100) + ax.add_feature(cartopy.feature.LAND, color='#fad9ae', zorder=1) ax.add_feature(cartopy.feature.OCEAN, color='#8eb8b4', alpha=0.6) ax.add_feature(cartopy.feature.LAKES, color='#8eb8b4', alpha=0.6) - ax.add_feature(cartopy.feature.COASTLINE,linewidth=0.4, zorder=102) - ax.add_feature(cartopy.feature.BORDERS, linewidth=0.4, zorder=103) + ax.add_feature(cartopy.feature.COASTLINE,linewidth=0.4, zorder=2) + ax.add_feature(cartopy.feature.BORDERS, linewidth=0.4, zorder=3) if states: @@ -142,22 +142,22 @@ def plot_map(flights, (start[0], end[0]), color='k', lw=1, - zorder=100, + zorder=1, transform=ccrs.Geodetic()) texts = [] for airport in airports.values(): ax.scatter( airport.lon, airport.lat, - color='k', s=20, zorder=105, transform=ccrs.PlateCarree()) + color='k', s=20, zorder=5, transform=ccrs.PlateCarree()) ax.scatter( airport.lon, airport.lat, - color='white', s=3.25, zorder=106, transform=ccrs.PlateCarree()) + color='white', s=3.25, zorder=6, transform=ccrs.PlateCarree()) if labels: if bounds[0] < airport.lon < bounds[1] and bounds[2] < airport.lat < bounds[3]: t = ax.text(airport.lon, airport.lat, airport.iata, size=6.75, - zorder=107 + airport_counts[airport], + zorder=7 + airport_counts[airport], transform=ccrs.PlateCarree(), ha='center', va='center', bbox={'facecolor': 'white', 'alpha': 1.0, 'edgecolor': 'k', 'boxstyle': 'round'}) diff --git a/pictures/20241007_191426.jpg b/pictures/20241007_191426.jpg new file mode 100644 index 0000000..486a2e8 Binary files /dev/null and b/pictures/20241007_191426.jpg differ diff --git a/pictures/20241007_205546.jpg b/pictures/20241007_205546.jpg deleted file mode 100644 index 8e585b9..0000000 Binary files a/pictures/20241007_205546.jpg and /dev/null differ