<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>geonames.py</filename>
    </added>
    <added>
      <filename>multimap.py</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,6 +1,8 @@
 import urllib
 from utils import simplejson, partial2
 
+# http://code.google.com/apis/maps/documentation/geocoding/index.html
+
 def geocode(q, api_key):
     json = simplejson.load(urllib.urlopen(
         'http://maps.google.com/maps/geo?' + urllib.urlencode({
@@ -12,8 +14,8 @@ def geocode(q, api_key):
         })
     ))
     try:
-        lat, lon = json['Placemark'][0]['Point']['coordinates'][:2]
-    except KeyError, IndexError:
+        lon, lat = json['Placemark'][0]['Point']['coordinates'][:2]
+    except (KeyError, IndexError):
         return None, (None, None)
     name = json['Placemark'][0]['address']
     return name, (lat, lon)</diff>
      <filename>google.py</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,8 @@
 from utils import make_nsfind, ET, partial2
 import urllib
 
+# http://developer.yahoo.com/geo/placemaker/guide/api_docs.html
+
 def geocode(q, api_key):
     find = make_nsfind({
         'ns': 'http://wherein.yahooapis.com/v1/schema'</diff>
      <filename>placemaker.py</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,8 @@
 from utils import make_nsfind, ET, partial2
 import urllib
 
+# http://developer.yahoo.com/maps/rest/V1/geocode.html
+
 def geocode(q, api_key):
     find = make_nsfind({'ns': 'urn:yahoo:maps'})
     args = {'location': q, 'appid': api_key}</diff>
      <filename>yahoo.py</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>69a2baecb73f64c520b1fd761af3eb27b211952c</id>
    </parent>
    <parent>
      <id>99816fc1d25a53964dddf3376d76c356033874b6</id>
    </parent>
  </parents>
  <author>
    <name>Jacob Kaplan-Moss</name>
    <email>jacob@jacobian.org</email>
  </author>
  <url>http://github.com/jacobian/geocoders/commit/0d8810e76297b72d019b581e0605433038a6fab1</url>
  <id>0d8810e76297b72d019b581e0605433038a6fab1</id>
  <committed-date>2009-05-27T20:15:41-07:00</committed-date>
  <authored-date>2009-05-27T20:15:41-07:00</authored-date>
  <message>Merge with 'simonw/master'</message>
  <tree>2b0a40910946c0e1816186fd529bad24476e02e1</tree>
  <committer>
    <name>Jacob Kaplan-Moss</name>
    <email>jacob@jacobian.org</email>
  </committer>
</commit>
