Skip to content
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: 0 additions & 1 deletion base_geoengine/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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.
Expand Down