From 2860cc2fcbac71c3ef92845bea075995570fda1d Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Wed, 2 Jan 2013 17:31:51 -0500
Subject: [PATCH] Name callbacks to make profiles more usable

---
 js/id/connection.js   | 27 ++++++++++++++++-----------
 js/id/renderer/map.js |  4 ++--
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/js/id/connection.js b/js/id/connection.js
index 9ccbb5255..d5851c104 100644
--- a/js/id/connection.js
+++ b/js/id/connection.js
@@ -14,17 +14,19 @@ iD.Connection = function() {
     }
 
     function bboxFromAPI(box, tile, callback) {
-         loadFromURL(bboxUrl(box), function(err, parsed) {
+        function done(err, parsed) {
              loadedTiles[tile.toString()] = true;
              callback(err, parsed);
-         });
+         }
+         loadFromURL(bboxUrl(box), done);
     }
 
     function loadFromURL(url, callback) {
+        function done(dom) {
+            return callback(null, parse(dom));
+        }
         inflight.push(d3.xml(url).get()
-            .on('load', function(dom) {
-                return callback(null, parse(dom));
-            }));
+            .on('load', done));
     }
 
     function getNodes(obj) {
@@ -129,13 +131,14 @@ iD.Connection = function() {
     };
 
     function userDetails(callback) {
-        oauth.xhr({ method: 'GET', path: '/api/0.6/user/details' }, function(err, user_details) {
+        function done(err, user_details) {
             var u = user_details.getElementsByTagName('user')[0];
             callback(connection.user({
                 display_name: u.attributes.display_name.nodeValue,
                 id: u.attributes.id.nodeValue
             }).user());
-        });
+        }
+        oauth.xhr({ method: 'GET', path: '/api/0.6/user/details' }, done);
     }
 
     function tileAlreadyLoaded(c) { return !loadedTiles[c.toString()]; }
@@ -143,9 +146,10 @@ iD.Connection = function() {
     function abortRequest(i) { i.abort(); }
 
     function loadTile(e) {
-        bboxFromAPI(e.box, e.tile, function(err, g) {
+        function done(err, g) {
             event.load(err, g);
-        });
+        }
+        bboxFromAPI(e.box, e.tile, done);
     }
 
     function loadTiles(projection) {
@@ -211,10 +215,11 @@ iD.Connection = function() {
     };
 
     connection.authenticate = function(callback) {
-        return oauth.authenticate(function(err, res) {
+        function done(err, res) {
             event.auth();
             if (callback) callback(err, res);
-        });
+        }
+        return oauth.authenticate(done);
     };
 
     connection.bboxFromAPI = bboxFromAPI;
diff --git a/js/id/renderer/map.js b/js/id/renderer/map.js
index 66727cd06..d0bf373d1 100644
--- a/js/id/renderer/map.js
+++ b/js/id/renderer/map.js
@@ -84,9 +84,9 @@ iD.Map = function() {
             filter = d3.functor(true);
         } else {
             var only = {};
-            difference.forEach(function (id) {
+            difference.forEach(function buildDifference(id) {
                 only[id] = graph.fetch(id);
-                graph.parentWays(id).forEach(function (parent) {
+                graph.parentWays(id).forEach(function buildOnly(parent) {
                     only[parent.id] = graph.fetch(parent.id);
                 });
             });