Skip to content

Commit

Permalink
Merge pull request #4513 from nasa-gibs/release
Browse files Browse the repository at this point in the history
Release to Main v4.10.1
  • Loading branch information
ryanweiler92 authored Jul 20, 2023
2 parents 1daf792 + b32793a commit 1ef2b93
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 23 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "worldview",
"version": "4.10.0",
"version": "4.10.1",
"description": "Interactive interface for browsing full-resolution, global satellite imagery",
"keywords": [
"NASA",
Expand Down
19 changes: 7 additions & 12 deletions tasks/build-options/getCapabilities.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,13 @@ async function getCapabilities () {
// Download each GC xml using the "from" attribute and put it in the "to" location
if (Object.prototype.hasOwnProperty.call(config, 'wv-options-fetch')) {
const fetchValues = config['wv-options-fetch']
// Perform fetchConfigs and processGetCapabilities seperately so that each batch can be done in parallel
await Promise.all(fetchValues.map(async (value) => {
for (const value of fetchValues) {
const inputFile = value.from
const outputFile = `${outputDir}/${value.to}`

return fetchConfigs(inputFile, outputFile)
}))
await Promise.all(fetchValues.map(async (value) => {
const outputFile = `${outputDir}/${value.to}`

return processGetCapabilities(outputFile)
}))
await fetchConfigs(inputFile, outputFile)
await processGetCapabilities(outputFile)
}
}
}

Expand Down Expand Up @@ -178,9 +173,9 @@ async function gatherProcess (type, typeStr, dir, ext) {
if (!fs.existsSync(dir)) {
fs.mkdirSync(dir)
}
await Promise.all(Object.values(type).map((link) => {
return processMetadata(link, dir, ext)
}))
Object.values(type).forEach(async (link) => {
await processMetadata(link, dir, ext)
})
}

main().catch((err) => {
Expand Down
6 changes: 3 additions & 3 deletions tasks/build-options/getVisMetadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ async function main (url) {
layerOrder = layerOrder.filter(x => !skipLayers.includes(x))

console.warn(`${prog}: Fetching ${layerOrder.length} layer-metadata files`)
await Promise.all(layerOrder.map((layerId) => {
return getMetadata(layerId, url)
}))
for (layerId of layerOrder) {
await getMetadata(layerId, url)
}

const layers = Object.keys(layerMetadata).sort().reduce(
(obj, key) => {
Expand Down
4 changes: 2 additions & 2 deletions web/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
(function (w, d, s, l, i) {
w[l] = w[l] || []; w[l].push({
'gtm.start':
new Date().getTime(), event: '.js'
new Date().getTime(), event: 'gtm.js'
}); var f = d.getElementsByTagName(s)[0],
j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src =
'https://www.googletagmanager.com/.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
})(window,document,'script','dataLayer','GTM-WNP7MLF');
}
</script>
Expand Down
4 changes: 2 additions & 2 deletions web/js/components/map/coordinates.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ export default class Coordinates extends React.Component {
onClick={this.changeFormat}
>
<span className="map-coord">
{`${coords}`}
{coords}
</span>
<div className="map-coord-format">
<span className="map-coord">
{`${crs}`}
{crs}
</span>
<div aria-label="Change coordinates format" className="coord-btn">
<i className="coord-switch" />
Expand Down
2 changes: 1 addition & 1 deletion web/js/components/smart-handoffs/smart-handoff-modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ function SmartHandoffModal({
{STD_NRT_MAP[type] + (version ? ` - v${version}` : '')}
<br />
<a href={cmrSearchDetailURL} target="_blank" rel="noopener noreferrer">
{`${title || 'Details'}`}
{title || 'Details'}
</a>
</div>

Expand Down

0 comments on commit 1ef2b93

Please sign in to comment.