Merge pull request #404 from NASA-IMPACT/develop

Release 1.4.2
NASA-IMPACT · Sep 15, 2020 · b755cdb · b755cdb
2 parents 9e77382 + ecf9c6d
commit b755cdb
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 38 deletions.
diff --git a/app/assets/scripts/components/common/layers/index.js b/app/assets/scripts/components/common/layers/index.js
@@ -70,13 +70,13 @@ const layerOverridesBySpotlight = {
     'water-chlorophyll': (l, spotlightId) => {
       return {
         ...l,
-        domain: ['2020-03-02', '2020-04-03', '2020-04-19', '2020-05-04', '2020-05-05', '2020-05-19', '2020-05-21', '2020-05-24']
+        domain: ['2020-03-02', '2020-04-03', '2020-04-19', '2020-05-04', '2020-05-05', '2020-05-19', '2020-05-21', '2020-05-24', '2020-06-01', '2020-06-03', '2020-06-06', '2020-06-13', '2020-06-18', '2020-06-21', '2020-06-22', '2020-06-23', '2020-06-26', '2020-06-28', '2020-07-01', '2020-07-03', '2020-07-06', '2020-07-08', '2020-07-13']
       };
     },
     'water-spm': (l, spotlightId) => {
       return {
         ...l,
-        domain: ['2020-03-02', '2020-04-03', '2020-04-19', '2020-05-04', '2020-05-05', '2020-05-19', '2020-05-21', '2020-05-24']
+        domain: ['2020-03-02', '2020-04-03', '2020-04-19', '2020-05-04', '2020-05-05', '2020-05-21', '2020-05-24', '2020-05-28', '2020-06-01', '2020-06-03', '2020-06-06', '2020-06-13', '2020-06-21', '2020-06-22', '2020-06-23', '2020-06-25', '2020-06-28', '2020-07-01', '2020-07-03']
       };
     }
   },
