Skip to content

Commit ecdf864

Browse files
WV-3066 - Openlayers v10 Support (#6031)
* Openlayers v10 upgrade * Add waiting for all data to preload * Updated documentation * Squashed commit of the following: commit 0a854ff Author: christof-wittreich <christof.wittreich@nasa.gov> Date: Mon Aug 25 10:27:22 2025 -0400 Dependency Updates 08-22-25 (#6092) commit 910590d Merge: 9d59f14 9c06adc Author: christof-wittreich <christof.wittreich@nasa.gov> Date: Wed Aug 20 16:37:27 2025 -0400 Merge pull request #6088 from nasa-gibs/main Main to Develop v4.74.0 commit 9c06adc Merge: 5e85011 a4cb7c1 Author: christof-wittreich <christof.wittreich@nasa.gov> Date: Wed Aug 20 15:45:37 2025 -0400 Merge pull request #6087 from nasa-gibs/release Release to Main v4.74.0 commit a4cb7c1 Author: christof-wittreich <christof.wittreich@nasa.gov> Date: Wed Aug 20 14:06:44 2025 -0400 UAT-v4.74.0 to Release (#6086) * Node v22.18.0 (#6055) * Dependency Updates 08-08-25 (#6065) * Update doi to new version (#6066) * Add three NIghttime lights (DNB) layers (#6067) * Dependency Updates 08-15-25 (#6078) * WV-3720: Add updated HLS VI descriptions (#6079) * Update NDVI, NDMI, NBR and NBR2 VI HLS descriptions * update descriptions * WV-3581 - Improved Charting Error Messages (#6081) * Removed 'days' and accounted for error_days * Removed 'try again' text * Text correction * WV-3579 - Prevent pan/zoom when in Charting Mode (#6070) * Charting mode lock-down * Projection button conditional disabling * WV-3639: Add OPERA Vegetation Disturbance Annual layer (#6082) * Add OPERA DIST-ANN layer * Update OPERA_L3_DIST-ANN-HLS_Color_Index.json * Add TROPOMI SO2 (#6080) * Update to point to v8 doi dataset landing pages (#6068) * npm scans (#6083) * WV-3645: Add 3 AMSRUE snow water equivalent layers (#6084) * Add 2 AMSRUE SWE layers * Add preview images * Update Sulfur Dioxide.json (#6085) * v4.74.0 --------- Co-authored-by: minniewong <min.m.wong@nasa.gov> commit 9d59f14 Author: minniewong <min.m.wong@nasa.gov> Date: Wed Aug 20 12:08:49 2025 -0400 Update Sulfur Dioxide.json (#6085) commit c2f4350 Author: minniewong <min.m.wong@nasa.gov> Date: Wed Aug 20 12:00:45 2025 -0400 WV-3645: Add 3 AMSRUE snow water equivalent layers (#6084) * Add 2 AMSRUE SWE layers * Add preview images commit 120ade1 Author: christof-wittreich <christof.wittreich@nasa.gov> Date: Wed Aug 20 11:15:22 2025 -0400 npm scans (#6083) commit 0806f2d Author: minniewong <min.m.wong@nasa.gov> Date: Wed Aug 20 09:17:48 2025 -0400 Update to point to v8 doi dataset landing pages (#6068) commit 2ed821d Author: minniewong <min.m.wong@nasa.gov> Date: Wed Aug 20 09:17:28 2025 -0400 Add TROPOMI SO2 (#6080) commit 3346694 Author: minniewong <min.m.wong@nasa.gov> Date: Wed Aug 20 09:17:10 2025 -0400 WV-3639: Add OPERA Vegetation Disturbance Annual layer (#6082) * Add OPERA DIST-ANN layer * Update OPERA_L3_DIST-ANN-HLS_Color_Index.json commit 98c5f29 Author: christof-wittreich <christof.wittreich@nasa.gov> Date: Wed Aug 20 09:12:54 2025 -0400 WV-3579 - Prevent pan/zoom when in Charting Mode (#6070) * Charting mode lock-down * Projection button conditional disabling commit 63b09ec Author: christof-wittreich <christof.wittreich@nasa.gov> Date: Wed Aug 20 08:41:08 2025 -0400 WV-3581 - Improved Charting Error Messages (#6081) * Removed 'days' and accounted for error_days * Removed 'try again' text * Text correction commit 0605e51 Author: minniewong <min.m.wong@nasa.gov> Date: Tue Aug 19 15:51:23 2025 -0400 WV-3720: Add updated HLS VI descriptions (#6079) * Update NDVI, NDMI, NBR and NBR2 VI HLS descriptions * update descriptions commit 6c5cf95 Author: christof-wittreich <christof.wittreich@nasa.gov> Date: Mon Aug 18 13:18:44 2025 -0400 Dependency Updates 08-15-25 (#6078) commit e2509a7 Author: minniewong <min.m.wong@nasa.gov> Date: Wed Aug 13 13:19:03 2025 -0400 Add three NIghttime lights (DNB) layers (#6067) commit 2e1d6b6 Author: minniewong <min.m.wong@nasa.gov> Date: Tue Aug 12 12:51:10 2025 -0400 Update doi to new version (#6066) commit 49645e4 Author: christof-wittreich <christof.wittreich@nasa.gov> Date: Mon Aug 11 13:20:27 2025 -0400 Dependency Updates 08-08-25 (#6065) commit 3d9afe4 Author: christof-wittreich <christof.wittreich@nasa.gov> Date: Thu Aug 7 15:27:47 2025 -0400 Node v22.18.0 (#6055) commit 92535bf Merge: 74890c7 5e85011 Author: christof-wittreich <christof.wittreich@nasa.gov> Date: Wed Aug 6 12:44:50 2025 -0400 Merge pull request #6053 from nasa-gibs/main Main to Develop v4.73.0 commit 5e85011 Merge: 73a034f 1f3d7e8 Author: christof-wittreich <christof.wittreich@nasa.gov> Date: Wed Aug 6 12:07:17 2025 -0400 Merge pull request #6052 from nasa-gibs/release Release to Main v4.73.0 commit 1f3d7e8 Merge: 3be7707 b964447 Author: christof-wittreich <christof.wittreich@nasa.gov> Date: Wed Aug 6 10:19:29 2025 -0400 Merge pull request #6051 from nasa-gibs/UAT-v4.73.0 UAT-v4.73.0 to Release commit b964447 Author: christof-wittreich <christof.wittreich@nasa.gov> Date: Wed Aug 6 09:03:13 2025 -0400 v4.73.0 commit 74890c7 Author: christof-wittreich <christof.wittreich@nasa.gov> Date: Tue Aug 5 16:42:34 2025 -0400 WV-3077: Add 2 PREFIRE Layers (#6050) * Add PREFIRE/TIRS Sat 1 and Sat 2 layers * Added preview images * Fixed typos --------- Co-authored-by: mwong4 <min.m.wong@nasa.gov> commit 19cfa6b Author: christof-wittreich <christof.wittreich@nasa.gov> Date: Fri Aug 1 10:47:37 2025 -0400 Dependency Updates 08-01-25 (#6048)
1 parent 0a854ff commit ecdf864

File tree

5 files changed

+83
-204
lines changed

5 files changed

+83
-204
lines changed

package-lock.json

Lines changed: 25 additions & 61 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
"moment": "^2.30.1",
178178
"moment-locales-webpack-plugin": "^1.2.0",
179179
"node-dir": "^0.1.17",
180-
"ol": "^8.2.0",
180+
"ol": "^10.6.1",
181181
"ol-mapbox-style": "^12.6.1",
182182
"p-queue": "^8.1.0",
183183
"proj4": "^2.19.10",

web/js/components/animation-widget/play-queue.js

Lines changed: 12 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -186,37 +186,6 @@ class PlayQueue extends React.Component {
186186

187187
getAverageFetchTime = () => this.fetchTimes.reduce((a, b) => a + b) / this.fetchTimes.length;
188188

189-
calcBufferSize() {
190-
const { numberOfFrames, speed } = this.props;
191-
let bufferSize = 0;
192-
const msPerSec = 1000;
193-
const avgFetchTime = this.getAverageFetchTime();
194-
const remainingFrames = numberOfFrames - this.initialBufferSize;
195-
const remainingLoadTime = avgFetchTime * remainingFrames;
196-
const remainingPlayTime = (remainingFrames / speed) * msPerSec;
197-
const totalPlayTime = (numberOfFrames / speed) * msPerSec;
198-
const timeToBufferEnd = totalPlayTime - remainingPlayTime;
199-
const framesLoadedDuringInitialBufferPlayback = timeToBufferEnd / avgFetchTime;
200-
const canKeepUp = framesLoadedDuringInitialBufferPlayback >= this.initialBufferSize;
201-
202-
if (!canKeepUp && remainingLoadTime >= remainingPlayTime) {
203-
const preloadTime = remainingLoadTime - remainingPlayTime;
204-
bufferSize = Math.ceil(preloadTime / msPerSec);
205-
}
206-
207-
// const totalLoadTime = ((avgFetchTime * numberOfFrames) / msPerSec / CONCURRENT_REQUESTS).toFixed(2);
208-
// console.debug('Total frames: ', numberOfFrames);
209-
// console.debug('Avg fetch time: ', (avgFetchTime / msPerSec).toFixed(2));
210-
// console.debug('Play time (t/r): ', (totalPlayTime / msPerSec).toFixed(2), (remainingPlayTime / msPerSec).toFixed(2));
211-
// console.debug('Load time (t/r): ', totalLoadTime, (remainingLoadTime / msPerSec).toFixed(2));
212-
213-
const totalBuffer = bufferSize + this.initialBufferSize;
214-
if (totalBuffer >= numberOfFrames) {
215-
return numberOfFrames;
216-
}
217-
return totalBuffer;
218-
}
219-
220189
isPreloadSufficient() {
221190
const { numberOfFrames } = this.props;
222191
const currentBufferSize = util.objectLength(this.bufferObject);
@@ -230,11 +199,7 @@ class PlayQueue extends React.Component {
230199
this.checkQueue();
231200
return false;
232201
}
233-
if (!this.minBufferLength) {
234-
this.minBufferLength = this.calcBufferSize();
235-
}
236-
// console.debug(`Buffer: ${currentBufferSize} / ${this.minBufferLength}`);
237-
return currentBufferSize >= this.minBufferLength;
202+
return false;
238203
}
239204

240205
checkShouldPlay = function(loopStart) {
@@ -348,18 +313,19 @@ class PlayQueue extends React.Component {
348313
const fetchTime = elapsedTime >= MIN_REQUEST_TIME_MS ? elapsedTime : MIN_REQUEST_TIME_MS;
349314
this.fetchTimes.push(fetchTime);
350315
this.setState({ loadedItems: loadedItems += 1 });
351-
return strDate;
352-
});
353316

354-
if (!this.mounted) return;
355-
this.bufferObject[strDate] = strDate;
356-
delete this.inQueueObject[strDate];
357-
const currentBufferSize = util.objectLength(this.bufferObject);
317+
if (!this.mounted) return;
318+
this.bufferObject[strDate] = strDate;
319+
delete this.inQueueObject[strDate];
320+
const currentBufferSize = util.objectLength(this.bufferObject);
358321

359-
if (!initialLoad || this.canPreloadAll || currentBufferSize >= this.initialBufferSize) {
360-
this.checkQueue();
361-
this.checkShouldPlay();
362-
}
322+
if (!initialLoad || this.canPreloadAll || currentBufferSize >= this.initialBufferSize) {
323+
this.checkQueue();
324+
this.checkShouldPlay();
325+
}
326+
327+
return strDate;
328+
});
363329
}
364330

365331
play() {

0 commit comments

Comments
 (0)