Skip to content
This repository has been archived by the owner on Aug 17, 2020. It is now read-only.

Commit

Permalink
feat: clearer details section, with 'level' elements
Browse files Browse the repository at this point in the history
  • Loading branch information
@severo
severo committed Apr 9, 2019
1 parent c3c1e59 commit 1a63ffe
Show file tree
Hide file tree
Showing 9 changed files with 194 additions and 74 deletions.
9 changes: 6 additions & 3 deletions docs/css/main.css
View file

Large diffs are not rendered by default.

49 changes: 35 additions & 14 deletions docs/lib/main.en.js
View file
Expand Up @@ -19578,11 +19578,24 @@
}
}

function addLevelItem(parent, heading, title) {
var level = parent.append('div').classed('level-item has-text-centered', true);
level.append('p').classed('heading', true).text(heading);
level.append('p').classed('title', true).text(title);
return level;
}

function makeMun$1(parent, dispatcher, view, state) {
var main = parent.select('#details-main');
main.html(null);
makeHeader(main, state.mun.properties.name, state.mun.properties.fuName);
main.append('p').html('<strong>Population:</strong> ' + (+state.mun.properties.population).toLocaleString('en-US'));
/*main
.append('p')
.html(
'<strong>Population</strong> ' +
(+state.mun.properties.population).toLocaleString('en-US')
);
*/

if (view === 'limits') {
makeLimits(main, dispatcher, state.mun, state.data);
Expand All @@ -19601,53 +19614,61 @@
}

function makeCocktail(parent, dispatcher, mun, data) {
// map1Number should always be present - NaN if no tests
var level = parent.append('nav').classed('level is-mobile', true);
addLevelItem(level, 'Population', (+mun.properties.population).toLocaleString('en-US')); // map1Number should always be present - NaN if no tests

if (isNaN(mun.properties.map1Number)) {
parent.append('header').html('<strong class="is-size-4">No data</strong>' + ' about agrotoxics inside drinking water in ' + mun.properties.name + '.');
addLevelItem(level, 'Pesticides detected', 'No data');
parent.append('header').html('<span class="is-size-4">No data</span>' + ' about agrotoxics inside drinking water in ' + mun.properties.name + '.');
} else if (mun.properties.map1Number === 0) {
parent.append('header').html('<strong class="is-size-4">No agrotoxics</strong>' + ' detected inside drinking water in ' + mun.properties.name + '.');
addLevelItem(level, 'Pesticides detected', mun.properties.map1Number);
parent.append('header').html('<span class="is-size-4">No agrotoxics</span>' + ' detected inside drinking water in ' + mun.properties.name + '.');
} else {
parent.append('header').html('<strong class="is-size-4"><span class="is-size-2">' + mun.properties.map1Number + '</span> agrotoxic(s)</strong>' + ' detected in drinking water in ' + mun.properties.name + '.');
addLevelItem(level, 'Pesticides detected', mun.properties.map1Number);
parent.append('header').html('<span class="is-size-4">' + mun.properties.map1Number + '</span> agrotoxic(s)' + ' detected in drinking water in ' + mun.properties.name + '.');
var list = parent.append('ul');
var hhceSubstances = mun.properties.tests.filter(function (sub) {
return sub.substance.isHhce && sub.max > 0;
});

if (hhceSubstances.length > 0) {
makeTubesCocktail(parent, hhceSubstances, '<strong class="is-size-4">' + hhceSubstances.length + '</strong> out of ' + mun.properties.map1Number + ': associated with ' + '<strong>chronic dieses</strong> ' + 'such as cancer, birth defects and endocrine disruption', 'hhce');
makeTubesCocktail(list.append('li'), hhceSubstances, '<span class="is-size-4">' + hhceSubstances.length + '</span> associated with ' + '<strong>chronic dieses</strong> ' + 'such as cancer, birth defects and endocrine disruption', 'hhce');
var otherSubstances = mun.properties.tests.filter(function (sub) {
return !sub.substance.isHhce && sub.max > 0;
});

if (otherSubstances.length > 0) {
makeTubesCocktail(parent, otherSubstances, '<strong class="is-size-4">' + otherSubstances.length + '</strong> out of ' + mun.properties.map1Number + ': other pesticides', 'no-hhce');
makeTubesCocktail(list.append('li'), otherSubstances, '<span class="is-size-4">' + otherSubstances.length + '</span> other pesticides', 'no-hhce');
}
} else {
makeTubesCocktail(parent, mun.properties.tests, '', 'no-hhce');
makeTubesCocktail(list.append('li'), mun.properties.tests, '', 'no-hhce');
}
}
}

function makeLimits(parent, dispatcher, mun, data) {
// map2Category should always be present
var level = parent.append('nav').classed('level is-mobile', true);
addLevelItem(level, 'Population', (+mun.properties.population).toLocaleString('en-US')); // map2Category should always be present

if (mun.properties.map2Category === MAP2.CATEGORY.NO_TEST) {
parent.append('header').html('<strong class="is-size-4">' + 'No data</strong> about agrotoxics inside drinking water in ' + mun.properties.name + '.');
parent.append('header').html('<span class="is-size-4">' + 'No data</span> about agrotoxics inside drinking water in ' + mun.properties.name + '.');
} else if (mun.properties.map2Category === MAP2.CATEGORY.BELOW) {
parent.append('header').html('<strong class="is-size-4">' + 'No agrotoxics</strong> detected above the Brazilian or European limits in ' + mun.properties.name + '.');
parent.append('header').html('<span class="is-size-4">' + 'No agrotoxics</span> detected above the Brazilian or European limits in ' + mun.properties.name + '.');
} else {
var supBrSubstances = mun.properties.tests.filter(function (sub) {
return sub.map2Category === MAP2.CATEGORY.SUP_BR;
});

if (supBrSubstances.length > 0) {
makeTubesLimits(parent, supBrSubstances, '<strong class="is-size-4">' + supBrSubstances.length + '</strong> agrotoxic(s) detected above the Brazilian limit', 'cat-' + MAP2.CATEGORY.SUP_BR);
makeTubesLimits(parent, supBrSubstances, '<span class="is-size-4">' + supBrSubstances.length + '</span> agrotoxic(s) detected above the Brazilian limit', 'cat-' + MAP2.CATEGORY.SUP_BR);
}

var supEuSubstances = mun.properties.tests.filter(function (sub) {
return sub.map2Category === MAP2.CATEGORY.SUP_EU;
});

if (supEuSubstances.length > 0) {
makeTubesLimits(parent, supEuSubstances, '<strong class="is-size-4">' + supEuSubstances.length + '</strong> agrotoxic(s) detected above the European limit', 'cat-' + MAP2.CATEGORY.SUP_EU);
makeTubesLimits(parent, supEuSubstances, '<span class="is-size-4">' + supEuSubstances.length + '</span> agrotoxic(s) detected above the European limit', 'cat-' + MAP2.CATEGORY.SUP_EU);
}
}
}
Expand All @@ -19657,7 +19678,7 @@
parent
.append('p')
.html(
'<strong>Population:</strong> ' +
'<strong>Population</strong> ' +
(+mun.properties.population).toLocaleString('en-US')
);

Expand Down
49 changes: 35 additions & 14 deletions docs/lib/main.es.js
View file
Expand Up @@ -19578,11 +19578,24 @@
}
}

