umap-project 3.3.2__tar.gz → 3.3.3__tar.gz

{umap_project-3.3.2 → umap_project-3.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: umap-project
-Version: 3.3.2
+Version: 3.3.3
 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>
@@ -35,7 +35,7 @@ Requires-Dist: mkdocs-material==9.6.18; extra == 'dev'
 Requires-Dist: mkdocs-static-i18n==1.3.0; extra == 'dev'
 Requires-Dist: mkdocs==1.6.1; extra == 'dev'
 Requires-Dist: pymdown-extensions==10.16.1; extra == 'dev'
-Requires-Dist: ruff==0.12.10; extra == 'dev'
+Requires-Dist: ruff==0.12.11; extra == 'dev'
 Requires-Dist: vermin==1.6.0; extra == 'dev'
 Provides-Extra: docker
 Requires-Dist: uvicorn==0.35.0; extra == 'docker'
@@ -48,7 +48,7 @@ Requires-Dist: websockets==15.0.1; extra == 'sync'
 Provides-Extra: test
 Requires-Dist: daphne==4.2.1; extra == 'test'
 Requires-Dist: factory-boy==3.3.3; extra == 'test'
-Requires-Dist: moto[s3]==5.1.10; extra == 'test'
+Requires-Dist: moto[s3]==5.1.11; extra == 'test'
 Requires-Dist: playwright>=1.39; extra == 'test'
 Requires-Dist: pytest-django==4.11.1; extra == 'test'
 Requires-Dist: pytest-playwright==0.7.0; extra == 'test'

{umap_project-3.3.2 → umap_project-3.3.3}/pyproject.toml

@@ -44,7 +44,7 @@ dependencies = [
 [project.optional-dependencies]
 dev = [
   "hatch==1.14.1",
-  "ruff==0.12.10",
+  "ruff==0.12.11",
   "djlint==1.36.4",
   "mkdocs==1.6.1",
   "mkdocs-material==9.6.18",
@@ -62,7 +62,7 @@ test = [
   "pytest-playwright==0.7.0",
   "pytest-rerunfailures==15.1",
   "pytest-xdist>=3.5.0,<4",
-  "moto[s3]==5.1.10"
+  "moto[s3]==5.1.11"
 ]
 docker = [
   "uvicorn==0.35.0",

umap_project-3.3.3/umap/__init__.py

@@ -0,0 +1 @@
+VERSION = "3.3.3"

{umap_project-3.3.2 → umap_project-3.3.3}/umap/static/umap/js/modules/rendering/layers/cluster.js

@@ -186,6 +186,12 @@ export const Cluster = FeatureGroup.extend({
     return this
   },
 
+  removeLayer: function (layer) {
+    if (!layer.getLatLng) return FeatureGroup.prototype.removeLayer.call(this, layer)
+    this._bucket = this._bucket.filter((el) => el !== layer)
+    return this
+  },
+
   onAdd: function (leafletMap) {
     this.on('click', this.onClick)
     this.on('mouseover', this.onMouseOver)

{umap_project-3.3.2 → umap_project-3.3.3}/umap/static/umap/js/modules/rendering/map.js

@@ -154,6 +154,7 @@ const ControlsMixin = {
 
 const ManageTilelayerMixin = {
   initTileLayers: function () {
+    this.pullProperties()
     this.tilelayers = []
     for (const props of this.options.tilelayers) {
       const layer = this.createTileLayer(props)

{umap_project-3.3.2 → umap_project-3.3.3}/umap/static/umap/js/modules/rendering/ui.js

@@ -135,7 +135,9 @@ const PointMixin = {
   _onDragEnd(event) {
     if (this._cluster) {
       delete this._originalLatLng
-      this.feature.datalayer.dataChanged()
+      this.once('editable:edited', () => {
+        this.feature.datalayer.dataChanged()
+      })
     }
     this.feature.edit(event)
   },

{umap_project-3.3.2 → umap_project-3.3.3}/umap/static/umap/locale/fr.js

@@ -595,7 +595,6 @@ const locale = {
     "Transform to regular line": "Transformer en ligne simple",
     "Transform to route": "Transformer en route",
     "Restore route": "Rétablir la route",
-    "Compute elevation": "Récupérer les altitudes",
     "Profile": "Moyen de transport",
     "Compute elevations": "Récupérer les altitudes",
     "Route preference": "Préférence de routage",

{umap_project-3.3.2 → umap_project-3.3.3}/umap/static/umap/locale/fr.json

@@ -595,7 +595,6 @@
     "Transform to regular line": "Transformer en ligne simple",
     "Transform to route": "Transformer en route",
     "Restore route": "Rétablir la route",
-    "Compute elevation": "Récupérer les altitudes",
     "Profile": "Moyen de transport",
     "Compute elevations": "Récupérer les altitudes",
     "Route preference": "Préférence de routage",

umap_project-3.3.3/umap/tests/integration/test_cluster.py

@@ -0,0 +1,99 @@
+import pytest
+from playwright.sync_api import expect
+
+from ..base import DataLayerFactory
+
+pytestmark = pytest.mark.django_db
+
+
+DATALAYER_DATA = {
+    "type": "FeatureCollection",
+    "_umap_options": {
+        "name": "Calque 1",
+        "type": "Cluster",
+        "cluster": {},
+        "browsable": True,
+        "inCaption": True,
+        "displayOnLoad": True,
+    },
+    "features": [
+        {
+            "type": "Feature",
+            "properties": {"name": "one point in france"},
+            "geometry": {"type": "Point", "coordinates": [3.339844, 46.920255]},
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "name": "one another point in france in same position",
+                "description": "can you see me ?",
+            },
+            "geometry": {"type": "Point", "coordinates": [3.339844, 46.920255]},
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "name": "again one another point",
+                "description": "and me ?",
+            },
+            "geometry": {"type": "Point", "coordinates": [3.34, 46.1]},
+        },
+    ],
+}
+
+
+def test_can_open_feature_on_browser_click(live_server, page, map):
+    map.settings["properties"]["onLoadPanel"] = "databrowser"
+    map.save()
+    DataLayerFactory(map=map, data=DATALAYER_DATA)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}#7/46.920/3.340")
+    page.get_by_text("one another point in france in same position").click()
+    expect(page.get_by_text("can you see me ?")).to_be_visible()
+    page.get_by_text("again one another point").click()
+    expect(page.get_by_text("and me ?")).to_be_visible()
+
+
+def test_can_drag_single_marker_in_cluster_layer(live_server, page, tilelayer, openmap):
+    DataLayerFactory(map=openmap, data=DATALAYER_DATA)
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit#7/46.920/3.340")
+
+    marker = page.locator(".umap-div-icon")
+    map = page.locator("#map")
+
+    expect(page.locator(".edit-undo")).to_be_disabled()
+    # Drag marker
+    old_bbox = marker.bounding_box()
+    marker.first.drag_to(map, target_position={"x": 250, "y": 250})
+    assert marker.bounding_box() != old_bbox
+    expect(page.locator(".edit-undo")).to_be_enabled()
+
+
+def test_can_drag_marker_in_cluster(live_server, page, tilelayer, openmap):
+    DataLayerFactory(map=openmap, data=DATALAYER_DATA)
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit#18/46.92/3.34")
+
+    marker = page.locator(".umap-div-icon")
+    cluster = page.locator(".umap-cluster-icon")
+    map = page.locator("#map")
+    expect(marker).to_have_count(0)
+
+    expect(page.locator(".edit-undo")).to_be_disabled()
+    cluster.click()
+    marker.first.drag_to(map, target_position={"x": 250, "y": 250})
+    expect(page.locator(".edit-undo")).to_be_enabled()
+    # There is no more cluster
+    expect(marker).to_have_count(2)
+
+
+def test_can_change_datalayer_of_marker_in_cluster(
+    live_server, page, datalayer, openmap, tilelayer
+):
+    DataLayerFactory(map=openmap, data=DATALAYER_DATA)
+    datalayer.settings["iconClass"] = "Ball"
+    datalayer.save()
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit#7/46.920/3.340")
+
+    expect(page.locator(".umap-ball-icon")).to_have_count(0)
+    page.locator(".umap-div-icon").click(modifiers=["Shift"])
+    page.get_by_role("combobox").select_option(str(datalayer.pk))
+    expect(page.locator(".umap-ball-icon")).to_have_count(1)

umap_project-3.3.2/umap/__init__.py

@@ -1 +0,0 @@
-VERSION = "3.3.2"

umap_project-3.3.2/umap/tests/integration/test_cluster.py

@@ -1,53 +0,0 @@
-import pytest
-from playwright.sync_api import expect
-
-from ..base import DataLayerFactory
-
-pytestmark = pytest.mark.django_db
-
-
-DATALAYER_DATA = {
-    "type": "FeatureCollection",
-    "_umap_options": {
-        "name": "Calque 1",
-        "type": "Cluster",
-        "cluster": {},
-        "browsable": True,
-        "inCaption": True,
-        "displayOnLoad": True,
-    },
-    "features": [
-        {
-            "type": "Feature",
-            "properties": {"name": "one point in france"},
-            "geometry": {"type": "Point", "coordinates": [3.339844, 46.920255]},
-        },
-        {
-            "type": "Feature",
-            "properties": {
-                "name": "one another point in france in same position",
-                "description": "can you see me ?",
-            },
-            "geometry": {"type": "Point", "coordinates": [3.339844, 46.920255]},
-        },
-        {
-            "type": "Feature",
-            "properties": {
-                "name": "again one another point",
-                "description": "and me ?",
-            },
-            "geometry": {"type": "Point", "coordinates": [3.34, 46.1]},
-        },
-    ],
-}
-
-
-def test_can_open_feature_on_browser_click(live_server, page, map):
-    map.settings["properties"]["onLoadPanel"] = "databrowser"
-    map.save()
-    DataLayerFactory(map=map, data=DATALAYER_DATA)
-    page.goto(f"{live_server.url}{map.get_absolute_url()}#7/46.920/3.340")
-    page.get_by_text("one another point in france in same position").click()
-    expect(page.get_by_text("can you see me ?")).to_be_visible()
-    page.get_by_text("again one another point").click()
-    expect(page.get_by_text("and me ?")).to_be_visible()