umap-project 2.0.0a3__py3-none-any.whl → 2.0.3__py3-none-any.whl

umap/templates/umap/css.html

@@ -1,5 +1,4 @@
 {% load static %}
-
 <link rel="stylesheet"
       href="{% static 'umap/vendors/leaflet/leaflet.css' %}" />
 <link rel="stylesheet"
@@ -22,6 +21,7 @@
       href="{% static 'umap/vendors/locatecontrol/L.Control.Locate.min.css' %}" />
 <link rel="stylesheet"
       href="{% static 'umap/vendors/iconlayers/iconLayers.css' %}" />
+<link rel="stylesheet" href="{% static 'umap/vars.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/font.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/base.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/content.css' %}" />

umap/templates/umap/js.html

@@ -1,37 +1,48 @@
 {% load static %}
-
-<script type="module" src="{% static 'umap/vendors/leaflet/leaflet-src.esm.js' %}" defer></script>
+<script type="module"
+        src="{% static 'umap/vendors/leaflet/leaflet-src.esm.js' %}"
+        defer></script>
 <script type="module" src="{% static 'umap/js/modules/global.js' %}" defer></script>
 <script src="{% static 'umap/vendors/editable/Path.Drag.js' %}" defer></script>
 <script src="{% static 'umap/vendors/editable/Leaflet.Editable.js' %}" defer></script>
 <script src="{% static 'umap/vendors/hash/leaflet-hash.js' %}" defer></script>
 <script src="{% static 'umap/vendors/i18n/Leaflet.i18n.js' %}" defer></script>
-<script src="{% static 'umap/vendors/editinosm/Leaflet.EditInOSM.js' %}" defer></script>
-<script src="{% static 'umap/vendors/minimap/Control.MiniMap.min.js' %}" defer></script>
+<script src="{% static 'umap/vendors/editinosm/Leaflet.EditInOSM.js' %}"
+        defer></script>
+<script src="{% static 'umap/vendors/minimap/Control.MiniMap.min.js' %}"
+        defer></script>
 <script src="{% static 'umap/vendors/csv2geojson/csv2geojson.js' %}" defer></script>
 <script src="{% static 'umap/vendors/togeojson/togeojson.umd.js' %}" defer></script>
 <script src="{% static 'umap/vendors/osmtogeojson/osmtogeojson.js' %}" defer></script>
 <script src="{% static 'umap/vendors/loading/Control.Loading.js' %}" defer></script>
-<script src="{% static 'umap/vendors/markercluster/leaflet.markercluster.js' %}" defer></script>
-<script src="{% static 'umap/vendors/contextmenu/leaflet.contextmenu.min.js' %}" defer></script>
+<script src="{% static 'umap/vendors/markercluster/leaflet.markercluster.js' %}"
+        defer></script>
+<script src="{% static 'umap/vendors/contextmenu/leaflet.contextmenu.min.js' %}"
+        defer></script>
 <script src="{% static 'umap/vendors/photon/leaflet.photon.js' %}" defer></script>
-<script src="{% static 'umap/vendors/georsstogeojson/GeoRSSToGeoJSON.js' %}" defer></script>
+<script src="{% static 'umap/vendors/georsstogeojson/GeoRSSToGeoJSON.js' %}"
+        defer></script>
 <script src="{% static 'umap/vendors/heat/leaflet-heat.js' %}" defer></script>
-<script src="{% static 'umap/vendors/fullscreen/Leaflet.fullscreen.min.js' %}" defer></script>
+<script src="{% static 'umap/vendors/fullscreen/Leaflet.fullscreen.min.js' %}"
+        defer></script>
 <script src="{% static 'umap/vendors/toolbar/leaflet.toolbar.js' %}" defer></script>
-<script src="{% static 'umap/vendors/formbuilder/Leaflet.FormBuilder.js' %}" defer></script>
-<script src="{% static 'umap/vendors/measurable/Leaflet.Measurable.js' %}" defer></script>
+<script src="{% static 'umap/vendors/formbuilder/Leaflet.FormBuilder.js' %}"
+        defer></script>
+<script src="{% static 'umap/vendors/measurable/Leaflet.Measurable.js' %}"
+        defer></script>
 <script src="{% static 'umap/vendors/togpx/togpx.js' %}" defer></script>
 <script src="{% static 'umap/vendors/iconlayers/iconLayers.js' %}" defer></script>
 <script src="{% static 'umap/vendors/tokml/tokml.js' %}" defer></script>