function addLevelItem(parent, heading, title) {
var level = parent.append('div').classed('level-item has-text-centered', true);
level.append('p').classed('heading', true).text(heading);
level.append('p').classed('title', true).text(title);
return level;
}

function makeMun$1(parent, dispatcher, view, state) {
var main = parent.select('#details-main');
main.html(null);
makeHeader(main, state.mun.properties.name, state.mun.properties.fuName);
main.append('p').html('<strong>Población:</strong> ' + (+state.mun.properties.population).toLocaleString('es-BO'));
/*main
.append('p')
.html(
'<strong>Población</strong> ' +
(+state.mun.properties.population).toLocaleString('es-BO')
);
*/

if (view === 'limits') {
makeLimits(main, dispatcher, state.mun, state.data);
Expand All @@ -19601,53 +19614,61 @@
}

function makeCocktail(parent, dispatcher, mun, data) {
// map1Number should always be present - NaN if no tests
var level = parent.append('nav').classed('level is-mobile', true);
addLevelItem(level, 'Población', (+mun.properties.population).toLocaleString('es-BO')); // map1Number should always be present - NaN if no tests

if (isNaN(mun.properties.map1Number)) {
parent.append('header').html('<strong class="is-size-4">Sin datos</strong>' + ' sobre pesticidas en el agua potable de ' + mun.properties.name + '.');
addLevelItem(level, 'Pesticida(s) detectado(s)', 'Sin datos');
parent.append('header').html('<span class="is-size-4">Sin datos</span>' + ' sobre pesticidas en el agua potable de ' + mun.properties.name + '.');
} else if (mun.properties.map1Number === 0) {
parent.append('header').html('<strong class="is-size-4">Ningún pesticida</strong>' + ' detectado en el agua potable de ' + mun.properties.name + '.');
addLevelItem(level, 'Pesticida(s) detectado(s)', mun.properties.map1Number);
parent.append('header').html('<span class="is-size-4">Ningún pesticida</span>' + ' detectado en el agua potable de ' + mun.properties.name + '.');
} else {
parent.append('header').html('<strong class="is-size-4"><span class="is-size-2">' + mun.properties.map1Number + '</span> pesticida(s)</strong>' + ' detectado(s) en el agua potable de ' + mun.properties.name + '.');
addLevelItem(level, 'Pesticida(s) detectado(s)', mun.properties.map1Number);
parent.append('header').html('<span class="is-size-4">' + mun.properties.map1Number + '</span> pesticida(s)' + ' detectado(s) en el agua potable de ' + mun.properties.name + '.');
var list = parent.append('ul');
var hhceSubstances = mun.properties.tests.filter(function (sub) {
return sub.substance.isHhce && sub.max > 0;
});

if (hhceSubstances.length > 0) {
makeTubesCocktail(parent, hhceSubstances, '<strong class="is-size-4">' + hhceSubstances.length + '</strong> de ' + mun.properties.map1Number + ': asociado(s) con ' + '<strong>enfermedades crónicas</strong> ' + ' como cáncer, defectos congénitos y alteración endocrina', 'hhce');
makeTubesCocktail(list.append('li'), hhceSubstances, '<span class="is-size-4">' + hhceSubstances.length + '</span> asociado(s) con ' + '<strong>enfermedades crónicas</strong> ' + ' como cáncer, defectos congénitos y alteración endocrina', 'hhce');
var otherSubstances = mun.properties.tests.filter(function (sub) {
return !sub.substance.isHhce && sub.max > 0;
});

if (otherSubstances.length > 0) {
makeTubesCocktail(parent, otherSubstances, '<strong class="is-size-4">' + otherSubstances.length + '</strong> de ' + mun.properties.map1Number + ': otro(s) pesticida(s)', 'no-hhce');
makeTubesCocktail(list.append('li'), otherSubstances, '<span class="is-size-4">' + otherSubstances.length + '</span> otro(s) pesticida(s)', 'no-hhce');
}
} else {
makeTubesCocktail(parent, mun.properties.tests, '', 'no-hhce');
makeTubesCocktail(list.append('li'), mun.properties.tests, '', 'no-hhce');
}
}
}

function makeLimits(parent, dispatcher, mun, data) {
// map2Category should always be present
var level = parent.append('nav').classed('level is-mobile', true);
addLevelItem(level, 'Población', (+mun.properties.population).toLocaleString('es-BO')); // map2Category should always be present

if (mun.properties.map2Category === MAP2.CATEGORY.NO_TEST) {
parent.append('header').html('<strong class="is-size-4">' + 'Sin datos</strong> sobre pesticides en el agua potable de ' + mun.properties.name + '.');
parent.append('header').html('<span class="is-size-4">' + 'Sin datos</span> sobre pesticides en el agua potable de ' + mun.properties.name + '.');
} else if (mun.properties.map2Category === MAP2.CATEGORY.BELOW) {
parent.append('header').html('<strong class="is-size-4">' + 'Ningún pesticida</strong> detectado por encima de los límites brasilero o europeo en ' + mun.properties.name + '.');
parent.append('header').html('<span class="is-size-4">' + 'Ningún pesticida</span> detectado por encima de los límites brasilero o europeo en ' + mun.properties.name + '.');
} else {
var supBrSubstances = mun.properties.tests.filter(function (sub) {
return sub.map2Category === MAP2.CATEGORY.SUP_BR;
});

if (supBrSubstances.length > 0) {
makeTubesLimits(parent, supBrSubstances, '<strong class="is-size-4">' + supBrSubstances.length + '</strong> pesticida(s) detectado(s) por encima del límite brasilero', 'cat-' + MAP2.CATEGORY.SUP_BR);
makeTubesLimits(parent, supBrSubstances, '<span class="is-size-4">' + supBrSubstances.length + '</span> pesticida(s) detectado(s) por encima del límite brasilero', 'cat-' + MAP2.CATEGORY.SUP_BR);
}

var supEuSubstances = mun.properties.tests.filter(function (sub) {
return sub.map2Category === MAP2.CATEGORY.SUP_EU;
});

if (supEuSubstances.length > 0) {
makeTubesLimits(parent, supEuSubstances, '<strong class="is-size-4">' + supEuSubstances.length + '</strong> pesticida(s) detectado(s) por encima del límite europeo', 'cat-' + MAP2.CATEGORY.SUP_EU);
makeTubesLimits(parent, supEuSubstances, '<span class="is-size-4">' + supEuSubstances.length + '</span> pesticida(s) detectado(s) por encima del límite europeo', 'cat-' + MAP2.CATEGORY.SUP_EU);
}
}
}
Expand All @@ -19657,7 +19678,7 @@
parent
.append('p')
.html(
'<strong>Población:</strong> ' +
'<strong>Población</strong> ' +
(+mun.properties.population).toLocaleString('es-BO')
);

Expand Down
49 changes: 35 additions & 14 deletions docs/lib/main.pt.js
View file
Expand Up @@ -19578,11 +19578,24 @@
}
}

