Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

Fix dateInterval and matrixSetLimits wv layer values

ZachTRice90e6d1a0561a
diff --git a/package-lock.json b/package-lock.json
index d7f62ea7b..095933142 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -66,6 +66,7 @@
"regenerator-runtime": "^0.13.3",
"reselect": "^4.0.0",
"rgbcolor": "^0.0.4",
+ "simplebar": "^6.2.0",
"simplebar-react": "^2.1.0",
"stackblur": "^1.0.0",
"supercluster": "7.0.0",
@@ -3093,9 +3094,9 @@
}
},
"node_modules/@juggle/resize-observer": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.3.1.tgz",
- "integrity": "sha512-zMM9Ds+SawiUkakS7y94Ymqx+S0ORzpG3frZirN3l+UlXUmSUR7hF4wxCVqW+ei94JzV5kt0uXBcoOEAuiydrw=="
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.4.0.tgz",
+ "integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA=="
},
"node_modules/@khanisak/temperature-converter": {
"version": "1.2.0",
@@ -18323,16 +18324,21 @@
"dev": true
},
"node_modules/simplebar": {
- "version": "5.3.9",
- "resolved": "https://registry.npmjs.org/simplebar/-/simplebar-5.3.9.tgz",
- "integrity": "sha512-1vIIpjDvY9sVH14e0LGeiCiTFU3ILqAghzO6OI9axeG+mvU/vMSrvXeAXkBolqFFz3XYaY8n5ahH9MeP3sp2Ag==",
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/simplebar/-/simplebar-6.2.0.tgz",
+ "integrity": "sha512-KiXO9hGg0wK7Oh5zbcdHKEPGlyem3IWA27HLKqolrhpToP0SA8iLf5tbXFBS4qRH4QTXiUn87wh9zCd4GnCZeQ==",
"dependencies": {
- "@juggle/resize-observer": "^3.3.1",
"can-use-dom": "^0.1.0",
- "core-js": "^3.0.1",
- "lodash.debounce": "^4.0.8",
- "lodash.memoize": "^4.1.2",
- "lodash.throttle": "^4.1.1"
+ "simplebar-core": "^1.2.0"
+ }
+ },
+ "node_modules/simplebar-core": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/simplebar-core/-/simplebar-core-1.2.0.tgz",
+ "integrity": "sha512-OgF3poOTi3mzj6HmNvuJfPtvMH/7OsMC+2H3HXQUzddyRDxUifpjHx1/3ozziWWAGTrJejLtu4E8h/kK3eboWQ==",
+ "dependencies": {
+ "can-use-dom": "^0.1.0",
+ "lodash": "^4.17.21"
}
},
"node_modules/simplebar-react": {
@@ -18348,6 +18354,19 @@
"react-dom": "^0.14.9 || ^15.3.0 || ^16.0.0-rc || ^16.0 || ^17.0 || ^18.0.0"
}
},
+ "node_modules/simplebar-react/node_modules/simplebar": {
+ "version": "5.3.9",
+ "resolved": "https://registry.npmjs.org/simplebar/-/simplebar-5.3.9.tgz",
+ "integrity": "sha512-1vIIpjDvY9sVH14e0LGeiCiTFU3ILqAghzO6OI9axeG+mvU/vMSrvXeAXkBolqFFz3XYaY8n5ahH9MeP3sp2Ag==",
+ "dependencies": {
+ "@juggle/resize-observer": "^3.3.1",
+ "can-use-dom": "^0.1.0",
+ "core-js": "^3.0.1",
+ "lodash.debounce": "^4.0.8",
+ "lodash.memoize": "^4.1.2",
+ "lodash.throttle": "^4.1.1"
+ }
+ },
"node_modules/sirv": {
"version": "1.0.19",
"resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.19.tgz",
@@ -23021,9 +23040,9 @@
}
},
"@juggle/resize-observer": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.3.1.tgz",
- "integrity": "sha512-zMM9Ds+SawiUkakS7y94Ymqx+S0ORzpG3frZirN3l+UlXUmSUR7hF4wxCVqW+ei94JzV5kt0uXBcoOEAuiydrw=="
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.4.0.tgz",
+ "integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA=="
},
"@khanisak/temperature-converter": {
"version": "1.2.0",
@@ -34425,16 +34444,21 @@
"dev": true
},
"simplebar": {
- "version": "5.3.9",
- "resolved": "https://registry.npmjs.org/simplebar/-/simplebar-5.3.9.tgz",
- "integrity": "sha512-1vIIpjDvY9sVH14e0LGeiCiTFU3ILqAghzO6OI9axeG+mvU/vMSrvXeAXkBolqFFz3XYaY8n5ahH9MeP3sp2Ag==",
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/simplebar/-/simplebar-6.2.0.tgz",
+ "integrity": "sha512-KiXO9hGg0wK7Oh5zbcdHKEPGlyem3IWA27HLKqolrhpToP0SA8iLf5tbXFBS4qRH4QTXiUn87wh9zCd4GnCZeQ==",
"requires": {
- "@juggle/resize-observer": "^3.3.1",
"can-use-dom": "^0.1.0",
- "core-js": "^3.0.1",
- "lodash.debounce": "^4.0.8",
- "lodash.memoize": "^4.1.2",
- "lodash.throttle": "^4.1.1"
+ "simplebar-core": "^1.2.0"
+ }
+ },
+ "simplebar-core": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/simplebar-core/-/simplebar-core-1.2.0.tgz",
+ "integrity": "sha512-OgF3poOTi3mzj6HmNvuJfPtvMH/7OsMC+2H3HXQUzddyRDxUifpjHx1/3ozziWWAGTrJejLtu4E8h/kK3eboWQ==",
+ "requires": {
+ "can-use-dom": "^0.1.0",
+ "lodash": "^4.17.21"
}
},
"simplebar-react": {
@@ -34444,6 +34468,21 @@
"requires": {
"prop-types": "^15.6.1",
"simplebar": "^5.3.6"
+ },
+ "dependencies": {
+ "simplebar": {
+ "version": "5.3.9",
+ "resolved": "https://registry.npmjs.org/simplebar/-/simplebar-5.3.9.tgz",
+ "integrity": "sha512-1vIIpjDvY9sVH14e0LGeiCiTFU3ILqAghzO6OI9axeG+mvU/vMSrvXeAXkBolqFFz3XYaY8n5ahH9MeP3sp2Ag==",
+ "requires": {
+ "@juggle/resize-observer": "^3.3.1",
+ "can-use-dom": "^0.1.0",
+ "core-js": "^3.0.1",
+ "lodash.debounce": "^4.0.8",
+ "lodash.memoize": "^4.1.2",
+ "lodash.throttle": "^4.1.1"
+ }
+ }
}
},
"sirv": {
diff --git a/package.json b/package.json
index eee76e2ba..47fbc84f9 100644
--- a/package.json
+++ b/package.json
@@ -208,6 +208,7 @@
"regenerator-runtime": "^0.13.3",
"reselect": "^4.0.0",
"rgbcolor": "^0.0.4",
+ "simplebar": "^6.2.0",
"simplebar-react": "^2.1.0",
"stackblur": "^1.0.0",
"supercluster": "7.0.0",
diff --git a/tasks/build-options/extractConfigFromWMTS.js b/tasks/build-options/extractConfigFromWMTS.js
index 793f9a5dd..803fef326 100644
--- a/tasks/build-options/extractConfigFromWMTS.js
+++ b/tasks/build-options/extractConfigFromWMTS.js
@@ -237,10 +237,10 @@ async function processLayer (gcLayer, wvLayers, entry) {
for (const setLimit of matrixSetLimits) {
mappedSetLimits.push({
tileMatrix: setLimit.TileMatrix._text,
- minTileRow: parseInt(setLimit.MinTileRow, 10),
- maxTileRow: parseInt(setLimit.MaxTileRow, 10),
- minTileCol: parseInt(setLimit.MinTileCol, 10),
- maxTileCol: parseInt(setLimit.MaxTileCol, 10)
+ minTileRow: parseInt(setLimit.MinTileRow._text, 10),
+ maxTileRow: parseInt(setLimit.MaxTileRow._text, 10),
+ minTileCol: parseInt(setLimit.MinTileCol._text, 10),
+ maxTileCol: parseInt(setLimit.MaxTileCol._text, 10)
})
}
wvLayer.projections[entry.projection].matrixSetLimits = mappedSetLimits
diff --git a/tasks/build-options/processColormap.js b/tasks/build-options/processColormap.js
index 3606d78b2..64e6d0cd3 100755
--- a/tasks/build-options/processColormap.js
+++ b/tasks/build-options/processColormap.js
@@ -250,7 +250,7 @@ async function readFileAsync (file) {
async function processFile (id, xml) {
let document
- let colormaps
+ let colormaps = []
try {
document = JSON.parse(convert.xml2json(xml, { compact: true, spaces: 2 }))
if (document && document.ColorMaps && document.ColorMaps.ColorMap) {
@@ -286,6 +286,7 @@ async function processFile (id, xml) {
const outputFile = path.join(outputDir, `${id}.json`)
await writeFile(outputFile, JSON.stringify(data, null, 2), { encoding: 'utf-8' })
} catch (error) {
+ console.error(id)
console.error(error)
}
}
diff --git a/tasks/build-options/processTemporalLayer.js b/tasks/build-options/processTemporalLayer.js
index 66f472411..0aad4ba1b 100644
--- a/tasks/build-options/processTemporalLayer.js
+++ b/tasks/build-options/processTemporalLayer.js
@@ -77,7 +77,7 @@ async function processTemporalLayer (wvLayer, value) {
wvLayer.dateRanges = dateRangeStart.map((s, i) => ({
startDate: s,
endDate: dateRangeEnd[i],
- dateInterval: rangeInterval[i][0]
+ dateInterval: rangeInterval[i]
}))
}
}