Skip to content

Commit

Permalink
Merge branch 'develop' into WV-2958-more-veg-indices
Browse files Browse the repository at this point in the history
  • Loading branch information
christof-wittreich authored Aug 5, 2024
2 parents 366d43c + 750cbde commit 21490c4
Show file tree
Hide file tree
Showing 26 changed files with 296 additions and 168 deletions.
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"files": ["*.js"],
"rules": {
"n/no-unpublished-require": "off", // 96 failures across 79 files - many "@playwright/test" related
"n/no-unsupported-features/node-builtins": "off"
}
}
]
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
1 change: 1 addition & 0 deletions config/default/common/config/wv.json/layerOrder.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"dateInterval": "60"
}
],
"wrapX": true,
"wrapX": false,
"projections": {
"geographic": {
"source": "AERONET"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"dateInterval": "60"
}
],
"wrapX": true,
"wrapX": false,
"projections": {
"geographic": {
"source": "AERONET"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"vectorStyle": {
"id": "DAILY_AERONET_ANGSTROM_440-870NM"
},
"wrapX": true,
"wrapX": false,
"projections": {
"geographic": {
"source": "AERONET"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"vectorStyle": {
"id": "DAILY_AERONET_AOD_500NM"
},
"wrapX": true,
"wrapX": false,
"projections": {
"geographic": {
"source": "AERONET"
Expand Down
Original file line number Diff line number Diff line change
@@ -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
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
]
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion config/default/common/config/wv.json/naturalEvents.json
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@
false
],
[
"VIIRS_SNPP_Chlorophyll_a",
"VIIRS_SNPP_L2_Chlorophyll_A",
false
]
],
Expand Down
4 changes: 2 additions & 2 deletions e2e/features/layers/layer-picker-test.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
76 changes: 48 additions & 28 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"lint:scss": "npx stylelint ./web/scss/**/*.scss",
"lint:js": "npx eslint . --quiet",
"preinstall": "node tasks/util/checkNodeVersion.js",
"postinstall": "patch-package && husky install",
"postinstall": "patch-package && husky",
"start": "node ./tasks/util/start.js",
"t-debug": "npx playwright test --debug",
"test": "run-script-os",
Expand Down Expand Up @@ -86,7 +86,7 @@
"@playwright/test": "^1.45.2",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
"@webpack-cli/serve": "^2.0.5",
"ajv": "^8.16.0",
"ajv": "^8.17.1",
"autoprefixer": "^10.4.19",
"babel-loader": "^9.1.3",
"cheerio": "^1.0.0-rc.12",
Expand All @@ -103,14 +103,14 @@
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^28.6.0",
"eslint-plugin-jsx-a11y": "^6.9.0",
"eslint-plugin-n": "^17.9.0",
"eslint-plugin-n": "^17.10.1",
"eslint-plugin-no-storage": "^1.0.2",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^6.4.0",
"eslint-plugin-promise": "^6.6.0",
"eslint-plugin-react": "^7.34.4",
"express": "^4.19.2",
"glob": "^11.0.0",
"husky": "^9.0.11",
"husky": "^9.1.2",
"jest": "^29.7.0",
"jest-canvas-mock": "^2.5.2",
"jest-environment-jsdom": "^29.7.0",
Expand All @@ -120,20 +120,20 @@
"node-ssh": "^13.2.0",
"npm-run-all": "^4.1.5",
"patch-package": "^8.0.0",
"postcss": "^8.4.39",
"postcss": "^8.4.40",
"postcss-loader": "^8.1.1",
"react-refresh": "^0.14.1",
"react-test-renderer": "^18.3.0",
"redux-mock-store": "^1.5.4",
"run-script-os": "^1.1.6",
"sass": "^1.77.6",
"sass-loader": "^14.2.1",
"sass": "^1.77.8",
"sass-loader": "^15.0.0",
"shelljs": "^0.8.5",
"showdown": "^2.1.0",
"stylelint": "^15.11.0",
"stylelint-config-standard-scss": "^11.1.0",
"stylelint-high-performance-animation": "^1.10.0",
"tar": "^7.4.0",
"tar": "^7.4.3",
"terser-webpack-plugin": "^5.3.10",
"uuid": "^10.0.0",
"webpack": "^5.93.0",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 21490c4

Please sign in to comment.