umap-project 2.7.0b2__tar.gz → 2.7.0b3__tar.gz

{umap_project-2.7.0b2 → umap_project-2.7.0b3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: umap-project
-Version: 2.7.0b2
+Version: 2.7.0b3
 Summary: Create maps with OpenStreetMap layers in a minute and embed them in your site.
 Author-email: Yohan Boniface <yb@enix.org>
 Maintainer-email: David Larlet <david@larlet.fr>
@@ -19,25 +19,25 @@ Requires-Python: >=3.10
 Requires-Dist: django-agnocomplete==2.2.0
 Requires-Dist: django-environ==0.11.2
 Requires-Dist: django-probes==1.7.0
-Requires-Dist: django==5.1.1
+Requires-Dist: django==5.1.2
 Requires-Dist: pillow==10.4.0
 Requires-Dist: psycopg==3.2.3
 Requires-Dist: pydantic==2.9.2
-Requires-Dist: rcssmin==1.1.2
+Requires-Dist: rcssmin==1.1.3
 Requires-Dist: requests==2.32.3
-Requires-Dist: rjsmin==1.2.2
+Requires-Dist: rjsmin==1.2.3
 Requires-Dist: social-auth-app-django==5.4.2
 Requires-Dist: social-auth-core==4.5.4
 Requires-Dist: websockets==13.1
 Provides-Extra: dev
 Requires-Dist: djlint==1.35.2; extra == 'dev'
-Requires-Dist: hatch==1.12.0; extra == 'dev'
+Requires-Dist: hatch==1.13.0; extra == 'dev'
 Requires-Dist: isort==5.13.2; extra == 'dev'
-Requires-Dist: mkdocs-material==9.5.39; extra == 'dev'
+Requires-Dist: mkdocs-material==9.5.40; extra == 'dev'
 Requires-Dist: mkdocs-static-i18n==1.2.3; extra == 'dev'
 Requires-Dist: mkdocs==1.6.1; extra == 'dev'
 Requires-Dist: pymdown-extensions==10.11.2; extra == 'dev'
-Requires-Dist: ruff==0.6.8; extra == 'dev'
+Requires-Dist: ruff==0.6.9; extra == 'dev'
 Requires-Dist: vermin==1.6.0; extra == 'dev'
 Provides-Extra: docker
 Requires-Dist: uwsgi==2.0.27; extra == 'docker'
@@ -46,6 +46,7 @@ Requires-Dist: factory-boy==3.3.1; extra == 'test'
 Requires-Dist: playwright>=1.39; extra == 'test'
 Requires-Dist: pytest-django==4.9.0; extra == 'test'
 Requires-Dist: pytest-playwright==0.5.2; extra == 'test'
+Requires-Dist: pytest-rerunfailures==14.0; extra == 'test'
 Requires-Dist: pytest-xdist<4,>=3.5.0; extra == 'test'
 Requires-Dist: pytest==8.3.3; extra == 'test'
 Description-Content-Type: text/markdown

{umap_project-2.7.0b2 → umap_project-2.7.0b3}/pyproject.toml

@@ -28,7 +28,7 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-  "Django==5.1.1",
+  "Django==5.1.2",
   "django-agnocomplete==2.2.0",
   "django-environ==0.11.2",
   "django-probes==1.7.0",
@@ -36,8 +36,8 @@ dependencies = [
   "psycopg==3.2.3",
   "pydantic==2.9.2",
   "requests==2.32.3",
-  "rcssmin==1.1.2",
-  "rjsmin==1.2.2",
+  "rcssmin==1.1.3",
+  "rjsmin==1.2.3",
   "social-auth-core==4.5.4",
   "social-auth-app-django==5.4.2",
   "websockets==13.1",
@@ -45,11 +45,11 @@ dependencies = [
 
 [project.optional-dependencies]
 dev = [
-  "hatch==1.12.0",
-  "ruff==0.6.8",
+  "hatch==1.13.0",
+  "ruff==0.6.9",
   "djlint==1.35.2",
   "mkdocs==1.6.1",
-  "mkdocs-material==9.5.39",
+  "mkdocs-material==9.5.40",
   "mkdocs-static-i18n==1.2.3",
   "vermin==1.6.0",
   "pymdown-extensions==10.11.2",
@@ -61,6 +61,7 @@ test = [
   "pytest==8.3.3",
   "pytest-django==4.9.0",
   "pytest-playwright==0.5.2",
+  "pytest-rerunfailures==14.0",
   "pytest-xdist>=3.5.0,<4",
 ]
 docker = [

umap_project-2.7.0b3/umap/__init__.py

@@ -0,0 +1 @@
+VERSION = "2.7.0b3"

{umap_project-2.7.0b2 → umap_project-2.7.0b3}/umap/static/umap/js/modules/browser.js

@@ -1,6 +1,9 @@
 import { DomEvent, DomUtil, stamp } from '../../vendors/leaflet/leaflet-src.esm.js'
 import { translate } from './i18n.js'
 import * as Icon from './rendering/icon.js'
+import * as Utils from './utils.js'
+import { EXPORT_FORMATS } from './formatter.js'
+import ContextMenu from './ui/contextmenu.js'
 
 export default class Browser {
   constructor(map) {
@@ -98,6 +101,7 @@ export default class Browser {
     datalayer.eachFeature((feature) => this.addFeature(feature, container))
 
     const total = datalayer.count()
+    if (!total) return
     const current = container.querySelectorAll('li').length
     const count = total === current ? total : `${current}/${total}`
     const counter = DomUtil.create('span', 'datalayer-counter', headline)
@@ -164,6 +168,7 @@ export default class Browser {
     })
     this.filtersTitle = container.querySelector('summary')
     this.toggleBadge()
+    this.addMainToolbox(container)
     this.dataContainer = DomUtil.create('div', '', container)
 
     let fields = [
@@ -215,6 +220,48 @@ export default class Browser {
     }
   }
 
+  addMainToolbox(container) {
+    const [toolbox, { toggle, fitBounds, download }] = Utils.loadTemplateWithRefs(`
+      <div class="main-toolbox">
+        <i class="icon icon-16 icon-eye" title="${translate('show/hide all layers')}" data-ref="toggle"></i>
+        <i class="icon icon-16 icon-zoom" title="${translate('zoom to data extent')}" data-ref="fitBounds"></i>
+        <i class="icon icon-16 icon-download" title="${translate('download visible data')}" data-ref="download"></i>
+      </div>
+    `)
+    container.appendChild(toolbox)
+    toggle.addEventListener('click', () => this.toggleLayers())
+    fitBounds.addEventListener('click', () => this.map.fitDataBounds())
+    download.addEventListener('click', () => this.downloadVisible(download))
+  }
+
+  downloadVisible(element) {
+    const menu = new ContextMenu({ fixed: true })
+    const items = []
+    for (const format of Object.keys(EXPORT_FORMATS)) {
+      items.push({
+        label: format,
+        action: () => this.map.share.download(format),
+      })
+    }
+    menu.openBelow(element, items)
+  }
+
+  toggleLayers() {
+    // If at least one layer is shown, hide it
+    // otherwise show all
+    let allHidden = true
+    this.map.eachBrowsableDataLayer((datalayer) => {
+      if (datalayer.isVisible()) allHidden = false
+    })
+    this.map.eachBrowsableDataLayer((datalayer) => {
+      if (allHidden) {
+        datalayer.show()
+      } else {
+        if (datalayer.isVisible()) datalayer.hide()
+      }
+    })
+  }
+
   static backButton(map) {
     const button = DomUtil.createButtonIcon(
       DomUtil.create('li', '', undefined),

{umap_project-2.7.0b2 → umap_project-2.7.0b3}/umap/static/umap/js/modules/rendering/layers/classified.js

@@ -3,6 +3,7 @@ import { translate } from '../../i18n.js'
 import { LayerMixin } from './base.js'
 import * as Utils from '../../utils.js'
 import { CircleMarker } from '../ui.js'
+import colorbrewer from '../../../../vendors/colorbrewer/colorbrewer.js'
 
 // Layer where each feature color is relative to the others,
 // so we need all features before behing able to set one

{umap_project-2.7.0b2 → umap_project-2.7.0b3}/umap/static/umap/js/modules/rendering/ui.js

@@ -36,6 +36,12 @@ 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.onContextMenu)
     this.on('click', this.onClick)
@@ -86,8 +92,9 @@ const FeatureMixin = {
 
   onContextMenu: function (event) {
     DomEvent.stop(event)
-    const items = this._map.getContextMenuItems(event)
-    items.push('-', ...this.feature.getContextMenuItems(event))
+    const items = this.feature
+      .getContextMenuItems(event)
+      .concat(this._map.getContextMenuItems(event))
     this._map.contextmenu.open(event.originalEvent, items)
   },
 
@@ -160,6 +167,12 @@ export const LeafletMarker = Marker.extend({
     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
@@ -167,7 +180,19 @@ export const LeafletMarker = Marker.extend({
     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

{umap_project-2.7.0b2 → umap_project-2.7.0b3}/umap/static/umap/js/modules/ui/contextmenu.js

@@ -21,6 +21,11 @@ export default class ContextMenu extends Positioned {
     this.openAt([left, top], items)
   }
 
+  openBelow(element, items) {
+    const coords = this.getPosition(element)
+    this.openAt([coords.left, coords.bottom], items)
+  }
+
   openAt([left, top], items) {
     this.container.innerHTML = ''
     for (const item of items) {

{umap_project-2.7.0b2 → umap_project-2.7.0b3}/umap/static/umap/js/umap.controls.js

@@ -453,17 +453,13 @@ U.PermanentCreditsControl = L.Control.extend({
   },
 
   onAdd: function () {
-    const paragraphContainer = L.DomUtil.create(
+    this.paragraphContainer = L.DomUtil.create(
       'div',
-      'umap-permanent-credits-container'
+      'umap-permanent-credits-container text'
     )
-    const creditsParagraph = L.DomUtil.create('p', '', paragraphContainer)
-
-    this.paragraphContainer = paragraphContainer
     this.setCredits()
     this.setBackground()
-
-    return paragraphContainer
+    return this.paragraphContainer
   },
 
   setCredits: function () {
@@ -661,9 +657,7 @@ const ControlsMixin = {
         })
       }
       button.addEventListener('click', () => {
-        const x = button.offsetLeft
-        const y = button.offsetTop + button.offsetHeight
-        menu.openAt([x, y], actions)
+        menu.openBelow(button, actions)
       })
     }
     this.help.getStartedLink(rightContainer)

{umap_project-2.7.0b2 → umap_project-2.7.0b3}/umap/static/umap/js/umap.js

@@ -191,15 +191,17 @@ U.Map = L.Map.extend({
       this.renderEditToolbar()
     }
 
-    this.initShortcuts()
-    if (!this.options.noControl) this.initCaptionBar()
-    this.onceDataLoaded(this.setViewFromQueryString)
+    if (!this.options.noControl) {
+      this.initShortcuts()
+      this.initCaptionBar()
+      this.on('contextmenu', this.onContextMenu)
+      this.onceDataLoaded(this.setViewFromQueryString)
+      this.on('click', this.closeInplaceToolbar)
+      this.propagate()
+    }
 
     window.onbeforeunload = () => (this.editEnabled && this.isDirty) || null
     this.backup()
-    this.on('click', this.closeInplaceToolbar)
-    this.on('contextmenu', this.onContextMenu)
-    this.propagate()
   },
 
   initSyncEngine: async function () {
@@ -1686,7 +1688,7 @@ U.Map = L.Map.extend({
     this.loader.onAdd(this)
   },
 
-  getContextMenuItems: function (event) {
+  getOwnContextMenuItems: function (event) {
     const items = []
     if (this.hasEditMode()) {
       if (this.editEnabled) {
@@ -1752,9 +1754,14 @@ U.Map = L.Map.extend({
       },
       {
         label: this.help.displayLabel('SEARCH'),
-        action: () => this.search(event),
+        action: () => this.search(),
       }
     )
+    return items
+  },
+
+  getContextMenuItems: function (event) {
+    const items = []
     if (this.options.urls.routing) {
       items.push('-', {
         label: L._('Directions from here'),
@@ -1771,7 +1778,9 @@ U.Map = L.Map.extend({
   },
 
   onContextMenu: function (event) {
-    const items = this.getContextMenuItems(event)
+    const items = this.getOwnContextMenuItems(event).concat(
+      this.getContextMenuItems(event)
+    )
     this.contextmenu.open(event.originalEvent, items)
   },
 

{umap_project-2.7.0b2 → umap_project-2.7.0b3}/umap/static/umap/locale/en.js

@@ -513,7 +513,10 @@ const locale = {
     "Type new owner's username": "Type new owner's username",
     "Type editor's username": "Type editor's username",
     "Map": "Map",
-    "Manage collaborators": "Manage collaborators"
+    "Manage collaborators": "Manage collaborators",
+    "show/hide all layers": "show/hide all layers",
+    "zoom to data extent": "zoom to data extent",
+    "download visible data": "download visible data"
 }
 L.registerLocale("en", locale)
 L.setLocale("en")

{umap_project-2.7.0b2 → umap_project-2.7.0b3}/umap/static/umap/locale/en.json

@@ -513,5 +513,8 @@
     "Type new owner's username": "Type new owner's username",
     "Type editor's username": "Type editor's username",
     "Map": "Map",
-    "Manage collaborators": "Manage collaborators"
+    "Manage collaborators": "Manage collaborators",
+    "show/hide all layers": "show/hide all layers",
+    "zoom to data extent": "zoom to data extent",
+    "download visible data": "download visible data"
 }

{umap_project-2.7.0b2 → umap_project-2.7.0b3}/umap/static/umap/locale/fr.js

@@ -513,7 +513,10 @@ const locale = {
     "Type new owner's username": "Nom d'utilisateur du nouveau propriétaire",
     "Type editor's username": "Nom d'utilisateur de l'éditeur",
     "Map": "Carte",
-    "Manage collaborators": "Gérer les collaborateurs"
+    "Manage collaborators": "Gérer les collaborateurs",
+    "show/hide all layers": "montrer/masquer les calques",
+    "zoom to data extent": "zoomer sur les données",
+    "download visible data": "télécharger les données affichées"
 }
 L.registerLocale("fr", locale)
 L.setLocale("fr")

{umap_project-2.7.0b2 → umap_project-2.7.0b3}/umap/static/umap/locale/fr.json

@@ -513,5 +513,8 @@
     "Type new owner's username": "Nom d'utilisateur du nouveau propriétaire",
     "Type editor's username": "Nom d'utilisateur de l'éditeur",
     "Map": "Carte",
-    "Manage collaborators": "Gérer les collaborateurs"
+    "Manage collaborators": "Gérer les collaborateurs",
+    "show/hide all layers": "montrer/masquer les calques",
+    "zoom to data extent": "zoomer sur les données",
+    "download visible data": "télécharger les données affichées"
 }

{umap_project-2.7.0b2 → umap_project-2.7.0b3}/umap/static/umap/map.css

@@ -913,6 +913,16 @@ a.umap-control-caption,
 .umap-caption .umap-map-author {
     padding-inline-start: 31px;
 }
+.umap-browser .main-toolbox {
+    padding-left: 4px; /* Align with toolbox below  */
+    border-top: 1px solid var(--color-mediumGray);
+    margin-top: var(--box-margin);
+    padding-top: 3px;
+    padding-bottom: 3px;
+}
+.umap-browser .main-toolbox i {
+    cursor: pointer;
+}
 
 
 /* ********************************* */

{umap_project-2.7.0b2 → umap_project-2.7.0b3}/umap/static/umap/unittests/hlc.js

@@ -81,7 +81,7 @@ describe('HybridLogicalClock', () => {
       const now = Date.now()
       clock = new HybridLogicalClock(now, 5, 'local')
       const result = clock.receive(`${now}:7:remote`)
-      expect(result.walltime).to.equal(now)
+      expect(result.walltime).to.be.at.least(now)
       expect(result.nn).to.equal(8)
       expect(result.id).to.equal('local')
     })
@@ -100,7 +100,12 @@ describe('HybridLogicalClock', () => {
       clock = new HybridLogicalClock(now, 5, 'local')
       const result = clock.receive(`${now - 1000}:7:remote`)
       expect(result.walltime).to.be.least(now)
-      expect(result.nn).to.equal(6)
+      if (result.walltime > now) {
+        expect(result.nn).to.equal(5)
+      }
+      else {
+        expect(result.nn).to.equal(6)
+      }
       expect(result.id).to.equal('local')
     })
   })
@@ -117,7 +122,7 @@ describe('HybridLogicalClock', () => {
     const event2 = hlc.tick()
 
     // Simulate receiving a message from another node
-    const remoteEvent = hlc.receive(`${Date.now() - 50}:5:remote-id`)
+    hlc.receive(`${Date.now() - 50}:5:remote-id`)
 
     const event3 = hlc.tick()