Skip to content

Fix/multimap meta label #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kiddhustle wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix/multimap meta label #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d954188
accessibilty fixes
kiddhustle Sep 16, 2020
b9e7a4c
dvc724: PR feedback - mobile variable select
kiddhustle Sep 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions multimap/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@
})
(window, document, 'script', 'dataLayer', 'GTM-MBCBVQS');
</script>

<meta charset="UTF-8">
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>Multiple variables map</title>
<meta name='viewport' content='initial-scale=1,maximum-scale=1' />
<meta name='viewport' content='initial-scale=1' />

<link href='css/mapbox-gl.css' rel='stylesheet' />
<link href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;700&display=swap" rel="stylesheet">
Expand Down Expand Up @@ -451,6 +449,7 @@
}

input[type='radio']:checked+label {
background: #206095;
color: white;
}

Expand Down
63 changes: 36 additions & 27 deletions multimap/js/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,17 +195,25 @@ if(Modernizr.webgl) {
// .on('click',function(d,i){onchange(i)})


selectgroup = d3.select('#selectnav')
.append('select')
.attr('class','dropdown')
.on('change', onselect)
.selectAll("option")
.data(dvc.varlabels)
.enter()
.append('option')
.attr("value", function(d,i){return i})
.property("selected", function(d, i) {return i===dvc.varload;})
.text(function(d,i){return dvc.varlabels[i]});
var container = d3.select('#selectnav')

container.append('label')
.attr('for', 'selectlistMobile')
.attr('class', 'visuallyhidden')
.text('Choose from selection');

selectgroup = container
.append('select')
.attr('class', 'dropdown')
.attr('id', 'selectlistMobile')
.on('change', onselect)
.selectAll("option")
.data(dvc.varlabels)
.enter()
.append('option')
.attr("value", function (d, i) { return i })
.property("selected", function (d, i) { return i === dvc.varload; })
.text(function (d, i) { return dvc.varlabels[i] });


}
Expand All @@ -219,15 +227,15 @@ if(Modernizr.webgl) {


//Flatten data values and work out breaks
if(config.ons.breaks[a] =="jenks" || config.ons.breaks[a] =="equal") {
if(config.ons.breaks =="jenks" || config.ons.breaks =="equal") {
var values = data.map(function(d) { return +d[variables[a]]; }).filter(function(d) {return !isNaN(d)}).sort(d3.ascending);
};

if(config.ons.breaks[a] =="jenks") {
if(config.ons.breaks =="jenks") {
breaks = [];

ss.ckmeans(values, (dvc.numberBreaks[a])).map(function(cluster,i) {
if(i<dvc.numberBreaks[a]-1) {
ss.ckmeans(values, (dvc.numberBreaks)).map(function(cluster,i) {
if(i<dvc.numberBreaks-1) {
breaks.push(cluster[0]);
} else {
breaks.push(cluster[0])
Expand All @@ -236,8 +244,8 @@ if(Modernizr.webgl) {
}
});
}
else if (config.ons.breaks[a] == "equal") {
breaks = ss.equalIntervalBreaks(values, dvc.numberBreaks[a]);
else if (config.ons.breaks == "equal") {
breaks = ss.equalIntervalBreaks(values, dvc.numberBreaks);
}
else {breaks = config.ons.breaks[a];};

Expand All @@ -248,20 +256,20 @@ if(Modernizr.webgl) {
});

//work out halfway point (for no data position)
midpoint = breaks[0] + ((breaks[dvc.numberBreaks[a]] - breaks[0])/2)
midpoint = breaks[0] + ((breaks[dvc.numberBreaks] - breaks[0])/2)

}

function setupScales() {
//set up d3 color scales
//Load colours
if(typeof dvc.varcolour[a] === 'string') {
color=chroma.scale(dvc.varcolour[a]).colors(dvc.numberBreaks[a])
if(typeof dvc.varcolour === 'string') {
color=chroma.scale(dvc.varcolour).colors(dvc.numberBreaks)
colour=[]
color.forEach(function(d){colour.push(chroma(d).darken(0.4).saturate(0.6).hex())})
// colour = colorbrewer[dvc.varcolour[a]][dvc.numberBreaks];
// colour = colorbrewer[dvc.varcolour][dvc.numberBreaks];
} else {
colour = dvc.varcolour[a];
colour = dvc.varcolour;
}

//set up d3 color scales
Expand Down Expand Up @@ -582,7 +590,7 @@ if(Modernizr.webgl) {

// Set up scales for legend
x = d3.scaleLinear()
.domain([breaks[0], breaks[dvc.numberBreaks[a]]]) /*range for data*/
.domain([breaks[0], breaks[dvc.numberBreaks]]) /*range for data*/
.range([0,keywidth-30]); /*range for pixels*/


Expand Down Expand Up @@ -756,10 +764,11 @@ if(Modernizr.webgl) {
var menuarea = d3.zip(areanames,areacodes).sort(function(a, b){ return d3.ascending(a[0], b[0]); });

// Build option menu for occupations
var optns = d3.select("#selectNav").append("div").attr("id","sel").append("select")
.attr("id","areaselect")
.attr("style","width:calc(100% - 6px)")
.attr("class","chosen-select");
var optns = d3.select("#selectNav").append("div").attr("id", "sel")
.append("select")
.attr("id", "areaselect")
.attr("style", "width:calc(100% - 6px)")
.attr("class", "chosen-select");

optns.append("option")
// .attr("value","first")
Expand Down