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

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 = [
@@ -745,14 +736,12 @@ L.FormBuilder.Switch = L.FormBuilder.CheckBox.extend({
 })
 
 L.FormBuilder.FacetSearchBase = L.FormBuilder.Element.extend({
-
   buildLabel: function () {
     this.label = L.DomUtil.element({
       tagName: 'legend',
       textContent: this.options.label,
     })
-  }
-
+  },
 })
 L.FormBuilder.FacetSearchChoices = L.FormBuilder.FacetSearchBase.extend({
   build: function () {
@@ -865,13 +854,13 @@ L.FormBuilder.MinMaxBase = L.FormBuilder.FacetSearchBase.extend({
   },
 
   isMinModified: function () {
-    const default_ = this.minInput.getAttribute("value")
+    const default_ = this.minInput.getAttribute('value')
     const current = this.minInput.value
     return current != default_
   },
 
   isMaxModified: function () {
-    const default_ = this.maxInput.getAttribute("value")
+    const default_ = this.maxInput.getAttribute('value')
     const current = this.maxInput.value
     return current != default_
   },
@@ -943,7 +932,11 @@ L.FormBuilder.MultiChoice = L.FormBuilder.Element.extend({
     if (!this.container.querySelector(`input[type="radio"][value="${value}"]`)) {
       value = this.options.default !== undefined ? this.options.default : this.default
     }
-    this.container.querySelector(`input[type="radio"][value="${value}"]`).checked = true
+    const choices = this.getChoices().map(([value, label]) => value)
+    if (choices.includes(value)) {
+      this.container.querySelector(`input[type="radio"][value="${value}"]`).checked =
+        true
+    }
   },
 
   value: function () {
@@ -1065,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({
@@ -1094,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++)
@@ -1183,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 () {