function addLevelItem(parent, heading, title) {
var level = parent.append('div').classed('level-item has-text-centered', true);
level.append('p').classed('heading', true).text(heading);
level.append('p').classed('title', true).text(title);
return level;
}

function makeMun$1(parent, dispatcher, view, state) {
var main = parent.select('#details-main');
main.html(null);
makeHeader(main, state.mun.properties.name, state.mun.properties.fuName);
main.append('p').html('<strong>Población:</strong> ' + (+state.mun.properties.population).toLocaleString('pt-BR'));
/*main
.append('p')
.html(
'<strong>Población</strong> ' +
(+state.mun.properties.population).toLocaleString('pt-BR')
);
*/

if (view === 'limits') {
makeLimits(main, dispatcher, state.mun, state.data);
Expand All @@ -19601,53 +19614,61 @@
}

function makeCocktail(parent, dispatcher, mun, data) {
// map1Number should always be present - NaN if no tests
var level = parent.append('nav').classed('level is-mobile', true);
addLevelItem(level, 'Población', (+mun.properties.population).toLocaleString('pt-BR')); // map1Number should always be present - NaN if no tests

if (isNaN(mun.properties.map1Number)) {
parent.append('header').html('<strong class="is-size-4">Sin datos</strong>' + ' sobre pesticidas en el agua potable de ' + mun.properties.name + '.');
addLevelItem(level, 'Pesticida(s) detectado(s)', 'Sin datos');
parent.append('header').html('<span class="is-size-4">Sin datos</span>' + ' sobre pesticidas en el agua potable de ' + mun.properties.name + '.');
} else if (mun.properties.map1Number === 0) {
parent.append('header').html('<strong class="is-size-4">Ningún pesticida</strong>' + ' detectado en el agua potable de ' + mun.properties.name + '.');
addLevelItem(level, 'Pesticida(s) detectado(s)', mun.properties.map1Number);
parent.append('header').html('<span class="is-size-4">Ningún pesticida</span>' + ' detectado en el agua potable de ' + mun.properties.name + '.');
} else {
parent.append('header').html('<strong class="is-size-4"><span class="is-size-2">' + mun.properties.map1Number + '</span> pesticida(s)</strong>' + ' detectado(s) en el agua potable de ' + mun.properties.name + '.');
addLevelItem(level, 'Pesticida(s) detectado(s)', mun.properties.map1Number);
parent.append('header').html('<span class="is-size-4">' + mun.properties.map1Number + '</span> pesticida(s)' + ' detectado(s) en el agua potable de ' + mun.properties.name + '.');
var list = parent.append('ul');
var hhceSubstances = mun.properties.tests.filter(function (sub) {
return sub.substance.isHhce && sub.max > 0;
});

if (hhceSubstances.length > 0) {
makeTubesCocktail(parent, hhceSubstances, '<strong class="is-size-4">' + hhceSubstances.length + '</strong> de ' + mun.properties.map1Number + ': asociado(s) con ' + '<strong>enfermedades crónicas</strong> ' + ' como cáncer, defectos congénitos y alteración endocrina', 'hhce');
makeTubesCocktail(list.append('li'), hhceSubstances, '<span class="is-size-4">' + hhceSubstances.length + '</span> asociado(s) con ' + '<strong>enfermedades crónicas</strong> ' + ' como cáncer, defectos congénitos y alteración endocrina', 'hhce');
var otherSubstances = mun.properties.tests.filter(function (sub) {
return !sub.substance.isHhce && sub.max > 0;
});

if (otherSubstances.length > 0) {
makeTubesCocktail(parent, otherSubstances, '<strong class="is-size-4">' + otherSubstances.length + '</strong> de ' + mun.properties.map1Number + ': otro(s) pesticida(s)', 'no-hhce');
makeTubesCocktail(list.append('li'), otherSubstances, '<span class="is-size-4">' + otherSubstances.length + '</span> otro(s) pesticida(s)', 'no-hhce');
}
} else {
makeTubesCocktail(parent, mun.properties.tests, '', 'no-hhce');
makeTubesCocktail(list.append('li'), mun.properties.tests, '', 'no-hhce');
}
}
}

function makeLimits(parent, dispatcher, mun, data) {
// map2Category should always be present
var level = parent.append('nav').classed('level is-mobile', true);
addLevelItem(level, 'Población', (+mun.properties.population).toLocaleString('pt-BR')); // map2Category should always be present

if (mun.properties.map2Category === MAP2.CATEGORY.NO_TEST) {
parent.append('header').html('<strong class="is-size-4">' + 'Sin datos</strong> sobre pesticides en el agua potable de ' + mun.properties.name + '.');
parent.append('header').html('<span class="is-size-4">' + 'Sin datos</span> sobre pesticides en el agua potable de ' + mun.properties.name + '.');
} else if (mun.properties.map2Category === MAP2.CATEGORY.BELOW) {
parent.append('header').html('<strong class="is-size-4">' + 'Ningún pesticida</strong> detectado por encima de los límites brasilero o europeo en ' + mun.properties.name + '.');
parent.append('header').html('<span class="is-size-4">' + 'Ningún pesticida</span> detectado por encima de los límites brasilero o europeo en ' + mun.properties.name + '.');
} else {
var supBrSubstances = mun.properties.tests.filter(function (sub) {
return sub.map2Category === MAP2.CATEGORY.SUP_BR;
});

if (supBrSubstances.length > 0) {
makeTubesLimits(parent, supBrSubstances, '<strong class="is-size-4">' + supBrSubstances.length + '</strong> pesticida(s) detectado(s) por encima del límite brasilero', 'cat-' + MAP2.CATEGORY.SUP_BR);
makeTubesLimits(parent, supBrSubstances, '<span class="is-size-4">' + supBrSubstances.length + '</span> pesticida(s) detectado(s) por encima del límite brasilero', 'cat-' + MAP2.CATEGORY.SUP_BR);
}

var supEuSubstances = mun.properties.tests.filter(function (sub) {
return sub.map2Category === MAP2.CATEGORY.SUP_EU;
});

if (supEuSubstances.length > 0) {
makeTubesLimits(parent, supEuSubstances, '<strong class="is-size-4">' + supEuSubstances.length + '</strong> pesticida(s) detectado(s) por encima del límite europeo', 'cat-' + MAP2.CATEGORY.SUP_EU);
makeTubesLimits(parent, supEuSubstances, '<span class="is-size-4">' + supEuSubstances.length + '</span> pesticida(s) detectado(s) por encima del límite europeo', 'cat-' + MAP2.CATEGORY.SUP_EU);
}
}
}
Expand All @@ -19657,7 +19678,7 @@
parent
.append('p')
.html(
'<strong>Población:</strong> ' +
'<strong>Población</strong> ' +
(+mun.properties.population).toLocaleString('pt-BR')
);

Expand Down

0 comments on commit 1a63ffe

Please sign in to comment.