Merge branch 'develop' into wv-3285-image-pre-fetch

config/default/common/config/metadata/layers/seawifs/SEAWIFS_ORBVIEW-2_GAC_True_Color.md

@@ -0,0 +1,5 @@
+The SeaWiFS Corrected Reflectance (True Color) layer provides true-color or natural color images because the combination of wavelengths produces an image that is similar to what the human eye would see. The images are natural-looking images of land surface, oceanic and atmospheric features.
+
+The SeaWiFS instrument was launched by Orbital Sciences Corporation on the OrbView-2 (a.k.a. SeaStar) satellite in August 1997, and collected data from September 1997 until the end of mission in December 2010. SeaWiFS had 8 spectral bands from 412 to 865 nm. It collected global data at 4 km resolution, and local data (limited onboard storage and direct broadcast) at 1 km. The mission and sensor were optimized for ocean color measurements, with a local noon (descending) equator crossing time orbit, fore-and-aft tilt capability, full dynamic range, and low polarization sensitivity.
+
+The SeaWiFS Corrected Reflectance (Global Area Coverage (GAC)) product is available from the OrbView-2 satellite for September 4, 1997 to December 11, 2010. The sensor and imagery resolution is 4 km, and the temporal resolution is daily.

config/default/common/config/wv.json/layerOrder.json

@@ -145,6 +145,7 @@
  "VIIRS_NOAA20_Photosynthetically_Available_Radiation",
  "VIIRS_SNPP_L2_Chlorophyll_A",
  "VIIRS_SNPP_L2_Photosynthetically_Available_Radiation",
+ "SEAWIFS_ORBVIEW-2_GAC_True_Color",
  "SEAWIFS_ORBVIEW-2_GAC_Chlorophyll_a",
  "GOES-East_ABI_GeoColor",
  "GOES-West_ABI_GeoColor",

config/default/common/config/wv.json/layers/aeronet/AERONET_ANGSTROM_440-870NM.json

@@ -22,7 +22,7 @@
  "dateInterval": "60"
  }
  ],
- "wrapX": true,
+ "wrapX": false,
  "projections": {
  "geographic": {
  "source": "AERONET"

config/default/common/config/wv.json/layers/aeronet/AERONET_AOD_500NM.json

@@ -22,7 +22,7 @@
  "dateInterval": "60"
  }
  ],
- "wrapX": true,
+ "wrapX": false,
  "projections": {
  "geographic": {
  "source": "AERONET"

config/default/common/config/wv.json/layers/aeronet/DAILY_AERONET_ANGSTROM_440-870NM.json

@@ -14,7 +14,7 @@
  "vectorStyle": {
  "id": "DAILY_AERONET_ANGSTROM_440-870NM"
  },
- "wrapX": true,
+ "wrapX": false,
  "projections": {
  "geographic": {
  "source": "AERONET"

config/default/common/config/wv.json/layers/aeronet/DAILY_AERONET_AOD_500NM.json

@@ -14,7 +14,7 @@
  "vectorStyle": {
  "id": "DAILY_AERONET_AOD_500NM"
  },
- "wrapX": true,
+ "wrapX": false,
  "projections": {
  "geographic": {
  "source": "AERONET"

config/default/common/config/wv.json/layers/seawifs/SEAWIFS_ORBVIEW-2_GAC_True_Color.json

@@ -0,0 +1,12 @@
+{
+ "layers": {
+ "SEAWIFS_ORBVIEW-2_GAC_True_Color": {
+ "id": "SEAWIFS_ORBVIEW-2_GAC_True_Color",
+ "description": "seawifs/SEAWIFS_ORBVIEW-2_GAC_True_Color",
+ "tags": "cr",
+ "group": "overlays",
+ "layergroup": "Corrected Reflectance",
+ "wrapadjacentdays": true
+ }
+ }
+}

config/default/common/config/wv.json/measurements/Corrected Reflectance.json

@@ -3,7 +3,7 @@
  "Corrected Reflectance": {
  "id": "corrected-reflectance",
  "title": "Corrected Reflectance",
- "subtitle": "Aqua/MODIS, Terra/MODIS, Suomi NPP/VIIRS, NOAA-20/VIIRS, NOAA-21/VIIRS, PACE/OCI, Landsat/WELD",
+ "subtitle": "Aqua/MODIS, Terra/MODIS, Suomi NPP/VIIRS, NOAA-20/VIIRS, NOAA-21/VIIRS, PACE/OCI, Landsat/WELD, OrbView-2/SeaWiFS",
  "sources": {
  "Aqua/MODIS": {
  "id": "aqua-modis",
@@ -93,6 +93,15 @@
  "Landsat_WELD_CorrectedReflectance_Bands743_Global_Annual",
  "Landsat_WELD_CorrectedReflectance_Bands743_Global_Monthly"
  ]
+ },
+ "OrbView-2/SeaWiFS": {
+ "id": "orbview-2-seawifs",
+ "title": "OrbView-2/SeaWiFS",
+ "description": "",
+ "image": "",
+ "settings": [
+ "SEAWIFS_ORBVIEW-2_GAC_True_Color"
+ ]
  }
  }
  }

config/default/common/config/wv.json/naturalEvents.json

@@ -679,7 +679,7 @@
  false
  ],
  [
- "VIIRS_SNPP_Chlorophyll_a",
+ "VIIRS_SNPP_L2_Chlorophyll_A",
  false
  ]
  ],

e2e/features/layers/layer-picker-test.spec.js

@@ -155,8 +155,8 @@ test('Disabling coverage filter updates list', async () => {
  } = selectors
  await availableFilterCheckbox.click()
  await expect(availableFilterCheckboxInput).not.toBeChecked()
- await expect(layersSearchRow).toHaveCount(14)
- await expect(layerResultsCountText).toContainText('Showing 14 out of')
+ await expect(layersSearchRow).toHaveCount(15)
+ await expect(layerResultsCountText).toContainText('Showing 15 out of')
 })
 
 test('Finding layer by ID with search', async () => {

web/js/map/layerbuilder.js

@@ -578,7 +578,7 @@ export default function mapLayerBuilder(config, cache, store) {
  for (let j = 0; j < split2.length; j += 1) {
  rowObj[key[j]] = split2[j];
  }
- if (!!rowObj.AERONET_Site_Name && rowObj.AERONET_Site_Name !== '' && !takenNamesActive[rowObj.AERONET_Site_Name]) {
+ if (!!rowObj.AERONET_Site_Name && rowObj.AERONET_Site_Name !== '' && !takenNamesActive[rowObj.AERONET_Site_Name] && parseInt(rowObj['Date(dd:mm:yyyy)'].split(':')[0], 10) === date.getUTCDate()) {
  featuresObj[rowObj.AERONET_Site_Name] = {};
  featuresObj[rowObj.AERONET_Site_Name].type = 'Feature';
  featuresObj[rowObj.AERONET_Site_Name].geometry = { type: 'Point' };