diff --git a/base_geoengine/__manifest__.py b/base_geoengine/__manifest__.py index f87a4d562..c395bcc66 100644 --- a/base_geoengine/__manifest__.py +++ b/base_geoengine/__manifest__.py @@ -30,7 +30,6 @@ ("include", "web._assets_bootstrap"), ], "base_geoengine.assets_jsLibs_geoengine": [ - "/base_geoengine/static/lib/ol-10.5.0/ol.js", "/base_geoengine/static/lib/chromajs-3.1.2/chroma.js", "/base_geoengine/static/lib/geostats-2.1.0/geostats.js", "/base_geoengine/static/lib/geostats-2.1.0/geostats.css", diff --git a/base_geoengine/static/src/js/views/geoengine/geoengine_renderer/geoengine_renderer.esm.js b/base_geoengine/static/src/js/views/geoengine/geoengine_renderer/geoengine_renderer.esm.js index c6aa0c346..9856a49d5 100644 --- a/base_geoengine/static/src/js/views/geoengine/geoengine_renderer/geoengine_renderer.esm.js +++ b/base_geoengine/static/src/js/views/geoengine/geoengine_renderer/geoengine_renderer.esm.js @@ -30,7 +30,7 @@ import { extractFieldsFromArchInfo, } from "@web/model/relational_model/utils"; import {evaluateExpr} from "@web/core/py_js/py"; -import {loadBundle} from "@web/core/assets"; +import {loadBundle, loadJS} from "@web/core/assets"; import {getTemplate} from "@web/core/templates"; import {parseXML} from "@web/core/utils/xml"; import {rasterLayersStore} from "../../../raster_layers_store.esm"; @@ -77,6 +77,7 @@ export class GeoengineRenderer extends Component { onWillStart(async () => Promise.all([ loadBundle("base_geoengine.assets_jsLibs_geoengine"), + loadJS("/base_geoengine/static/lib/ol-10.5.0/ol.js"), this.loadVectorModel(), (this.isGeoengineAdmin = await user.hasGroup( "base_geoengine.group_geoengine_admin" diff --git a/base_geoengine/static/src/js/widgets/geoengine_edit_map/field_geoengine_edit_map.esm.js b/base_geoengine/static/src/js/widgets/geoengine_edit_map/field_geoengine_edit_map.esm.js index 5e5b3e51f..4a4144d28 100644 --- a/base_geoengine/static/src/js/widgets/geoengine_edit_map/field_geoengine_edit_map.esm.js +++ b/base_geoengine/static/src/js/widgets/geoengine_edit_map/field_geoengine_edit_map.esm.js @@ -9,7 +9,7 @@ */ import {Component, onMounted, onRendered, onWillStart, useEffect} from "@odoo/owl"; -import {loadBundle} from "@web/core/assets"; +import {loadBundle, loadJS} from "@web/core/assets"; import {registry} from "@web/core/registry"; import {standardFieldProps} from "@web/views/fields/standard_field_props"; import {useService} from "@web/core/utils/hooks"; @@ -21,7 +21,10 @@ export class FieldGeoEngineEditMap extends Component { this.orm = useService("orm"); onWillStart(() => - Promise.all([loadBundle("base_geoengine.assets_jsLibs_geoengine")]) + Promise.all([ + loadBundle("base_geoengine.assets_jsLibs_geoengine"), + loadJS("/base_geoengine/static/lib/ol-10.5.0/ol.js"), + ]) ); // Is executed when component is mounted.