Skip to content

Commit

Permalink
Use friendlier units for trace elements
Browse files Browse the repository at this point in the history
Suspended Solids are present in an order of magnitude larger
quantities than trace elements like Nitrogen and Phosphorus.
To better represent them in charts and tables, we keep kg/ha
as the unit Suspended Solids, but use g/ha for Nitrogen and
Phosphorus.
  • Loading branch information
rajadain committed Aug 23, 2017
1 parent fba8507 commit 10054e0
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
16 changes: 10 additions & 6 deletions src/mmw/js/src/compare/models.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,11 @@ var Tr55QualityCharts = ChartRowsCollection.extend({
var name = chart.get('name'),
values = _.map(results, function(result) {
var measures = result.quality.modified,
load = _.find(measures, { measure: name }).load;
load = _.find(measures, { measure: name }).load,
adjustedLoad = name === 'Total Suspended Solids' ?
load : load * 1000;

return aoivm.getLoadingRate(load);
return aoivm.getLoadingRate(adjustedLoad);
});

chart.set({
Expand Down Expand Up @@ -167,18 +169,20 @@ var Tr55QualityTable = TableRowsCollection.extend({
get = function(key) {
return function(result) {
var measures = result.quality.modified,
load = _.find(measures, { measure: key }).load;
load = _.find(measures, { measure: key }).load,
adjustedLoad = key === 'Total Suspended Solids' ?
load : load * 1000;

return aoivm.getLoadingRate(load);
return aoivm.getLoadingRate(adjustedLoad);
};
},
tss = _.map(results, get('Total Suspended Solids')),
tn = _.map(results, get('Total Nitrogen')),
tp = _.map(results, get('Total Phosphorus')),
rows = [
{ name: "Total Suspended Solids", unit: "kg/ha", values: tss },
{ name: "Total Nitrogen" , unit: "kg/ha", values: tn },
{ name: "Total Phosphorus" , unit: "kg/ha", values: tp },
{ name: "Total Nitrogen" , unit: "g/ha", values: tn },
{ name: "Total Phosphorus" , unit: "g/ha", values: tp },
];

this.reset(rows);
Expand Down
4 changes: 2 additions & 2 deletions src/mmw/js/src/compare/views.js
Original file line number Diff line number Diff line change
Expand Up @@ -659,15 +659,15 @@ function getTr55Tabs(scenarios) {
chartDiv: 'tn-chart',
seriesColors: ['#389b9b'],
legendItems: null,
unit: 'kg/ha',
unit: 'g/ha',
unitLabel: 'Loading Rate',
},
{
name: 'Total Phosphorus',
chartDiv: 'tp-chart',
seriesColors: ['#389b9b'],
legendItems: null,
unit: 'kg/ha',
unit: 'g/ha',
unitLabel: 'Loading Rate',
}
], { scenarios: scenarios, aoiVolumeModel: aoiVolumeModel });
Expand Down

0 comments on commit 10054e0

Please sign in to comment.