umap-project 2.4.2__py3-none-any.whl → 2.5.0__py3-none-any.whl

umap/static/umap/js/modules/ui/panel.js

@@ -9,7 +9,7 @@ export class Panel {
     // This will be set once according to the panel configurated at load
     // or by using panels as popups
     this.mode = null
-    this.classname = 'left'
+    this.className = 'left'
     DomEvent.disableClickPropagation(this.container)
     DomEvent.on(this.container, 'contextmenu', DomEvent.stopPropagation) // Do not activate our custom context menu.
     DomEvent.on(this.container, 'wheel', DomEvent.stopPropagation)
@@ -25,9 +25,10 @@ export class Panel {
   }
 
   open({ content, className, actions = [] } = {}) {
-    this.container.className = `with-transition panel window ${this.classname} ${
+    this.container.className = `with-transition panel window ${this.className} ${
       this.mode || ''
     }`
+    document.body.classList.add(`panel-${this.className.split(' ')[0]}-on`)
     this.container.innerHTML = ''
     const actionsContainer = DomUtil.create('ul', 'buttons', this.container)
     const body = DomUtil.create('div', 'body', this.container)
@@ -69,6 +70,7 @@ export class Panel {
   }
 
   close() {
+    document.body.classList.remove(`panel-${this.className.split(' ')[0]}-on`)
     if (DomUtil.hasClass(this.container, 'on')) {
       DomUtil.removeClass(this.container, 'on')
       this.map.invalidateSize({ pan: false })
@@ -80,14 +82,14 @@ export class Panel {
 export class EditPanel extends Panel {
   constructor(map) {
     super(map)
-    this.classname = 'right dark'
+    this.className = 'right dark'
   }
 }
 
 export class FullPanel extends Panel {
   constructor(map) {
     super(map)
-    this.classname = 'full dark'
+    this.className = 'full dark'
     this.mode = 'expanded'
   }
 }

umap/static/umap/js/modules/ui/tooltip.js

@@ -1,8 +1,10 @@
 import { DomEvent, DomUtil } from '../../../vendors/leaflet/leaflet-src.esm.js'
 import { translate } from '../i18n.js'
+import { Positioned } from './base.js'
 
-export default class Tooltip {
+export default class Tooltip extends Positioned {
   constructor(parent) {
+    super()
     this.parent = parent
     this.container = DomUtil.create('div', 'with-transition', this.parent)
     this.container.id = 'umap-tooltip-container'
@@ -13,16 +15,8 @@ export default class Tooltip {
   }
 
   open(opts) {
-    function showIt() {
-      if (opts.anchor && opts.position === 'top') {
-        this.anchorTop(opts.anchor)
-      } else if (opts.anchor && opts.position === 'left') {
-        this.anchorLeft(opts.anchor)
-      } else if (opts.anchor && opts.position === 'bottom') {
-        this.anchorBottom(opts.anchor)
-      } else {
-        this.anchorAbsolute()
-      }
+    const showIt = () => {
+      this.openAt(opts)
       L.DomUtil.addClass(this.parent, 'umap-tooltip')
       this.container.innerHTML = U.Utils.escapeHTML(opts.content)
     }
@@ -39,43 +33,6 @@ export default class Tooltip {
     }
   }
 
-  anchorAbsolute() {
-    this.container.className = ''
-    const left =
-      this.parent.offsetLeft +
-      this.parent.clientWidth / 2 -
-      this.container.clientWidth / 2
-    const top = this.parent.offsetTop + 75
-    this.setPosition({ top: top, left: left })
-  }
-
-  anchorTop(el) {
-    this.container.className = 'tooltip-top'
-    const coords = this.getPosition(el)
-    this.setPosition({
-      left: coords.left - 10,
-      bottom: this.getDocHeight() - coords.top + 11,
-    })
-  }
-
-  anchorBottom(el) {
-    this.container.className = 'tooltip-bottom'
-    const coords = this.getPosition(el)
-    this.setPosition({
-      left: coords.left,
-      top: coords.bottom + 11,
-    })
-  }
-
-  anchorLeft(el) {
-    this.container.className = 'tooltip-left'
-    const coords = this.getPosition(el)
-    this.setPosition({
-      top: coords.top,
-      right: document.documentElement.offsetWidth - coords.left + 11,
-    })
-  }
-
   close(id) {
     // Clear timetout even if a new tooltip has been added
     // in the meantime. Eg. after a mouseout from the anchor.
@@ -86,31 +43,4 @@ export default class Tooltip {
     this.setPosition({})
     L.DomUtil.removeClass(this.parent, 'umap-tooltip')
   }
-
-  getPosition(el) {
-    return el.getBoundingClientRect()
-  }
-
-  setPosition(coords) {
-    if (coords.left) this.container.style.left = `${coords.left}px`
-    else this.container.style.left = 'initial'
-    if (coords.right) this.container.style.right = `${coords.right}px`
-    else this.container.style.right = 'initial'
-    if (coords.top) this.container.style.top = `${coords.top}px`
-    else this.container.style.top = 'initial'
-    if (coords.bottom) this.container.style.bottom = `${coords.bottom}px`
-    else this.container.style.bottom = 'initial'
-  }
-
-  getDocHeight() {
-    const D = document
-    return Math.max(
-      D.body.scrollHeight,
-      D.documentElement.scrollHeight,
-      D.body.offsetHeight,
-      D.documentElement.offsetHeight,
-      D.body.clientHeight,
-      D.documentElement.clientHeight
-    )
-  }
 }

umap/static/umap/js/modules/utils.js

@@ -377,3 +377,23 @@ export function toggleBadge(element, value) {
   if (value) element.dataset.badge = value === true ? ' ' : value
   else delete element.dataset.badge
 }
+
+export function loadTemplate(html) {
+  const template = document.createElement('template')
+  template.innerHTML = html
+    .split('\n')
+    .map((line) => line.trim())
+    .join('')
+  return template.content.firstElementChild
+}
+
+export class WithTemplate {
+  loadTemplate(html) {
+    this.element = loadTemplate(html)
+    this.elements = {}
+    for (const element of this.element.querySelectorAll('[data-ref]')) {
+      this.elements[element.dataset.ref] = element
+    }
+    return this.element
+  }
+}

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

@@ -751,7 +751,7 @@ const ControlsMixin = {
         this.options.user.url
       )
     }
-    this.help.link(rightContainer, 'edit')
+    this.help.getStartedLink(rightContainer)
     const controlEditCancel = L.DomUtil.createButton(
       'leaflet-control-edit-cancel',
       rightContainer,

umap/static/umap/js/umap.features.js

@@ -1,6 +1,10 @@
 U.FeatureMixin = {
   staticOptions: { mainColor: 'color' },
 
+  getPreviewColor: function () {
+    return this.getDynamicOption(this.staticOptions.mainColor)
+  },
+
   getSyncMetadata: function () {
     return {
       subject: 'feature',
@@ -194,16 +198,9 @@ U.FeatureMixin = {
   },
 
   getAdvancedEditActions: function (container) {
-    L.DomUtil.createButton(
-      'button umap-delete',
-      container,
-      L._('Delete'),
-      function (e) {
-        L.DomEvent.stop(e)
-        if (this.confirmDelete()) this.map.editPanel.close()
-      },
-      this
-    )
+    L.DomUtil.createButton('button umap-delete', container, L._('Delete'), (e) => {
+      this.confirmDelete().then(() => this.map.editPanel.close())
+    })
   },
 
   appendEditFieldsets: function (container) {
@@ -272,8 +269,11 @@ U.FeatureMixin = {
     this.bindPopup(new Class(this))
   },
 
-  confirmDelete: function () {
-    if (confirm(L._('Are you sure you want to delete the feature?'))) {
+  confirmDelete: async function () {
+    const confirmed = await this.map.dialog.confirm(
+      L._('Are you sure you want to delete the feature?')
+    )
+    if (confirmed) {
       this.del()
       return true
     }
@@ -759,8 +759,8 @@ U.Marker = L.Marker.extend({
       callback: function () {
         if (!this._latlng.isValid()) {
           U.Alert.error(L._('Invalid latitude or longitude'))
-          builder.resetField('_latlng.lat')
-          builder.resetField('_latlng.lng')
+          builder.restoreField('_latlng.lat')
+          builder.restoreField('_latlng.lng')
         }
         this.zoomTo({ easing: false })
       },
@@ -1207,6 +1207,14 @@ U.Polygon = L.Polygon.extend({
     return options
   },
 
+  getPreviewColor: function () {
+    // If user set a fillColor, use it, otherwise default to color
+    // which is usually the only one set
+    const color = this.getDynamicOption(this.staticOptions.mainColor)
+    if (color && color !== U.SCHEMA.color.default) return color
+    return this.getDynamicOption('color')
+  },
+
   getInteractionOptions: () => {
     const options = U.FeatureMixin.getInteractionOptions()
     options.push('properties._umap_options.interactive')

umap/static/umap/js/umap.forms.js

@@ -1,3 +1,153 @@
+U.COLORS = [
+  'Black',
+  'Navy',
+  'DarkBlue',
+  'MediumBlue',
+  'Blue',
+  'DarkGreen',
+  'Green',
+  'Teal',
+  'DarkCyan',
+  'DeepSkyBlue',
+  'DarkTurquoise',
+  'MediumSpringGreen',
+  'Lime',
+  'SpringGreen',
+  'Aqua',
+  'Cyan',
+  'MidnightBlue',
+  'DodgerBlue',
+  'LightSeaGreen',
+  'ForestGreen',
+  'SeaGreen',
+  'DarkSlateGray',
+  'DarkSlateGrey',
+  'LimeGreen',
+  'MediumSeaGreen',
+  'Turquoise',
+  'RoyalBlue',
+  'SteelBlue',
+  'DarkSlateBlue',
+  'MediumTurquoise',
+  'Indigo',
+  'DarkOliveGreen',
+  'CadetBlue',
+  'CornflowerBlue',
+  'MediumAquaMarine',
+  'DimGray',
+  'DimGrey',
+  'SlateBlue',
+  'OliveDrab',
+  'SlateGray',
+  'SlateGrey',
+  'LightSlateGray',
+  'LightSlateGrey',
+  'MediumSlateBlue',
+  'LawnGreen',
+  'Chartreuse',
+  'Aquamarine',
+  'Maroon',
+  'Purple',
+  'Olive',
+  'Gray',
+  'Grey',
+  'SkyBlue',
+  'LightSkyBlue',
+  'BlueViolet',
+  'DarkRed',
+  'DarkMagenta',
+  'SaddleBrown',
+  'DarkSeaGreen',
+  'LightGreen',
+  'MediumPurple',
+  'DarkViolet',
+  'PaleGreen',
+  'DarkOrchid',
+  'YellowGreen',
+  'Sienna',
+  'Brown',
+  'DarkGray',
+  'DarkGrey',
+  'LightBlue',
+  'GreenYellow',
+  'PaleTurquoise',
+  'LightSteelBlue',
+  'PowderBlue',
+  'FireBrick',
+  'DarkGoldenRod',
+  'MediumOrchid',
+  'RosyBrown',
+  'DarkKhaki',
+  'Silver',
+  'MediumVioletRed',
+  'IndianRed',
+  'Peru',
+  'Chocolate',
+  'Tan',
+  'LightGray',
+  'LightGrey',
+  'Thistle',
+  'Orchid',
+  'GoldenRod',
+  'PaleVioletRed',
+  'Crimson',
+  'Gainsboro',
+  'Plum',
+  'BurlyWood',
+  'LightCyan',
+  'Lavender',
+  'DarkSalmon',
+  'Violet',
+  'PaleGoldenRod',
+  'LightCoral',
+  'Khaki',
+  'AliceBlue',
+  'HoneyDew',
+  'Azure',
+  'SandyBrown',
+  'Wheat',
+  'Beige',
+  'WhiteSmoke',
+  'MintCream',
+  'GhostWhite',
+  'Salmon',
+  'AntiqueWhite',
+  'Linen',
+  'LightGoldenRodYellow',
+  'OldLace',
+  'Red',
+  'Fuchsia',
+  'Magenta',
+  'DeepPink',
+  'OrangeRed',
+  'Tomato',
+  'HotPink',
+  'Coral',
+  'DarkOrange',
+  'LightSalmon',
+  'Orange',
+  'LightPink',
+  'Pink',
+  'Gold',
+  'PeachPuff',
+  'NavajoWhite',
+  'Moccasin',
+  'Bisque',
+  'MistyRose',
+  'BlanchedAlmond',
+  'PapayaWhip',
+  'LavenderBlush',
+  'SeaShell',
+  'Cornsilk',
+  'LemonChiffon',
+  'FloralWhite',
+  'Snow',
+  'Yellow',
+  'LightYellow',
+  'Ivory',
+  'White',
+]
+
 L.FormBuilder.Element.include({
   undefine: function () {
     L.DomUtil.addClass(this.wrapper, 'undefined')
@@ -115,156 +265,7 @@ L.FormBuilder.CheckBox.include({
 })
 
 L.FormBuilder.ColorPicker = L.FormBuilder.Input.extend({
-  colors: [
-    'Black',
-    'Navy',
-    'DarkBlue',
-    'MediumBlue',
-    'Blue',
-    'DarkGreen',
-    'Green',
-    'Teal',
-    'DarkCyan',
-    'DeepSkyBlue',
-    'DarkTurquoise',
-    'MediumSpringGreen',
-    'Lime',
-    'SpringGreen',
-    'Aqua',
-    'Cyan',
-    'MidnightBlue',
-    'DodgerBlue',
-    'LightSeaGreen',
-    'ForestGreen',
-    'SeaGreen',
-    'DarkSlateGray',
-    'DarkSlateGrey',
-    'LimeGreen',
-    'MediumSeaGreen',
-    'Turquoise',
-    'RoyalBlue',
-    'SteelBlue',
-    'DarkSlateBlue',
-    'MediumTurquoise',
-    'Indigo',
-    'DarkOliveGreen',
-    'CadetBlue',
-    'CornflowerBlue',
-    'MediumAquaMarine',
-    'DimGray',
-    'DimGrey',
-    'SlateBlue',
-    'OliveDrab',
-    'SlateGray',
-    'SlateGrey',
-    'LightSlateGray',
-    'LightSlateGrey',
-    'MediumSlateBlue',
-    'LawnGreen',
-    'Chartreuse',
-    'Aquamarine',
-    'Maroon',
-    'Purple',
-    'Olive',
-    'Gray',
-    'Grey',
-    'SkyBlue',
-    'LightSkyBlue',
-    'BlueViolet',
-    'DarkRed',
-    'DarkMagenta',
-    'SaddleBrown',
-    'DarkSeaGreen',
-    'LightGreen',
-    'MediumPurple',
-    'DarkViolet',
-    'PaleGreen',
-    'DarkOrchid',
-    'YellowGreen',
-    'Sienna',
-    'Brown',
-    'DarkGray',
-    'DarkGrey',
-    'LightBlue',
-    'GreenYellow',
-    'PaleTurquoise',
-    'LightSteelBlue',
-    'PowderBlue',
-    'FireBrick',
-    'DarkGoldenRod',
-    'MediumOrchid',
-    'RosyBrown',
-    'DarkKhaki',
-    'Silver',
-    'MediumVioletRed',
-    'IndianRed',
-    'Peru',
-    'Chocolate',
-    'Tan',
-    'LightGray',
-    'LightGrey',
-    'Thistle',
-    'Orchid',
-    'GoldenRod',
-    'PaleVioletRed',
-    'Crimson',
-    'Gainsboro',
-    'Plum',
-    'BurlyWood',
-    'LightCyan',
-    'Lavender',
-    'DarkSalmon',
-    'Violet',
-    'PaleGoldenRod',
-    'LightCoral',
-    'Khaki',
-    'AliceBlue',
-    'HoneyDew',
-    'Azure',
-    'SandyBrown',
-    'Wheat',
-    'Beige',
-    'WhiteSmoke',
-    'MintCream',
-    'GhostWhite',
-    'Salmon',
-    'AntiqueWhite',
-    'Linen',
-    'LightGoldenRodYellow',
-    'OldLace',
-    'Red',
-    'Fuchsia',
-    'Magenta',
-    'DeepPink',
-    'OrangeRed',
-    'Tomato',
-    'HotPink',
-    'Coral',
-    'DarkOrange',
-    'LightSalmon',
-    'Orange',
-    'LightPink',
-    'Pink',
-    'Gold',
-    'PeachPuff',
-    'NavajoWhite',
-    'Moccasin',
-    'Bisque',
-    'MistyRose',
-    'BlanchedAlmond',
-    'PapayaWhip',
-    'LavenderBlush',
-    'SeaShell',
-    'Cornsilk',
-    'LemonChiffon',
-    'FloralWhite',
-    'Snow',
-    'Yellow',
-    'LightYellow',
-    'Ivory',
-    'White',
-  ],
-
+  colors: U.COLORS,
   getParentNode: function () {
     L.FormBuilder.CheckBox.prototype.getParentNode.call(this)
     return this.quickContainer
@@ -346,6 +347,7 @@ L.FormBuilder.LayerTypeChooser = L.FormBuilder.Select.extend({
       U.Layer.Cluster,
       U.Layer.Heat,
       U.Layer.Choropleth,
+      U.Layer.Categorized,
     ]
     return layer_classes.map((class_) => [class_.TYPE, class_.NAME])
   },
@@ -454,6 +456,7 @@ L.FormBuilder.BlurInput.include({
     L.FormBuilder.Input.prototype.build.call(this)
     const button = L.DomUtil.create('span', 'button blur-button')
     L.DomUtil.after(this.input, button)
+    L.DomEvent.on(this.input, 'focus', this.fetch, this)
   },
 })
 
@@ -901,8 +904,8 @@ L.FormBuilder.MultiChoice = L.FormBuilder.Element.extend({
   },
 
   fetch: function () {
-    this.backup = this.toHTML()
-    let value = this.backup
+    this.initial = this.toHTML()
+    let value = this.initial
     if (!this.container.querySelector(`input[type="radio"][value="${value}"]`)) {
       value = this.options.default !== undefined ? this.options.default : this.default
     }
@@ -1156,7 +1159,7 @@ U.FormBuilder = L.FormBuilder.extend({
     }
   },
 
-  finish: function () {
-    this.map.editPanel.close()
+  finish: (event) => {
+    event.helper?.input?.blur()
   },
 })