umap-project 2.4.0b2__py3-none-any.whl → 2.4.2__py3-none-any.whl

umap/static/umap/js/umap.controls.js

@@ -162,7 +162,7 @@ U.BaseFeatureAction = L.ToolbarAction.extend({
     this.postInit()
   },
 
-  postInit: function () {},
+  postInit: () => {},
 
   hideToolbar: function () {
     this.map.removeLayer(this.toolbar)
@@ -356,7 +356,7 @@ U.DropControl = L.Class.extend({
     this.dropzone.classList.add('umap-dragover')
   },
 
-  dragover: function (e) {
+  dragover: (e) => {
     L.DomEvent.stop(e)
   },
 
@@ -393,7 +393,7 @@ U.EditControl = L.Control.extend({
     L.DomEvent.on(
       enableEditing,
       'mouseover',
-      function () {
+      () => {
         map.tooltip.open({
           content: map.help.displayLabel('TOGGLE_EDIT'),
           anchor: enableEditing,
@@ -434,9 +434,9 @@ U.MoreControls = L.Control.extend({
   },
 
   toggle: function () {
-    const pos = this.getPosition(),
-      corner = this._map._controlCorners[pos],
-      className = 'umap-more-controls'
+    const pos = this.getPosition()
+    const corner = this._map._controlCorners[pos]
+    const className = 'umap-more-controls'
     if (L.DomUtil.hasClass(corner, className)) L.DomUtil.removeClass(corner, className)
     else L.DomUtil.addClass(corner, className)
   },
@@ -454,10 +454,10 @@ U.PermanentCreditsControl = L.Control.extend({
 
   onAdd: function () {
     const paragraphContainer = L.DomUtil.create(
-        'div',
-        'umap-permanent-credits-container'
-      ),
-      creditsParagraph = L.DomUtil.create('p', '', paragraphContainer)
+      'div',
+      'umap-permanent-credits-container'
+    )
+    const creditsParagraph = L.DomUtil.create('p', '', paragraphContainer)
 
     this.paragraphContainer = paragraphContainer
     this.setCredits()
@@ -503,7 +503,7 @@ L.Control.Button = L.Control.extend({
     return container
   },
 
-  afterAdd: function (container) {},
+  afterAdd: (container) => {},
 })
 
 U.DataLayersControl = L.Control.Button.extend({
@@ -745,7 +745,7 @@ const ControlsMixin = {
       L.DomUtil.createLink(
         'umap-user',
         rightContainer,
-        L._(`My Dashboard ({username})`, {
+        L._('My Dashboard ({username})', {
           username: this.options.user.name,
         }),
         this.options.user.url
@@ -832,10 +832,10 @@ const ControlsMixin = {
       row.dataset.id = L.stamp(datalayer)
     })
     const onReorder = (src, dst, initialIndex, finalIndex) => {
-      const layer = this.datalayers[src.dataset.id],
-        other = this.datalayers[dst.dataset.id],
-        minIndex = Math.min(layer.getRank(), other.getRank()),
-        maxIndex = Math.max(layer.getRank(), other.getRank())
+      const layer = this.datalayers[src.dataset.id]
+      const other = this.datalayers[dst.dataset.id]
+      const minIndex = Math.min(layer.getRank(), other.getRank())
+      const maxIndex = Math.max(layer.getRank(), other.getRank())
       if (finalIndex === 0) layer.bringToTop()
       else if (finalIndex > initialIndex) layer.insertBefore(other)
       else layer.insertAfter(other)
@@ -948,10 +948,10 @@ U.TileLayerChooser = L.Control.extend({
   },
 
   addTileLayerElement: function (tilelayer, options) {
-    const selectedClass = this.map.hasLayer(tilelayer) ? 'selected' : '',
-      el = L.DomUtil.create('li', selectedClass, this._tilelayers_container),
-      img = L.DomUtil.create('img', '', el),
-      name = L.DomUtil.create('div', '', el)
+    const selectedClass = this.map.hasLayer(tilelayer) ? 'selected' : ''
+    const el = L.DomUtil.create('li', selectedClass, this._tilelayers_container)
+    const img = L.DomUtil.create('img', '', el)
+    const name = L.DomUtil.create('div', '', el)
     img.src = U.Utils.template(tilelayer.options.url_template, this.map.demoTileInfos)
     img.loading = 'lazy'
     name.textContent = tilelayer.options.name
@@ -961,7 +961,7 @@ U.TileLayerChooser = L.Control.extend({
       function () {
         this.map.selectTileLayer(tilelayer)
         this.map._controls.tilelayers.setLayers()
-        if (options && options.callback) options.callback(tilelayer)
+        if (options?.callback) options.callback(tilelayer)
       },
       this
     )
@@ -982,8 +982,8 @@ U.AttributionControl = L.Control.Attribution.extend({
     this._container.innerHTML = ''
     const container = L.DomUtil.create('div', 'attribution-container', this._container)
     container.innerHTML = credits
-    const shortCredit = this._map.getOption('shortCredit'),
-      captionMenus = this._map.getOption('captionMenus')
+    const shortCredit = this._map.getOption('shortCredit')
+    const captionMenus = this._map.getOption('captionMenus')
     if (shortCredit) {
       L.DomUtil.element({
         tagName: 'span',
@@ -1205,9 +1205,7 @@ L.Control.MiniMap.include({
     this._miniMap.addLayer(this._layer)
   },
 
-  _cloneLayer: function (layer) {
-    return new L.TileLayer(layer._url, L.Util.extend({}, layer.options))
-  },
+  _cloneLayer: (layer) => new L.TileLayer(layer._url, L.Util.extend({}, layer.options)),
 })
 
 L.Control.Loading.include({
@@ -1312,7 +1310,7 @@ U.Editable = L.Editable.extend({
   },
 
   drawingTooltip: function (e) {
-    if (e.layer instanceof L.Marker && e.type == 'editable:drawing:start') {
+    if (e.layer instanceof L.Marker && e.type === 'editable:drawing:start') {
       this.map.tooltip.open({ content: L._('Click to add a marker') })
     }
     if (!(e.layer instanceof L.Polyline)) {
@@ -1364,7 +1362,7 @@ U.Editable = L.Editable.extend({
     this.map.ui.closeTooltip()
   },
 
-  onVertexRawClick: function (e) {
+  onVertexRawClick: (e) => {
     e.layer.onVertexRawClick(e)
     L.DomEvent.stop(e)
     e.cancel()

umap/static/umap/js/umap.core.js

@@ -1,4 +1,4 @@
-L.Util.copyToClipboard = function (textToCopy) {
+L.Util.copyToClipboard = (textToCopy) => {
   // https://stackoverflow.com/a/65996386
   // Navigator clipboard api needs a secure context (https)
   if (navigator.clipboard && window.isSecureContext) {
@@ -25,10 +25,10 @@ L.Util.copyToClipboard = function (textToCopy) {
   }
 }
 
-L.Util.queryString = function (name, fallback) {
+L.Util.queryString = (name, fallback) => {
   const decode = (s) => decodeURIComponent(s.replace(/\+/g, ' '))
-  const qs = window.location.search.slice(1).split('&'),
-    qa = {}
+  const qs = window.location.search.slice(1).split('&')
+  const qa = {}
   for (const i in qs) {
     const key = qs[i].split('=')
     if (!key) continue
@@ -37,27 +37,27 @@ L.Util.queryString = function (name, fallback) {
   return qa[name] || fallback
 }
 
-L.Util.booleanFromQueryString = function (name) {
+L.Util.booleanFromQueryString = (name) => {
   const value = L.Util.queryString(name)
   return value === '1' || value === 'true'
 }
 
-L.Util.setFromQueryString = function (options, name) {
+L.Util.setFromQueryString = (options, name) => {
   const value = L.Util.queryString(name)
   if (typeof value !== 'undefined') options[name] = value
 }
 
-L.Util.setBooleanFromQueryString = function (options, name) {
+L.Util.setBooleanFromQueryString = (options, name) => {
   const value = L.Util.queryString(name)
-  if (typeof value !== 'undefined') options[name] = value == '1' || value == 'true'
+  if (typeof value !== 'undefined') options[name] = value === '1' || value === 'true'
 }
 
-L.Util.setNumberFromQueryString = function (options, name) {
+L.Util.setNumberFromQueryString = (options, name) => {
   const value = +L.Util.queryString(name)
-  if (!isNaN(value)) options[name] = value
+  if (!Number.isNaN(value)) options[name] = value
 }
 
-L.Util.setNullableBooleanFromQueryString = function (options, name) {
+L.Util.setNullableBooleanFromQueryString = (options, name) => {
   let value = L.Util.queryString(name)
   if (typeof value !== 'undefined') {
     if (value === 'null') value = null
@@ -192,7 +192,7 @@ L.DomUtil.after = (target, el) => {
 // convert colour in range 0-255 to the modifier used within luminance calculation
 L.DomUtil.colourMod = (colour) => {
   const sRGB = colour / 255
-  let mod = Math.pow((sRGB + 0.055) / 1.055, 2.4)
+  let mod = ((sRGB + 0.055) / 1.055) ** 2.4
   if (sRGB < 0.03928) mod = sRGB / 12.92
   return mod
 }
@@ -222,7 +222,11 @@ L.DomUtil.contrastedColor = (el, bgcolor) => {
   let rgb = window.getComputedStyle(el).getPropertyValue('background-color')
   rgb = L.DomUtil.RGBRegex.exec(rgb)
   if (!rgb || rgb.length !== 4) return out
-  rgb = [parseInt(rgb[1], 10), parseInt(rgb[2], 10), parseInt(rgb[3], 10)]
+  rgb = [
+    Number.parseInt(rgb[1], 10),
+    Number.parseInt(rgb[2], 10),
+    Number.parseInt(rgb[3], 10),
+  ]
   out = L.DomUtil.contrastWCAG21(rgb)
   if (bgcolor) _CACHE_CONSTRAST[bgcolor] = out
   return out
@@ -247,9 +251,9 @@ L.DomEvent.once = (el, types, fn, context) => {
 
 L.LatLng.prototype.isValid = function () {
   return (
-    isFinite(this.lat) &&
+    Number.isFinite(this.lat) &&
     Math.abs(this.lat) <= 90 &&
-    isFinite(this.lng) &&
+    Number.isFinite(this.lng) &&
     Math.abs(this.lng) <= 180
   )
 }

umap/static/umap/js/umap.datalayer.permissions.js

@@ -7,15 +7,12 @@ U.DataLayerPermissions = L.Class.extend({
     this.options = L.Util.setOptions(this, datalayer.options.permissions)
     this.datalayer = datalayer
     let isDirty = false
-    const self = this
     try {
       Object.defineProperty(this, 'isDirty', {
-        get: function () {
-          return isDirty
-        },
-        set: function (status) {
+        get: () => isDirty,
+        set: (status) => {
           isDirty = status
-          if (status) self.datalayer.isDirty = status
+          if (status) this.datalayer.isDirty = status
         },
       })
     } catch (e) {
@@ -29,19 +26,19 @@ U.DataLayerPermissions = L.Class.extend({
 
   edit: function (container) {
     const fields = [
-        [
-          'options.edit_status',
-          {
-            handler: 'IntSelect',
-            label: L._('Who can edit "{layer}"', { layer: this.datalayer.getName() }),
-            selectOptions: this.datalayer.map.options.datalayer_edit_statuses,
-          },
-        ],
+      [
+        'options.edit_status',
+        {
+          handler: 'IntSelect',
+          label: L._('Who can edit "{layer}"', { layer: this.datalayer.getName() }),
+          selectOptions: this.datalayer.map.options.datalayer_edit_statuses,
+        },
       ],
-      builder = new U.FormBuilder(this, fields, {
-        className: 'umap-form datalayer-permissions',
-      }),
-      form = builder.build()
+    ]
+    const builder = new U.FormBuilder(this, fields, {
+      className: 'umap-form datalayer-permissions',
+    })
+    const form = builder.build()
     container.appendChild(form)
   },