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 to @biigle/ol:v9.2.4 #174

Merged
merged 1 commit into from
Jul 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
@biigle:registry=https://npm.pkg.github.com
@mzur:registry=https://npm.pkg.github.com
110 changes: 3 additions & 107 deletions package-lock.json

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

3 changes: 0 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,5 @@
"sass-loader": "^8.0.0",
"vue-loader": "^15.9.6",
"vue-template-compiler": "^2.6.11"
},
"dependencies": {
"ol": "^5.3.3"
}
}
2 changes: 1 addition & 1 deletion src/public/assets/scripts/main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"/assets/scripts/main.js": "/assets/scripts/main.js?id=ce78b48db1150c3d6fa8fc329da774d2",
"/assets/scripts/main.js": "/assets/scripts/main.js?id=b2f996e539a38c10b0e61fbbeeab7c58",
"/assets/styles/main.css": "/assets/styles/main.css?id=d9c4dfc8488700b3e69f86ede1183aac"
}
8 changes: 4 additions & 4 deletions src/resources/assets/js/components/refineCandidatesCanvas.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<script>
import Collection from 'ol/Collection';
import OlObject from 'ol/Object';
import Collection from '@biigle/ol/Collection';
import OlObject from '@biigle/ol/Object';
import RefineCanvas from './refineCanvas';
import VectorLayer from 'ol/layer/Vector';
import VectorSource from 'ol/source/Vector';
import VectorLayer from '@biigle/ol/layer/Vector';
import VectorSource from '@biigle/ol/source/Vector';
import {StylesStore} from '../import';

/**
Expand Down
21 changes: 17 additions & 4 deletions src/resources/assets/js/components/refineCanvas.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<script>
import Collection from 'ol/Collection';
import VectorLayer from 'ol/layer/Vector';
import VectorSource from 'ol/source/Vector';
import Collection from '@biigle/ol/Collection';
import Style from '@biigle/ol/style/Style';
import VectorLayer from '@biigle/ol/layer/Vector';
import VectorSource from '@biigle/ol/source/Vector';
import {AnnotationCanvas} from '../import';
import {AttachLabelInteraction} from '../import';
import {Keyboard} from '../import';
Expand Down Expand Up @@ -52,13 +53,25 @@ export default {
this.unselectedAnnotationSource = new VectorSource({
features: this.unselectedAnnotationFeatures
});
// The style can't be used directly because biigle/maia imports their own
// @biigle/ol package and the Style object of biigle/core's @biigle/ol does
// not match this one.
const editingStyle = StylesStore.editing;
this.unselectedAnnotationLayer = new VectorLayer({
source: this.unselectedAnnotationSource,
// Should be below regular annotations which are at index 100.
zIndex: 99,
updateWhileAnimating: true,
updateWhileInteracting: true,
style: StylesStore.editing,
style: [
new Style({
stroke: editingStyle[0].stroke,
image: editingStyle[0].image,
}),
new Style({
stroke: editingStyle[1].stroke,
}),
],
opacity: 0.5,
});
},
Expand Down