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

umap/templates/umap/css.html

@@ -10,6 +10,8 @@
       href="{% static 'umap/vendors/editinosm/Leaflet.EditInOSM.css' %}" />
 <link rel="stylesheet"
       href="{% static 'umap/vendors/minimap/Control.MiniMap.min.css' %}" />
+<link rel="stylesheet"
+      href="{% static 'umap/vendors/contextmenu/leaflet.contextmenu.min.css' %}" />
 <link rel="stylesheet"
       href="{% static 'umap/vendors/toolbar/leaflet.toolbar.css' %}" />
 <link rel="stylesheet"

umap/templates/umap/js.html

@@ -36,6 +36,7 @@
 <script src="{% static 'umap/vendors/iconlayers/iconLayers.js' %}" defer></script>
 <script src="{% static 'umap/vendors/locatecontrol/L.Control.Locate.min.js' %}"
         defer></script>
+<script src="{% static 'umap/vendors/colorbrewer/colorbrewer.js' %}" defer></script>
 <script src="{% static 'umap/vendors/simple-statistics/simple-statistics.min.js' %}"
         defer></script>
 <script src="{% static 'umap/js/umap.core.js' %}" defer></script>

umap/templates/umap/map_detail.html

@@ -17,8 +17,8 @@
   {% umap_css %}
   {{ block.super }}
   {% umap_js locale=locale %}
-  {% if UMAP_DEMO_SITE or object.share_status != object.PUBLIC %}
-    <meta name="robots" content="noindex,nofollow">
+  {% if object.share_status != object.PUBLIC %}
+    <meta name="robots" content="noindex">
   {% endif %}
   <link rel="alternate"
         type="application/json+oembed"

umap/tests/fixtures/test_upload_data.csv

@@ -1,3 +1,3 @@
 Foo,Latitude,geo_Longitude,title,description
-bar,48.5,14.5,a point somewhere,the description of this point
-bar,45.7,14.7,a point somewhere else,the description of this other point
+bar,41.34,122.86,a point somewhere,the description of this point
+bar,43.34,121.86,a point somewhere else,the description of this other point

umap/tests/integration/test_browser.py

@@ -81,7 +81,7 @@ def test_data_browser_should_be_open(live_server, page, bootstrap, map):
 
 
 def test_data_browser_should_be_filterable(live_server, page, bootstrap, map):
-    page.goto(f"{live_server.url}{map.get_absolute_url()}#2/19/-2")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
     expect(page.get_by_title("Features in this layer: 3")).to_be_visible()
     markers = page.locator(".leaflet-marker-icon")
     paths = page.locator(".leaflet-overlay-pane path")
@@ -115,7 +115,7 @@ def test_filter_uses_layer_setting_if_any(live_server, page, bootstrap, map):
     datalayer = map.datalayer_set.first()
     datalayer.settings["labelKey"] = "foo"
     datalayer.save()
-    page.goto(f"{live_server.url}{map.get_absolute_url()}#2/19/-2")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
     expect(page.get_by_title("Features in this layer: 3")).to_be_visible()
     markers = page.locator(".leaflet-marker-icon")
     paths = page.locator(".leaflet-overlay-pane path")
@@ -154,7 +154,7 @@ def test_filter_works_with_variable_in_labelKey(live_server, page, map):
     data = deepcopy(DATALAYER_DATA)
     data["_umap_options"]["labelKey"] = "{name} ({bar})"
     DataLayerFactory(map=map, data=data)
-    page.goto(f"{live_server.url}{map.get_absolute_url()}#2/19/-2")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
     expect(page.get_by_title("Features in this layer: 3")).to_be_visible()
     markers = page.locator(".leaflet-marker-icon")
     paths = page.locator(".leaflet-overlay-pane path")
@@ -182,7 +182,7 @@ def test_filter_works_with_missing_name(live_server, page, map):
     data = deepcopy(DATALAYER_DATA)
     del data["features"][0]["properties"]["name"]
     DataLayerFactory(map=map, data=data, name="foobar")