-<script src="{% static 'umap/vendors/locatecontrol/L.Control.Locate.min.js' %}" defer></script>
+<script src="{% static 'umap/vendors/locatecontrol/L.Control.Locate.min.js' %}"
+        defer></script>
 <script src="{% static 'umap/vendors/dompurify/purify.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/vendors/simple-statistics/simple-statistics.min.js' %}"
+        defer></script>
 {% if locale %}
-    {% with "umap/locale/"|add:locale|add:".js" as path %}
-        <script src="{% static path %}" defer></script>
-    {% endwith %}
+  {% with "umap/locale/"|add:locale|add:".js" as path %}
+    <script src="{% static path %}" defer></script>
+  {% endwith %}
 {% endif %}
 <script src="{% static 'umap/js/umap.core.js' %}" defer></script>
 <script src="{% static 'umap/js/umap.autocomplete.js' %}" defer></script>

umap/templates/umap/map_detail.html

@@ -8,21 +8,19 @@
 {% endblock body_class %}
 {% block extra_head %}
   {% if preconnect_domains %}
-    {% for domain in preconnect_domains %}
-      <link rel="preconnect" href="{{ domain }}" />
-    {% endfor %}
+    {% for domain in preconnect_domains %}<link rel="preconnect" href="{{ domain }}" />{% endfor %}
   {% endif %}
   {% umap_css %}
   {{ block.super }}
   {% umap_js locale=locale %}
   {% if object.share_status != object.PUBLIC %}<meta name="robots" content="noindex">{% endif %}
-  <link rel="alternate" type="application/json+oembed"
-    href="{{ oembed_absolute_uri }}?url={{ quoted_absolute_uri }}&format=json"
-    title="{{ map.name }} oEmbed URL" />
+  <link rel="alternate"
+        type="application/json+oembed"
+        href="{{ oembed_absolute_uri }}?url={{ quoted_absolute_uri }}&format=json"
+        title="{{ map.name }} oEmbed URL" />
 {% endblock extra_head %}
 {% block content %}
   {% block map_init %}
     {% include "umap/map_init.html" %}
   {% endblock map_init %}
-  {% include "umap/map_messages.html" %}
 {% endblock content %}

umap/templates/umap/map_fragment.html

@@ -1,4 +1,4 @@
 {% load umap_tags %}
 <umap-fragment data-settings='{{ map_settings|escape }}'>
-  <div id="{{ unique_id }}" class="map_fragment"></div>
+<div id="{{ unique_id }}" class="map_fragment"></div>
 </umap-fragment>

umap/templates/umap/map_init.html

@@ -2,9 +2,16 @@
 <div id="map"></div>
 <!-- djlint:off -->
 <script defer type="text/javascript">
-  let MAP
   window.addEventListener('DOMContentLoaded', (event) => {
-    MAP = new U.Map("map", {{ map_settings|notag|safe }});
-  });
+    U.MAP = new U.Map("map", {{ map_settings|notag|safe }})
+    {% for m in messages %}
+      {# We have just one, but we need to loop, as for messages API #}
+      U.MAP.ui.alert({
+        content: "{{ m }}",
+        level: "{{ m.tags }}",
+        duration: 100000
+      })
+    {% endfor %}
+  })
 </script>
 <!-- djlint:on -->

umap/templates/umap/map_table.html

@@ -21,8 +21,9 @@
             </th>
             <td>
               {{ map_inst.preview_settings|json_script:unique_id }}
-              <button class="map-icon map-opener" data-map-id="{{ unique_id }}"
-                title="{% translate "Open preview" %}">
+              <button class="map-icon map-opener"
+                      data-map-id="{{ unique_id }}"
+                      title="{% translate "Open preview" %}">
                 <span class="icon-dashboard icon-view"></span>
                 <span class="sr-only">{% translate "Open preview" %}</span>
               </button>
@@ -42,35 +43,37 @@
               <a href="{{ map_inst.owner.get_url }}">{{ map_inst.owner }}</a>
             </td>
             <td>
