Merge branch 'master' of https://github.com/katzrkool/maps

lkellar · Jan 22, 2020 · f125ff9 · f125ff9
2 parents 5d01943 + 3fea763
commit f125ff9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/maps/scraper/geocoder/__init__.py b/maps/scraper/geocoder/__init__.py
@@ -43,4 +43,4 @@ def geocode_lookup(addresses: [str]) -> dict:
         # Fetch job results
         job_manager.fetch_results()
 
-    return job_manager.address_to_coord
+    return job_manager.address_to_geocode
diff --git a/maps/scraper/geocoder/jobmanager.py b/maps/scraper/geocoder/jobmanager.py
@@ -42,14 +42,15 @@ def __init__(self, row):
         values = list(filter(None, values))
 
         # Set properties in order (result follows heading schema)
-        self.id, self.address, self.city, self.state, self.country, self.lat, self.lon = values
+        # Zipcode will be inaccurate most likely, pls ignore it
+        self.id, self.address, self.zipcode, self.state, self.country, self.lat, self.lon, self.city = values
 
         self.coord = (self.lat, self.lon)
 
 
-def format_address(id_, address, city='Springdale', state='AR', country='US'):
+def format_address(id_, address, zipcode=72764, state='AR', country='US'):
     """ Format geocode request body according to our Geocode Dataflow heading """
-    return f'{id_}|{address}|{city}|{state}|{country}'
+    return f'{id_}|{address}|{zipcode}|{state}|{country}'
 
 
 # ------------------------------ JOB MANAGER ------------------------------
@@ -60,7 +61,7 @@ def __init__(self):
         self.completed_url = None
 
         self.results: [Result] = []
-        self.address_to_coord = {}
+        self.address_to_geocode = {}
 
     def create(self, addresses):
         """
@@ -129,5 +130,5 @@ def fetch_results(self):
         for row in rows:
             result = Result(row)
             self.results.append(result)
-            self.address_to_coord[result.address] = result.coord
+            self.address_to_geocode[result.address] = {'coord': result.coord, 'city': result.city}
 
diff --git a/maps/scraper/geocoder/settings.py b/maps/scraper/geocoder/settings.py
@@ -23,13 +23,14 @@ class GeocodeDataflow:
         # Define input fields for our geo-coding request
         'Id',
         'GeocodeRequest/Address/AddressLine',  # address
-        'GeocodeRequest/Address/Locality',  # city
+        'GeocodeRequest/Address/PostalCode',  # Zip Code
         'GeocodeRequest/Address/AdminDistrict',  # state
         'GeocodeRequest/Address/CountryRegion',  # country
 
         # Define Response fields latitude and longitude
         'GeocodeResponse/Point/Latitude',
-        'GeocodeResponse/Point/Longitude'
+        'GeocodeResponse/Point/Longitude',
+        'GeocodeResponse/Address/Locality' # City
     )
     # Generate our schema for geo-coding requests and responses to the Dataflow API
     HEADING = 'Bing Spatial Data Services, 2.0\n' + '|'.join(FIELDS)

diff --git a/maps/scraper/springdale.py b/maps/scraper/springdale.py
@@ -13,14 +13,16 @@
 
 def geocode_calls(calls):
     addresses = [call.address for call in calls]
-    address_to_coord = geocode_lookup(addresses)
+    address_to_geocode = geocode_lookup(addresses)
 
     for call in calls:
         # Lookup the coordinates for the address from our response
-        lat, lon = address_to_coord[call.address]
+        result = address_to_geocode[call.address]
+        lat, lon = result['coord']
 
         call.lat = lat
         call.lon = lon
+        call.city = result['city']
 
     return calls