From 23a0470f4465e76eca3b1ab8794461bb2c3227cd Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Tue, 13 Nov 2012 12:29:59 -0500
Subject: [PATCH] Add background circles for POIs, better select states for
 them.

---
 css/map.css           | 18 +++++++++++++-----
 js/iD/renderer/Map.js | 43 +++++++++++++++++++++++++------------------
 2 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/css/map.css b/css/map.css
index 04ca64677..a1dd1c05f 100644
--- a/css/map.css
+++ b/css/map.css
@@ -7,6 +7,18 @@ path, image.marker {
     cursor: pointer;
 }
 
+g.marker circle {
+    fill:#fff;
+    stroke:#888;
+    stroke-width:1;
+}
+
+g.marker.active circle {
+    stroke-width:2;
+    stroke:#000;
+    fill:#FCFFAF;
+}
+
 /* interactive elements */
 circle.handle {
     cursor: move;
@@ -29,14 +41,10 @@ circle.teaser-point {
 
 .casing.active {
     stroke:#FFF9C9;
-    stroke-opacity:0.5;
+    stroke-opacity:1;
     stroke-width:8;
 }
 
-image.marker {
-    background:#fff;
-}
-
 .stroke {
     stroke: #555;
     stroke-linecap:round;
diff --git a/js/iD/renderer/Map.js b/js/iD/renderer/Map.js
index 17d176997..ee4c9b81f 100755
--- a/js/iD/renderer/Map.js
+++ b/js/iD/renderer/Map.js
@@ -26,7 +26,7 @@ iD.Map = function(elem) {
         connection = iD.Connection(),
         inspector = iD.Inspector(history),
         parent = d3.select(elem),
-        selection = [],
+        selection = null,
         projection = d3.geo.mercator()
             .scale(512).translate([512, 512]),
         // behaviors
@@ -35,6 +35,7 @@ iD.Map = function(elem) {
             .scale(projection.scale())
             .scaleExtent([256, 134217728])
             .on('zoom', zoomPan),
+
         // this is used with handles
         dragbehavior = d3.behavior.drag()
             .origin(function(entity) {
@@ -111,10 +112,11 @@ iD.Map = function(elem) {
         var ways = [], areas = [], points = [];
 
         var active_entity = null;
-        var selected_id = selection && selection[0];
+        var selected_id = selection;
 
         for (var i = 0; i < all.length; i++) {
             var a = all[i];
+            if (a.id === selected_id) active_entity = a;
             if (a.type === 'way') {
                 a._line = nodeline(a);
                 if (!iD.Way.isClosed(a)) {
@@ -122,16 +124,19 @@ iD.Map = function(elem) {
                 } else {
                     areas.push(a);
                 }
-                if (a.id === selected_id) active_entity = a;
             } else if (a._poi) {
                 points.push(a);
             }
         }
 
+        function classActive(d) {
+            return d.id === selected_id;
+        }
+
         var fills = fill_g.selectAll('path.area').data(areas, key),
             casings = casing_g.selectAll('path.casing').data(ways, key),
             strokes = stroke_g.selectAll('path.stroke').data(ways, key),
-            markers = hit_g.selectAll('image.marker').data(points, key);
+            markers = hit_g.selectAll('g.marker').data(points, key);
 
         // Fills
         fills.exit().remove();
@@ -146,9 +151,7 @@ iD.Map = function(elem) {
         casings.order()
             .attr('d', function(d) { return d._line; })
             .attr('class', class_casing)
-            .classed('active', function(d) {
-                return d.id === selected_id;
-            });
+            .classed('active', classActive);
 
         // Strokes
         strokes.exit().remove();
@@ -157,19 +160,23 @@ iD.Map = function(elem) {
         strokes.order()
             .attr('d', function(d) { return d._line; })
             .attr('class', class_stroke)
-            .classed('active', function(d) {
-                return d.id === selected_id;
-            });
+            .classed('active', classActive);
 
         // Markers
         markers.exit().remove();
-        markers.enter().append('image')
-            .attr('class', class_marker)
+        var marker = markers.enter().append('g')
+            .attr('class', 'marker')
             .on('click', selectClick)
-            .attr({ width: 16, height: 16 })
-            .attr('xlink:href', iD.Style.markerimage)
             .call(dragbehavior);
-        markers.attr('transform', function(d) {
+        marker.append('circle')
+            .attr('r', 10)
+            .attr('cx', 8)
+            .attr('cy', 8);
+        marker.append('image')
+            .attr({ width: 16, height: 16 })
+            .attr('xlink:href', iD.Style.markerimage);
+        markers.classed('active', classActive)
+            .attr('transform', function(d) {
             var pt = projection([d.lon, d.lat]);
             pt[0] -= 8;
             pt[1] -= 8;
@@ -209,15 +216,15 @@ iD.Map = function(elem) {
     }, 1000);
 
     function deselectClick() {
-        selection = [];
+        selection = null;
         drawVector();
         d3.select('.inspector-wrap').style('display', 'none');
         d3.event.stopPropagation();
     }
 
     function selectClick(d) {
-        if (selection[0] === d.id) return;
-        selection = [d.id];
+        if (selection === d.id) return;
+        selection = d.id;
         drawVector();
         d3.select('.inspector-wrap')
             .style('display', 'block')