From 03d4fb1b95640bfcc267843c6593f932bfbeb301 Mon Sep 17 00:00:00 2001 From: Jack Sweeney Date: Tue, 10 Nov 2020 02:16:34 +0000 Subject: [PATCH] rename Airport lookup, ignore comments --- defAirport.py | 50 +++++++++++++++++++++++++------------------------- planeClass.py | 6 +++--- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/defAirport.py b/defAirport.py index 5970e8c..e84c498 100644 --- a/defAirport.py +++ b/defAirport.py @@ -1,27 +1,27 @@ #https://www.geeksforgeeks.org/python-calculate-distance-between-two-places-using-geopy/ #https://openflights.org/data.html -def getAirport(latitude, longitude): - import json - import csv - from geopy.distance import geodesic - plane = (latitude, longitude) - header = ["id", "name", "city", "country", "iata", "icao", "lat", "lng", "alt", "tz", "dst", "tz_db", "type", "source"] - airports = [] - first_run = True - with open('airports.dat', encoding='utf-8') as csvf: - reader = csv.DictReader( csvf, header) - #for row in reader: - # airports.append(row) - for row in reader: - airport = row - airport_coord = float(airport['lat']), float(airport['lng']) - airport_dist = float((geodesic(plane, airport_coord).mi)) - if first_run: - closest_airport_dict = airport - closest_airport_dist = airport_dist - first_run = False - elif airport_dist < closest_airport_dist: - closest_airport_dict = airport - closest_airport_dist = airport_dist - print("Closest Airport:", closest_airport_dict['icao'], closest_airport_dict['name'], closest_airport_dist, "Miles Away") - return closest_airport_dict \ No newline at end of file +def getClosestAirport(latitude, longitude): + import json + import csv + from geopy.distance import geodesic + plane = (latitude, longitude) + header = ["id", "name", "city", "country", "iata", "icao", "lat", "lng", "alt", "tz", "dst", "tz_db", "type", "source"] + airports = [] + first_run = True + with open('airports.dat', encoding='utf-8') as csvf: + reader = csv.DictReader(filter(lambda row: row[0]!='#', csvf), header) + #for row in reader: + # airports.append(row) + for row in reader: + airport = row + airport_coord = float(airport['lat']), float(airport['lng']) + airport_dist = float((geodesic(plane, airport_coord).mi)) + if first_run: + closest_airport_dict = airport + closest_airport_dist = airport_dist + first_run = False + elif airport_dist < closest_airport_dist: + closest_airport_dict = airport + closest_airport_dist = airport_dist + print("Closest Airport:", closest_airport_dict['icao'], closest_airport_dict['name'], closest_airport_dist, "Miles Away") + return closest_airport_dict \ No newline at end of file diff --git a/planeClass.py b/planeClass.py index eb58e5d..7db254c 100644 --- a/planeClass.py +++ b/planeClass.py @@ -47,7 +47,7 @@ class Plane: import platform from datetime import datetime from tabulate import tabulate - from defAirport import getAirport + from defAirport import getClosestAirport if self.config.get('MAP', 'OPTION') == "GOOGLESTATICMAP": from defMap import getMap elif self.config.get('MAP', 'OPTION') == "ADSBX": @@ -304,7 +304,7 @@ class Plane: raise Exception("Map option not set correctly in this planes conf") #Discord if self.config.getboolean('DISCORD', 'ENABLE'): - nearest = getAirport(self.latitude, self.longitude) + nearest = getClosestAirport(self.latitude, self.longitude) self.dis_message = (self.dis_title + " " + self.tookoff_message + nearest['icao'] + ", " + nearest["name"]).strip() sendDis(self.dis_message, self.map_file_name, self.config) #PushBullet @@ -346,7 +346,7 @@ class Plane: raise Exception("Map option not set correctly in this planes conf") #Discord if self.config.getboolean('DISCORD', 'ENABLE'): - nearest = getAirport(self.last_latitude, self.last_longitude) + nearest = getClosestAirport(self.last_latitude, self.last_longitude) self.dis_message = (self.dis_title + " " +self.landed_message + nearest['icao'] + ", " + nearest["name"]).strip() sendDis(self.dis_message, self.map_file_name, self.config) #PushBullet