Merge lp:~jpg0/eyefi/update-geolocate into lp:eyefi

[Jonathan Gilbert]

Fixed Google Geolocation API access

=== modified file 'eyefi/actions.py'
--- eyefi/actions.py	2012-11-03 20:33:13 +0000
+++ eyefi/actions.py	2013-01-23 10:50:44 +0000
@@ -125,7 +125,7 @@
         if sidecar or photo.lower().endswith(".jpg"):
             loc = loc["location"]
             write_gps(photo,
-                loc["latitude"], loc["longitude"], loc.get("altitude", None),
+                loc["lat"], loc["lng"], loc.get("alt", None),
                 "WGS-84", loc.get("accuracy", None), sidecar, xmp)
         return loc, photo
 
 
=== modified file 'eyefi/google_loc.py'
--- eyefi/google_loc.py	2012-11-03 20:33:13 +0000
+++ eyefi/google_loc.py	2013-01-23 10:50:44 +0000
@@ -30,12 +30,15 @@
     """
     base = {"wifiAccessPoints": [],}
     for mac in macs:
-        base["wifiAccessPoints"].append({"macAddress": mac})
-    d = getPage("%s?key=%s" % (LOC_BASE_URL, key), method="POST",
-            postdata=simplejson.dumps(base))
+        base["wifiAccessPoints"].append(format_mac(mac))
+    d = getPage(str("%s?key=%s" % (LOC_BASE_URL, key)), method="POST",
+            postdata=str(simplejson.dumps(base)), headers={"Content-Type": "application/json"})
     d.addCallback(simplejson.loads)
     return d
 
+def format_mac(mac):
+    return {"macAddress": mac["mac_address"], "age": mac["age"], "signalToNoiseRatio": mac["signal_to_noise"]}
+
 def main():
     from twisted.internet import reactor
     from twisted.python import log