Merge branch 'master' into tooltips

css/map.css

@@ -65,9 +65,12 @@ g.vertex circle.stroke {
     fill:#333;
 }
 
-g.vertex.shared circle {
+g.vertex.shared circle.fill {
     fill:#aff;
 }
+g.vertex.shared circle.stroke {
+    fill:#044;
+}
 
 g.vertex.hover circle.fill {
     -webkit-transform:scale(1.5, 1.5);

js/id/modes/select.js

@@ -87,11 +87,12 @@ iD.modes.Select = function (entity) {
 
         // Exit mode if selected entity gets undone
         mode.history.on('change.entity-undone', function() {
+            var old = entity;
             entity = mode.history.graph().entity(entity.id);
             if (!entity) {
                 mode.controller.enter(iD.modes.Browse());
-            } else {
-                d3.select('.inspector-wrap').datum(entity).call(inspector);
+            } else if(!_.isEqual(entity.tags, old.tags)) {
+                inspector.tags(entity.tags);
             }
         });
 

js/id/renderer/map.js

@@ -64,12 +64,15 @@ iD.Map = function() {
             all = graph.intersects(extent);
             filter = d3.functor(true);
         } else {
-            var only = {};
+            var only = {},
+                filterOnly = {};
             for (var j = 0; j < difference.length; j++) {
-                var id = difference[j];
-                var entity = graph.fetch(id);
+                var id = difference[j],
+                    entity = graph.fetch(id);
+                // Even if the entity is false (deleted), it needs to be
+                // removed from the surface
+                only[id] = entity;
                 if (entity && entity.intersects(extent, graph)) {
-                    only[id] = entity;
                     if (only[id].type === 'node') {
                         var parents = graph.parentWays(only[id]);
                         for (var k = 0; k < parents.length; k++) {
@@ -81,7 +84,7 @@ iD.Map = function() {
                     }
                 }
             }
-            all = _.values(only);
+            all = _.compact(_.values(only));
             filter = function(d) { return d.midpoint ? d.way in only : d.id in only; };
         }
 

js/id/ui/inspector.js

@@ -99,7 +99,8 @@ iD.ui.inspector = function() {
             tags = [{key: '', value: ''}];
         }
 
-        var li = tagList.selectAll('li')
+        var li = tagList.html('')
+            .selectAll('li')
             .data(tags, function(d) { return d.key; });
 
         li.exit().remove();
@@ -154,7 +155,6 @@ iD.ui.inspector = function() {
                                 if (en.on_node) types.push('point');
                                 if (en.on_way) types.push('line');
                                 en.types = types;
-                                console.log(en);
                                 iD.ui.modal()
                                     .select('.content')
                                     .datum(en)
@@ -256,15 +256,19 @@ iD.ui.inspector = function() {
         event.close(entity);
     }
 
-    inspector.tags = function () {
-        var tags = {};
-        tagList.selectAll('li').each(function() {
-            var row = d3.select(this),
-                key = row.selectAll('.key').property('value'),
-                value = row.selectAll('.value').property('value');
-            if (key !== '') tags[key] = value;
-        });
-        return tags;
+    inspector.tags = function (tags) {
+        if (!arguments.length) {
+            var tags = {};
+            tagList.selectAll('li').each(function() {
+                var row = d3.select(this),
+                    key = row.selectAll('.key').property('value'),
+                    value = row.selectAll('.value').property('value');
+                if (key !== '') tags[key] = value;
+            });
+            return tags;
+        } else {
+            drawTags(tags);
+        }
     };
 
     return d3.rebind(inspector, event, 'on');