From feb9f6ca11cf0b441f1e24f8b379878c442fb0b3 Mon Sep 17 00:00:00 2001
From: "james.p.turk" <james.p.turk@1885ebd5-0a40-0410-88a4-770918bee656>
Date: Thu, 17 Jan 2008 19:33:02 +0000
Subject: [PATCH] added optional geocoder param

git-svn-id: https://polipoly.googlecode.com/svn/trunk@13 1885ebd5-0a40-0410-88a4-770918bee656
---
 examples/address_to_district.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/examples/address_to_district.py b/examples/address_to_district.py
index 707c8b9..369a45a 100755
--- a/examples/address_to_district.py
+++ b/examples/address_to_district.py
@@ -9,9 +9,10 @@ Be sure to set GMAPS_API_KEY and PATH_TO_CDFILES appropriately:
     GMAPS_API_KEY: Google Maps key (http://www.google.com/apis/maps/signup.html)
     PATH_TO_CDFILES: copy of cd99 (http://www.census.gov/geo/www/cob/cd110.html)
 
-The CGI script takes two parameters:
+The CGI script takes three parameters:
     addr -- address string in any format the google geocoder can handle
     output -- optional parameter specifying formatting ('xml' or default 'json')
+    geocoder -- optional parameter specifying which geocoder to use
 '''
 
 import cgi
@@ -20,7 +21,7 @@ from polipoly import AddressToDistrictService, GeocodingError
 
 PATH_TO_CDFILES = 'congdist/cd99_110'
 GEOCODER = AddressToDistrictService.GEOCODER_US
-GMAPS_API_KEY = 'define-me'
+GMAPS_API_KEY = None
 
 class ApiException(Exception):
 
@@ -46,6 +47,13 @@ def main():
     fields = cgi.FieldStorage()
     addr = fields.getvalue('address') or ''
     output = fields.getvalue('output')
+    geocoder_name = fields.getvalue('geocoder')
+    if geocoder_name == 'googlemaps' and GMAPS_API_KEY:
+        geocoder = AddressToDistrictService.GEOCODER_GMAPS
+        geocoder_name = 'googlemaps'
+    else:
+        geocoder = AddressToDistrictService.GEOCODER_US
+        geocoder_name = 'geocoder.us'
 
     # discard blank addresses as error 301
     if re.match('^\s*$', addr):
@@ -75,21 +83,22 @@ def main():
                               for dist in districts])
         print 'Content-type: text/xml\n'
         print '''<results>
+<geocoder>%s</geocoder>
 <address>%s</address>
 <latitude>%s</latitude>
 <longitude>%s</longitude>
 <districts>
 %s
 </districts>
-</results>''' % (addr, lat, lng, dist_str)
+</results>''' % (geocoder_name, addr, lat, lng, dist_str)
 
     # JSON output (default)
     else:
         dist_str = ','.join(['{"state":"%s", "district":"%s"}' % dist
                                 for dist in districts])
         print 'Content-type: application/json\n'
-        print '''{"address":"%s", "latitude":"%s", "longitude":"%s",
-"districts": [ %s ] }''' % (addr, lat, lng, dist_str)
+        print '''{"geocoder":"%s", "address":"%s", "latitude":"%s", "longitude":"%s",
+"districts": [ %s ] }''' % (geocoder_name, addr, lat, lng, dist_str)
 
 
 if __name__ == '__main__':