@@ -85,7 +85,7 @@ const layerOverridesBySpotlight = {
     'water-chlorophyll': (l, spotlightId) => {
       return {
         ...l,
-        domain: ['2018-01-03', '2018-01-10', '2018-01-17', '2018-01-24', '2018-01-31', '2018-02-14', '2018-02-21', '2018-03-07', '2018-03-14', '2018-03-28', '2018-04-04', '2018-04-11', '2018-04-18', '2018-04-25', '2018-05-02', '2018-05-09', '2018-05-16', '2018-05-30', '2018-06-20', '2018-06-27', '2018-07-04', '2018-07-11', '2018-07-18', '2018-07-25', '2018-08-01', '2018-08-08', '2018-08-22', '2018-09-05', '2018-09-12', '2018-09-19', '2018-09-26', '2018-10-03', '2018-10-17', '2018-10-24', '2018-11-07', '2018-11-14', '2018-11-21', '2018-11-28', '2018-12-12', '2018-12-19', '2018-12-26', '2019-01-02', '2019-01-09', '2019-01-16', '2019-01-23', '2019-01-30', '2019-02-13', '2019-02-27', '2019-03-06', '2019-03-13', '2019-03-20', '2019-03-27', '2019-04-03', '2019-04-10', '2019-05-08', '2019-05-15', '2019-05-22', '2019-05-29', '2019-06-12', '2019-06-19', '2019-07-24', '2019-07-31', '2019-08-07', '2019-08-14', '2019-08-21', '2019-08-28', '2019-09-04', '2019-09-11', '2019-09-25', '2019-10-02', '2019-10-09', '2019-10-23', '2019-10-30', '2019-11-06', '2019-11-13', '2019-11-20', '2019-11-27', '2019-12-11', '2019-12-18', '2019-12-25', '2020-01-01', '2020-01-08', '2020-01-15', '2020-01-29', '2020-02-05', '2020-02-19', '2020-02-26', '2020-03-04', '2020-03-18', '2020-03-25', '2020-04-01', '2020-04-08', '2020-04-15', '2020-04-29', '2020-05-06', '2020-05-13', '2020-05-20', '2020-06-03'],
+        domain: ['2018-01-03', '2018-01-10', '2018-01-17', '2018-01-24', '2018-01-31', '2018-02-14', '2018-02-21', '2018-03-07', '2018-03-14', '2018-03-28', '2018-04-04', '2018-04-11', '2018-04-18', '2018-04-25', '2018-05-02', '2018-05-09', '2018-05-16', '2018-05-30', '2018-06-20', '2018-06-27', '2018-07-04', '2018-07-11', '2018-07-18', '2018-07-25', '2018-08-01', '2018-08-08', '2018-08-22', '2018-09-05', '2018-09-12', '2018-09-19', '2018-09-26', '2018-10-03', '2018-10-17', '2018-10-24', '2018-11-07', '2018-11-14', '2018-11-21', '2018-11-28', '2018-12-12', '2018-12-19', '2018-12-26', '2019-01-02', '2019-01-09', '2019-01-16', '2019-01-23', '2019-01-30', '2019-02-13', '2019-02-27', '2019-03-06', '2019-03-13', '2019-03-20', '2019-03-27', '2019-04-03', '2019-04-10', '2019-05-08', '2019-05-15', '2019-05-22', '2019-05-29', '2019-06-12', '2019-06-19', '2019-07-24', '2019-07-31', '2019-08-07', '2019-08-14', '2019-08-21', '2019-08-28', '2019-09-04', '2019-09-11', '2019-09-25', '2019-10-02', '2019-10-09', '2019-10-23', '2019-10-30', '2019-11-06', '2019-11-13', '2019-11-20', '2019-11-27', '2019-12-11', '2019-12-18', '2019-12-25', '2020-01-01', '2020-01-08', '2020-01-15', '2020-01-29', '2020-02-05', '2020-02-19', '2020-02-26', '2020-03-04', '2020-03-18', '2020-03-25', '2020-04-01', '2020-04-08', '2020-04-15', '2020-04-29', '2020-05-06', '2020-05-13', '2020-05-20', '2020-06-03', '2020-06-10', '2020-06-13', '2020-07-25', '2020-08-01', '2020-08-08', '2020-08-15'],
         source: {
           ...l.source,
           tiles: l.source.tiles.map(t => t.replace('&rescale=-100%2C100', ''))
@@ -98,7 +98,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']
+        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']
       };
     },
     'detection-ship': (l, spotlightId) =>
@@ -108,7 +108,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']
+        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']
       };
     },
     '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,21 +8,21 @@ export default {
   type: 'raster-timeseries',
   domain: [
     '2018-03-01',
-    '2020-07-01'
+    '2020-08-01'
   ],
   source: {
     type: 'raster',
     tiles: [
-      `${config.api}/{z}/{x}/{y}@1x?url=s3://covid-eo-data/OMNO2d_HRMDifference/OMI_trno2_0.10x0.10_{date}_Col3_V4.nc.tif&resampling_method=bilinear&bidx=1&rescale=-3e15%2C3e15&color_map=rdbu_r&color_formula=gamma r {gamma}`
+      `${config.api}/{z}/{x}/{y}@1x?url=s3://covid-eo-data/OMNO2d_HRMDifference/OMI_trno2_0.10x0.10_{date}_Col3_V4.nc.tif&resampling_method=bilinear&bidx=1&rescale=-3e15%2C3e15&color_map=rdbu_r3`
     ]
   },
   exclusiveWith: ['co2', 'co2-diff', 'gibs-population', 'car-count', 'nightlights-viirs', 'nightlights-hd', 'detection-ship', 'detection-multi', 'water-chlorophyll', 'water-spm', 'no2'],
   enabled: false,
   swatch: indicatorGroupColors['air-quality'],
   legend: {
-    type: 'gradient-adjustable',
-    min: 'less',
-    max: 'more',
+    type: 'gradient',
+    min: '< -3',
+    max: '> 3',
     stops: [
       '#3A88BD',
       '#C9E0ED',
@@ -32,5 +32,5 @@ export default {
 
     ]
   },
-  info: 'This layer shows changes in nitrogen dioxide (NO₂) levels. Redder colors indicate increases in NO₂. Bluer colors indicate lower levels of NO₂.'
+  info: 'This layer shows changes in nitrogen dioxide (NO₂) levels in µmol/m₂. Redder colors indicate increases in NO₂. Bluer colors indicate lower levels of NO₂.'
 };
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-07-01'
+    '2020-08-01'
   ],
   source: {
     type: 'raster',

diff --git a/app/assets/scripts/components/indicators/indicator-agriculture.js b/app/assets/scripts/components/indicators/indicator-agriculture.js
@@ -10,7 +10,10 @@ import media from '../../styles/utils/media-queries';
 
 import { glsp } from '../../styles/utils/theme-values';
 import Heading from '../../styles/type/heading';
+import MediaImage from '../../styles/media-image';
+// import config from '../../config';
 
+// const { baseUrl } = config;
 const LeadFold = styled(Fold)`
   padding-bottom: 0;
 
@@ -75,15 +78,29 @@ const InterpretDataFold = styled(Fold)`
     align-items: center;
   }
 
