umap-project 2.3.1__py3-none-any.whl → 2.4.0__py3-none-any.whl

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

@@ -139,7 +139,7 @@ L.DomUtil.createButtonIcon = (parent, className, title, size = 16) => {
 
 L.DomUtil.createTitle = (parent, text, className, tag = 'h3') => {
   const title = L.DomUtil.create(tag, '', parent)
-  L.DomUtil.createIcon(title, className)
+  if (className) L.DomUtil.createIcon(title, className)
   L.DomUtil.add('span', '', title, text)
   return title
 }
@@ -245,329 +245,6 @@ L.DomEvent.once = (el, types, fn, context) => {
   return L.DomEvent.on(el, types, fn, context).on(el, types, handler, context)
 }
 
-/*
- * Global events
- */
-U.Keys = {
-  LEFT: 37,
-  UP: 38,
-  RIGHT: 39,
-  DOWN: 40,
-  TAB: 9,
-  ENTER: 13,
-  ESC: 27,
-  APPLE: 91,
-  SHIFT: 16,
-  ALT: 17,
-  CTRL: 18,
-  E: 69,
-  F: 70,
-  H: 72,
-  I: 73,
-  L: 76,
-  M: 77,
-  O: 79,
-  P: 80,
-  S: 83,
-  Z: 90,
-}
-
-U.Help = L.Class.extend({
-  SHORTCUTS: {
-    DRAW_MARKER: {
-      shortcut: 'Modifier+M',
-      label: L._('Draw a marker'),
-    },
-    DRAW_LINE: {
-      shortcut: 'Modifier+L',
-      label: L._('Draw a polyline'),
-    },
-    DRAW_POLYGON: {
-      shortcut: 'Modifier+P',
-      label: L._('Draw a polygon'),
-    },
-    TOGGLE_EDIT: {
-      shortcut: 'Modifier+E',
-      label: L._('Toggle edit mode'),
-    },
-    STOP_EDIT: {
-      shortcut: 'Modifier+E',
-      label: L._('Stop editing'),
-    },
-    SAVE_MAP: {
-      shortcut: 'Modifier+S',
-      label: L._('Save map'),
-    },
-    IMPORT_PANEL: {
-      shortcut: 'Modifier+I',
-      label: L._('Import data'),
-    },
-    SEARCH: {
-      shortcut: 'Modifier+F',
-      label: L._('Search location'),
-    },
-    CANCEL: {
-      shortcut: 'Modifier+Z',
-      label: L._('Cancel edits'),
-    },
-    PREVIEW: {
-      shortcut: 'Modifier+E',
-      label: L._('Back to preview'),
-    },
-    SAVE: {
-      shortcut: 'Modifier+S',
-      label: L._('Save current edits'),
-    },
-    EDIT_FEATURE_LAYER: {
-      shortcut: 'Modifier+⇧+Click',
-      label: L._("Edit feature's layer"),
-    },
-    CONTINUE_LINE: {
-      shortcut: 'Modifier+Click',
-      label: L._('Continue line'),
-    },
-  },
-
-  displayLabel: function (action, withKbdTag = true) {
-    let { shortcut, label } = this.SHORTCUTS[action]
-    const modifier = this.isMacOS ? 'Cmd' : 'Ctrl'
-    shortcut = shortcut.replace('Modifier', modifier)
-    if (withKbdTag) {
-      shortcut = shortcut
-        .split('+')
-        .map((el) => `<kbd>${el}</kbd>`)
-        .join('+')
-      label += ` ${shortcut}`
-    } else {
-      label += ` (${shortcut})`
-    }
-    return label
-  },
-
-  initialize: function (map) {
-    this.map = map
-    this.box = L.DomUtil.create(
-      'div',
-      'umap-help-box with-transition dark',
-      document.body
-    )
-    const closeButton = L.DomUtil.createButton(
-      'umap-close-link',
-      this.box,
-      '',
-      this.hide,
-      this
-    )
-    L.DomUtil.add('i', 'umap-close-icon', closeButton)
-    const label = L.DomUtil.create('span', '', closeButton)
-    label.title = label.textContent = L._('Close')
-    this.content = L.DomUtil.create('div', 'umap-help-content', this.box)
-    this.isMacOS = /mac/i.test(
-      // eslint-disable-next-line compat/compat -- Fallback available.
-      navigator.userAgentData ? navigator.userAgentData.platform : navigator.platform
-    )
-  },
-
-  onKeyDown: function (e) {
-    const key = e.keyCode,
-      ESC = 27
-    if (key === ESC) {
-      this.hide()
-    }
-  },
-
-  show: function () {
-    this.content.innerHTML = ''
-    for (let i = 0, name; i < arguments.length; i++) {
-      name = arguments[i]
-      L.DomUtil.add('div', 'umap-help-entry', this.content, this.resolve(name))
-    }
-    L.DomUtil.addClass(document.body, 'umap-help-on')
-  },
-
-  hide: function () {
-    L.DomUtil.removeClass(document.body, 'umap-help-on')
-  },
-
-  visible: function () {
-    return L.DomUtil.hasClass(document.body, 'umap-help-on')
-  },
-
-  resolve: function (name) {
-    return typeof this[name] === 'function' ? this[name]() : this[name]
-  },
-
-  button: function (container, entries, classname) {
-    const helpButton = L.DomUtil.createButton(
-      classname || 'umap-help-button',
-      container,
-      L._('Help')
-    )
-    if (entries) {
-      L.DomEvent.on(helpButton, 'click', L.DomEvent.stop).on(
-        helpButton,
-        'click',
-        function (e) {
-          const args = typeof entries === 'string' ? [entries] : entries
-          this.show.apply(this, args)
-        },
-        this
-      )
-    }
-    return helpButton
-  },
-
-  link: function (container, entries) {
-    const helpButton = this.button(container, entries, 'umap-help-link')
-    helpButton.textContent = L._('Help')
-    return helpButton
-  },
-
-  edit: function () {
-    const container = L.DomUtil.create('div', ''),
-      self = this,
-      title = L.DomUtil.create('h3', '', container),
-      actionsContainer = L.DomUtil.create('ul', 'umap-edit-actions', container)
-    const addAction = (action) => {
-      const actionContainer = L.DomUtil.add('li', '', actionsContainer)
-      L.DomUtil.add('i', action.options.className, actionContainer),
-        L.DomUtil.add('span', '', actionContainer, action.options.tooltip)
-      L.DomEvent.on(actionContainer, 'click', action.addHooks, action)
-      L.DomEvent.on(actionContainer, 'click', self.hide, self)
-    }
-    title.textContent = L._('Where do we go from here?')
-    for (const id in this.map.helpMenuActions) {
-      addAction(this.map.helpMenuActions[id])
-    }
-    return container
-  },
-
-  importFormats: function () {
-    const container = L.DomUtil.create('div')
-    L.DomUtil.add('h3', '', container, 'GeojSON')
-    L.DomUtil.add('p', '', container, L._('All properties are imported.'))
-    L.DomUtil.add('h3', '', container, 'GPX')
-    L.DomUtil.add('p', '', container, `${L._('Properties imported:')}name, desc`)
-    L.DomUtil.add('h3', '', container, 'KML')
-    L.DomUtil.add('p', '', container, `${L._('Properties imported:')}name, description`)
-    L.DomUtil.add('h3', '', container, 'CSV')
-    L.DomUtil.add(
-      'p',
-      '',
-      container,
-      L._(
-        'Comma, tab or semi-colon separated values. SRS WGS84 is implied. Only Point geometries are imported. The import will look at the column headers for any mention of «lat» and «lon» at the begining of the header, case insensitive. All other column are imported as properties.'
-      )
-    )
-    L.DomUtil.add('h3', '', container, 'uMap')
-    L.DomUtil.add(
-      'p',
-      '',
-      container,
-      L._('Imports all umap data, including layers and settings.')
-    )
-    return container
-  },
-
-  textFormatting: function () {
-    const container = L.DomUtil.create('div'),
-      title = L.DomUtil.add('h3', '', container, L._('Text formatting')),
-      elements = L.DomUtil.create('ul', '', container)
-    L.DomUtil.add('li', '', elements, L._('*single star for italic*'))
-    L.DomUtil.add('li', '', elements, L._('**double star for bold**'))
-    L.DomUtil.add('li', '', elements, L._('# one hash for main heading'))
-    L.DomUtil.add('li', '', elements, L._('## two hashes for second heading'))
-    L.DomUtil.add('li', '', elements, L._('### three hashes for third heading'))
-    L.DomUtil.add('li', '', elements, L._('Simple link: [[http://example.com]]'))
-    L.DomUtil.add(
-      'li',
-      '',
-      elements,
-      L._('Link with text: [[http://example.com|text of the link]]')
-    )
-    L.DomUtil.add('li', '', elements, L._('Image: {{http://image.url.com}}'))
-    L.DomUtil.add(
-      'li',
-      '',
-      elements,
-      L._('Image with custom width (in px): {{http://image.url.com|width}}')
-    )
-    L.DomUtil.add('li', '', elements, L._('Iframe: {{{http://iframe.url.com}}}'))
-    L.DomUtil.add(
-      'li',
-      '',
-      elements,
-      L._('Iframe with custom height (in px): {{{http://iframe.url.com|height}}}')
-    )
-    L.DomUtil.add(
-      'li',
-      '',
-      elements,
-      L._(
-        'Iframe with custom height and width (in px): {{{http://iframe.url.com|height*width}}}'
-      )
-    )
-    L.DomUtil.add('li', '', elements, L._('--- for a horizontal rule'))
-    return container
-  },
-
-  dynamicProperties: function () {
-    const container = L.DomUtil.create('div')
-    L.DomUtil.add('h3', '', container, L._('Dynamic properties'))
-    L.DomUtil.add(
-      'p',
-      '',
-      container,
-      L._(
-        'Use placeholders with feature properties between brackets, eg. &#123;name&#125;, they will be dynamically replaced by the corresponding values.'
-      )
-    )
-    return container
-  },
-
-  formatURL: `${L._(
-    'Supported variables that will be dynamically replaced'
-  )}: {bbox}, {lat}, {lng}, {zoom}, {east}, {north}..., {left}, {top}..., locale, lang`,
-  colorValue: L._('Must be a valid CSS value (eg.: DarkBlue or #123456)'),
-  smoothFactor: L._(
-    'How much to simplify the polyline on each zoom level (more = better performance and smoother look, less = more accurate)'
-  ),
-  dashArray: L._(
-    'A comma separated list of numbers that defines the stroke dash pattern. Ex.: "5, 10, 15".'
-  ),
-  zoomTo: L._('Zoom level for automatic zooms'),
-  labelKey: L._(
-    'The name of the property to use as feature label (eg.: "nom"). You can also use properties inside brackets to use more than one or mix with static content (eg.: "&lcub;name&rcub; in &lcub;place&rcub;")'
-  ),
-  stroke: L._('Whether to display or not polygons paths.'),
-  fill: L._('Whether to fill polygons with color.'),
-  fillColor: L._('Optional. Same as color if not set.'),
-  shortCredit: L._('Will be displayed in the bottom right corner of the map'),
-  longCredit: L._('Will be visible in the caption of the map'),
-  permanentCredit: L._(
-    'Will be permanently visible in the bottom left corner of the map'
-  ),
-  sortKey: L._(
-    'Comma separated list of properties to use for sorting features. To reverse the sort, put a minus sign (-) before. Eg. mykey,-otherkey.'
-  ),
-  slugKey: L._('The name of the property to use as feature unique identifier.'),
-  filterKey: L._(
-    'Comma separated list of properties to use when filtering features by text input'
-  ),
-  facetKey: L._(
-    'Comma separated list of properties to use for filters (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key). To control input field type, add it after another | (eg.: mykey|My Key|checkbox,otherkey|Other Key|datetime). Allowed values for the input field type are checkbox (default), radio, number, date and datetime.'
-  ),
-  interactive: L._(
-    'If false, the polygon or line will act as a part of the underlying map.'
-  ),
-  outlink: L._('Define link to open in a new window on polygon click.'),
-  dynamicRemoteData: L._('Fetch data each time map view changes.'),
-  proxyRemoteData: L._("To use if remote server doesn't allow cross domain (slower)"),
-  browsable: L._(
-    'Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…'
-  ),
-})
-
 L.LatLng.prototype.isValid = function () {
   return (
     isFinite(this.lat) &&

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

@@ -1,25 +1,61 @@
 U.FeatureMixin = {
   staticOptions: { mainColor: 'color' },
 
-  initialize: function (map, latlng, options) {
+  getSyncMetadata: function () {
+    return {
+      subject: 'feature',
+      metadata: {
+        id: this.id,
+        layerId: this.datalayer?.id || null,
+        featureType: this.getClassName(),
+      },
+    }
+  },
+
+  onCommit: function () {
+    // When the layer is a remote layer, we don't want to sync the creation of the
+    // points via the websocket, as the other peers will get them themselves.
+    if (this.datalayer.isRemoteLayer()) return
+    this.sync.upsert(this.toGeoJSON())
+  },
+
+  getGeometry: function () {
+    return this.toGeoJSON().geometry
+  },
+
+  syncDelete: function () {
+    this.sync.delete()
+  },
+
+  initialize: function (map, latlng, options, id) {
     this.map = map
+    this.sync = map.sync_engine.proxy(this)
+
     if (typeof options === 'undefined') {
       options = {}
     }
     // DataLayer the marker belongs to
     this.datalayer = options.datalayer || null
     this.properties = { _umap_options: {} }
-    let geojson_id
+
     if (options.geojson) {
       this.populate(options.geojson)
-      geojson_id = options.geojson.id
     }
 
-    // Each feature needs an unique identifier
-    if (U.Utils.checkId(geojson_id)) {
-      this.id = geojson_id
+    if (id) {
+      this.id = id
     } else {
-      this.id = U.Utils.generateId()
+      let geojson_id
+      if (options.geojson) {
+        geojson_id = options.geojson.id
+      }
+
+      // Each feature needs an unique identifier
+      if (U.Utils.checkId(geojson_id)) {
+        this.id = geojson_id
+      } else {
+        this.id = U.Utils.generateId()
+      }
     }
     let isDirty = false
     const self = this
@@ -98,6 +134,7 @@ U.FeatureMixin = {
         this.view()
       }
     }
+    this._redraw()
   },
 
   openPopup: function () {
@@ -107,7 +144,11 @@ U.FeatureMixin = {
   edit: function (e) {
     if (!this.map.editEnabled || this.isReadOnly()) return
     const container = L.DomUtil.create('div', 'umap-feature-container')
-    L.DomUtil.createTitle(container, L._('Feature properties'), this.getClassName())
+    L.DomUtil.createTitle(
+      container,
+      L._('Feature properties'),
+      `icon-${this.getClassName()}`
+    )
 
     let builder = new U.FormBuilder(
       this,
@@ -134,7 +175,6 @@ U.FeatureMixin = {
     properties.unshift('properties.name')
     builder = new U.FormBuilder(this, properties, {
       id: 'umap-feature-properties',
-      callback: this._redraw, // In case we have dynamic options…
     })
     container.appendChild(builder.build())
     this.appendEditFieldsets(container)
@@ -149,7 +189,7 @@ U.FeatureMixin = {
   },
 
   getAdvancedEditActions: function (container) {
-    const deleteButton = L.DomUtil.createButton(
+    L.DomUtil.createButton(
       'button umap-delete',
       container,
       L._('Delete'),
@@ -165,7 +205,6 @@ U.FeatureMixin = {
     const optionsFields = this.getShapeOptions()
     let builder = new U.FormBuilder(this, optionsFields, {
       id: 'umap-feature-shape-properties',
-      callback: this._redraw,
     })
     const shapeProperties = L.DomUtil.createFieldset(container, L._('Shape properties'))
     shapeProperties.appendChild(builder.build())
@@ -173,7 +212,6 @@ U.FeatureMixin = {
     const advancedOptions = this.getAdvancedOptions()
     builder = new U.FormBuilder(this, advancedOptions, {
       id: 'umap-feature-advanced-properties',
-      callback: this._redraw,
     })
     const advancedProperties = L.DomUtil.createFieldset(
       container,
@@ -182,9 +220,7 @@ U.FeatureMixin = {
     advancedProperties.appendChild(builder.build())
 
     const interactionOptions = this.getInteractionOptions()
-    builder = new U.FormBuilder(this, interactionOptions, {
-      callback: this._redraw,
-    })
+    builder = new U.FormBuilder(this, interactionOptions)
     const popupFieldset = L.DomUtil.createFieldset(
       container,
       L._('Interaction options')
@@ -240,13 +276,14 @@ U.FeatureMixin = {
     }
     return false
   },
-
-  del: function () {
+  del: function (sync) {
     this.isDirty = true
     this.map.closePopup()
     if (this.datalayer) {
       this.datalayer.removeLayer(this)
       this.disconnectFromDataLayer(this.datalayer)
+
+      if (sync !== false) this.syncDelete()
     }
   },
 
@@ -495,7 +532,7 @@ U.FeatureMixin = {
   },
 
   isFiltered: function () {
-    const filterKeys = this.map.getFilterKeys()
+    const filterKeys = this.datalayer.getFilterKeys()
     const filter = this.map.browser.options.filter
     if (filter && !this.matchFilter(filter, filterKeys)) return true
     if (!this.matchFacets()) return true
@@ -504,6 +541,10 @@ U.FeatureMixin = {
 
   matchFilter: function (filter, keys) {
     filter = filter.toLowerCase()
+    if (U.Utils.hasVar(keys)) {
+      return this.getDisplayName().toLowerCase().indexOf(filter) !== -1
+    }
+    keys = keys.split(',')
     for (let i = 0, value; i < keys.length; i++) {
       value = (this.properties[keys[i]] || '') + ''
       if (value.toLowerCase().indexOf(filter) !== -1) return true
@@ -549,7 +590,10 @@ U.FeatureMixin = {
   },
 
   clone: function () {
-    const layer = this.datalayer.geojsonToFeatures(this.toGeoJSON())
+    const geoJSON = this.toGeoJSON()
+    delete geoJSON.id
+    delete geoJSON.properties.id
+    const layer = this.datalayer.geojsonToFeatures(geoJSON)
     layer.isDirty = true
     layer.edit()
     return layer
@@ -562,7 +606,7 @@ U.FeatureMixin = {
     if (locale) properties.locale = locale
     if (L.lang) properties.lang = L.lang
     properties.rank = this.getRank() + 1
-    if (this.hasGeom()) {
+    if (this._map && this.hasGeom()) {
       center = this.getCenter()
       properties.lat = center.lat
       properties.lon = center.lng
@@ -602,9 +646,11 @@ U.Marker = L.Marker.extend({
       function (e) {
         this.isDirty = true
         this.edit(e)
+        this.sync.update('geometry', this.getGeometry())
       },
       this
     )
+    this.on('editable:drawing:commit', this.onCommit)
     if (!this.isReadOnly()) this.on('mouseover', this._enableDragging)
     this.on('mouseout', this._onMouseOut)
     this._popupHandlersAdded = true // prevent Leaflet from binding event on bindPopup
@@ -726,14 +772,10 @@ U.Marker = L.Marker.extend({
     const builder = new U.FormBuilder(this, coordinatesOptions, {
       callback: function () {
         if (!this._latlng.isValid()) {
-          this.map.ui.alert({
-            content: L._('Invalid latitude or longitude'),
-            level: 'error',
-          })
+          U.Alert.error(L._('Invalid latitude or longitude'))
           builder.resetField('_latlng.lat')
           builder.resetField('_latlng.lng')
         }
-        this._redraw()
         this.zoomTo({ easing: false })
       },
       callbackContext: this,
@@ -878,14 +920,15 @@ U.PathMixin = {
 
   _onMouseOver: function () {
     if (this.map.measureTools && this.map.measureTools.enabled()) {
-      this.map.ui.tooltip({ content: this.getMeasure(), anchor: this })
+      this.map.tooltip.open({ content: this.getMeasure(), anchor: this })
     } else if (this.map.editEnabled && !this.map.editedFeature) {
-      this.map.ui.tooltip({ content: L._('Click to edit'), anchor: this })
+      this.map.tooltip.open({ content: L._('Click to edit'), anchor: this })
     }
   },
 
   addInteractions: function () {
     U.FeatureMixin.addInteractions.call(this)
+    this.on('editable:disable', this.onCommit)
     this.on('mouseover', this._onMouseOver)
     this.on('edit', this.makeDirty)
     this.on('drag editable:drag', this._onDrag)
@@ -928,7 +971,7 @@ U.PathMixin = {
     items.push({
       text: L._('Display measure'),
       callback: function () {
-        this.map.ui.alert({ content: this.getMeasure(), level: 'info' })
+        U.Alert.info(this.getMeasure())
       },
       context: this,
     })
@@ -1086,6 +1129,9 @@ U.Polyline = L.Polyline.extend({
     geojson.geometry.coordinates = [
       U.Utils.flattenCoordinates(geojson.geometry.coordinates),
     ]
+
+    delete geojson.id // delete the copied id, a new one will be generated.
+
     const polygon = this.datalayer.geojsonToFeatures(geojson)
     polygon.edit()
     this.del()
@@ -1093,7 +1139,7 @@ U.Polyline = L.Polyline.extend({
 
   getAdvancedEditActions: function (container) {
     U.FeatureMixin.getAdvancedEditActions.call(this, container)
-    const toPolygon = L.DomUtil.createButton(
+    L.DomUtil.createButton(
       'button umap-to-polygon',
       container,
       L._('Transform to polygon'),
@@ -1223,6 +1269,8 @@ U.Polygon = L.Polygon.extend({
 
   toPolyline: function () {
     const geojson = this.toGeoJSON()
+    delete geojson.id
+    delete geojson.properties.id
     geojson.geometry.type = 'LineString'
     geojson.geometry.coordinates = U.Utils.flattenCoordinates(
       geojson.geometry.coordinates

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

@@ -78,7 +78,7 @@ L.FormBuilder.Element.include({
           info,
           'mouseover',
           function () {
-            this.builder.map.ui.tooltip({
+            this.builder.map.tooltip.open({
               anchor: info,
               content: this.options.helpTooltip,
               position: 'top',
@@ -340,15 +340,6 @@ L.FormBuilder.TextColorPicker = L.FormBuilder.ColorPicker.extend({
   ],
 })
 
-L.FormBuilder.ProxyTTLSelect = L.FormBuilder.Select.extend({
-  selectOptions: [
-    [undefined, L._('No cache')],
-    ['300', L._('5 min')],
-    ['3600', L._('1 hour')],
-    ['86400', L._('1 day')],
-  ],
-})
-
 L.FormBuilder.LayerTypeChooser = L.FormBuilder.Select.extend({
   getOptions: function () {
     const layer_classes = [
@@ -1067,7 +1058,7 @@ L.FormBuilder.ManageOwner = L.FormBuilder.Element.extend({
       className: 'edit-owner',
       on_select: L.bind(this.onSelect, this),
     }
-    this.autocomplete = new U.AutoComplete.Ajax.Select(this.parentNode, options)
+    this.autocomplete = new U.AjaxAutocomplete(this.parentNode, options)
     const owner = this.toHTML()
     if (owner)
       this.autocomplete.displaySelected({
@@ -1096,7 +1087,7 @@ L.FormBuilder.ManageEditors = L.FormBuilder.Element.extend({
       on_select: L.bind(this.onSelect, this),
       on_unselect: L.bind(this.onUnselect, this),
     }
-    this.autocomplete = new U.AutoComplete.Ajax.SelectMultiple(this.parentNode, options)
+    this.autocomplete = new U.AjaxAutocompleteMultiple(this.parentNode, options)
     this._values = this.toHTML()
     if (this._values)
       for (let i = 0; i < this._values.length; i++)
@@ -1185,7 +1176,12 @@ U.FormBuilder = L.FormBuilder.extend({
   setter: function (field, value) {
     L.FormBuilder.prototype.setter.call(this, field, value)
     this.obj.isDirty = true
-    if ('render' in this.obj) this.obj.render([field], this)
+    if ('render' in this.obj) {
+      this.obj.render([field], this)
+    }
+    if ('sync' in this.obj) {
+      this.obj.sync.update(field, value)
+    }
   },
 
   finish: function () {