From cb337026db792653e9975f908ef0ff013458c24c Mon Sep 17 00:00:00 2001 From: John Dwyer Date: Fri, 18 Nov 2016 11:00:19 -0800 Subject: [PATCH] Now reads minVal and maxVal for contours from metadatafile --- dataviz/static/geometadata/meta.json | 6 ++++++ dataviz/static/js/app.js | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 dataviz/static/geometadata/meta.json diff --git a/dataviz/static/geometadata/meta.json b/dataviz/static/geometadata/meta.json new file mode 100644 index 0000000..0d10925 --- /dev/null +++ b/dataviz/static/geometadata/meta.json @@ -0,0 +1,6 @@ +[ + {"title":"Surface Temperature [K]", + "minval": 220, + "maxval": 330 + } +] diff --git a/dataviz/static/js/app.js b/dataviz/static/js/app.js index 622b13d..d9fe742 100644 --- a/dataviz/static/js/app.js +++ b/dataviz/static/js/app.js @@ -29,6 +29,16 @@ function getTiffs(array) { // process each tiff asynchronously processTiffs(years, function (ind, val, report) { + + // Load meta data for plotting + d3.json('static/geometadata/meta.json', function(error, jsondata) { + if (error) throw error; + var figtitle = jsondata[0]['title'] + var minVal = jsondata[0]['minval'] + var maxVal = jsondata[0]['maxval'] + + + // append an HTML5 canvas element to the map div var canvas = d3.select("#canvas" + val).select("canvas") .attr("width", width) @@ -65,8 +75,7 @@ function getTiffs(array) { data[j][image.getWidth()] = data[j][image.getWidth()-1] } - // interpollate raster color values - var maxVal = 330, minVal = 220; + // set intervals within min/max range var intervals = d3.range(minVal, maxVal + (maxVal - minVal) / 20, (maxVal - minVal) / 20); @@ -111,6 +120,7 @@ function getTiffs(array) { }); }); + }); }