-    page.goto(f"{live_server.url}{map.get_absolute_url()}#2/19/-2")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
     expect(page.get_by_title("Features in this layer: 3")).to_be_visible()
     markers = page.locator(".leaflet-marker-icon")
     paths = page.locator(".leaflet-overlay-pane path")
@@ -299,7 +299,7 @@ def test_data_browser_with_variable_in_name(live_server, page, bootstrap, map):
     # Include a variable
     map.settings["properties"]["labelKey"] = "{name} ({foo})"
     map.save()
-    page.goto(f"{live_server.url}{map.get_absolute_url()}#2/19/-2")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
     expect(page.get_by_text("one point in france (point)")).to_be_visible()
     expect(page.get_by_text("one line in new zeland (line)")).to_be_visible()
     expect(page.get_by_text("one polygon in greenland (polygon)")).to_be_visible()
@@ -335,7 +335,7 @@ def test_should_sort_features_in_natural_order(live_server, map, page):
 
 
 def test_should_redraw_list_on_feature_delete(live_server, openmap, page, bootstrap):
-    page.goto(f"{live_server.url}{openmap.get_absolute_url()}#2/19/-2")
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}")
     # Enable edit
     page.get_by_role("button", name="Edit").click()
     buttons = page.locator(".umap-browser .datalayer li .icon-delete")
@@ -380,7 +380,7 @@ def test_should_use_color_variable(live_server, map, page):
 
 
 def test_should_allow_to_toggle_datalayer_visibility(live_server, map, page, bootstrap):
-    page.goto(f"{live_server.url}{map.get_absolute_url()}#2/19/-2")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
     markers = page.locator(".leaflet-marker-icon")
     paths = page.locator(".leaflet-overlay-pane path")
     expect(markers).to_have_count(1)
