From db6c4f2b82ab815555fb88706a6274a87af5baa8 Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Wed, 28 Nov 2012 16:49:01 -0500
Subject: [PATCH] Dblclick on by default and update marker images

---
 js/id/renderer/map.js | 10 ++++++----
 js/id/ui/inspector.js |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/js/id/renderer/map.js b/js/id/renderer/map.js
index fa30e1625..e4ee894cd 100644
--- a/js/id/renderer/map.js
+++ b/js/id/renderer/map.js
@@ -16,7 +16,7 @@ iD.Map = function(elem, connection) {
             .scaleExtent([256, 134217728])
             .on('zoom', zoomPan),
         only,
-        dblclickEnabled = false,
+        dblclickEnabled = true,
         dragbehavior = d3.behavior.drag()
             .origin(function(entity) {
                 var p = projection(ll2a(entity));
@@ -205,12 +205,13 @@ iD.Map = function(elem, connection) {
         marker.append('circle')
             .attr({ r: 10, cx: 8, cy: 8 });
         marker.append('image')
-            .attr({ width: 16, height: 16, 'xlink:href': iD.Style.markerimage });
+            .attr({ width: 16, height: 16 });
         markers.attr('transform', function(d) {
                 var pt = projection([d.lon, d.lat]);
                 return 'translate(' + [~~pt[0], ~~pt[1]] + ') translate(-8, -8)';
             })
             .classed('active', classActive);
+        markers.select('image').attr('xlink:href', iD.Style.markerimage);
     }
 
     function drawStrokes(ways, filter) {
@@ -387,8 +388,9 @@ iD.Map = function(elem, connection) {
     });
 
     function zoomPan() {
-        if (d3.event && d3.event.sourceEvent.type === "dblclick" &&
-            !dblclickEnabled) return;
+        if (d3.event && d3.event.sourceEvent.type === 'dblclick') {
+            if (!dblclickEnabled) return;
+        }
         var fast = (d3.event.scale === projection.scale());
         projection
             .translate(d3.event.translate)
diff --git a/js/id/ui/inspector.js b/js/id/ui/inspector.js
index 58639401e..1718827b8 100644
--- a/js/id/ui/inspector.js
+++ b/js/id/ui/inspector.js
@@ -112,6 +112,7 @@ iD.Inspector = function() {
                 .attr('class', 'save').text('Save')
                 .on('click', function() {
                     event.changeTags(entity, clean(grabtags()));
+                    event.close(entity);
                 });
 
             selection.append('button')