Skip to content

Commit

Permalink
fixed merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
holmesjoli committed Apr 15, 2022
2 parents eb4235a + 79e133c commit c0e71db
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions modules/visualization.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ function daysLabel(days, dates) {
return days2;
}


// Title Simulation
// Description Create the simulation so that nodes are spread out and do not overlap
// Description Uses a force simulation to spread the blooms out
export function sim(svg, data, speed, xScale, yScale, fillScale, rStart, rEnd) {

var tooltip = d3.select("#chart")
Expand Down Expand Up @@ -144,4 +143,4 @@ export function drawGrid(svg, dates, xScale, yScale, sdFillScale) {
.attr("height", yScale.bandwidth())
.attr("fill", function(d) {return sdFillScale(d.sd); })
.attr("fill-opacity", function(d) {return sdFillOpacity(d.date_is_median); });
}
}

0 comments on commit c0e71db

Please sign in to comment.