@@ -414,65 +414,3 @@ def test_should_have_edit_buttons_in_edit_mode(live_server, openmap, page, boots
     expect(delete_layer).to_be_visible()
     expect(edit_feature).to_have_count(3)
     expect(delete_feature).to_have_count(3)
-
-
-def test_main_toolbox_toggle_all_layers(live_server, map, page):
-    map.settings["properties"]["onLoadPanel"] = "databrowser"
-    map.save()
-    data = {
-        "type": "FeatureCollection",
-        "features": [
-            {
-                "type": "Feature",
-                "properties": {"name": "one point"},
-                "geometry": {"type": "Point", "coordinates": [3.33, 46.92]},
-            },
-        ],
-    }
-    DataLayerFactory(map=map, data=data)
-    data = {
-        "type": "FeatureCollection",
-        "features": [
-            {
-                "type": "Feature",
-                "properties": {"name": "one other point"},
-                "geometry": {"type": "Point", "coordinates": [3.34, 46.94]},
-            },
-        ],
-    }
-    DataLayerFactory(map=map, data=data)
-    data = {
-        "type": "FeatureCollection",
-        "features": [
-            {
-                "type": "Feature",
-                "properties": {"name": "another point"},
-                "geometry": {"type": "Point", "coordinates": [3.35, 46.95]},
-            },
-        ],
-        "_umap_options": {"displayOnLoad": False},
-    }
-    DataLayerFactory(map=map, data=data, settings={"displayOnLoad": False})
-    page.goto(f"{live_server.url}{map.get_absolute_url()}#10/46.93/3.33")
-    markers = page.locator(".leaflet-marker-icon")
-    expect(markers).to_have_count(2)
-    # Only one is off
-    expect(page.locator(".datalayer.off")).to_have_count(1)
-
-    # Click on button
-    page.locator(".umap-browser [data-ref=toggle]").click()
-    # Should have hidden the two other layers
-    expect(page.locator(".datalayer.off")).to_have_count(3)
-    expect(markers).to_have_count(0)
-
-    # Click again
-    page.locator(".umap-browser [data-ref=toggle]").click()
-    # Should shown all layers
-    expect(page.locator(".datalayer.off")).to_have_count(0)
-    expect(markers).to_have_count(3)
-
-    # Click again
-    page.locator(".umap-browser [data-ref=toggle]").click()
-    # Should hidden again all layers
-    expect(page.locator(".datalayer.off")).to_have_count(3)
-    expect(markers).to_have_count(0)

umap/tests/integration/test_caption.py

@@ -20,11 +20,11 @@ def test_caption(live_server, page, map):
     panel = page.locator(".panel.left.on")
     expect(panel).to_have_class(re.compile(".*condensed.*"))
     expect(panel.locator(".umap-caption")).to_be_visible()
-    expect(panel.locator(".caption-item").get_by_text(basic.name)).to_be_visible()
+    expect(panel.locator(".datalayer-legend").get_by_text(basic.name)).to_be_visible()
     expect(
-        panel.locator(".caption-item .off").get_by_text(non_loaded.name)
+        panel.locator(".datalayer-legend .off").get_by_text(non_loaded.name)
     ).to_be_visible()
-    expect(panel.locator(".caption-item").get_by_text(hidden.name)).to_be_hidden()
+    expect(panel.locator(".datalayer-legend").get_by_text(hidden.name)).to_be_hidden()
 
 
 def test_caption_should_display_owner_as_author(live_server, page, map):

umap/tests/integration/test_datalayer.py

@@ -55,6 +55,10 @@ def test_should_honour_fromZoom(live_server, map, datalayer, page):
     expect(markers).to_be_visible()
 
 
+@pytest.mark.skipif(
+    os.environ.get("CI", "false") == "true",
+    reason="Test is failing intermittently, skipping in the CI",
+)
 def test_should_honour_toZoom(live_server, map, datalayer, page):
     set_options(datalayer, displayOnLoad=True, toZoom=6)
     page.goto(f"{live_server.url}{map.get_absolute_url()}#7/48.55/14.68")
@@ -107,7 +111,7 @@ def test_should_honour_color_variable(live_server, map, page):
         },
     }
     DataLayerFactory(map=map, data=data)
-    page.goto(f"{live_server.url}{map.get_absolute_url()}#6/47.5/2.5")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
     expect(page.locator(".leaflet-overlay-pane path[fill='tomato']"))
     markers = page.locator(".leaflet-marker-icon .icon_container")
     expect(markers).to_have_css("background-color", "rgb(240, 248, 255)")

umap/tests/integration/test_edit_datalayer.py

@@ -86,6 +86,7 @@ def test_can_clone_datalayer(live_server, openmap, login, datalayer, page):
 
 
 def test_can_change_icon_class(live_server, openmap, page):
+    # Faster than doing a login
     data = {
         "type": "FeatureCollection",
         "features": [
@@ -97,7 +98,7 @@ def test_can_change_icon_class(live_server, openmap, page):
         ],
     }
     DataLayerFactory(map=openmap, data=data)
-    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit#6/45.3/1")
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
     expect(page.locator(".umap-div-icon")).to_be_visible()
     page.get_by_role("link", name="Manage layers").click()
     expect(page.locator(".umap-circle-icon")).to_be_hidden()

umap/tests/integration/test_edit_map.py

@@ -23,7 +23,7 @@ def test_can_edit_name(page, live_server, tilelayer):
 
 def test_can_edit_name_on_click_on_toolbar(page, live_server, tilelayer):
     page.goto(f"{live_server.url}/en/map/new/")
-    page.locator(".umap-main-edit-toolbox .map-name").click()
+    page.locator(".map-name").click()
     name_input = page.locator('.map-metadata input[name="name"]')
     expect(name_input).to_be_visible()
 

umap/tests/integration/test_edit_marker.py

