seschultz · October 26, 2017 04:34
diff --git a/.block b/.block
 license: mit
diff --git a/README.md b/README.md
diff --git a/diabetes2015Label.csv b/diabetes2015Label.csv
diff --git a/index.html b/index.html
 <!DOCTYPE html>
 <html>
  <head>
    <meta charset="utf-8">
    <title>D3 Example</title>
    <script src="//cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js"></script>
    <link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
    <style>
    
      .axis text {
        font-family: 'Open Sans', sans-serif;
        font-size: 20pt;
      }
      .axis .label {
        font-size: 20pt;
      }

      .axis path, .axis line {
        fill: none;
        stroke: #000;
        shape-rendering: crispEdges;
      }

      .x.axis text {
        font-size: 20pt;
      }

    </style>
  </head>
  <body>
    <script>
      var outerWidth = 960;
      var outerHeight = 500;
      var margin = { left: 90, top: 16, right: 30, bottom: 85 };
      var barPadding = 0.2;

      var xColumn = d => d.key;
      var yColumn = d => d.values.diagnosed;
      //var yColumn1 = d => d.values.total;
      var colorColumn = xColumn;//d => d.values.diagnosed;
      var layerColumn = d => d.values.diagnosed;

      var innerWidth  = outerWidth  - margin.left - margin.right;
      var innerHeight = outerHeight - margin.top  - margin.bottom;

      var svg = d3.select("body").append("svg")
        .attr("width",  outerWidth)
        .attr("height", outerHeight);
      var g = svg.append("g")
        .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
      var xAxisG = g.append("g")
        .attr("class", "x axis")
        .attr("transform", "translate(0," + innerHeight + ")");
      var yAxisG = g.append("g")
        .attr("class", "y axis");

      var xScale = d3.scale.ordinal().rangeBands([0, innerWidth], barPadding);
      var yScale = d3.scale.linear().range([innerHeight, 0]);
      var colorScale = d3.scale.category10();

      // Use a modified SI formatter that uses "B" for Billion.
      
      var siFormat = d3.format("s");
      var customTickFormat = function (d){
        return siFormat(d).replace("G", "B");
      };

      var xAxis = d3.svg.axis().scale(xScale).orient("bottom")
        .outerTickSize(0);
      var yAxis = d3.svg.axis().scale(yScale).orient("left")
        .ticks(5)
        .tickFormat(customTickFormat)
        .outerTickSize(0);

      function render(data){

        xScale.domain(       data.map( function (d){ return xColumn(d); }));
        yScale.domain([0, d3.max(data, function (d){ return yColumn(d); })]);
        colorScale.domain(data.map(function (d){ return colorColumn(d); }));

        xAxisG
          .call(xAxis)
          .selectAll("text")  
          .attr("dx", "-0.4em")
          .attr("dy", "1.24em")
          .attr("transform", "rotate(-16)" );

        yAxisG.call(yAxis);

        var bars = g.selectAll("rect").data(data);
        bars.enter().append("rect")
          .attr("width", xScale.rangeBand());
        bars
          .attr("x", function (d){ return xScale(xColumn(d)); })
          .attr("y", function (d){ return yScale(yColumn(d)); })
          .attr("height", function (d){ return innerHeight - yScale(yColumn(d)); })
          .attr("fill", function (d){ return colorScale(colorColumn(d)); });
        bars.exit().remove();
      }

      function type(d){
        //d.population = +d.population;
        d.TotalEnrollment=+d.TotalEnrollment;
        d.TotalDiagnosed=+d.TotalDiagnosed;
        return d;
      }

      d3.csv("diabetes2015Label.csv", type, (dataRaw=>{
             var data = d3.nest()
  							.key(function(d) { return d.PittOrSub; })
  							.rollup(function(v) { return {
    							total: d3.sum(v, function(d) { return d.TotalEnrolled; }),
                  diagnosed: d3.sum(v, function(d) {return d.TotalDiagnosed;})
  								}; })
  							.entries(dataRaw);
      			render(data)}));
             //render));

    </script>
  </body>
 </html>
