From 5669fa3285c3a69e2816cbf4ae382555cd2f20ed Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 6 Mar 2013 11:02:53 -0800
Subject: [PATCH 1/3] Switch back to live by default

---
 js/id/connection.js       | 2 +-
 js/id/ui/source_switch.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/id/connection.js b/js/id/connection.js
index 380c24b02..c540f244b 100644
--- a/js/id/connection.js
+++ b/js/id/connection.js
@@ -1,7 +1,7 @@
 iD.Connection = function(context) {
 
     var event = d3.dispatch('auth', 'load'),
-        url = 'http://api06.dev.openstreetmap.org',
+        url = 'http://www.openstreetmap.org',
         connection = {},
         user = {},
         keys,
diff --git a/js/id/ui/source_switch.js b/js/id/ui/source_switch.js
index 8b770269a..4ddeaef1b 100644
--- a/js/id/ui/source_switch.js
+++ b/js/id/ui/source_switch.js
@@ -18,8 +18,8 @@ iD.ui.SourceSwitch = function(context) {
     return function(selection) {
         selection.append('a')
             .attr('href', '#')
-            .text(t('source_switch.dev'))
-            .classed('live', false)
+            .text(t('source_switch.live'))
+            .classed('live', true)
             .on('click', click);
     };
 };

From 116e03c6d6dbcc1e8771bde609b998404d918212 Mon Sep 17 00:00:00 2001
From: Ansis Brammanis <ansis.brammanis@gmail.com>
Date: Wed, 6 Mar 2013 14:22:52 -0500
Subject: [PATCH 2/3] tweak point label halo

---
 css/map.css         | 1 -
 js/id/svg/labels.js | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/css/map.css b/css/map.css
index 660987695..78a314cec 100644
--- a/css/map.css
+++ b/css/map.css
@@ -673,7 +673,6 @@ text.pointlabel {
 
 text.point {
   font-size: 10px;
-  baseline-shift: 2px;
 }
 
 /* Cursors */
diff --git a/js/id/svg/labels.js b/js/id/svg/labels.js
index e52e649e8..6e8bd6149 100644
--- a/js/id/svg/labels.js
+++ b/js/id/svg/labels.js
@@ -41,7 +41,7 @@ iD.svg.Labels = function(projection) {
     });
 
     var pointOffsets = [
-        [15, 3, 'start'], // right
+        [15, 2, 'start'], // right
         [10, 0, 'start'], // unused right now
         [-15, 0, 'end']
     ];
@@ -126,11 +126,11 @@ iD.svg.Labels = function(projection) {
                 }
                 return x;
             },
-            'y': function(d, i) { return labels[i].y - labels[i].height + 1 - 2; },
+            'y': function(d, i) { return labels[i].y - labels[i].height + 1; },
             'rx': 3,
             'ry': 3,
             'width': function(d, i) { return textWidth(name(d), labels[i].height) + 4; },
-            'height': function(d, i) { return labels[i].height + 4; },
+            'height': function(d, i) { return labels[i].height + 2; },
             'fill': 'white'
         });
 

From c24fff51e0dc190d544d121da8d480e807e6c2ac Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 6 Mar 2013 11:24:30 -0800
Subject: [PATCH 3/3] Fix test

---
 test/spec/connection.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/spec/connection.js b/test/spec/connection.js
index e286bb2bf..546a7c517 100644
--- a/test/spec/connection.js
+++ b/test/spec/connection.js
@@ -24,13 +24,13 @@ describe('iD.Connection', function () {
 
     describe('#changesetUrl', function() {
         it('provides a changeset url', function() {
-            expect(c.changesetUrl(2)).to.eql('http://api06.dev.openstreetmap.org/browse/changeset/2');
+            expect(c.changesetUrl(2)).to.eql('http://www.openstreetmap.org/browse/changeset/2');
         });
     });
 
     describe('#userUrl', function() {
         it('provides a user url', function() {
-            expect(c.userUrl('bob')).to.eql('http://api06.dev.openstreetmap.org/user/bob');
+            expect(c.userUrl('bob')).to.eql('http://www.openstreetmap.org/user/bob');
         });
     });