@@ -40,7 +40,7 @@ def test_can_edit_on_shift_click(live_server, openmap, page, datalayer):
 
 
 def test_marker_style_should_have_precedence(live_server, openmap, page, bootstrap):
-    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit#6/48.5/19")
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
 
     # Change colour at layer level
     page.get_by_role("link", name="Manage layers").click()

umap/tests/integration/test_facets_browser.py

@@ -175,7 +175,7 @@ def test_date_facet_search(live_server, page, map):
     map.save()
     DataLayerFactory(map=map, data=DATALAYER_DATA1)
     DataLayerFactory(map=map, data=DATALAYER_DATA2)
-    page.goto(f"{live_server.url}{map.get_absolute_url()}#6/47.5/-1.5")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_have_count(4)
     expect(page.get_by_text("Date Filter")).to_be_visible()
@@ -196,7 +196,7 @@ def test_choice_with_empty_value(live_server, page, map):
     del data["features"][1]["properties"]["mytype"]
     DataLayerFactory(map=map, data=data)
     DataLayerFactory(map=map, data=DATALAYER_DATA2)
-    page.goto(f"{live_server.url}{map.get_absolute_url()}#6/47.5/-1.5")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
     expect(page.get_by_text("<empty value>")).to_be_visible()
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_have_count(4)
@@ -212,7 +212,7 @@ def test_number_with_zero_value(live_server, page, map):
     data["features"][0]["properties"]["mynumber"] = 0
     DataLayerFactory(map=map, data=data)
     DataLayerFactory(map=map, data=DATALAYER_DATA2)
-    page.goto(f"{live_server.url}{map.get_absolute_url()}#6/47.5/-1.5")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
     expect(page.get_by_label("Min")).to_have_value("0")
     expect(page.get_by_label("Max")).to_have_value("14")
     page.get_by_label("Min").fill("1")

umap/tests/integration/test_import.py

@@ -71,6 +71,10 @@ def test_umap_import_from_file(live_server, tilelayer, page):
     expect(nonloaded).to_have_count(1)
 
 
+@pytest.mark.skipif(
+    os.environ.get("CI", "false") == "true",
+    reason="Test is failing intermittently, skipping in the CI",
+)
 def test_umap_import_from_textarea(live_server, tilelayer, page, settings):
     settings.UMAP_ALLOW_ANONYMOUS = True
     page.goto(f"{live_server.url}/map/new/")

umap/tests/integration/test_map.py

@@ -148,6 +148,10 @@ def test_default_view_latest_with_polygon(map, live_server, page):
     expect(layers).to_have_count(1)
 
 
