Merge pull request #147 from NASA-IMPACT/develop

Release v0.4.1
NASA-IMPACT · Jun 12, 2020 · 46827cf · 46827cf
2 parents de8b1bd + b2a6d3b
commit 46827cf
Show file tree

Hide file tree

Showing 19 changed files with 1,072 additions and 50 deletions.
diff --git a/app/assets/scripts/components/common/layers/index.js b/app/assets/scripts/components/common/layers/index.js
@@ -3,11 +3,13 @@ import population from './layer-population';
 import carCount from './layer-car-count';
 import nightlightsViirs from './layer-nightlights-viirs';
 import nightlightsHd from './layer-nightlights-hd';
+import sampleML from './layer-sample-ml';
 
 export default [
   no2,
   population,
   carCount,
   nightlightsViirs,
-  nightlightsHd
+  nightlightsHd,
+  sampleML
 ];
diff --git a/app/assets/scripts/components/common/layers/layer-car-count.js b/app/assets/scripts/components/common/layers/layer-car-count.js
@@ -12,7 +12,7 @@ export default {
       `${config.api}/{z}/{x}/{y}@1x?url=s3://covid-eo-data/ALOS_SAMPLE/alos2-s1-beijing_{date}.tif&resampling_method=nearest&bidx=1&rescale=1%2C65536`
     ]
   },
-  exclusiveWith: ['no2', 'gibs-population', 'nightlights-viirs', 'nightlights-hd'],
+  exclusiveWith: ['no2', 'gibs-population', 'nightlights-viirs', 'nightlights-hd', 'sample-ml'],
   swatch: {
     color: '#666666',
     name: 'Grey'

diff --git a/app/assets/scripts/components/common/layers/layer-nightlights-hd.js b/app/assets/scripts/components/common/layers/layer-nightlights-hd.js
@@ -15,7 +15,7 @@ export default {
       `${config.api}/{z}/{x}/{y}@1x?url=s3://covid-eo-data/BMHD_30M_MONTHLY/BMHD_VNP46A2_{spotlightId}_{date}_cog.tif&resampling_method=bilinear&bidx=1%2C2%2C3`
     ]
   },
-  exclusiveWith: ['no2', 'gibs-population', 'car-count', 'nightlights-viirs'],
+  exclusiveWith: ['no2', 'gibs-population', 'car-count', 'nightlights-viirs', 'sample-ml'],
   swatch: {
     color: '#f2a73a',
     name: 'Gold'

diff --git a/app/assets/scripts/components/common/layers/layer-nightlights-viirs.js b/app/assets/scripts/components/common/layers/layer-nightlights-viirs.js
@@ -14,7 +14,7 @@ export default {
       `${config.api}/{z}/{x}/{y}@1x?url=s3://covid-eo-data/BM_500M_DAILY/VNP46A2_V011_{spotlightName}_{date}_cog.tif&resampling_method=nearest&bidx=1&rescale=0%2C100&color_map=viridis`
     ]
   },
-  exclusiveWith: ['no2', 'gibs-population', 'car-count', 'nightlights-hd'],
+  exclusiveWith: ['no2', 'gibs-population', 'car-count', 'nightlights-hd', 'sample-ml'],
   swatch: {
     color: '#f2a73a',
     name: 'Gold'

diff --git a/app/assets/scripts/components/common/layers/layer-no2.js b/app/assets/scripts/components/common/layers/layer-no2.js
@@ -5,7 +5,7 @@ import config from '../../../config';
 export default {
   id: 'no2',
   name: 'Nitrogen dioxide',
-  description: 'Acute harm due to NO2 exposure is only likely to arise in occupational settings. Direct exposure to the skin can cause irritations and burns.',
+  description: 'Acute harm due to NO<sub>2</sub> exposure is only likely to arise in occupational settings. Direct exposure to the skin can cause irritations and burns.',
   type: 'raster-timeseries',
   domain: [
     '2019-03-01',
@@ -17,7 +17,7 @@ export default {
       `${config.api}/{z}/{x}/{y}@1x?url=s3://covid-eo-data/OMNO2d_HRM/OMI_trno2_0.10x0.10_{date}_Col3_V4.nc.tif&resampling_method=bilinear&bidx=1&rescale=0%2C1e16&color_map=custom_no2&color_formula=gamma r {gamma}`
     ]
   },
-  exclusiveWith: ['gibs-population', 'car-count', 'nightlights-viirs', 'nightlights-hd'],
+  exclusiveWith: ['gibs-population', 'car-count', 'nightlights-viirs', 'nightlights-hd', 'sample-ml'],
   enabled: true,
   compare: {
     enabled: true,
@@ -41,5 +41,5 @@ export default {
       '#050308'
     ]
   },
-  info: 'Acute harm due to NO2 exposure is only likely to arise in occupational settings. Direct exposure to the skin can cause irritations and burns.'
+  info: 'Higher nitrogen dioxide (NO2) levels, associated with higher levels of travel and economic activity, are indicated by the darker colors on the map. Lighter colors indicate lower levels of NO2 and less activity.'
 };
diff --git a/app/assets/scripts/components/common/layers/layer-population.js b/app/assets/scripts/components/common/layers/layer-population.js
@@ -8,7 +8,8 @@ export default {
       'https://gibs.earthdata.nasa.gov/wmts/epsg3857/best/GPW_Population_Density_2020/default/2020-05-14T00:00:00Z/GoogleMapsCompatible_Level7/{z}/{y}/{x}.png'
     ]
   },
-  exclusiveWith: ['no2', 'car-count', 'nightlights-viirs', 'nightlights-hd'],
+  exclusiveWith: ['no2', 'car-count', 'nightlights-viirs', 'nightlights-hd', 'sample-ml'
+  ],
   swatch: {
     color: '#F55E2C',
     name: 'Orange'

diff --git a/app/assets/scripts/components/common/layers/layer-sample-ml.js b/app/assets/scripts/components/common/layers/layer-sample-ml.js
@@ -0,0 +1,34 @@
+import config from '../../../config';
+
+// Sample ML Data
+// import * as sampleData from './ship-2020-03-11T1647.json';
+import * as sampleData from './ship-2020-03-11T1834.json';
+
+export default {
+  id: 'sample-ml',
+  name: 'Sample ML',
+  description: 'Sample ML',
+  type: 'inference',
+  domain: [
+    '2020-03-11'
+  ],
+  source: {
+    vector: {
+      type: 'geojson',
+      data: sampleData
+    },
+    raster: {
+      type: 'raster',
+      tiles: [
+        `${config.api}/{z}/{x}/{y}@1x?url=s3://covid-eo-data/planet/sf_2020_03_11.tif&resampling_method=nearest&bidx=1,2,3`
+      ]
+    },
+    tiles: []
+  },
+  exclusiveWith: ['no2', 'gibs-population', 'car-count', 'nightlights-viirs', 'nightlights-hd'],
+  enabled: false,
+  swatch: {
+    color: '#411073',
+    name: 'Purple'
+  }
+};