From 9b97ddf7e1bc1febc4066cd5e083cee688d77027 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 20 Feb 2019 16:20:20 +0100 Subject: also avoid adding countries --- scraper/countries.json | 2 +- scraper/s2-geocode.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'scraper') diff --git a/scraper/countries.json b/scraper/countries.json index d3dd213d..87b3c997 100644 --- a/scraper/countries.json +++ b/scraper/countries.json @@ -229,7 +229,7 @@ {"name": "Ukraine", "code": "UA"}, {"name": "United Arab Emirates", "code": "AE", "alt": ["Abu Dhabi - United Arab Emirates"]}, {"name": "United Kingdom", "code": "GB", "alt": ["UK"]}, -{"name": "United States", "code": "US", "alt": ["USA"]}, +{"name": "United States", "code": "US", "alt": ["USA", "United States of America"]}, {"name": "United States Minor Outlying Islands", "code": "UM"}, {"name": "Uruguay", "code": "UY"}, {"name": "Uzbekistan", "code": "UZ"}, diff --git a/scraper/s2-geocode.py b/scraper/s2-geocode.py index 705f3a17..1fcc690d 100644 --- a/scraper/s2-geocode.py +++ b/scraper/s2-geocode.py @@ -18,6 +18,7 @@ def s2_geocode(fn): # geolocator = geocoders.Nominatim(user_agent="cool geocoding service") geolocator = geocoders.GoogleV3(os.getenv('MAPS_API_KEY')) worksheet = fetch_worksheet('institutions') + countries = load_countries() # print(fn) @@ -31,6 +32,8 @@ def s2_geocode(fn): name = row[2] name = remove_department_name(name) if not name or len(name) < 2: + if cname in countries: + print("cname is a country: {}".format(cname)) continue try: location = geolocator.geocode(name) -- cgit v1.2.3-70-g09d2