-              <a href="{{ map_inst.get_absolute_url }}?share" class="icon-link"
-                title="{% translate "Share" %}">
+              <a href="{{ map_inst.get_absolute_url }}?share"
+                 class="icon-link"
+                 title="{% translate "Share" %}">
                 <span class="icon-dashboard icon-share"></span>
                 <span class="sr-only">{% translate "Share" %}</span>
               </a>
-              <a href="{{ map_inst.get_absolute_url }}?edit" class="icon-link"
-                title="{% translate "Edit" %}">
+              <a href="{{ map_inst.get_absolute_url }}?edit"
+                 class="icon-link"
+                 title="{% translate "Edit" %}">
                 <span class="icon-dashboard icon-edit"></span>
                 <span class="sr-only">{% translate "Edit" %}</span>
               </a>
-              <a href="{% url 'map_download' map_inst.pk %}" class="icon-link"
-                title="{% translate "Download" %}">
+              <a href="{% url 'map_download' map_inst.pk %}"
+                 class="icon-link"
+                 title="{% translate "Download" %}">
                 <span class="icon-dashboard icon-download"></span>
                 <span class="sr-only">{% translate "Download" %}</span>
               </a>
               <form action="{% url 'map_clone' map_inst.pk %}" method="post">
                 {% csrf_token %}
-                <button class="map-icon" type="submit"
-                  title="{% translate "Clone" %}">
+                <button class="map-icon" type="submit" title="{% translate "Clone" %}">
                   <span class="icon-dashboard icon-duplicate"></span>
                   <span class="sr-only">{% translate "Clone" %}</span>
                 </button>
               </form>
               <form action="{% url 'map_delete' map_inst.pk %}"
-                method="post" class="map-delete">
+                    method="post"
+                    class="map-delete">
                 {% csrf_token %}
                 <input type="hidden" name="next" value="{% url 'user_dashboard' %}">
-                <button class="map-icon" type="submit"
-                  title="{% translate "Delete" %}">
+                <button class="map-icon" type="submit" title="{% translate "Delete" %}">
                   <span class="icon-dashboard icon-delete"></span>
                   <span class="sr-only">{% translate "Delete" %}</span>
                 </button>