+  ${MediaImage} {
+    grid-column: full-start / full-end;
+
+    ${media.mediumUp`
+      grid-column: content-start / content-end;
+    `}
+
+    ${media.largeUp`
+      grid-row: 1;
+      grid-column: content-8 / full-end;
+    `}
+  }
+
   ${FoldDetails} {
     grid-column: content-start / content-end;
+    text-align: left;
 
     ${media.mediumUp`
       grid-column: content-start / content-8;
     `}
 
     ${media.largeUp`
-      grid-column: content-start / content-10;
+      grid-column: content-start / content-8;
     `}
   }
 `;
@@ -141,7 +158,7 @@ class AgLongForm extends React.Component {
             <FoldDetails>
               <Prose>
                 <p>
-                  Goverments and agricultural organizations typically rely on
+                  Governments and agricultural organizations typically rely on
                   in-person surveys to track key farming milestones like sowing,
                   crop progress, and harvesting. Due to social distancing
                   measures during the COVID-19 pandemic, groups are increasingly
@@ -153,7 +170,7 @@ class AgLongForm extends React.Component {
                   coronavirus has unevenly impacted global food supply chains.
                   In higher income countries with more isolated agricultural
                   communities and less intensive cultivation techniques, the
-                  virus’s spread has had a minimal effect on key staple crops
+                  virus&apos;s spread has had a minimal effect on key staple crops
                   like wheat, maize, rice, and soybeans. Yet, in some middle
                   and lower income countries where mandatory shelter-in-place
                   orders have strained the cultivation of labor-intensive
@@ -165,12 +182,13 @@ class AgLongForm extends React.Component {
                   Researchers are using data from the{' '}
                   <a
                     href='https://cropmonitor.org/'
+                    title='Visit GEOGLAM page'
                     target='_blank'
                     rel='noopener noreferrer'
                   >
                     Group on Earth Observation’s Global Agricultural Monitoring
-                    Intiative (GEOGLAM) global Crop Monitor{' '}
-                  </a>
+                    Intiative (GEOGLAM) global Crop Monitor
+                  </a>{' '}
                   during the COVID-19 pandemic to predict unexpected
                   agricultural shortfalls in order to strengthen global food
                   security. The GEOGLAM Crop Monitor combines Earth
@@ -195,36 +213,37 @@ class AgLongForm extends React.Component {
                 changes in agricultural land use, as well as agricultural
                 productivity and sustainability. During the pandemic,
                 researchers can leverage this data to rapidly map and depict
-                how the nature and distribution of a country’s agricultural
+                how the nature and distribution of a country&apos;s agricultural
                 fields might be changing during the pandemic. In addition,
                 ongoing work within{' '}
                 <a
                   href='https://nasaharvest.org/'
+                  title='Visit NASA Harvest page'
                   target='_blank'
                   rel='noopener noreferrer'
                 >
                   NASA Harvest
                 </a>
-                a partnership between NASA and the University of Maryland
-                within{' '}
+                , NASA&apos;s food and agriculture program under{' '}
                 <a
                   href='https://appliedsciences.nasa.gov/'
+                  title='Visit NASA Earth Science Applied Sciences Program page'
                   target='_blank'
                   rel='noopener noreferrer'
                 >
-                  NASA’s Earth Science Applied Sciences Program
-                </a>
-                , seeks to enable and advance the adoption of satellite Earth
-                observations by public and private organizations to benefit
-                food security, agriculture, and human and environmental
-                resiliency worldwide.
+                  NASA&apos;s Earth Science Applied Sciences Program
+                </a>{' '}
+                implemented through the University of Maryland, seeks to enable
+                and advance the adoption of satellite Earth observations by
+                public and private organizations to benefit food security,
+                agriculture, and human and environmental resiliency worldwide.
               </p>
               <p>
-                Researchers and the GEOGLAM Crop Monitor use a variety of
-                methods to assess crop conditions, including Normalized
-                Difference Vegetation Index (NDVI), precipitation, soil
-                moisture, evapotranspiration, and temperature. Each of these
-                aspects can be observed using satellites.
+                Researchers use a variety of methods to assess crop conditions,
+                including Normalized Difference Vegetation Index (NDVI),
+                precipitation, soil moisture, evapotranspiration, and
+                temperature. Each of these aspects can be observed using
+                satellites.
               </p>
               <p>
                 NDVI is used to monitor the amount of healthy vegetation in a
@@ -241,11 +260,12 @@ class AgLongForm extends React.Component {
                 water from plants and the land surface, is measured using the{' '}
                 <a
                   href='https://servirglobal.net/Global/Evaporative-Stress-Index/'
+                  title='Learn more about ESI'
                   target='_blank'
                   rel='noopener noreferrer'
                 >
-                  Evaporative Stress Index (ESI){' '}
-                </a>
+                  Evaporative Stress Index (ESI)
+                </a>{' '}
                 to monitor normal evapotranspiration rates and detect potential
                 drought in a region. And temperature is an important factor to
                 assess crop growth because certain crops have specific
@@ -267,11 +287,12 @@ class AgLongForm extends React.Component {
               <Prose>
                 <p>
                   The agricultural data presented in the dashboard are taken
-                  from the GEOGLAM Crop Monitor developed to provide open,
+                  from the GEOGLAM Crop Monitor and developed to provide open,
                   timely, science-driven information on crop conditions in
                   support of market transparency for the{' '}
                   <a
                     href='http://www.amis-outlook.org/amis-about'
+                    title='Visit AMIS page'
                     target='_blank'
                     rel='noopener noreferrer'
                   >
@@ -283,15 +304,29 @@ class AgLongForm extends React.Component {
                   international, multi-source, consensus assessment of global
                   crop growing conditions, status, and climatic factors likely
                   to impact production, such as temperature and precipitation
-                  changes.
+                  changes. These data also underlie the Crop Monitor for Early
+                  Warning (CM4EW), which provides crop condition assessments
+                  for key staple crops and early warning of potential impacts
+                  to crop production that may affect food supply and access
+                  for the most vulnerable populations.
+                </p>
+                <p>
+                  &quot;Assessing the global supply situation and being
+                  able to predict unexpected shortfalls is the single most
+                  important task to guarantee global food security,&quot;
+                  explained Abdolreza Abbassian, Secretary of AMIS and a U.N.
+                  Food and Agriculture Organization senior economist. &quot;
+                  However, such assessments must be evidence-based and
+                  credible, and this is where reliance on timely information
+                  from remote sensing plays a fundamental role.&quot;
                 </p>
                 <p>
-                  Within the Crop Monitor data, each timestep shows the
+                  Within the GEOGLAM Crop Monitor data, each timestep shows the
                   global synthesis crop condition map of all crops being
                   monitored. Each color represents a different crop condition.
                   Blue is “Exceptional,” where crop conditions are much better
                   than average. This label is used only during the
-                  grain-filling through harvest stages. Green is favourable,
+                  grain-filling through harvest stages. Green is favorable,
                   where crop conditions range from slightly below to slightly
                   above average at reporting time. Yellow is Watch, where crop
                   conditions are not far from average but there is a potential
@@ -326,6 +361,13 @@ class AgLongForm extends React.Component {
                 </p>
               </Prose>
             </FoldDetails>
+            {/* <MediaImage
+              src={`${baseUrl}/assets/graphics/content/cropmonitor-july.png`}
+              alt='Crop Monitor for AMIS July'
+            >
+              Crop Monitor for AMIS and Early Warning July synthesis map. Image
+              Credit: GEOGLAM Crop Monitor
+            </MediaImage> */}
           </Gridder>
         </InterpretDataFold>
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "covid-dashboard",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "Frontend application for the Covid Dashboard",
   "repository": {
     "type": "git",