Skip to content

Commit

Permalink
Fix reprojection
Browse files Browse the repository at this point in the history
  • Loading branch information
@sbrunner
sbrunner committed Nov 20, 2023
1 parent 22a83e1 commit f697d19
Showing 1 changed file with 68 additions and 69 deletions.
137 changes: 68 additions & 69 deletions base_geoengine/static/src/js/widgets/geoengine_widgets.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
odoo.define("base_geoengine.geoengine_widgets", function (require) {
"use strict";

var core = require("web.core");
var AbstractField = require("web.AbstractField");
var geoengine_common = require("base_geoengine.geoengine_common");
var BackgroundLayers = require("base_geoengine.BackgroundLayers");
var registry = require("web.field_registry");
const core = require("web.core");
const AbstractField = require("web.AbstractField");
const geoengine_common = require("base_geoengine.geoengine_common");
const BackgroundLayers = require("base_geoengine.BackgroundLayers");
const registry = require("web.field_registry");

var FieldGeoEngineEditMap = AbstractField.extend(
const FieldGeoEngineEditMap = AbstractField.extend(
geoengine_common.GeoengineMixin,
{
// eslint-disable-line max-len
Expand All @@ -43,7 +43,7 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {
* @override
*/
start: function () {
var def = this._super();
let def = this._super();

// Add a listener on parent tab if it exists in order to refresh
// geoengine view we need to trigger it on DOM update for changes
Expand Down Expand Up @@ -95,7 +95,7 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {
},

_createFeatureStyles: function () {
var styles = {
let styles = {
edit: new ol.style.Style({
fill: new ol.style.Fill({
opacity: 0.7,
Expand Down Expand Up @@ -144,7 +144,7 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {
this.vectorLayers = [];
this.source = {};
this.features = {};
var styles = this._createFeatureStyles();
let styles = this._createFeatureStyles();
this.vectorLayers.push(
this._createVectorLayer(this.name, styles.edit)
);
Expand All @@ -169,7 +169,7 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {
_addVectorLayers: function () {
// first create the readonly layers to have a
// lower zIndex
var readonlyLayers = this.vectorLayers.slice(1);
let readonlyLayers = this.vectorLayers.slice(1);
if (readonlyLayers) {
this.readonlyOverlaysGroup = new ol.layer.Group({
title: "Readonly Overlays",
Expand Down Expand Up @@ -220,10 +220,10 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {
},

_updateMapEmpty: function () {
var map_view = this.map.getView();
let map_view = this.map.getView();
// Default extent
if (map_view) {
var extent = this.defaultExtent
let extent = this.defaultExtent
.replace(/\s/g, "")
.split(",");
extent = extent.map((coord) => Number(coord));
Expand All @@ -232,18 +232,18 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {
},

_updateMapZoom: function (zoom) {
var map_zoom = typeof zoom === "undefined" ? true : zoom;
let map_zoom = typeof zoom === "undefined" ? true : zoom;

if (this.source[this.name]) {
var extent = this.source[this.name].getExtent();
var infinite_extent = [
let extent = this.source[this.name].getExtent();
let infinite_extent = [
Infinity,
Infinity,
-Infinity,
-Infinity,
];
if (map_zoom && extent !== infinite_extent) {
var map_view = this.map.getView();
let map_view = this.map.getView();
if (map_view) {
map_view.fit(extent, { maxZoom: 15 });
}
Expand All @@ -254,11 +254,12 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {
_setValue: function (value, zoom) {
this._super(value);
this.value = value;
let geometry = this.format.readGeometry(value);

if (this.map) {
var ft = new ol.Feature({
geometry: new ol.format.GeoJSON().readGeometry(value),
labelPoint: new ol.format.GeoJSON().readGeometry(value),
let ft = new ol.Feature({
geometry: geometry,
labelPoint: geometry,
});
this.source[this.name].clear();
this.source[this.name].addFeature(ft);
Expand All @@ -272,13 +273,10 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {
this.vectorFields,
function (fieldName) {
var value = this.record.data[fieldName];
var geometry = this.format.readGeometry(value);
var ft = new ol.Feature({
geometry: new ol.format.GeoJSON().readGeometry(
value
),
labelPoint: new ol.format.GeoJSON().readGeometry(
value
),
geometry: geometry,
labelPoint: geometry,
});
this.source[fieldName].clear();
this.source[fieldName].addFeature(ft);
Expand All @@ -288,15 +286,15 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {
},

_isTabVisible: function () {
var tab = this.$el.closest("div.tab-pane");
let tab = this.$el.closest("div.tab-pane");
if (!tab.length) {
return false;
}
return tab.is(":visible");
},

_onUIChange: function () {
var value = null;
let value = null;
if (this._geometry) {
value = this.format.writeGeometry(this._geometry);
}
Expand All @@ -310,7 +308,7 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {
* As modify needs to get pointer position on map it requires
* the map to be rendered before being created
*/
var handler = null;
let handler = null;
if (this.geoType === "POLYGON") {
handler = "Polygon";
} else if (this.geoType === "MULTIPOLYGON") {
Expand All @@ -327,7 +325,7 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {
// FIXME: unsupported geo type
}

var drawControl = function (options) {
let drawControl = function (options) {
ol.interaction.Draw.call(this, options);
};
ol.inherits(drawControl, ol.interaction.Draw);
Expand Down Expand Up @@ -398,24 +396,25 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {

_renderMap: function () {
if (!this.map) {
var projection = new ol.proj.get(this.projectionCode);
var $el = this.$el[0];
let projection = new ol.proj.get(this.projectionCode);
let $el = this.$el[0];
$($el).css({ width: "100%", height: "100%" });
let view = new ol.View({
center: [0, 0],
zoom: 5,
projection: projection,
});
this.map = new ol.Map({
layers: this.rasterLayers,
target: $el,
view: new ol.View({
center: [0, 0],
zoom: 5,
projection: projection,
}),
view: view,
});

this._createVectorLayers();
this._addVectorLayers();
this.format = new ol.format.GeoJSON({
featureProjection: projection,
defaultDataProjection: "EPSG:" + this.srid,
defaultDataProjection: `EPSG:${this.srid}`,
});

$(document).trigger("FieldGeoEngineEditMap:ready", [
Expand Down Expand Up @@ -460,7 +459,7 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {

// TODO migrate the following widgets

var FieldGeoPointXY = AbstractField.extend({
let FieldGeoPointXY = AbstractField.extend({
template: "FieldGeoPointXY",

start: function () {
Expand All @@ -475,10 +474,10 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {
*
* @return [x, y]
*/
var x = openerp.web.parse_value(this.$input.eq(0).val(), {
let x = openerp.web.parse_value(this.$input.eq(0).val(), {
type: "float",
});
var y = openerp.web.parse_value(this.$input.eq(1).val(), {
let y = openerp.web.parse_value(this.$input.eq(1).val(), {
type: "float",
});
return [x, y];
Expand All @@ -492,7 +491,7 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {
this._super.apply(this, arguments);

if (value) {
var geo_obj = JSON.parse(value);
let geo_obj = JSON.parse(value);
this.$input.eq(0).val(geo_obj.coordinates[0]);
this.$input.eq(1).val(geo_obj.coordinates[1]);
} else {
Expand All @@ -501,9 +500,9 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {
},

_onUIChange: function () {
var coords = this.get_coords();
let coords = this.get_coords();
if (coords[0] && coords[1]) {
var json = this.make_GeoJSON(coords);
let json = this.make_GeoJSON(coords);
this.value = JSON.stringify(json);
} else {
this.value = false;
Expand All @@ -514,7 +513,7 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {
this.invalid = false;
try {
// Get coords to check if floats
var coords = this.get_coords();
let coords = this.get_coords();

// Make sure the two coordinates are set or None
this.invalid =
Expand All @@ -536,14 +535,14 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {
},
});

var FieldGeoPointXYReadonly = FieldGeoPointXY.extend({
let FieldGeoPointXYReadonly = FieldGeoPointXY.extend({
template: "FieldGeoPointXY.readonly",

_setValue: function (value) {
this._super.apply(this, arguments);
var show_value = "";
let show_value = "";
if (value) {
var geo_obj = JSON.parse(value);
let geo_obj = JSON.parse(value);
show_value =
"(" +
geo_obj.coordinates[0] +
Expand All @@ -560,7 +559,7 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {
},
});

var FieldGeoRect = AbstractField.extend({
let FieldGeoRect = AbstractField.extend({
template: "FieldGeoRect",

start: function () {
Expand All @@ -575,16 +574,16 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {
*
* @return [[x1, y1],[x2, y2]]
*/
var x1 = openerp.web.parse_value(this.$input.eq(0).val(), {
let x1 = openerp.web.parse_value(this.$input.eq(0).val(), {
type: "float",
});
var y1 = openerp.web.parse_value(this.$input.eq(1).val(), {
let y1 = openerp.web.parse_value(this.$input.eq(1).val(), {
type: "float",
});
var x2 = openerp.web.parse_value(this.$input.eq(2).val(), {
let x2 = openerp.web.parse_value(this.$input.eq(2).val(), {
type: "float",
});
var y2 = openerp.web.parse_value(this.$input.eq(3).val(), {
let y2 = openerp.web.parse_value(this.$input.eq(3).val(), {
type: "float",
});

Expand All @@ -595,20 +594,20 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {
},

make_GeoJSON: function (coords) {
var p1 = coords[0];
var p2 = [coords[0][0], coords[1][1]];
var p3 = coords[1];
var p4 = [coords[1][0], coords[0][1]];
let p1 = coords[0];
let p2 = [coords[0][0], coords[1][1]];
let p3 = coords[1];
let p4 = [coords[1][0], coords[0][1]];
// Create a loop in clockwise
var points = [[p1, p2, p3, p4, p1]];
let points = [[p1, p2, p3, p4, p1]];
return { type: "Polygon", coordinates: points };
},

_setValue: function (value) {
this._super.apply(this, arguments);

if (value) {
var geo_obj = JSON.parse(value);
let geo_obj = JSON.parse(value);
this.$input.eq(0).val(geo_obj.coordinates[0][0][0]);
this.$input.eq(1).val(geo_obj.coordinates[0][0][1]);
this.$input.eq(2).val(geo_obj.coordinates[0][2][0]);
Expand All @@ -624,16 +623,16 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {
*
* @return [[x1, y1],[x2, y2]]
*/
var x1 = coords[0][0],
let x1 = coords[0][0],
y1 = coords[0][1],
x2 = coords[1][0],
y2 = coords[1][1];

var minx = Math.min(x1, x2);
var maxx = Math.max(x1, x2);
let minx = Math.min(x1, x2);
let maxx = Math.max(x1, x2);

var miny = Math.min(y1, y2);
var maxy = Math.max(y1, y2);
let miny = Math.min(y1, y2);
let maxy = Math.max(y1, y2);

return [
[minx, miny],
Expand All @@ -642,10 +641,10 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {
},

_onUIChange: function () {
var coords = this.get_coords();
let coords = this.get_coords();
if (this.all_are_set(coords)) {
coords = this.correct_bounds(coords);
var json = this.make_GeoJSON(coords);
let json = this.make_GeoJSON(coords);
this.value = JSON.stringify(json);
} else {
this.value = false;
Expand Down Expand Up @@ -674,7 +673,7 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {
this.invalid = false;
try {
// Get coords to check if floats
var coords = this.get_coords();
let coords = this.get_coords();

// Make sure all the coordinates are set
// if not None or if required
Expand All @@ -696,14 +695,14 @@ odoo.define("base_geoengine.geoengine_widgets", function (require) {
},
});

var FieldGeoRectReadonly = FieldGeoRect.extend({
let FieldGeoRectReadonly = FieldGeoRect.extend({
template: "FieldGeoRect.readonly",

_setValue: function (value) {
this._super.apply(this, arguments);
var show_value = "";
let show_value = "";
if (value) {
var geo_obj = JSON.parse(value);
let geo_obj = JSON.parse(value);
show_value =
"(" +
geo_obj.coordinates[0][0][0] +
Expand Down

0 comments on commit f697d19

Please sign in to comment.