diff --git a/app/assets/graphics/content/cities/togo.jpg b/app/assets/graphics/content/cities/togo.jpg new file mode 100644 index 00000000..d8562168 Binary files /dev/null and b/app/assets/graphics/content/cities/togo.jpg differ diff --git a/app/assets/graphics/content/cities/wble.jpg b/app/assets/graphics/content/cities/wble.jpg new file mode 100644 index 00000000..5e29e223 Binary files /dev/null and b/app/assets/graphics/content/cities/wble.jpg differ diff --git a/app/assets/scripts/components/common/layers/index.js b/app/assets/scripts/components/common/layers/index.js index 206b2103..cb27ecfa 100644 --- a/app/assets/scripts/components/common/layers/index.js +++ b/app/assets/scripts/components/common/layers/index.js @@ -122,7 +122,7 @@ const layerOverridesBySpotlight = { 'water-chlorophyll': (l, spotlightId) => { return { ...l, - domain: ['2020-01-01', '2020-01-08', '2020-01-15', '2020-01-22', '2020-01-29', '2020-02-05', '2020-02-12', '2020-02-19', '2020-02-26', '2020-03-04', '2020-03-11', '2020-03-18', '2020-03-25', '2020-04-01', '2020-04-08', '2020-04-15', '2020-04-22', '2020-04-29', '2020-05-06', '2020-05-13', '2020-05-20', '2020-05-27', '2020-06-03', '2020-06-10', '2020-06-17', '2020-06-24', '2020-07-01', '2020-07-08', '2020-07-15', '2020-07-22', '2020-07-29', '2020-08-05'] + domain: ['2020-01-01', '2020-01-08', '2020-01-15', '2020-01-22', '2020-01-29', '2020-02-05', '2020-02-12', '2020-02-19', '2020-02-26', '2020-03-04', '2020-03-11', '2020-03-18', '2020-03-25', '2020-04-01', '2020-04-08', '2020-04-15', '2020-04-22', '2020-04-29', '2020-05-06', '2020-05-13', '2020-05-20', '2020-05-27', '2020-06-03', '2020-06-10', '2020-06-17', '2020-06-24', '2020-07-01', '2020-07-08', '2020-07-15', '2020-07-22', '2020-07-29', '2020-08-05', '2020-08-12', '2020-09-02', '2020-09-09', '2020-09-16', '2020-09-23', '2020-09-30'] }; }, 'detection-ship': (l, spotlightId) => @@ -132,7 +132,7 @@ const layerOverridesBySpotlight = { 'water-spm': (l, spotlightId) => { return { ...l, - domain: ['2020-01-01', '2020-01-08', '2020-01-15', '2020-01-22', '2020-01-29', '2020-02-05', '2020-02-12', '2020-02-19', '2020-02-26', '2020-03-04', '2020-03-11', '2020-03-18', '2020-03-25', '2020-04-01', '2020-04-08', '2020-04-15', '2020-04-22', '2020-04-29', '2020-05-06', '2020-05-13', '2020-05-20', '2020-05-27', '2020-06-03', '2020-06-10', '2020-06-17', '2020-06-24', '2020-07-01', '2020-07-08', '2020-07-15', '2020-07-22', '2020-07-29', '2020-08-05'] + domain: ['2020-01-01', '2020-01-08', '2020-01-15', '2020-01-22', '2020-01-29', '2020-02-05', '2020-02-12', '2020-02-19', '2020-02-26', '2020-03-04', '2020-03-11', '2020-03-18', '2020-03-25', '2020-04-01', '2020-04-08', '2020-04-15', '2020-04-22', '2020-04-29', '2020-05-06', '2020-05-13', '2020-05-20', '2020-05-27', '2020-06-03', '2020-06-10', '2020-06-17', '2020-06-24', '2020-07-01', '2020-07-08', '2020-07-15', '2020-07-22', '2020-07-29', '2020-08-05', '2020-08-12', '2020-09-02', '2020-09-09', '2020-09-16', '2020-09-23', '2020-09-30'] }; }, 'nightlights-hd': (l, spotlightId) => { diff --git a/app/assets/scripts/components/common/layers/layer-no2-diff.js b/app/assets/scripts/components/common/layers/layer-no2-diff.js index 621108f9..d7ea8ba3 100644 --- a/app/assets/scripts/components/common/layers/layer-no2-diff.js +++ b/app/assets/scripts/components/common/layers/layer-no2-diff.js @@ -8,7 +8,7 @@ export default { type: 'raster-timeseries', domain: [ '2018-03-01', - '2020-08-01' + '2020-09-01' ], source: { type: 'raster', diff --git a/app/assets/scripts/components/common/layers/layer-no2.js b/app/assets/scripts/components/common/layers/layer-no2.js index e000bac3..51c9a0a6 100644 --- a/app/assets/scripts/components/common/layers/layer-no2.js +++ b/app/assets/scripts/components/common/layers/layer-no2.js @@ -10,7 +10,7 @@ export default { type: 'raster-timeseries', domain: [ '2018-03-01', - '2020-08-01' + '2020-09-01' ], source: { type: 'raster', diff --git a/app/assets/scripts/components/common/simple-line-chart/yaxis.layer.js b/app/assets/scripts/components/common/simple-line-chart/yaxis.layer.js index c7f5e4ec..bcfc977d 100644 --- a/app/assets/scripts/components/common/simple-line-chart/yaxis.layer.js +++ b/app/assets/scripts/components/common/simple-line-chart/yaxis.layer.js @@ -23,7 +23,7 @@ export default { const { left, top } = ctx.margin; const { width } = ctx.getSize(); - const yAxis = d3fc.axisLeft(yScale).ticks(5, '.1e'); + const yAxis = d3fc.axisLeft(yScale).ticks(5, '.3~g'); svg.select('.y.axis') .attr('transform', `translate(${left - 8},${top})`) diff --git a/app/assets/scripts/components/spotlight/hub/index.js b/app/assets/scripts/components/spotlight/hub/index.js index 4bdff1df..aed2141e 100644 --- a/app/assets/scripts/components/spotlight/hub/index.js +++ b/app/assets/scripts/components/spotlight/hub/index.js @@ -113,6 +113,27 @@ class SpotlightAreasHub extends React.Component { ))} + + + + + + diff --git a/package.json b/package.json index 11530529..550c4bfa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "covid-dashboard", - "version": "1.6.0", + "version": "1.6.1", "description": "Frontend application for the Covid Dashboard", "repository": { "type": "git",