@andyreagan/hedotools 4.5.0 → 6.0.0

package/js/hedotools.barchart.js

@@ -264,11 +264,11 @@ hedotools.barchart = function() {
 	    .style('opacity','1.0').style('stroke-width','1.0').style('stroke','rgb(100,100,100)')
 	    .attr("height",function(d,i) { return 11; } )
 	    .attr("width",function(d,i) { if (d[3]>0) {return d3.max([x(d[3])-figcenter,0]);} else {return d3.max([figcenter-x(d[3]),0]); } } )
-	    .on('mouseover', function(d,i){
+	    .on('mouseover', function(event,d){
 		var rectSelection = d3.select(this).style('opacity','1.0').style('stroke','black').style('stroke-width','1.0');
-		hedotools.barchartoncall.test(d,i);
+		hedotools.barchartoncall.test(d,d[0]);
 	    })
-	    .on('mouseout', function(d){
+	    .on('mouseout', function(event,d){
 		var rectSelection = d3.select(this).style('opacity','1.0').style('stroke','rgb(100,100,100)').style('stroke-width','1.0');
 		// var rectSelection = d3.select(this).style({opacity:'0.7'});
 	    });
@@ -282,8 +282,8 @@ hedotools.barchart = function() {
 	    .style("text-anchor", function(d,i) { if (d[3]>0) { return "end";} else { return "start";}})
 	    .attr("y",function(d,i) { return y(i+1)+11; } )
             .text(function(d,i) { return (i+1)+". "+d[2]; })
-	    .on('mouseover', function(d,i){
-		hedotools.barchartoncall.test(d,i);
+	    .on('mouseover', function(event,d){
+		hedotools.barchartoncall.test(d,d[0]);
 	    });
 
 	// d3.select(window).on("resize.shiftplot",resizeshift);

package/js/hedotools.lens.js

@@ -99,7 +99,7 @@ hedotools.lens = function() {
 		.range([0,width]);
 	    
 	    // use d3.layout http://bl.ocks.org/mbostock/3048450
-	    var data = d3.histogram()
+	    var data = d3.bin()
 		.domain(x.domain())
 		.thresholds(x.ticks(65))
                 (lens);
@@ -227,11 +227,11 @@ hedotools.lens = function() {
 	    
 
 
-	    function brushended() {
-		if (!d3.event.sourceEvent) return;
-		if (!d3.event.selection) return;
+	    function brushended(event) {
+		if (!event.sourceEvent) return;
+		if (!event.selection) return;
 		// selection is in pixels; invert through brushX to data space
-		var extent0 = d3.event.selection.map(brushX.invert),
+		var extent0 = event.selection.map(brushX.invert),
 		extent1 = extent0; // should round it to bins
 
 		onredrawfunction();
@@ -316,7 +316,7 @@ hedotools.lens = function() {
 		.attr("type","button")
 		.attr("class", function(d,i) { return "btn btn-default btn-xs "+defaultnames[i]; })
 		.html(function(d,i) { return defaultnames[i]; })
-		.on("click",function(d,i) { 
+		.on("click",function(event,d) {
 		    figure.selectAll("button").attr("class","btn btn-default btn-xs"); 
 		    d3.select(this).attr("class","btn btn-primary btn-xs"); 
 		    d3.select(".lensbrush") //.transition()

package/js/hedotools.map.js

@@ -121,7 +121,8 @@ hedotools.map = function() {
     		.attr("height", 19)
     		.attr("fill", "white") //http://www.w3schools.com/html/html_colors.asp
     		.attr("opacity", "0.0")
-    		.on("mousedown", function(d,i) {
+    		.on("mousedown", function(event,d) {
+		    var i = selarray.indexOf(d);
 		    if (stateSelType !== d) {
 			stateSelType = d;
 			activeHover = true;
@@ -275,7 +276,7 @@ hedotools.map = function() {
 	    .attr("stroke","black")
 	    .attr("stroke-width",".7");
 
-	function state_clicked(d,i) { 
+	function state_clicked(event,d) { var i = stateFeatures.indexOf(d);
 	    // next line verifies that the data and json line up
 	    // console.log(d.properties.name); console.log(allData[i].name);
 
@@ -331,7 +332,7 @@ hedotools.map = function() {
 	    // }
 	}
 
-	function state_hover(d,i) { 
+	function state_hover(event,d) { var i = stateFeatures.indexOf(d);
 	    var bbox = this.getBBox(); 
 	    var x = Math.floor(bbox.x + bbox.width/2.0);
 	    var y = Math.floor(bbox.y + bbox.height/2.0);
@@ -480,7 +481,7 @@ hedotools.map = function() {
 	    }
 	}
 
-	function state_unhover(d,i) { 
+	function state_unhover(event,d) {
 
 	    d3.select(".hoverinfogroup").remove();
 

package/js/hedotools.sankey.js

@@ -250,7 +250,7 @@ hedotools.sankey = function() {
 		    .attr("fill", "none")
 		    .attr("class", function(d,i) { return "r"+classColor(data[i].oldindex)+"-8"; })
 		    .attr("stroke-width", function(d,i) { return pathwidth(Math.abs(data[i].change)); })
-	    .on("mouseover", function(d,i) { 
+	    .on("mouseover", function(event,d) { var i = sankeydata.indexOf(d);
 		// console.log(i);
 		// console.log(data[i]);
 		// var rectSelection = d3.select(this)
@@ -276,8 +276,8 @@ hedotools.sankey = function() {
 		    var hoverboxyoffset = 0;
 		    var hoverboxxoffset = 0;
 
-		    var x = d3.mouse(thispath)[0];
-		    var y = d3.mouse(thispath)[1];
+		    var x = d3.pointer(event, thispath)[0];
+		    var y = d3.pointer(event, thispath)[1];
 
                     var hoverboxheightguess = 190;
 		    if (refcity.length > 0) {
@@ -343,12 +343,12 @@ hedotools.sankey = function() {
 			console.log(compfile);
 			var refF;
 			var compF;
-			d3.text(reffile,function(text) {
+			d3.text(reffile).then(function(text) {
 			    refF = text.split(",");
 			    console.log(refF);
 			    if (!--csvLoadsRemaining) drawShift();
 			});
-			d3.text(compfile,function(text) {
+			d3.text(compfile).then(function(text) {
 			    compF = text.split(",");
 			    console.log(compF);
 			    if (!--csvLoadsRemaining) drawShift();
@@ -428,7 +428,7 @@ hedotools.sankey = function() {
 		clearTimeout(popuptimer);
 		popuptimer = setTimeout(hidehover,3000);
 	    })
-	    .on("mouseout", function(d,i) { 
+	    .on("mouseout", function(event,d) {
 		var timeout = 500;
 		if (useTip) {
 		    // hovergroup.style({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@andyreagan/hedotools",
-  "version": "4.5.0",
-  "description": "A collection of D3.js tools in use at hedonometer.org: word shifts (via @andyreagan/d3-shifterator), choropleth maps, sankey diagrams, a frequency lens, and bar charts. Version tracks the supported D3 major version (4.x = D3 v4).",
+  "version": "6.0.0",
+  "description": "A collection of D3.js tools in use at hedonometer.org: word shifts (via @andyreagan/d3-shifterator), choropleth maps, sankey diagrams, a frequency lens, and bar charts. Version tracks the supported D3 major version (6.x = D3 v6).",
   "author": "Andy Reagan",
   "license": "BSD-2-Clause",
   "scripts": {
@@ -32,8 +32,8 @@
     "vitest": "3.2.6"
   },
   "dependencies": {
-    "@andyreagan/d3-shifterator": "^4.1.0",
-    "d3": "^4.13.0",
+    "@andyreagan/d3-shifterator": "^6.0.0",
+    "d3": "^6.7.0",
     "jquery": "^3.5.1",
     "topojson-client": "^3.1.0"
   }