+@pytest.mark.skipif(
+    os.environ.get("CI", "false") == "true",
+    reason="Test is failing intermittently, skipping in the CI",
+)
 def test_default_view_locate(browser, live_server, map):
     context = browser.new_context(
         geolocation={"longitude": 8.52967, "latitude": 39.16267},

umap/tests/integration/test_view_marker.py

@@ -106,66 +106,3 @@ def test_extended_properties_in_popup(live_server, map, page, bootstrap):
     expect(page.get_by_text("Alt: 241")).to_be_visible()
     expect(page.get_by_text("Zoom: 7")).to_be_visible()
     expect(page.get_by_text("Layer: test datalayer")).to_be_visible()
-
-
-def test_only_visible_markers_are_added_to_dom(live_server, map, page):
-    data = {
-        "type": "FeatureCollection",
-        "features": [
-            {
-                "type": "Feature",
-                "properties": {
-                    "name": "marker 1",
-                    "description": "added to dom",
-                },
-                "geometry": {
-                    "type": "Point",
-                    "coordinates": [14.6, 48.5],
-                },
-            },
-            {
-                "type": "Feature",
-                "properties": {
-                    "name": "marker 2",
-                    "description": "not added to dom at load",
-                },
-                "geometry": {
-                    "type": "Point",
-                    "coordinates": [12.6, 44.5],
-                },
-            },
-        ],
-    }
-    DataLayerFactory(map=map, data=data)
-    map.settings["properties"]["showLabel"] = True
-    map.save()
-    page.goto(f"{live_server.url}{map.get_absolute_url()}")
-    markers = page.locator(".leaflet-marker-icon")
-    tooltips = page.locator(".leaflet-tooltip")
-    expect(markers).to_have_count(1)
-    expect(tooltips).to_have_count(1)
-
-    # Zoom in/out to show the other marker
-    page.get_by_label("Zoom out").click()
-    expect(markers).to_have_count(2)
-    expect(tooltips).to_have_count(2)
-    page.get_by_label("Zoom in").click()
-    expect(markers).to_have_count(1)
-    expect(tooltips).to_have_count(1)
-
-    # Drag map to show/hide the marker
-    map_el = page.locator("#map")
-    map_el.drag_to(
-        map_el,
-        source_position={"x": 100, "y": 600},
-        target_position={"x": 100, "y": 200},
-    )
-    expect(markers).to_have_count(2)
-    expect(tooltips).to_have_count(2)
-    map_el.drag_to(
-        map_el,
-        source_position={"x": 100, "y": 600},
-        target_position={"x": 100, "y": 200},
-    )
-    expect(markers).to_have_count(1)
-    expect(tooltips).to_have_count(1)

umap/tests/test_map_views.py

@@ -861,22 +861,3 @@ def test_ogp_links(client, map, datalayer):
     assert f'<meta property="og:title" content="{map.name}" />' in content
     assert f'<meta property="og:description" content="{map.description}" />' in content
     assert '<meta property="og:site_name" content="uMap" />' in content
-
-
-def test_non_public_map_should_have_noindex_meta(client, map, datalayer):
-    map.share_status = Map.OPEN
-    map.save()
-    response = client.get(map.get_absolute_url())
-    assert response.status_code == 200
-    assert (
-        '<meta name="robots" content="noindex,nofollow">' in response.content.decode()
-    )
-
-
-def test_demo_instance_should_have_noindex(client, map, datalayer, settings):
-    settings.UMAP_DEMO_SITE = True
-    response = client.get(map.get_absolute_url())
-    assert response.status_code == 200
-    assert (
-        '<meta name="robots" content="noindex,nofollow">' in response.content.decode()
-    )

{umap_project-2.7.0.dist-info → umap_project-2.7.0b0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: umap-project
-Version: 2.7.0
+Version: 2.7.0b0
 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,37 +19,33 @@ 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.2
-Requires-Dist: pillow==11.0.0
+Requires-Dist: django==5.1.1
+Requires-Dist: pillow==10.4.0
 Requires-Dist: psycopg==3.2.3
-Requires-Dist: rcssmin==1.1.3
+Requires-Dist: pydantic==2.9.2
+Requires-Dist: rcssmin==1.1.2
 Requires-Dist: requests==2.32.3
-Requires-Dist: rjsmin==1.2.3
+Requires-Dist: rjsmin==1.2.2
 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.13.0; extra == 'dev'
+Requires-Dist: hatch==1.12.0; extra == 'dev'
 Requires-Dist: isort==5.13.2; extra == 'dev'
-Requires-Dist: mkdocs-material==9.5.42; extra == 'dev'
+Requires-Dist: mkdocs-material==9.5.39; 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.7.0; extra == 'dev'
+Requires-Dist: ruff==0.6.8; extra == 'dev'
 Requires-Dist: vermin==1.6.0; extra == 'dev'
 Provides-Extra: docker
 Requires-Dist: uwsgi==2.0.27; extra == 'docker'
-Provides-Extra: sync
-Requires-Dist: channels==4.1.0; extra == 'sync'
-Requires-Dist: daphne==4.1.2; extra == 'sync'
-Requires-Dist: pydantic==2.9.2; extra == 'sync'
-Requires-Dist: websockets==13.1; extra == 'sync'
 Provides-Extra: test
 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