Upgrade to @biigle/ol:v9.2.4

.npmrc

@@ -1 +1,2 @@
+@biigle:registry=https://npm.pkg.github.com
 @mzur:registry=https://npm.pkg.github.com

package.json

@@ -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"
   }
 }

src/public/mix-manifest.json

@@ -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"
 }

src/resources/assets/js/components/refineCandidatesCanvas.vue

@@ -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';
 
 /**

src/resources/assets/js/components/refineCanvas.vue

@@ -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';
@@ -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,
             });
         },