Skip to content

Feature color scale between yellow and red #28

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
RidelHI wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Feature color scale between yellow and red #28

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
707c329
Fixed opacity of map RGBA color
RidelHI Apr 1, 2020
d81e5e8
Feature color scale between yellow and red
RidelHI Apr 2, 2020
9944ab6
Merge branch 'master' of https://github.com/covid19cubadata/covid19cu…
RidelHI Apr 2, 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
39 changes: 22 additions & 17 deletions js/custom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,25 +760,30 @@ $.getJSON("data/paises-info-dias.json", function (countriesdays) {
};
}

$('#cases1').css('color', "rgba(176,30,34," + logx(factor, genInfo.max_muns * factor * 0.2 / genInfo.max_muns) + ")");
$('#cases2').css('color', "rgba(176,30,34," + logx(factor, genInfo.max_muns * factor * 0.4 / genInfo.max_muns) + ")");
$('#cases3').css('color', "rgba(176,30,34," + logx(factor, genInfo.max_muns * factor * 0.6 / genInfo.max_muns) + ")");
$('#cases4').css('color', "rgba(176,30,34," + logx(factor, genInfo.max_muns * factor * 0.8 / genInfo.max_muns) + ")");
$('#cases5').css('color', "rgba(176,30,34," + logx(factor, genInfo.max_muns * factor / genInfo.max_muns) + ")");
function getColor(value) {
var hue = ((1 - value) * 120).toString(10);
return ["hsl(", hue / 1.6, ",80%,40%)"].join("");
}

$('#cases1').css('color', getColor(logx(factor, genInfo.max_muns * factor * 0.2 / genInfo.max_muns)));
$('#cases2').css('color', getColor(logx(factor, genInfo.max_muns * factor * 0.4 / genInfo.max_muns)));
$('#cases3').css('color', getColor(logx(factor, genInfo.max_muns * factor * 0.6 / genInfo.max_muns)));
$('#cases4').css('color', getColor(logx(factor, genInfo.max_muns * factor * 0.8 / genInfo.max_muns)));
$('#cases5').css('color', getColor(logx(factor, genInfo.max_muns * factor / genInfo.max_muns)));
$('#cases').html(genInfo.max_muns);

function getColorM(code) {
if (code in muns) {
var opac = logx(factor, muns[code].total * factor / genInfo.max_muns);
return "rgba(176,30,34," + opac + ")";
return getColor(opac);
}
return '#D1D2D4';
}

function getColorP(code) {
if (code in pros) {
var opac = logx(factor, pros[code].total * factor / genInfo.max_pros);
return "rgba(176,30,34," + opac + ")";
return getColor(opac);
}
return '#D1D2D4';
}
Expand Down Expand Up @@ -820,21 +825,21 @@ $.getJSON("data/paises-info-dias.json", function (countriesdays) {
$('#select-map').on('change', function (e) {
var val = $('#select-map').val();
if (val === 'map-mun') {
$('#cases1').css('color', "rgba(176,30,34," + logx(factor, genInfo.max_muns * factor * 0.2 / genInfo.max_muns) + ")");
$('#cases2').css('color', "rgba(176,30,34," + logx(factor, genInfo.max_muns * factor * 0.4 / genInfo.max_muns) + ")");
$('#cases3').css('color', "rgba(176,30,34," + logx(factor, genInfo.max_muns * factor * 0.6 / genInfo.max_muns) + ")");
$('#cases4').css('color', "rgba(176,30,34," + logx(factor, genInfo.max_muns * factor * 0.8 / genInfo.max_muns) + ")");
$('#cases5').css('color', "rgba(176,30,34," + logx(factor, genInfo.max_muns * factor / genInfo.max_muns) + ")");
$('#cases1').css('color', getColor(logx(factor, genInfo.max_muns * factor * 0.2 / genInfo.max_muns)));
$('#cases2').css('color', getColor(logx(factor, genInfo.max_muns * factor * 0.4 / genInfo.max_muns)));
$('#cases3').css('color', getColor(logx(factor, genInfo.max_muns * factor * 0.6 / genInfo.max_muns)));
$('#cases4').css('color', getColor(logx(factor, genInfo.max_muns * factor * 0.8 / genInfo.max_muns)));
$('#cases5').css('color', getColor(logx(factor, genInfo.max_muns * factor / genInfo.max_muns)));
$('#cases').html(genInfo.max_muns);
$('#map-pro').hide();
$('#map-mun').show();
map_mun.invalidateSize();
} else {
$('#cases1').css('color', "rgba(176,30,34," + logx(factor, genInfo.max_pros * factor * 0.2 / genInfo.max_pros) + ")");
$('#cases2').css('color', "rgba(176,30,34," + logx(factor, genInfo.max_pros * factor * 0.4 / genInfo.max_pros) + ")");
$('#cases3').css('color', "rgba(176,30,34," + logx(factor, genInfo.max_pros * factor * 0.6 / genInfo.max_pros) + ")");
$('#cases4').css('color', "rgba(176,30,34," + logx(factor, genInfo.max_pros * factor * 0.8 / genInfo.max_pros) + ")");
$('#cases5').css('color', "rgba(176,30,34," + logx(factor, genInfo.max_pros * factor / genInfo.max_pros) + ")");
$('#cases1').css('color', getColor(logx(factor, genInfo.max_pros * factor * 0.2 / genInfo.max_pros)));
$('#cases2').css('color', getColor(logx(factor, genInfo.max_pros * factor * 0.4 / genInfo.max_pros)));
$('#cases3').css('color', getColor(logx(factor, genInfo.max_pros * factor * 0.6 / genInfo.max_pros)));
$('#cases4').css('color', getColor(logx(factor, genInfo.max_pros * factor * 0.8 / genInfo.max_pros)));
$('#cases5').css('color', getColor(logx(factor, genInfo.max_pros * factor / genInfo.max_pros)));
$('#cases').html(genInfo.max_pros);
$('#map-mun').hide();
$('#map-pro').show();
Expand Down