diff --git a/css/60_photos.css b/css/60_photos.css index 505ab086f..ee44e7e9a 100644 --- a/css/60_photos.css +++ b/css/60_photos.css @@ -117,7 +117,7 @@ .layer-notes { pointer-events: none; } -.layer-notes .notes * { +.layer-notes * { color: #eebb00; } diff --git a/modules/svg/notes.js b/modules/svg/notes.js index f6dd5593d..58e6f94d3 100644 --- a/modules/svg/notes.js +++ b/modules/svg/notes.js @@ -61,32 +61,25 @@ export function svgNotes(projection, context, dispatch) { var service = getService(); var data = (service ? service.notes(projection) : []); var transform = svgPointTransform(projection); - var notes = layer.selectAll('.notes').selectAll('.note') + var notes = layer.selectAll('.note') .data(data, function(d) { return d.key; }); // exit notes.exit() .remove(); - // enter var notesEnter = notes.enter() - .append('g') - .attr('class', 'note'); - - // update - var markers = notes - .merge(notesEnter) - .attr('transform', transform); - - markers.selectAll('circle') - .data([0]) - .enter() .append('use') + .attr('class', 'note') .attr('width', '24px') .attr('height', '24px') .attr('x', '-12px') .attr('y', '-12px') .attr('xlink:href', '#fas-comment-alt'); + + notes + .merge(notesEnter) + .attr('transform', transform); } function drawNotes(selection) { @@ -99,16 +92,10 @@ export function svgNotes(projection, context, dispatch) { layer.exit() .remove(); - var layerEnter = layer.enter() + layer.enter() .append('g') .attr('class', 'layer-notes') - .style('display', enabled ? 'block' : 'none'); - - layerEnter - .append('g') - .attr('class', 'notes'); - - layer = layerEnter + .style('display', enabled ? 'block' : 'none') .merge(layer); if (enabled) {