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

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'
@@ -35,8 +36,14 @@ const FeatureMixin = {
     }
   },
 
+  _removeIcon: function () {
+    // It may not be in the DOM, and Leaflet does not deal with this
+    // situation
+    if (this._icon) Marker.prototype._removeIcon.call(this)
+  },
+
   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 +68,7 @@ const FeatureMixin = {
         }).addTo(this._map, this.feature, event.latlng)
       }
     }
-    L.DomEvent.stop(event)
+    DomEvent.stop(event)
   },
 
   resetTooltip: function () {
@@ -83,67 +90,12 @@ 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,
-      }
-    )
-    return items
+  onContextMenu: function (event) {
+    DomEvent.stop(event)
+    const items = this.feature
+      .getContextMenuItems(event)
+      .concat(this._map.getContextMenuItems(event))
+    this._map.contextmenu.open(event.originalEvent, items)
   },
 
   onCommit: function () {
@@ -158,27 +110,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 +121,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,8 +150,49 @@ 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)
+  },
+
+  getEvents: function () {
+    const events = Marker.prototype.getEvents.call(this)
+    events.moveend = this.onMoveEnd
+    return events
+  },
+
+  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)
+  },
+
+  onMoveEnd: function () {
+    this._initIcon()
+    this.update()
+  },
 
   _initIcon: function () {
+    if (!this._map.getBounds().contains(this.getCenter())) {
+      if (this._icon) this._removeIcon()
+      if (this._tooltip && this.isTooltipOpen()) {
+        this.unbindTooltip()
+      }
+      return
+    }
     this.options.icon = this.getIcon()
     Marker.prototype._initIcon.call(this)
     // Allow to run code when icon is actually part of the DOM
@@ -344,6 +313,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 +333,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 +377,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 +390,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 +454,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
 })

umap/static/umap/js/modules/share.js

@@ -142,9 +142,7 @@ export default class Share {
   async format(mode) {
     const type = EXPORT_FORMATS[mode]
     const content = await type.formatter(this.map)
-    let name = this.map.options.name || 'data'
-    name = name.replace(/[^a-z0-9]/gi, '_').toLowerCase()
-    const filename = name + type.ext
+    const filename = Utils.slugify(this.map.options.name) + type.ext
     return { content, filetype: type.filetype, filename }
   }
 

umap/static/umap/js/modules/slideshow.js

@@ -1,5 +1,5 @@
-import { WithTemplate } from './utils.js'
 import { translate } from './i18n.js'
+import { WithTemplate } from './utils.js'
 
 const TOOLBOX_TEMPLATE = `
   <ul class="umap-slideshow-toolbox dark">