Upgrade ol, Don't import from barrel files openlayers/openlayers#16461

package.json

@@ -51,7 +51,7 @@
     "core-js": "^3.6.5",
     "node-polyfill-webpack-plugin": "^2.0.0",
     "oidc-client-ts": "^3.0.1",
-    "ol": "^10.3.1",
+    "ol": "~10.4.0",
     "ol-stac": "^1.0.0-rc.6",
     "proj4": "^2.15.0",
     "remove-markdown": "^0.5.0",

src/components/Map.vue

@@ -28,11 +28,12 @@ import TextControl from './maps/TextControl.vue';
 import { mapGetters } from 'vuex';
 import { BPopover } from 'bootstrap-vue';
 import proj4 from 'proj4';
-import {register} from 'ol/proj/proj4.js';
 import Select from 'ol/interaction/Select';
+import {register} from 'ol/proj/proj4.js';
+import Stroke from 'ol/style/Stroke';
+import Style from 'ol/style/Style';
 import StacLayer from 'ol-stac';
 import { getStacObjectsForEvent } from 'ol-stac/util.js';
-import { Stroke, Style } from 'ol/style.js';
 
 register(proj4); // required to support source reprojection
 

src/components/maps/ControlMixin.js

@@ -1,4 +1,4 @@
-import { Control } from 'ol/control.js';
+import Control from 'ol/control/Control.js';
 
 export default {
   props: {

src/components/maps/MapSelect.vue

@@ -22,7 +22,7 @@ import Style, { createDefaultStyle } from 'ol/style/Style';
 import proj4 from 'proj4';
 import VectorSource from 'ol/source/Vector';
 import GeoJSON from 'ol/format/GeoJSON';
-import { Fill } from 'ol/style';
+import Fill from 'ol/style/Fill';
 import VectorLayer from 'ol/layer/Vector';
 import create from 'stac-js';
 import { toGeoJSON } from 'stac-js/src/geo.js';

src/components/maps/UserLocationControl.vue

@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import { Point } from 'ol/geom';
+import Point from 'ol/geom/Point';
 import ControlMixin from './ControlMixin';
 import { fromLonLat } from 'ol/proj';
 import { BIconPinMapFill } from 'bootstrap-vue';