umap-project 2.6.3__py3-none-any.whl → 2.7.0b0__py3-none-any.whl

umap/static/umap/js/modules/permissions.js

@@ -42,101 +42,129 @@ export class MapPermissions {
     return !this.map.options.permissions.owner
   }
 
-  getMap() {
-    return this.map
-  }
-
-  edit() {
-    if (this.map.options.editMode !== 'advanced') return
-    if (!this.map.options.umap_id) {
-      return Alert.info(translate('Please save the map first'))
-    }
-    const container = DomUtil.create('div', 'permissions-panel')
+  _editAnonymous(container) {
     const fields = []
-    DomUtil.createTitle(container, translate('Update permissions'), 'icon-key')
-    if (this.isAnonymousMap()) {
+    if (this.isOwner()) {
+      fields.push([
+        'options.edit_status',
+        {
+          handler: 'IntSelect',
+          label: translate('Who can edit'),
+          selectOptions: this.map.options.edit_statuses,
+        },
+      ])
+      const builder = new U.FormBuilder(this, fields)
+      const form = builder.build()
+      container.appendChild(form)
+
       if (this.options.anonymous_edit_url) {
-        const helpText = `${translate('Secret edit link:')}<br>${
+        DomUtil.createCopiableInput(
+          container,
+          translate('Secret edit link:'),
           this.options.anonymous_edit_url
-        }`
-        DomUtil.element({
-          tagName: 'p',
-          className: 'help-text',
-          innerHTML: helpText,
-          parent: container,
-        })
-        fields.push([
-          'options.edit_status',
-          {
-            handler: 'IntSelect',
-            label: translate('Who can edit'),
-            selectOptions: this.map.options.edit_statuses,
-            helpText: helpText,
-          },
-        ])
+        )
       }
-    } else {
-      if (this.isOwner()) {
-        fields.push([
-          'options.edit_status',
-          {
-            handler: 'IntSelect',
-            label: translate('Who can edit'),
-            selectOptions: this.map.options.edit_statuses,
-          },
-        ])
-        fields.push([
-          'options.share_status',
+
+      if (this.map.options.user?.id) {
+        // We have a user, and this user has come through here, so they can edit the map, so let's allow to own the map.
+        // Note: real check is made on the back office anyway.
+        const advancedActions = DomUtil.createFieldset(
+          container,
+          translate('Advanced actions')
+        )
+        const advancedButtons = DomUtil.create('div', 'button-bar', advancedActions)
+        DomUtil.createButton(
+          'button',
+          advancedButtons,
+          translate('Attach the map to my account'),
+          this.attach,
+          this
+        )
+      }
+    }
+  }
+
+  _editWithOwner(container) {
+    const topFields = []
+    const collaboratorsFields = []
+    const fieldset = Utils.loadTemplate(
+      `<fieldset class="separator"><legend>${translate('Map')}</legend></fieldset>`
+    )
+    container.appendChild(fieldset)
+    if (this.isOwner()) {
+      topFields.push([
+        'options.edit_status',
+        {
+          handler: 'IntSelect',
+          label: translate('Who can edit'),
+          selectOptions: this.map.options.edit_statuses,
+        },
+      ])
+      topFields.push([
+        'options.share_status',
+        {
+          handler: 'IntSelect',
+          label: translate('Who can view'),
+          selectOptions: this.map.options.share_statuses,
+        },
+      ])
+      collaboratorsFields.push([
+        'options.owner',
+        { handler: 'ManageOwner', label: translate("Map's owner") },
+      ])
+      if (this.map.options.user?.teams?.length) {
+        collaboratorsFields.push([
+          'options.team',
           {
-            handler: 'IntSelect',
-            label: translate('Who can view'),
-            selectOptions: this.map.options.share_statuses,
+            handler: 'ManageTeam',
+            label: translate('Attach map to a team'),
+            teams: this.map.options.user.teams,
           },
         ])
-        fields.push([
-          'options.owner',
-          { handler: 'ManageOwner', label: translate("Map's owner") },
-        ])
-        if (this.map.options.user?.teams?.length) {
-          fields.push([
-            'options.team',
-            {
-              handler: 'ManageTeam',
-              label: translate('Attach map to a team'),
-              teams: this.map.options.user.teams,
-            },
-          ])
-        }
       }
-      fields.push([
-        'options.editors',
-        { handler: 'ManageEditors', label: translate("Map's editors") },
-      ])
     }
+    collaboratorsFields.push([
+      'options.editors',
+      { handler: 'ManageEditors', label: translate("Map's editors") },
+    ])
 
-    const builder = new U.FormBuilder(this, fields)
+    const builder = new U.FormBuilder(this, topFields)
     const form = builder.build()
     container.appendChild(form)
-    if (this.isAnonymousMap() && this.map.options.user) {
-      // We have a user, and this user has come through here, so they can edit the map, so let's allow to own the map.
-      // Note: real check is made on the back office anyway.
-      const advancedActions = DomUtil.createFieldset(
-        container,
-        translate('Advanced actions')
+    if (collaboratorsFields.length) {
+      const fieldset = Utils.loadTemplate(
+        `<fieldset class="separator"><legend>${translate('Manage collaborators')}</legend></fieldset>`
       )
-      const advancedButtons = DomUtil.create('div', 'button-bar', advancedActions)
-      DomUtil.createButton(
-        'button',
-        advancedButtons,
-        translate('Attach the map to my account'),
-        this.attach,
-        this
+      container.appendChild(fieldset)
+      const builder = new U.FormBuilder(this, collaboratorsFields)
+      const form = builder.build()
+      container.appendChild(form)
+    }
+  }
+
+  _editDatalayers(container) {
+    if (this.map.hasLayers()) {
+      const fieldset = Utils.loadTemplate(
+        `<fieldset class="separator"><legend>${translate('Datalayers')}</legend></fieldset>`
       )
+      container.appendChild(fieldset)
+      this.map.eachDataLayer((datalayer) => {
+        datalayer.permissions.edit(fieldset)
+      })
     }
-    DomUtil.add('h4', '', container, translate('Datalayers'))
-    this.map.eachDataLayer((datalayer) => {
-      datalayer.permissions.edit(container)
-    })
+  }
+
+  edit() {
+    if (this.map.options.editMode !== 'advanced') return
+    if (!this.map.options.umap_id) {
+      Alert.info(translate('Please save the map first'))
+      return
+    }
+    const container = DomUtil.create('div', 'permissions-panel')
+    DomUtil.createTitle(container, translate('Update permissions'), 'icon-key')
+    if (this.isAnonymousMap()) this._editAnonymous(container)
+    else this._editWithOwner(container)
+    this._editDatalayers(container)
     this.map.editPanel.open({ content: container, className: 'dark' })
   }
 
@@ -150,15 +178,16 @@ export class MapPermissions {
   }
 
   async save() {
-    if (!this.isDirty) return this.map.continueSaving()
+    if (!this.isDirty) return
     const formData = new FormData()
     if (!this.isAnonymousMap() && this.options.editors) {
       const editors = this.options.editors.map((u) => u.id)
       for (let i = 0; i < this.options.editors.length; i++)
         formData.append('editors', this.options.editors[i].id)
     }
-    if (this.isOwner() || this.isAnonymousMap())
+    if (this.isOwner() || this.isAnonymousMap()) {
       formData.append('edit_status', this.options.edit_status)
+    }
     if (this.isOwner()) {
       formData.append('owner', this.options.owner?.id)
       formData.append('team', this.options.team?.id || '')
@@ -172,7 +201,6 @@ export class MapPermissions {
     if (!error) {
       this.commit()
       this.isDirty = false
-      this.map.continueSaving()
       this.map.fire('postsync')
     }
   }
@@ -197,9 +225,11 @@ export class MapPermissions {
   }
 
   getShareStatusDisplay() {
-    return Object.fromEntries(this.map.options.share_statuses)[
-      this.options.share_status
-    ]
+    if (this.map.options.share_statuses) {
+      return Object.fromEntries(this.map.options.share_statuses)[
+        this.options.share_status
+      ]
+    }
   }
 }
 
@@ -225,7 +255,7 @@ export class DataLayerPermissions {
     return this._isDirty
   }
 
-  getMap() {
+  get map() {
     return this.datalayer.map
   }
 
@@ -238,7 +268,7 @@ export class DataLayerPermissions {
           label: translate('Who can edit "{layer}"', {
             layer: this.datalayer.getName(),
           }),
-          selectOptions: this.datalayer.map.options.datalayer_edit_statuses,
+          selectOptions: this.map.options.datalayer_edit_statuses,
         },
       ],
     ]
@@ -250,16 +280,17 @@ export class DataLayerPermissions {
   }
 
   getUrl() {
-    return Utils.template(this.datalayer.map.options.urls.datalayer_permissions, {
-      map_id: this.datalayer.map.options.umap_id,
+    return this.map.urls.get('datalayer_permissions', {
+      map_id: this.map.options.umap_id,
       pk: this.datalayer.umap_id,
     })
   }
+
   async save() {
-    if (!this.isDirty) return this.datalayer.map.continueSaving()
+    if (!this.isDirty) return
     const formData = new FormData()
     formData.append('edit_status', this.options.edit_status)
-    const [data, response, error] = await this.datalayer.map.server.post(
+    const [data, response, error] = await this.map.server.post(
       this.getUrl(),
       {},
       formData
@@ -267,7 +298,6 @@ export class DataLayerPermissions {
     if (!error) {
       this.commit()
       this.isDirty = false
-      this.datalayer.map.continueSaving()
     }
   }
 

umap/static/umap/js/modules/rendering/ui.js

@@ -9,6 +9,7 @@ import {
   latLng,
   LatLng,
   LatLngBounds,
+  DomEvent,
 } from '../../../vendors/leaflet/leaflet-src.esm.js'
 import { translate } from '../i18n.js'
 import { uMapAlert as Alert } from '../../components/alerts/alert.js'
@@ -36,7 +37,7 @@ const FeatureMixin = {
   },
 
   addInteractions: function () {
-    this.on('contextmenu editable:vertex:contextmenu', this._showContextMenu)
+    this.on('contextmenu editable:vertex:contextmenu', this.onContextMenu)
     this.on('click', this.onClick)
   },
 
@@ -61,7 +62,7 @@ const FeatureMixin = {
         }).addTo(this._map, this.feature, event.latlng)
       }
     }
-    L.DomEvent.stop(event)
+    DomEvent.stop(event)
   },
 
   resetTooltip: function () {
@@ -83,67 +84,14 @@ const FeatureMixin = {
     }
   },
 
-  _showContextMenu: function (event) {
-    L.DomEvent.stop(event)
-    const pt = this._map.mouseEventToContainerPoint(event.originalEvent)
-    event.relatedTarget = this
-    this._map.contextmenu.showAt(pt, event)
-  },
-
-  getContextMenuItems: function (event) {
-    const permalink = this.feature.getPermalink()
-    let items = []
-    if (permalink) {
-      items.push({
-        text: translate('Permalink'),
-        callback: () => {
-          window.open(permalink)
-        },
-      })
-    }
-    items.push({
-      text: translate('Copy as GeoJSON'),
-      callback: () => {
-        L.Util.copyToClipboard(JSON.stringify(this.feature.toGeoJSON()))
-        this._map.tooltip.open({ content: L._('✅ Copied!') })
-      },
-    })
-    if (this._map.editEnabled && !this.feature.isReadOnly()) {
-      items = items.concat(this.getContextMenuEditItems(event))
-    }
-    return items
-  },
-
-  getContextMenuEditItems: function () {
-    let items = ['-']
-    if (this._map.editedFeature !== this) {
-      items.push({
-        text: `${translate('Edit this feature')} (⇧+Click)`,
-        callback: this.feature.edit,
-        context: this.feature,
-        iconCls: 'umap-edit',
-      })
-    }
-    items = items.concat(
-      {
-        text: this._map.help.displayLabel('EDIT_FEATURE_LAYER'),
-        callback: this.feature.datalayer.edit,
-        context: this.feature.datalayer,
-        iconCls: 'umap-edit',
-      },
-      {
-        text: translate('Delete this feature'),
-        callback: this.feature.confirmDelete,
-        context: this.feature,
-        iconCls: 'umap-delete',
-      },
-      {
-        text: translate('Clone this feature'),
-        callback: this.feature.clone,
-        context: this.feature,
-      }
+  onContextMenu: function (event) {
+    DomEvent.stop(event)
+    const items = this._map.getContextMenuItems(event)
+    items.push('-', ...this.feature.getContextMenuItems(event))
+    this._map.contextmenu.open(
+      [event.originalEvent.clientX, event.originalEvent.clientY],
+      items
     )
-    return items
   },
 
   onCommit: function () {
@@ -158,27 +106,6 @@ const PointMixin = {
   isOnScreen: function (bounds) {
     return bounds.contains(this.getCenter())
   },
-}
-
-export const LeafletMarker = Marker.extend({
-  parentClass: Marker,
-  includes: [FeatureMixin, PointMixin],
-
-  initialize: function (feature, latlng) {
-    FeatureMixin.initialize.call(this, feature, latlng)
-    this.setIcon(this.getIcon())
-  },
-
-  getClass: () => LeafletMarker,
-
-  // Make API consistent with path
-  getLatLngs: function () {
-    return this.getLatLng()
-  },
-
-  setLatLngs: function (latlng) {
-    return this.setLatLng(latlng)
-  },
 
   addInteractions() {
     FeatureMixin.addInteractions.call(this)
@@ -190,9 +117,6 @@ export const LeafletMarker = Marker.extend({
     this.on('editable:drawing:commit', this.onCommit)
     if (!this.feature.isReadOnly()) this.on('mouseover', this._enableDragging)
     this.on('mouseout', this._onMouseOut)
-    this._popupHandlersAdded = true // prevent Leaflet from binding event on bindPopup
-    this.on('popupopen', this.highlight)
-    this.on('popupclose', this.resetHighlight)
   },
 
   _onMouseOut: function () {
@@ -222,6 +146,29 @@ export const LeafletMarker = Marker.extend({
       this.disableEdit()
     }
   },
+}
+
+export const LeafletMarker = Marker.extend({
+  parentClass: Marker,
+  includes: [FeatureMixin, PointMixin],
+
+  initialize: function (feature, latlng) {
+    FeatureMixin.initialize.call(this, feature, latlng)
+    this.setIcon(this.getIcon())
+  },
+
+  getClass: () => LeafletMarker,
+
+  setLatLngs: function (latlng) {
+    return this.setLatLng(latlng)
+  },
+
+  addInteractions() {
+    PointMixin.addInteractions.call(this)
+    this._popupHandlersAdded = true // prevent Leaflet from binding event on bindPopup
+    this.on('popupopen', this.highlight)
+    this.on('popupclose', this.resetHighlight)
+  },
 
   _initIcon: function () {
     this.options.icon = this.getIcon()
@@ -344,6 +291,10 @@ const PathMixin = {
     }
     options.pointerEvents = options.interactive ? 'visiblePainted' : 'stroke'
     this.parentClass.prototype.setStyle.call(this, options)
+    // TODO remove me when this gets merged and released:
+    // https://github.com/Leaflet/Leaflet/pull/9475
+
+    this._path.classList.toggle('leaflet-interactive', options.interactive)
   },
 
   _redraw: function () {
@@ -360,65 +311,6 @@ const PathMixin = {
     }).addTo(this._map, this, event.latlng, event.vertex)
   },
 
-  getContextMenuItems: function (event) {
-    let items = FeatureMixin.getContextMenuItems.call(this, event)
-    items.push({
-      text: translate('Display measure'),
-      callback: () => Alert.info(this.getMeasure()),
-    })
-    if (this._map.editEnabled && !this.feature.isReadOnly() && this.feature.isMulti()) {
-      items = items.concat(this.getContextMenuMultiItems(event))
-    }
-    return items
-  },
-
-  getContextMenuMultiItems: function (event) {
-    const items = [
-      '-',
-      {
-        text: translate('Remove shape from the multi'),
-        callback: () => {
-          this.enableEdit().deleteShapeAt(event.latlng)
-        },
-      },
-    ]
-    const shape = this.shapeAt(event.latlng)
-    if (this._latlngs.indexOf(shape) > 0) {
-      items.push({
-        text: translate('Make main shape'),
-        callback: () => {
-          this.enableEdit().deleteShape(shape)
-          this.editor.prependShape(shape)
-        },
-      })
-    }
-    return items
-  },
-
-  getContextMenuEditItems: function (event) {
-    const items = FeatureMixin.getContextMenuEditItems.call(this, event)
-    if (
-      this._map?.editedFeature !== this.feature &&
-      this.feature.isSameClass(this._map.editedFeature)
-    ) {
-      items.push({
-        text: translate('Transfer shape to edited feature'),
-        callback: () => {
-          this.feature.transferShape(event.latlng, this._map.editedFeature)
-        },
-      })
-    }
-    if (this.feature.isMulti()) {
-      items.push({
-        text: translate('Extract shape to separate feature'),
-        callback: () => {
-          this.isolateShape(event.latlng)
-        },
-      })
-    }
-    return items
-  },
-
   isolateShape: function (atLatLng) {
     if (!this.feature.isMulti()) return
     const shape = this.enableEdit().deleteShapeAt(atLatLng)
@@ -463,46 +355,6 @@ export const LeafletPolyline = Polyline.extend({
     return actions
   },
 
-  getContextMenuEditItems: function (event) {
-    const items = PathMixin.getContextMenuEditItems.call(this, event)
-    const vertexClicked = event.vertex
-    let index
-    if (!this.feature.isMulti()) {
-      items.push({
-        text: translate('Transform to polygon'),
-        callback: this.feature.toPolygon,
-        context: this.feature,
-      })
-    }
-    if (vertexClicked) {
-      index = event.vertex.getIndex()
-      if (index !== 0 && index !== event.vertex.getLastIndex()) {
-        items.push({
-          text: translate('Split line'),
-          callback: event.vertex.split,
-          context: event.vertex,
-        })
-      } else if (index === 0 || index === event.vertex.getLastIndex()) {
-        items.push({
-          text: this._map.help.displayLabel('CONTINUE_LINE'),
-          callback: event.vertex.continue,
-          context: event.vertex.continue,
-        })
-      }
-    }
-    return items
-  },
-
-  getContextMenuMultiItems: function (event) {
-    const items = PathMixin.getContextMenuMultiItems.call(this, event)
-    items.push({
-      text: translate('Merge lines'),
-      callback: this.feature.mergeShapes,
-      context: this.feature,
-    })
-    return items
-  },
-
   getMeasure: function (shape) {
     // FIXME: compute from data in feature (with TurfJS)
     const length = L.GeoUtil.lineLength(this._map, shape || this._defaultShape())
@@ -516,29 +368,6 @@ export const LeafletPolygon = Polygon.extend({
 
   getClass: () => LeafletPolygon,
 
-  getContextMenuEditItems: function (event) {
-    const items = PathMixin.getContextMenuEditItems.call(this, event)
-    const shape = this.shapeAt(event.latlng)
-    // No multi and no holes.
-    if (
-      shape &&
-      !this.feature.isMulti() &&
-      (LineUtil.isFlat(shape) || shape.length === 1)
-    ) {
-      items.push({
-        text: translate('Transform to lines'),
-        callback: this.feature.toLineString,
-        context: this.feature,
-      })
-    }
-    items.push({
-      text: translate('Start a hole here'),
-      callback: this.startHole,
-      context: this,
-    })
-    return items
-  },
-
   startHole: function (event) {
     this.enableEdit().newHole(event.latlng)
   },
@@ -603,8 +432,4 @@ export const CircleMarker = BaseCircleMarker.extend({
   getCenter: function () {
     return this._latlng
   },
-  // FIXME when Leaflet.Editable knows about CircleMarker
-  editEnabled: () => false,
-  enableEdit: () => {}, // No-op
-  disableEdit: () => {}, // No-op
 })