diff --git a/religionWorldTotals.csv b/religionWorldTotals.csv
	<!DOCTYPE html>
	<html>
	<head>
	<meta charset="utf-8">
	<title>D3 Example</title>
	<script src="//cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js"></script>
	<link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
	<style>

	.axis text {
	font-family: 'Open Sans', sans-serif;
	font-size: 20pt;
	}
	.axis .label {
	font-size: 20pt;
	}

	.axis path, .axis line {
	fill: none;
	stroke: #000;
	shape-rendering: crispEdges;
	}

	.x.axis text {
	font-size: 20pt;
	}

	</style>
	</head>
	<body>
	<script>
	var outerWidth = 960;
	var outerHeight = 500;
	var margin = { left: 90, top: 16, right: 30, bottom: 85 };
	var barPadding = 0.2;

	var xColumn = d => d.key;
	var yColumn = d => d.values.diagnosed;
	//var yColumn1 = d => d.values.total;
	var colorColumn = xColumn;//d => d.values.diagnosed;
	var layerColumn = d => d.values.diagnosed;

	var innerWidth = outerWidth - margin.left - margin.right;
	var innerHeight = outerHeight - margin.top - margin.bottom;

	var svg = d3.select("body").append("svg")
	.attr("width", outerWidth)
	.attr("height", outerHeight);
	var g = svg.append("g")
	.attr("transform", "translate(" + margin.left + "," + margin.top + ")");
	var xAxisG = g.append("g")
	.attr("class", "x axis")
	.attr("transform", "translate(0," + innerHeight + ")");
	var yAxisG = g.append("g")
	.attr("class", "y axis");

	var xScale = d3.scale.ordinal().rangeBands([0, innerWidth], barPadding);
	var yScale = d3.scale.linear().range([innerHeight, 0]);
	var colorScale = d3.scale.category10();

	// Use a modified SI formatter that uses "B" for Billion.

	var siFormat = d3.format("s");
	var customTickFormat = function (d){
	return siFormat(d).replace("G", "B");
	};

	var xAxis = d3.svg.axis().scale(xScale).orient("bottom")
	.outerTickSize(0);
	var yAxis = d3.svg.axis().scale(yScale).orient("left")
	.ticks(5)
	.tickFormat(customTickFormat)
	.outerTickSize(0);

	function render(data){

	xScale.domain( data.map( function (d){ return xColumn(d); }));
	yScale.domain([0, d3.max(data, function (d){ return yColumn(d); })]);
	colorScale.domain(data.map(function (d){ return colorColumn(d); }));

	xAxisG
	.call(xAxis)
	.selectAll("text")
	.attr("dx", "-0.4em")
	.attr("dy", "1.24em")
	.attr("transform", "rotate(-16)" );

	yAxisG.call(yAxis);

	var bars = g.selectAll("rect").data(data);
	bars.enter().append("rect")
	.attr("width", xScale.rangeBand());
	bars
	.attr("x", function (d){ return xScale(xColumn(d)); })
	.attr("y", function (d){ return yScale(yColumn(d)); })
	.attr("height", function (d){ return innerHeight - yScale(yColumn(d)); })
	.attr("fill", function (d){ return colorScale(colorColumn(d)); });
	bars.exit().remove();
	}

	function type(d){
	//d.population = +d.population;
	d.TotalEnrollment=+d.TotalEnrollment;
	d.TotalDiagnosed=+d.TotalDiagnosed;
	return d;
	}

	d3.csv("diabetes2015Label.csv", type, (dataRaw=>{
	var data = d3.nest()
	.key(function(d) { return d.PittOrSub; })
	.rollup(function(v) { return {
	total: d3.sum(v, function(d) { return d.TotalEnrolled; }),
	diagnosed: d3.sum(v, function(d) {return d.TotalDiagnosed;})
	}; })
	.entries(dataRaw);
	render(data)}));
	//render));

	</script>
	</body>
	</html>
	religion	population
	Christian	2173100000
	Muslim	1598360000
	Unaffiliated	1126280000
	Hindu	1032860000
	Buddhist	487320000
	Folk Religions	404890000
	Other Religions	57770000
	Jewish	13640000