@@ -93,13 +96,11 @@
       <span></span>
       {# djlint:on #}
     {% endif %}
-
     <span class="current">
       {% blocktranslate with maps_number=maps.number num_pages=maps.paginator.num_pages trimmed %}
         Page {{ maps_number }} of {{ num_pages }}
       {% endblocktranslate %}
     </span>
-
     {% if maps.has_next %}
       <a href="?p={{ maps.next_page_number }}{% if q %}&q={{ q }}{% endif %}">{% translate "next" %} ›</a>
       <a href="?p={{ maps.paginator.num_pages }}{% if q %}&q={{ q }}{% endif %}">{% translate "last" %} »</a>
@@ -111,12 +112,12 @@
     {% endif %}
     <span>
       {% blocktranslate with per_page=maps.paginator.per_page trimmed %}
-      Lines per page: {{ per_page }}
+        Lines per page: {{ per_page }}
       {% endblocktranslate %}
     </span>
     <span>
       {% blocktranslate with count=maps.paginator.count trimmed %}
-      {{ count }} maps
+        {{ count }} maps
       {% endblocktranslate %}
     </span>
   {% endif %}

umap/templates/umap/user_dashboard.html

@@ -7,8 +7,7 @@
   {% trans "Search my maps" as placeholder %}
   <div class="row">
     <h2 class="section tabs">
-      <a class="selected" href="{% url 'user_dashboard' %}"
-      >{% blocktranslate with count=maps.paginator.count %}My Maps ({{ count }}){% endblocktranslate %}
+      <a class="selected" href="{% url 'user_dashboard' %}">{% blocktranslate with count=maps.paginator.count %}My Maps ({{ count }}){% endblocktranslate %}
       </a>
       <a href="{% url 'user_profile' %}">{% trans "My profile" %}</a>
     </h2>
@@ -19,17 +18,18 @@
         <form action="{{ request.get_full_path }}" method="get">
           <span>
             <label class="sr-only" for="q">{% translate "Map’s title" %}</label>
-            <input id="q" name="q" type="search"
+            <input id="q"
+                   name="q"
+                   type="search"
                    placeholder="{% translate "Map’s title" %}"
                    value="{{ request.GET.q|default:"" }}" />
           </span>
           <input type="submit" value="{% trans "Search my maps" %}" />
         </form>
         {% if maps.object_list|length > 1 %}
-          <a href="{% url 'user_download' %}?{% spaceless %}
-          {% for map_inst in maps %}map_id={{ map_inst.pk }}{% if not forloop.last %}&{% endif %}{% endfor %}
-          {% endspaceless %}" class="button button-download"
-            >{% blocktranslate with count=maps.object_list|length trimmed %}
+          <a href="{% url 'user_download' %}?{% spaceless %} {% for map_inst in maps %}map_id={{ map_inst.pk }}{% if not forloop.last %}&{% endif %}{% endfor %} {% endspaceless %}"
+             class="button button-download">
+            {% blocktranslate with count=maps.object_list|length trimmed %}
               Download {{ count }} maps
             {% endblocktranslate %}
           </a>
@@ -45,7 +45,6 @@
     </div>
   </div>
 {% endblock maincontent %}
-
 {% block bottom_js %}
   {{ block.super }}
   <script type="text/javascript">
@@ -58,7 +57,7 @@
           const mapId = button.dataset.mapId
           if (!document.querySelector(`#${mapId}_target`).hasChildNodes()) {
             const previewSettings = JSON.parse(document.getElementById(mapId).textContent)
-            const map = new L.U.Map(`${mapId}_target`, previewSettings)
+            const map = new U.Map(`${mapId}_target`, previewSettings)
             CACHE[mapId] = map
           } else {
             CACHE[mapId].invalidateSize()

umap/tests/conftest.py

@@ -5,8 +5,6 @@ import pytest
 from django.core.cache import cache
 from django.core.signing import get_cookie_signer
 
-from umap.models import Map
-
 from .base import (
     DataLayerFactory,
     LicenceFactory,

umap/tests/integration/test_anonymous_owned_map.py

@@ -1,10 +1,12 @@
 import re
+from smtplib import SMTPException
+from unittest.mock import patch
 
 import pytest
 from django.core.signing import get_cookie_signer
 from playwright.sync_api import expect
 
-from umap.models import DataLayer
+from umap.models import DataLayer, Map
 
 from ..base import DataLayerFactory
 
@@ -150,3 +152,50 @@ def test_can_change_perms_after_create(tilelayer, live_server, page):
         ".datalayer-permissions select[name='edit_status'] option:checked"
     )
     expect(option).to_have_text("Inherit")
+
+
+def test_alert_message_after_create(
+    tilelayer, live_server, page, monkeypatch, settings
+):
+    page.goto(f"{live_server.url}/en/map/new")
+    save = page.get_by_role("button", name="Save")
+    expect(save).to_be_visible()
+    alert = page.locator(".umap-alert")
+    expect(alert).to_be_hidden()
+    with page.expect_response(re.compile(r".*/map/create/")):
+        save.click()
+    new_map = Map.objects.last()
+    expect(alert).to_be_visible()
+    expect(
+        alert.get_by_text(
+            "Your map has been created! As you are not logged in, here is your secret "
+            "link to edit the map, please keep it safe:"
+        )
+    ).to_be_visible()
+    expect(alert.get_by_role("button", name="Copy")).to_be_visible()
+    expect(alert.get_by_role("button", name="Send me the link")).to_be_visible()
+    alert.get_by_placeholder("Email").fill("foo@bar.com")
+    with patch("umap.views.send_mail") as patched:
+        with page.expect_response(re.compile("/en/map/.*/send-edit-link/")):
+            alert.get_by_role("button", name="Send me the link").click()
+        assert patched.called
+        patched.assert_called_with(
+            "The uMap edit link for your map: Untitled map",
+            f"Here is your secret edit link: {new_map.get_anonymous_edit_url()}",
+            "test@test.org",
+            ["foo@bar.com"],
+            fail_silently=False,
+        )
+
+
+def test_email_sending_error_are_catched(tilelayer, page, live_server):
+    page.goto(f"{live_server.url}/en/map/new")
+    alert = page.locator(".umap-alert")
+    with page.expect_response(re.compile(r".*/map/create/")):
+        page.get_by_role("button", name="Save").click()
+    alert.get_by_placeholder("Email").fill("foo@bar.com")
+    with patch("umap.views.send_mail", side_effect=SMTPException) as patched:
+        with page.expect_response(re.compile("/en/map/.*/send-edit-link/")):
+            alert.get_by_role("button", name="Send me the link").click()
+        assert patched.called
+        expect(alert.get_by_text("Can't send email to foo@bar.com")).to_be_visible()

umap/tests/integration/test_collaborative_editing.py

@@ -38,7 +38,7 @@ def test_collaborative_editing_create_markers(context, live_server, tilelayer):
 
     with page_one.expect_response(DATALAYER_UPDATE):
         save_p1.click()
-        # Prefent two layers to be saved on the same second, as we compare them based
+        # Prevent two layers to be saved on the same second, as we compare them based
         # on time in case of conflict. FIXME do not use time for comparison.
         sleep(1)
     assert DataLayer.objects.get(pk=datalayer.pk).settings == {
@@ -140,3 +140,59 @@ def test_collaborative_editing_create_markers(context, live_server, tilelayer):
         "permissions": {"edit_status": 1},
     }
     expect(marker_pane_p2).to_have_count(5)
+
+
+def test_empty_datalayers_can_be_merged(context, live_server, tilelayer):
+    # Let's create a new map with an empty datalayer
+    map = MapFactory(name="collaborative editing")
+    DataLayerFactory(map=map, edit_status=DataLayer.ANONYMOUS, data={})
+
+    # Open two tabs at the same time, on the same empty map
+    page_one = context.new_page()
+    page_one.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
+
+    page_two = context.new_page()
+    page_two.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
+
+    save_p1 = page_one.get_by_role("button", name="Save")
+    expect(save_p1).to_be_visible()
+
+    # Click on the Draw a marker button on a new map.
+    create_marker_p1 = page_one.get_by_title("Draw a marker")
+    expect(create_marker_p1).to_be_visible()
+    create_marker_p1.click()
+
+    # Check no marker is present by default.
+    marker_pane_p1 = page_one.locator(".leaflet-marker-pane > div")
+    expect(marker_pane_p1).to_have_count(0)
+
+    # Click on the map, it will place a marker at the given position.
+    map_el_p1 = page_one.locator("#map")
+    map_el_p1.click(position={"x": 200, "y": 200})
+    expect(marker_pane_p1).to_have_count(1)
+
+    with page_one.expect_response(DATALAYER_UPDATE):
+        save_p1.click()
+        sleep(1)
+
+    save_p2 = page_two.get_by_role("button", name="Save")
+    expect(save_p2).to_be_visible()
+
+    # Click on the Draw a marker button on a new map.
+    create_marker_p2 = page_two.get_by_title("Draw a marker")
+    expect(create_marker_p2).to_be_visible()
+    create_marker_p2.click()
+
+    marker_pane_p2 = page_two.locator(".leaflet-marker-pane > div")
+
+    # Click on the map, it will place a marker at the given position.
+    map_el_p2 = page_two.locator("#map")
+    map_el_p2.click(position={"x": 220, "y": 220})
+    expect(marker_pane_p2).to_have_count(1)
+
+    # Save p1 and p2 at the same time
+    with page_two.expect_response(DATALAYER_UPDATE):
+        save_p2.click()
+        sleep(1)
+
+    expect(marker_pane_p2).to_have_count(2)

umap/tests/integration/test_dashboard.py

@@ -23,3 +23,16 @@ def test_owner_can_delete_map_after_confirmation(map, live_server, login):
         delete_button.click()
     assert dialog_shown
     assert Map.objects.all().count() == 0
+
+
+def test_dashboard_map_preview(map, live_server, datalayer, login):
+    page = login(map.owner)
+    page.goto(f"{live_server.url}/en/me")
+    dialog = page.locator("dialog")
+    expect(dialog).to_be_hidden()
+    button = page.get_by_role("button", name="Open preview")
+    expect(button).to_be_visible()
+    button.click()
+    expect(dialog).to_be_visible()
+    # Let's check we have a marker on it, so we can guess the map loaded correctly
+    expect(dialog.locator(".leaflet-marker-icon")).to_be_visible()

umap/tests/integration/test_map_preview.py

@@ -73,3 +73,11 @@ def test_map_preview_can_change_styling_from_querystring(page, live_server, tile
     markers = page.locator(".leaflet-marker-icon .icon_container")
     expect(markers).to_have_count(1)
     expect(markers).to_have_css("background-color", "rgb(139, 0, 0)")
+
+
+def test_can_open_feature_on_load(page, live_server, tilelayer):
+    page.goto(
+        f"{live_server.url}/map/?data={quote(json.dumps(GEOJSON))}&feature=Niagara Falls"
+    )
+    # Popup is open.
+    expect(page.get_by_text("Niagara Falls")).to_be_visible()

umap/tests/integration/test_querystring.py

@@ -50,3 +50,17 @@ def test_can_deactivate_wheel_from_query_string(map, live_server, page):
     expect(page).to_have_url(re.compile(r".*#7/.+"))
     page.mouse.wheel(0, 1)
     expect(page).to_have_url(re.compile(r".*#7/.+"))
+
+
+def test_zoom_control(map, live_server, datalayer, page):
+    control = page.locator(".leaflet-control-zoom")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    expect(control).to_be_visible()
+    page.goto(f"{live_server.url}{map.get_absolute_url()}?zoomControl=false")
+    expect(control).to_be_hidden()
+    page.goto(f"{live_server.url}{map.get_absolute_url()}?zoomControl=true")
+    expect(control).to_be_visible()
+    page.goto(f"{live_server.url}{map.get_absolute_url()}?zoomControl=null")
+    expect(control).to_be_hidden()
+    page.get_by_title("More controls").click()
+    expect(control).to_be_visible()

umap/tests/integration/test_share.py

@@ -6,7 +6,7 @@ from playwright.sync_api import expect
 pytestmark = pytest.mark.django_db
 
 
-def test_iframe_code(map, live_server, datalayer, page):
+def test_iframe_code_can_contain_datalayers(map, live_server, datalayer, page):
     page.goto(f"{live_server.url}{map.get_absolute_url()}?share")
     textarea = page.locator(".umap-share-iframe")
     expect(textarea).to_be_visible()
@@ -20,3 +20,21 @@ def test_iframe_code(map, live_server, datalayer, page):
     page.get_by_text("Embed and link options").click()
     page.get_by_title("Keep current visible layers").click()
     expect(textarea).to_have_text(re.compile(f"datalayers={datalayer.pk}"))
+    # Now click again
+    page.get_by_title("Keep current visible layers").click()
+    expect(textarea).not_to_have_text(re.compile(f"datalayers={datalayer.pk}"))
+
+
+def test_iframe_code_can_contain_feature(map, live_server, datalayer, page):
+    page.goto(f"{live_server.url}{map.get_absolute_url()}?share")
+    page.locator(".icon_container").click()
+    textarea = page.locator(".umap-share-iframe")
+    expect(textarea).to_be_visible()
+    expect(textarea).not_to_have_text(re.compile("feature=Here"))
+    # Open options
+    page.get_by_text("Embed and link options").click()
+    page.get_by_title("Open current feature on load").click()
+    expect(textarea).to_have_text(re.compile("feature=Here"))
+    # Click again to deactivate it
+    page.get_by_title("Open current feature on load").click()
+    expect(textarea).not_to_have_text(re.compile("feature=Here"))

umap/tests/integration/test_star.py

@@ -0,0 +1,27 @@
+import re
+
+import pytest
+from playwright.sync_api import expect
+
+from umap.models import Star
+
+pytestmark = pytest.mark.django_db
+
+
+def test_star_control_is_visible_if_logged_in(map, live_server, page, login, user):
+    login(user)
+    assert not Star.objects.count()
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    page.get_by_title("More controls").click()
+    control = page.locator(".leaflet-control-star")
+    expect(control).to_be_visible()
+    with page.expect_response(re.compile(".*/star/")):
+        control.click()
+    assert Star.objects.count() == 1
+
+
+def test_no_star_control_if_not_logged_in(map, live_server, page):
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    page.get_by_title("More controls").click()
+    control = page.locator(".leaflet-control-star")
+    expect(control).to_be_hidden()

umap/tests/integration/test_statics.py

@@ -1,6 +1,7 @@
 import re
 import shutil
 import tempfile
+from copy import deepcopy
 
 import pytest
 from django.core.management import call_command
@@ -12,6 +13,11 @@ from playwright.sync_api import expect
 def staticfiles(settings):
     static_root = tempfile.mkdtemp(prefix="test_static")
     settings.STATIC_ROOT = static_root
+    # Make sure settings are properly reset after the test
+    settings.STORAGES = deepcopy(settings.STORAGES)
+    settings.STORAGES["staticfiles"][
+        "BACKEND"
+    ] = "umap.storage.UmapManifestStaticFilesStorage"
     try:
         call_command("collectstatic", "--noinput")
         yield
@@ -22,9 +28,6 @@ def staticfiles(settings):
 def test_javascript_have_been_loaded(
     map, live_server, datalayer, page, settings, staticfiles
 ):
-    settings.STORAGES["staticfiles"][
-        "BACKEND"
-    ] = "umap.storage.UmapManifestStaticFilesStorage"
     datalayer.settings["displayOnLoad"] = False
     datalayer.save()
     map.settings["properties"]["defaultView"] = "latest"

umap/tests/settings.py

@@ -3,7 +3,7 @@ import os
 from umap.settings.base import *  # pylint: disable=W0614,W0401
 
 SECRET_KEY = "justfortests"
-FROM_EMAIL = "test@test.org"
+DEFAULT_FROM_EMAIL = "test@test.org"
 EMAIL_BACKEND = "django.core.mail.backends.locmem.EmailBackend"
 STORAGES["staticfiles"][
     "BACKEND"

umap/tests/test_map_views.py

@@ -818,10 +818,10 @@ def test_oembed_map(client, map, datalayer):
 def test_oembed_link(client, map, datalayer):
     response = client.get(map.get_absolute_url())
     assert response.status_code == 200
+
     assert (
-        '<link rel="alternate" type="application/json+oembed"'
-        in response.content.decode()
-    )
+        '<link rel="alternate"\n        type="application/json+oembed"'
+    ) in response.content.decode()
     assert (
         'href="http://testserver/map/oembed/'
         f'?url=http%3A%2F%2Ftestserver%2Fen%2Fmap%2Ftest-map_{map.id}&format=json"'

umap/urls.py

@@ -156,7 +156,7 @@ map_urls = [
         name="datalayer_permissions",
     ),
 ]
-if settings.FROM_EMAIL:
+if settings.DEFAULT_FROM_EMAIL:
     map_urls.append(
         re_path(
             r"^map/(?P<map_id>[\d]+)/send-edit-link/$",

umap/views.py

@@ -9,6 +9,7 @@ from datetime import datetime, timedelta
 from http.client import InvalidURL
 from io import BytesIO
 from pathlib import Path
+from smtplib import SMTPException
 from urllib.error import HTTPError, URLError
 from urllib.parse import quote, quote_plus, urlparse
 from urllib.request import Request, build_opener
@@ -836,16 +837,19 @@ class SendEditLink(FormLessEditMixin, FormView):
             return HttpResponseBadRequest("Invalid")
         link = self.object.get_anonymous_edit_url()
 
-        send_mail(
-            _(
-                "The uMap edit link for your map: %(map_name)s"
-                % {"map_name": self.object.name}
-            ),
-            _("Here is your secret edit link: %(link)s" % {"link": link}),
-            settings.FROM_EMAIL,
-            [email],
-            fail_silently=False,
+        subject = _(
+            "The uMap edit link for your map: %(map_name)s"
+            % {"map_name": self.object.name}
         )
+        body = _("Here is your secret edit link: %(link)s" % {"link": link})
+        try:
+            send_mail(
+                subject, body, settings.DEFAULT_FROM_EMAIL, [email], fail_silently=False
+            )
+        except SMTPException:
+            return simple_json_response(
+                error=_("Can't send email to %(email)s" % {"email": email})
+            )
         return simple_json_response(
             info=_("Email sent to %(email)s" % {"email": email})
         )
@@ -1076,7 +1080,9 @@ class DataLayerUpdate(FormLessEditMixin, GZipMixin, UpdateView):
 
         try:
             merged_features = merge_features(
-                reference["features"], latest["features"], entrant["features"]
+                reference.get("features", []),
+                latest.get("features", []),
+                entrant.get("features", []),
             )
             latest["features"] = merged_features
             return latest