Merge pull request #429 from NASA-IMPACT/develop

Release 1.6.1
NASA-IMPACT · Oct 9, 2020 · 68a28aa · 68a28aa
2 parents 15e564c + edeeaf0
commit 68a28aa
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 6 deletions.
diff --git a/app/assets/graphics/content/cities/togo.jpg b/app/assets/graphics/content/cities/togo.jpg
diff --git a/app/assets/graphics/content/cities/wble.jpg b/app/assets/graphics/content/cities/wble.jpg
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -113,6 +113,27 @@ class SpotlightAreasHub extends React.Component {
                     ))}
                 </EntriesList>
               </HubFold>
+              <HubFold>
+                <InpageHGroup
+                  title='Attribution'
+                  dashColor={metadata.color}
+                />
+                <Prose>
+                  <ul>
+                    <li>
+                      Togo image by{' '}
+                      <a
+                        href='https://commons.wikimedia.org/wiki/File:ECOWAS_Bank_for_Investment_and_Development_headquarters_in_Lom%C3%A9.jpg'
+                        target='_blank'
+                        rel='noopener noreferrer'
+                        title='View more'
+                      >
+                        Willem Heerbaart
+                      </a>, available under cc-by-2.0
+                    </li>
+                  </ul>
+                </Prose>
+              </HubFold>
             </PageConstrainer>
           </InpageBody>
         </Inpage>

diff --git 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",