PyCharm auto-reformatting for improved readability before making code improvements; added 2 spaces between functions. Minimizing line count is not important. Readability is a priority.

This commit is contained in:
williamnoonan 2022-02-17 13:04:49 -06:00
parent 043e69669b
commit d2ed9527da
1 changed files with 42 additions and 36 deletions

View File

@ -1,41 +1,47 @@
import csv import csv
import math import math
def add_airport_region(airport_dict): def add_airport_region(airport_dict):
#Get full region/state name from iso region name # Get full region/state name from iso region name
with open('./dependencies/regions.csv', 'r', encoding='utf-8') as regions_csv: with open('./dependencies/regions.csv', 'r', encoding='utf-8') as regions_csv:
regions_csv = csv.DictReader(filter(lambda row: row[0]!='#', regions_csv)) regions_csv = csv.DictReader(filter(lambda row: row[0] != '#', regions_csv))
for region in regions_csv: for region in regions_csv:
if region['code'] == airport_dict['iso_region']: if region['code'] == airport_dict['iso_region']:
airport_dict['region'] = region['name'] airport_dict['region'] = region['name']
return airport_dict return airport_dict
def getClosestAirport(latitude, longitude, allowed_types): def getClosestAirport(latitude, longitude, allowed_types):
from geopy.distance import geodesic from geopy.distance import geodesic
plane = (latitude, longitude) plane = (latitude, longitude)
with open('./dependencies/airports.csv', 'r', encoding='utf-8') as airport_csv: with open('./dependencies/airports.csv', 'r', encoding='utf-8') as airport_csv:
airport_csv_reader = csv.DictReader(filter(lambda row: row[0]!='#', airport_csv)) airport_csv_reader = csv.DictReader(filter(lambda row: row[0] != '#', airport_csv))
for airport in airport_csv_reader: for airport in airport_csv_reader:
if airport['type'] in allowed_types: if airport['type'] in allowed_types:
airport_coord = float(airport['latitude_deg']), float(airport['longitude_deg']) airport_coord = float(airport['latitude_deg']), float(airport['longitude_deg'])
airport_dist = float((geodesic(plane, airport_coord).mi)) airport_dist = float((geodesic(plane, airport_coord).mi))
if "closest_airport_dict" not in locals(): if "closest_airport_dict" not in locals():
closest_airport_dict = airport closest_airport_dict = airport
closest_airport_dist = airport_dist closest_airport_dist = airport_dist
elif airport_dist < closest_airport_dist: elif airport_dist < closest_airport_dist:
closest_airport_dict = airport closest_airport_dict = airport
closest_airport_dist = airport_dist closest_airport_dist = airport_dist
closest_airport_dict['distance_mi'] = closest_airport_dist closest_airport_dict['distance_mi'] = closest_airport_dist
#Convert indent key to icao key as its labeled icao in other places not ident # Convert indent key to icao key as its labeled icao in other places not ident
closest_airport_dict['icao'] = closest_airport_dict.pop('gps_code') closest_airport_dict['icao'] = closest_airport_dict.pop('gps_code')
closest_airport_dict = add_airport_region(closest_airport_dict) closest_airport_dict = add_airport_region(closest_airport_dict)
return closest_airport_dict return closest_airport_dict
def get_airport_by_icao(icao): def get_airport_by_icao(icao):
with open('./dependencies/airports.csv', 'r', encoding='utf-8') as airport_csv: with open('./dependencies/airports.csv', 'r', encoding='utf-8') as airport_csv:
airport_csv_reader = csv.DictReader(filter(lambda row: row[0]!='#', airport_csv)) airport_csv_reader = csv.DictReader(filter(lambda row: row[0] != '#', airport_csv))
for airport in airport_csv_reader: for airport in airport_csv_reader:
if airport['gps_code'] == icao: if airport['gps_code'] == icao:
matching_airport = airport matching_airport = airport
#Convert indent key to icao key as its labeled icao in other places not ident # Convert indent key to icao key as its labeled icao in other places not ident
matching_airport['icao'] = matching_airport.pop('gps_code') matching_airport['icao'] = matching_airport.pop('gps_code')
break break
matching_airport = add_airport_region(matching_airport) matching_airport = add_airport_region(matching_airport)
return matching_airport return matching_airport