Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade OpenLayers to v9 #868

Merged
merged 28 commits into from
Jul 16, 2024
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
17c8a3a
Migrate canvas source and polygon brush from @biigle/ol to core
mzur Jun 27, 2024
f2853bf
WIP Upgrade to OpenLayers v6
mzur Jun 28, 2024
7dda9c0
Improve video (minimap) rendering
mzur Jul 2, 2024
57db566
Fix size of OpenLayers controls
mzur Jul 2, 2024
04bbea8
Fix magic wand snapshot update behavior
mzur Jul 2, 2024
c5bb3d5
Remove unnecessary fallback
mzur Jul 2, 2024
5724449
Upgrade to OpenLayers v7
mzur Jul 3, 2024
a1b0242
Fix OpenLayers control style
mzur Jul 3, 2024
b6f7656
Upgrade to OpenLayers v9
mzur Jul 3, 2024
f190f71
Fix issues because minimap made OpenLayers map reactive
mzur Jul 3, 2024
2499167
Improve performance of polygon brush and modify brush interactions
mzur Jul 3, 2024
9a4cddd
Remove unnecessary option
mzur Jul 3, 2024
f47de14
Upgrade to OpenLayers v9 (for real)
mzur Jul 3, 2024
1f3f094
Fix screenshot button behavior
mzur Jul 4, 2024
f473700
Fix minimap update on color adjustment
mzur Jul 4, 2024
708fd0d
Fix padding of zoom to whole image interaction
mzur Jul 4, 2024
03ee712
Fix select interaction behavior
mzur Jul 5, 2024
6b45674
Fix flickering minimap with tiled image
mzur Jul 5, 2024
61c6bcd
Fix ESLint errors
mzur Jul 5, 2024
19d96f8
Make video annotation rendering more efficient
mzur Jul 5, 2024
01b4b83
Make annotation selection more efficient
mzur Jul 8, 2024
9adae2e
Merge branch 'master' into ol-v9
mzur Jul 8, 2024
ed17071
Enable Ellipse and Rectangle tools again with @biigle/ol:9.2.4
mzur Jul 10, 2024
aa347d5
Remove CancelableMap
mzur Jul 10, 2024
a4d47e3
Refactor MagicWandInteraction
mzur Jul 10, 2024
b93db49
Fix behavior of polygon brush and modify tools
mzur Jul 11, 2024
1a7a8ce
Fix issues with polygon brush eraser tool
mzur Jul 11, 2024
5f23767
Refactor polygon brush and modify interactions
mzur Jul 11, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove CancelableMap
This is no longer required with the new method of video rendering.
  • Loading branch information
mzur committed Jul 10, 2024
commit aa347d51a9caceb12562dde73e1346b15da21b7a
13 changes: 0 additions & 13 deletions resources/assets/js/annotations/ol/CancelableMap.js

This file was deleted.

2 changes: 1 addition & 1 deletion resources/assets/js/videos/components/videoScreen.vue
Original file line number Diff line number Diff line change
@@ -267,7 +267,7 @@ import ControlButton from '../../annotations/components/controlButton';
import DrawInteractions from './videoScreen/drawInteractions';
import Indicators from './videoScreen/indicators';
import Keyboard from '../../core/keyboard';
import {CancelableMap as Map} from '../../annotations/ol/CancelableMap';
import Map from '@biigle/ol/Map';
import Minimap from '../../annotations/components/minimap';
import ModifyInteractions from './videoScreen/modifyInteractions';
import PolygonBrushInteractions from './videoScreen/polygonBrushInteractions';
Original file line number Diff line number Diff line change
@@ -86,10 +86,6 @@ export default {
this.map.render();
},
stopRenderLoop() {
// Explicitly cancel rendering of the map because there could be one
// animation frame left that would be executed while the video already began
// seeking and thus render an empty video.
this.map.cancelRender();
window.cancelAnimationFrame(this.animationFrameId);
this.animationFrameId = null;
},