[IMP] web_view_leaflet_map: black, isort, prettier

Author: legalsylvain

setup/web_view_leaflet_map/odoo/addons/web_view_leaflet_map

@@ -0,0 +1 @@
+../../../../web_view_leaflet_map

setup/web_view_leaflet_map/setup.py

@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

web_view_leaflet_map/data/ir_config_parameter.xml

@@ -1,13 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--
 Copyright (C) 2022 - Today: GRAP (http://www.grap.coop)
 @author: Sylvain LE GAL (https://twitter.com/legalsylvain)
 License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 -->
 <odoo noupdate="1">
-    <record id="config_parameter_leaflet_copyright" model="ir.config_parameter" forcecreate="True">
+    <record
+        id="config_parameter_leaflet_copyright"
+        model="ir.config_parameter"
+        forcecreate="True"
+    >
         <field name="key">leaflet.copyright</field>
-        <field name="value"><![CDATA[
+        <field
+            name="value"
+        ><![CDATA[
             &copy; <a href='http://www.openstreetmap.org/copyright'>OpenStreetMap</a>]]>
         </field>
     </record>

web_view_leaflet_map/demo/ir_config_parameter.xml

@@ -1,11 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--
 Copyright (C) 2022 - Today: GRAP (http://www.grap.coop)
 @author: Sylvain LE GAL (https://twitter.com/legalsylvain)
 License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 -->
 <odoo noupdate="1">
-    <record id="config_parameter_leaflet_tile_url" model="ir.config_parameter" forcecreate="True">
+    <record
+        id="config_parameter_leaflet_tile_url"
+        model="ir.config_parameter"
+        forcecreate="True"
+    >
         <field name="key">leaflet.tile_url</field>
         <field name="value">https://tile.openstreetmap.org/{z}/{x}/{y}.png</field>
     </record>

web_view_leaflet_map/hooks.py

@@ -5,11 +5,14 @@
 
 
 def uninstall_hook(cr, registry):
-    cr.execute("UPDATE ir_act_window "
-               "SET view_mode=replace(view_mode, ',leaflet_map', '')"
-               "WHERE view_mode LIKE '%,leaflet_map%';")
-    cr.execute("UPDATE ir_act_window "
-               "SET view_mode=replace(view_mode, 'leaflet_map,', '')"
-               "WHERE view_mode LIKE '%leaflet_map,%';")
-    cr.execute("DELETE FROM ir_act_window "
-               "WHERE view_mode = 'leaflet_map';")
+    cr.execute(
+        "UPDATE ir_act_window "
+        "SET view_mode=replace(view_mode, ',leaflet_map', '')"
+        "WHERE view_mode LIKE '%,leaflet_map%';"
+    )
+    cr.execute(
+        "UPDATE ir_act_window "
+        "SET view_mode=replace(view_mode, 'leaflet_map,', '')"
+        "WHERE view_mode LIKE '%leaflet_map,%';"
+    )
+    cr.execute("DELETE FROM ir_act_window " "WHERE view_mode = 'leaflet_map';")

web_view_leaflet_map/models/__init__.py

@@ -1,4 +1,4 @@
 from . import ir_act_window_view
 from . import ir_ui_view
 from . import ir_http
-from . import res_users
+from . import res_users

web_view_leaflet_map/models/ir_act_window_view.py

@@ -7,6 +7,6 @@
 
 
 class IrActionsActWindowView(models.Model):
-    _inherit = 'ir.actions.act_window.view'
+    _inherit = "ir.actions.act_window.view"
 
-    view_mode = fields.Selection(selection_add=[('leaflet_map', 'Leaflet Map')])
+    view_mode = fields.Selection(selection_add=[("leaflet_map", "Leaflet Map")])

web_view_leaflet_map/models/ir_http.py

@@ -6,13 +6,15 @@
 
 
 class Http(models.AbstractModel):
-    _inherit = 'ir.http'
+    _inherit = "ir.http"
 
     def session_info(self):
         result = super(Http, self).session_info()
-        config = self.env['ir.config_parameter'].sudo()
-        result.update({
-            "leaflet.tile_url": config.get_param('leaflet.tile_url', default=''),
-            "leaflet.copyright": config.get_param('leaflet.copyright', default=''),
-        })
+        config = self.env["ir.config_parameter"].sudo()
+        result.update(
+            {
+                "leaflet.tile_url": config.get_param("leaflet.tile_url", default=""),
+                "leaflet.copyright": config.get_param("leaflet.copyright", default=""),
+            }
+        )
         return result

web_view_leaflet_map/models/ir_ui_view.py

@@ -7,6 +7,6 @@
 
 
 class IrUiView(models.Model):
-    _inherit = 'ir.ui.view'
+    _inherit = "ir.ui.view"
 
-    type = fields.Selection(selection_add=[('leaflet_map', 'Leaflet Map')])
+    type = fields.Selection(selection_add=[("leaflet_map", "Leaflet Map")])

web_view_leaflet_map/models/res_users.py

@@ -6,7 +6,7 @@
 
 
 class ResUsers(models.Model):
-    _inherit = 'res.users'
+    _inherit = "res.users"
 
     @api.model
     def get_default_leaflet_position(self, model_name):

web_view_leaflet_map/static/src/css/web_view_leaflet_map.css

@@ -8,7 +8,6 @@
     overflow-x: visible;
     height: 100%;
     width: 100%;
-
 }
 
 .o_leaflet_map_container {
@@ -20,12 +19,10 @@
     cursor: pointer;
 }
 
-
 .o_map_selector:hover {
     background-color: #eee;
 }
 
-
 .leaflet_marker_icon {
     background-color: white;
     border: 1px black solid;
@@ -57,6 +54,7 @@
     This directive force to display the elements for the leaflet elements.
     See : https://github.com/odoo/odoo/blob/12.0/addons/web/static/src/scss/ui.scss#L13
 */
-.leaflet-container [aria-hidden="true"], [aria-hidden="1"] {
-    display: inline!important;
-}
+.leaflet-container [aria-hidden="true"],
+[aria-hidden="1"] {
+    display: inline !important;
+}

web_view_leaflet_map/static/src/js/view/map/map_renderer.js

@@ -1,19 +1,19 @@
-odoo.define('web_view_leaflet_map.MapRenderer', function (require) {
-    'use strict';
+odoo.define("web_view_leaflet_map.MapRenderer", function (require) {
+    "use strict";
 
-    var AbstractRenderer = require('web.AbstractRenderer');
-    var session = require('web.session');
-    var field_utils = require('web.field_utils');
+    var AbstractRenderer = require("web.AbstractRenderer");
+    var session = require("web.session");
+    var field_utils = require("web.field_utils");
 
     var MapRenderer = AbstractRenderer.extend({
-        tagName: 'div',
-        className: 'o_leaflet_main_container',
+        tagName: "div",
+        className: "o_leaflet_main_container",
 
         init: function (parent, state, params) {
             this._super.apply(this, arguments);
 
-            this.leaflet_tile_url = session['leaflet.tile_url'];
-            this.leaflet_copyright = session['leaflet.copyright'];
+            this.leaflet_tile_url = session["leaflet.tile_url"];
+            this.leaflet_copyright = session["leaflet.copyright"];
             this.default_zoom = params.arch.attrs.default_zoom || 7;
             this.max_zoom = params.arch.attrs.max_zoom || 19;
             this.zoom_snap = params.arch.attrs.zoom_snap | 1;
@@ -31,11 +31,13 @@ odoo.define('web_view_leaflet_map.MapRenderer', function (require) {
         start: function () {
             var self = this;
             var self_super = this._super;
-            return this._initDefaultPosition().then(function () {
-                self._initMap();
-            }).then(function () {
-                return self_super.apply(self, arguments);
-            })
+            return this._initDefaultPosition()
+                .then(function () {
+                    self._initMap();
+                })
+                .then(function () {
+                    return self_super.apply(self, arguments);
+                });
         },
 
         _render: function () {
@@ -57,55 +59,70 @@ odoo.define('web_view_leaflet_map.MapRenderer', function (require) {
             // the map. See.
             // https://github.com/Leaflet/Leaflet/issues/3002#issuecomment-93836022
             return this._super.apply(this, arguments).then(function () {
-                window.setTimeout(function(){
-                      self.leaflet_map.invalidateSize();
-                },1);
-            })
+                window.setTimeout(function () {
+                    self.leaflet_map.invalidateSize();
+                }, 1);
+            });
         },
 
-        _renderRecord: function(record) {
+        _renderRecord: function (record) {
             var self = this;
-            var latlng = L.latLng(record.data[this.field_latitude], record.data[this.field_longitude]);
+            var latlng = L.latLng(
+                record.data[this.field_latitude],
+                record.data[this.field_longitude]
+            );
             // Display only records that have a valid position
             if (latlng.lat != 0 && latlng.lng != 0) {
-                // create marker
+                // Create marker
                 var markerOptions = this._prepareMarkerOptions(record);
-                var marker = L.marker(latlng, markerOptions).addTo(this.leaflet_layer_group);
+                var marker = L.marker(latlng, markerOptions).addTo(
+                    this.leaflet_layer_group
+                );
 
                 // Create Popup and attach an event onclick
                 var popup = L.popup().setContent(this._preparePopUpData(record));
 
                 marker.bindPopup(popup).on("popupopen", () => {
-                    $(".o_map_selector").parent().parent().click({model_name: record.model, res_id: record.data["id"], current_object: self}, self._onClickLeafletPopup);
+                    $(".o_map_selector")
+                        .parent()
+                        .parent()
+                        .click(
+                            {
+                                model_name: record.model,
+                                res_id: record.data.id,
+                                current_object: self,
+                            },
+                            self._onClickLeafletPopup
+                        );
                 });
-
             }
         },
 
         _onClickLeafletPopup: function (ev) {
             ev.preventDefault();
-            ev.data.current_object.trigger_up('switch_view', {
-                view_type: 'form',
+            ev.data.current_object.trigger_up("switch_view", {
+                view_type: "form",
                 res_id: ev.data.res_id,
                 model: ev.data.model_name,
             });
         },
 
-        _prepareMarkerIcon: function(record) {
+        _prepareMarkerIcon: function (record) {
             var myIcon = L.icon({
-                iconUrl: session.url('/web/image', {
+                iconUrl: session.url("/web/image", {
                     model: record.model,
                     id: JSON.stringify(record.data.id),
                     field: this.field_marker_icon_image,
-                    // unique forces a reload of the image when the record has been updated
-                   unique: field_utils.format.datetime(record.data.__last_update).replace(/[^0-9]/g, ''),
+                    // Unique forces a reload of the image when the record has been updated
+                    unique: field_utils.format
+                        .datetime(record.data.__last_update)
+                        .replace(/[^0-9]/g, ""),
                 }),
                 className: "leaflet_marker_icon",
                 iconSize: [this.marker_icon_size_x, this.marker_icon_size_y],
                 popupAnchor: [this.marker_popup_anchor_x, this.marker_popup_anchor_y],
             });
             return myIcon;
-
         },
 
         _prepareMarkerOptions: function (record) {
@@ -114,7 +131,7 @@ odoo.define('web_view_leaflet_map.MapRenderer', function (require) {
                 title: record.data[this.field_title],
                 alt: record.data[this.field_title],
                 riseOnHover: true,
-            }
+            };
             if (icon) {
                 result.icon = icon;
             }
@@ -123,22 +140,27 @@ odoo.define('web_view_leaflet_map.MapRenderer', function (require) {
 
         _preparePopUpData: function (record) {
             return (
-                "<div class='o_map_selector' res_id='" + record.data["id"] + "'>"
-                + "<b>" + record.data[this.field_title] + "</b><br/>"
-                + " - " + record.data[this.field_address]
-                + "</div>"
+                "<div class='o_map_selector' res_id='" +
+                record.data.id +
+                "'>" +
+                "<b>" +
+                record.data[this.field_title] +
+                "</b><br/>" +
+                " - " +
+                record.data[this.field_address] +
+                "</div>"
             );
         },
 
         _initDefaultPosition: function () {
             var self = this;
             return this._rpc({
                 model: "res.users",
-                method: 'get_default_leaflet_position',
+                method: "get_default_leaflet_position",
                 args: [this.state.model],
             }).then(function (result) {
                 self.default_lat_lng = L.latLng(result.lat, result.lng);
-            })
+            });
         },
 
         _initMap: function () {
@@ -153,9 +175,7 @@ odoo.define('web_view_leaflet_map.MapRenderer', function (require) {
             }).addTo(this.leaflet_map);
             this.$el.append($mainDiv);
         },
-
     });
 
     return MapRenderer;
-
 });

web_view_leaflet_map/static/src/js/view/map/map_view.js

@@ -1,35 +1,33 @@
-odoo.define('web_view_leaflet_map.MapView', function (require) {
-    'use strict';
+odoo.define("web_view_leaflet_map.MapView", function (require) {
+    "use strict";
 
-    var BasicView = require('web.BasicView');
-    var core = require('web.core');
-    var MapRenderer = require('web_view_leaflet_map.MapRenderer');
+    var BasicView = require("web.BasicView");
+    var core = require("web.core");
+    var MapRenderer = require("web_view_leaflet_map.MapRenderer");
     var _lt = core._lt;
 
-
     var MapView = BasicView.extend({
-        accesskey: 'm',
-        display_name: _lt('Map'),
-        icon: 'fa-map-o',
+        accesskey: "m",
+        display_name: _lt("Map"),
+        icon: "fa-map-o",
         config: _.extend({}, BasicView.prototype.config, {
             Renderer: MapRenderer,
         }),
-        viewType: 'leaflet_map',
+        viewType: "leaflet_map",
 
         init: function (viewInfo, params) {
             this._super.apply(this, arguments);
 
-            var mode = this.arch.attrs.editable && !params.readonly ? "edit" : "readonly";
+            var mode =
+                this.arch.attrs.editable && !params.readonly ? "edit" : "readonly";
 
             this.controllerParams.mode = mode;
             this.rendererParams.arch = this.arch;
 
             this.loadParams.limit = this.loadParams.limit || 80;
-            this.loadParams.type = 'list';
-
+            this.loadParams.type = "list";
         },
     });
 
     return MapView;
-
 });