umap-project 2.1.2__py3-none-any.whl → 2.2.0__py3-none-any.whl

umap/static/umap/vendors/formbuilder/Leaflet.FormBuilder.js

@@ -208,6 +208,7 @@ L.FormBuilder.Textarea = L.FormBuilder.Element.extend({
     build: function () {
         this.input = L.DomUtil.create('textarea', this.options.className || '', this.parentNode);
         if (this.options.placeholder) this.input.placeholder = this.options.placeholder;
+        this.input.name = this.name;
         this.fetch();
         L.DomEvent.on(this.input, 'input', this.sync, this);
         L.DomEvent.on(this.input, 'keypress', this.onKeyPress, this);

umap/static/umap/vendors/iconlayers/iconLayers.js

@@ -307,4 +307,4 @@
     iconLayers.Constructor = IconLayers;
 
     return iconLayers;
-});
+});

umap/templates/umap/css.html

@@ -23,8 +23,10 @@
       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/css/icon.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/base.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/content.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/nav.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/map.css' %}" />
+<link rel="stylesheet" href="{% static 'umap/css/panel.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/theme.css' %}" />

umap/templates/umap/js.html

@@ -42,7 +42,6 @@
 <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/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>

umap/templates/umap/map_detail.html

@@ -18,6 +18,10 @@
         type="application/json+oembed"
         href="{{ oembed_absolute_uri }}?url={{ quoted_absolute_uri }}&format=json"
         title="{{ map.name }} oEmbed URL" />
+  <meta property="og:url" content="{{ SITE_URL }}{{ map.get_absolute_url }}" />
+  <meta property="og:title" content="{{ map.name }}" />
+  <meta property="og:description" content="{{ map.description }}" />
+  <meta property="og:site_name" content="{{ SITE_NAME }}" />
 {% endblock extra_head %}
 {% block content %}
   {% block map_init %}

umap/templates/umap/map_table.html

@@ -68,16 +68,18 @@
                   <span class="sr-only">{% translate "Clone" %}</span>
                 </button>
               </form>
-              <form action="{% url 'map_delete' map_inst.pk %}"
-                    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" %}">
-                  <span class="icon-dashboard icon-delete"></span>
-                  <span class="sr-only">{% translate "Delete" %}</span>
-                </button>
-              </form>
+              {% if map_inst|can_delete_map:request %}
+                <form action="{% url 'map_delete' map_inst.pk %}"
+                      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" %}">
+                    <span class="icon-dashboard icon-delete"></span>
+                    <span class="sr-only">{% translate "Delete" %}</span>
+                  </button>
+                </form>
+              {% endif %}
             </td>
           </tr>
         {% endwith %}

umap/templatetags/umap_tags.py

@@ -43,6 +43,11 @@ def tilelayer_preview(tilelayer):
     return output
 
 
+@register.filter
+def can_delete_map(map, request):
+    return map.can_delete(request.user, request)
+
+
 @register.filter
 def notag(s):
     return s.replace("<", "&lt;")

umap/tests/conftest.py

@@ -5,6 +5,8 @@ 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,
@@ -48,6 +50,13 @@ def map(licence, tilelayer):
     return MapFactory(owner=user, licence=licence)
 
 
+@pytest.fixture
+def openmap(map):
+    map.edit_status = Map.ANONYMOUS
+    map.save()
+    return map
+
+
 @pytest.fixture
 def anonymap(map):
     map.owner = None

umap/tests/fixtures/test_upload_data.csv

@@ -1,2 +1,3 @@
 Foo,Latitude,geo_Longitude,title,description
-bar,41.34,122.86,a point somewhere,the description of this 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/fixtures/test_upload_data.umap

@@ -0,0 +1,171 @@
+{
+    "type": "umap",
+    "geometry": {
+        "type": "Point",
+        "coordinates": [
+            3.0528,
+            50.6269
+        ]
+    },
+    "properties": {
+        "umap_id": 666,
+        "longCredit": "the illustrious mapmaker",
+        "shortCredit": "the mapmaker",
+        "slideshow": {},
+        "captionBar": true,
+        "dashArray": "5,5",
+        "fillOpacity": "0.5",
+        "fillColor": "Crimson",
+        "fill": true,
+        "weight": "2",
+        "opacity": "0.9",
+        "smoothFactor": "1",
+        "iconClass": "Drop",
+        "color": "Red",
+        "limitBounds": {},
+        "tilelayer": {
+            "maxZoom": 20,
+            "url_template": "https://tile.openstreetmap.fr/hot/{z}/{x}/{y}.png",
+            "minZoom": 0,
+            "attribution": "map data © [[https://osm.org/copyright|OpenStreetMap contributors]] under ODbL  - Tiles © HOT",
+            "name": "OSM Humanitarian (OSM-FR)"
+        },
+        "licence": {
+            "url": "",
+            "name": "No licence set"
+        },
+        "description": "Map description",
+        "name": "Imported map",
+        "tilelayersControl": true,
+        "onLoadPanel": "caption",
+        "displayPopupFooter": true,
+        "miniMap": true,
+        "moreControl": true,
+        "scaleControl": true,
+        "zoomControl": true,
+        "scrollWheelZoom": true,
+        "datalayersControl": true,
+        "zoom": 6
+    },
+    "layers": [
+        {
+            "type": "FeatureCollection",
+            "features": [
+                {
+                    "type": "Feature",
+                    "geometry": {
+                        "type": "Polygon",
+                        "coordinates": [
+                            [
+                                [
+                                    4.2939,
+                                    50.8893
+                                ],
+                                [
+                                    4.2441,
+                                    50.8196
+                                ],
+                                [
+                                    4.3869,
+                                    50.7642
+                                ],
+                                [
+                                    4.4813,
+                                    50.7929
+                                ],
+                                [
+                                    4.413,
+                                    50.9119
+                                ],
+                                [
+                                    4.2939,
+                                    50.8893
+                                ]
+                            ]
+                        ]
+                    },
+                    "properties": {
+                        "name": "Bruxelles",
+                        "description": "polygon"
+                    }
+                },
+                {
+                    "type": "Feature",
+                    "geometry": {
+                        "type": "Point",
+                        "coordinates": [
+                            3.0528,
+                            50.6269
+                        ]
+                    },
+                    "properties": {
+                        "_umap_options": {
+                            "color": "Orange"
+                        },
+                        "name": "Lille",
+                        "description": "une ville"
+                    }
+                }
+            ],
+            "_umap_options": {
+                "displayOnLoad": true,
+                "name": "Cities",
+                "id": 108,
+                "remoteData": {},
+                "description": "A layer with some cities",
+                "color": "Navy",
+                "iconClass": "Drop",
+                "smoothFactor": "1",
+                "dashArray": "5,1",
+                "fillOpacity": "0.5",
+                "fillColor": "Blue",
+                "fill": true
+            }
+        },
+        {
+            "type": "FeatureCollection",
+            "features": [
+                {
+                    "type": "Feature",
+                    "geometry": {
+                        "type": "LineString",
+                        "coordinates": [
+                            [
+                                1.7715,
+                                50.9255
+                            ],
+                            [
+                                1.6589,
+                                50.9696
+                            ],
+                            [
+                                1.4941,
+                                51.0128
+                            ],
+                            [
+                                1.4199,
+                                51.0638
+                            ],
+                            [
+                                1.2881,
+                                51.1104
+                            ]
+                        ]
+                    },
+                    "properties": {
+                        "_umap_options": {
+                            "weight": "4"
+                        },
+                        "name": "tunnel sous la Manche"
+                    }
+                }
+            ],
+            "_umap_options": {
+                "displayOnLoad": true,
+                "name": "Tunnels",
+                "id": 109,
+                "remoteData": {}
+            }
+        }
+    ]
+}

umap/tests/fixtures/test_upload_data_osm.json

@@ -0,0 +1,33 @@
+{
+    "version": 0.6,
+    "generator": "Overpass API 0.7.55.4 3079d8ea",
+    "osm3s": {
+        "timestamp_osm_base": "2018-09-22T05:26:02Z",
+        "copyright": "The data included in this document is from www.openstreetmap.org. The data is made available under ODbL."
+    },
+    "elements": [
+        {
+            "type": "node",
+            "id": 3619112991,
+            "lat": 48.9352995,
+            "lon": 2.3570684,
+            "tags": {
+                "information": "map",
+                "map_size": "city",
+                "map_type": "scheme",
+                "tourism": "information"
+            }
+        },
+        {
+            "type": "node",
+            "id": 3682500756,
+            "lat": 48.9804426,
+            "lon": 2.2719725,
+            "tags": {
+                "information": "map",
+                "level": "0",
+                "tourism": "information"
+            }
+        }
+    ]
+}

umap/tests/integration/conftest.py

@@ -1,6 +1,22 @@
+import os
+
 import pytest
 
 
+@pytest.fixture(autouse=True)
+def set_timeout(context):
+    context.set_default_timeout(int(os.environ.get("PLAYWRIGHT_TIMEOUT", 7500)))
+    context.set_default_navigation_timeout(
+        int(os.environ.get("PLAYWRIGHT_TIMEOUT", 7500))
+    )
+
+
+@pytest.fixture(autouse=True)
+def mock_osm_tiles(page):
+    if not bool(os.environ.get("PLAYWRIGHT_USE_TILES", False)):
+        page.route("*/**/osmfr/**", lambda route: route.fulfill())
+
+
 @pytest.fixture
 def login(context, settings, live_server):
     def do_login(user):

umap/tests/integration/test_anonymous_owned_map.py

@@ -34,7 +34,7 @@ def test_map_load_with_owner(anonymap, live_server, owner_session):
     expect(save).to_be_visible()
     add_marker = owner_session.get_by_title("Draw a marker")
     expect(add_marker).to_be_visible()
-    edit_settings = owner_session.get_by_title("Edit map properties")
+    edit_settings = owner_session.get_by_title("Map advanced properties")
     expect(edit_settings).to_be_visible()
     edit_permissions = owner_session.get_by_title("Update permissions and editors")
     expect(edit_permissions).to_be_visible()
@@ -65,7 +65,7 @@ def test_map_load_with_anonymous_but_editable_layer(
     expect(save).to_be_visible()
     add_marker = page.get_by_title("Draw a marker")
     expect(add_marker).to_be_visible()
-    edit_settings = page.get_by_title("Edit map properties")
+    edit_settings = page.get_by_title("Map advanced properties")
     expect(edit_settings).to_be_hidden()
     edit_permissions = page.get_by_title("Update permissions and editors")
     expect(edit_permissions).to_be_hidden()
@@ -92,6 +92,9 @@ def test_owner_permissions_form(map, datalayer, live_server, owner_session):
         ".datalayer-permissions select[name='edit_status'] option:checked"
     )
     expect(option).to_have_text("Inherit")
+    # Those fields should not be present in anonymous maps
+    expect(owner_session.locator(".umap-field-share_status select")).to_be_hidden()
+    expect(owner_session.locator(".umap-field-owner")).to_be_hidden()
 
 
 def test_anonymous_can_add_marker_on_editable_layer(
@@ -111,12 +114,13 @@ def test_anonymous_can_add_marker_on_editable_layer(
     marker = page.locator(".leaflet-marker-icon")
     map_el = page.locator("#map")
     expect(marker).to_have_count(2)
-    expect(map_el).not_to_have_class(re.compile("umap-ui"))
+    panel = page.locator(".panel.right.on")
+    expect(panel).to_be_hidden()
     add_marker.click()
     map_el.click(position={"x": 100, "y": 100})
     expect(marker).to_have_count(3)
     # Edit panel is open
-    expect(map_el).to_have_class(re.compile("umap-ui"))
+    expect(panel).to_be_visible()
     datalayer_select = page.locator("select[name='datalayer']")
     expect(datalayer_select).to_be_visible()
     options = page.locator("select[name='datalayer'] option")
@@ -129,7 +133,7 @@ def test_can_change_perms_after_create(tilelayer, live_server, page):
     page.goto(f"{live_server.url}/en/map/new")
     # Create a layer
     page.get_by_title("Manage layers").click()
-    page.get_by_role("button", name="Add a layer").click()
+    page.get_by_title("Add a layer").click()
     page.locator("input[name=name]").fill("Layer 1")
     save = page.get_by_role("button", name="Save")
     expect(save).to_be_visible()
@@ -199,3 +203,24 @@ def test_email_sending_error_are_catched(tilelayer, page, live_server):
             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()
+
+
+@pytest.mark.skip(reason="Changing DEFAULT_FROM_EMAIL at runtime has no effect")
+def test_alert_message_after_create_show_link_even_without_mail(
+    tilelayer, live_server, page, monkeypatch, settings
+):
+    # Disable email
+    settings.DEFAULT_FROM_EMAIL = None
+    page.goto(f"{live_server.url}/en/map/new")
+    with page.expect_response(re.compile(r".*/map/create/")):
+        page.get_by_role("button", name="Save").click()
+    alert = page.locator(".umap-alert")
+    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_hidden()

umap/tests/integration/test_basics.py

@@ -45,3 +45,24 @@ def test_create_map_with_cursor(page, live_server, tilelayer):
             "z-index: 200;"
         ),
     )
+
+
+def test_cannot_put_script_tag_in_datalayer_name_or_description(
+    openmap, live_server, page, tilelayer
+):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}")
+    page.get_by_role("button", name="Edit").click()
+    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Add a layer").click()
+    page.locator('input[name="name"]').click()
+    page.locator('input[name="name"]').fill('<script>alert("attack")</script>')
+    page.locator(".umap-field-description textarea").click()
+    page.locator(".umap-field-description textarea").fill(
+        '<p>before <script>alert("attack")</script> after</p>'
+    )
+    page.get_by_role("button", name="Save").click()
+    page.get_by_role("button", name="About").click()
+    # Title should contain raw HTML (we are using textContent)
+    expect(page.get_by_text('<script>alert("attack")</script>')).to_be_visible()
+    # Description should contain escaped HTML
+    expect(page.get_by_text("before after")).to_be_visible()

umap/tests/integration/test_browser.py

@@ -4,8 +4,6 @@ from time import sleep
 import pytest
 from playwright.sync_api import expect
 
-from umap.models import Map
-
 from ..base import DataLayerFactory
 
 pytestmark = pytest.mark.django_db
@@ -65,7 +63,7 @@ def bootstrap(map, live_server):
 
 def test_data_browser_should_be_open(live_server, page, bootstrap, map):
     page.goto(f"{live_server.url}{map.get_absolute_url()}")
-    el = page.locator(".umap-browse-data")
+    el = page.locator(".umap-browser")
     expect(el).to_be_visible()
     expect(page.get_by_text("one point in france")).to_be_visible()
     expect(page.get_by_text("one line in new zeland")).to_be_visible()
@@ -83,7 +81,7 @@ def test_data_browser_should_be_filterable(live_server, page, bootstrap, map):
     expect(filter_).to_be_visible()
     filter_.type("poly")
     expect(page.get_by_title("Features in this layer: 1/3")).to_be_visible()
-    expect(page.get_by_title("Features in this layer: 1/3")).to_have_text("1/3")
+    expect(page.get_by_title("Features in this layer: 1/3")).to_have_text("(1/3)")
     expect(page.get_by_text("one point in france")).to_be_hidden()
     expect(page.get_by_text("one line in new zeland")).to_be_hidden()
     expect(page.get_by_text("one polygon in greenland")).to_be_visible()
@@ -161,20 +159,19 @@ def test_data_browser_bbox_filter_should_be_persistent(
     el = page.get_by_text("Current map view")
     expect(el).to_be_visible()
     el.click()
-    browser = page.locator("#umap-ui-container")
+    browser = page.locator(".panel.left.on")
     expect(browser.get_by_text("one point in france")).to_be_visible()
     expect(browser.get_by_text("one line in new zeland")).to_be_hidden()
     expect(browser.get_by_text("one polygon in greenland")).to_be_hidden()
     # Close and reopen the browser to make sure this settings is persistent
-    close = browser.get_by_text("Close")
+    close = browser.get_by_title("Close")
     close.click()
     expect(browser).to_be_hidden()
     sleep(0.5)
     expect(browser.get_by_text("one point in france")).to_be_hidden()
     expect(browser.get_by_text("one line in new zeland")).to_be_hidden()
     expect(browser.get_by_text("one polygon in greenland")).to_be_hidden()
-    page.get_by_title("See data layers").click()
-    page.get_by_role("button", name="Browse data").click()
+    page.get_by_title("See layers").click()
     expect(browser.get_by_text("one point in france")).to_be_visible()
     expect(browser.get_by_text("one line in new zeland")).to_be_hidden()
     expect(browser.get_by_text("one polygon in greenland")).to_be_hidden()
@@ -187,7 +184,7 @@ def test_data_browser_bbox_filtered_is_clickable(live_server, page, bootstrap, m
     el = page.get_by_text("Current map view")
     expect(el).to_be_visible()
     el.click()
-    browser = page.locator("#umap-ui-container")
+    browser = page.locator(".panel.left.on")
     expect(browser.get_by_text("one point in france")).to_be_visible()
     expect(browser.get_by_text("one line in new zeland")).to_be_hidden()
     expect(browser.get_by_text("one polygon in greenland")).to_be_hidden()
@@ -219,18 +216,6 @@ def test_data_browser_with_variable_in_name(live_server, page, bootstrap, map):
     expect(page.get_by_text("one polygon in greenland (polygon)")).to_be_visible()
 
 
-def test_can_open_databrowser_from_layers_list(live_server, map, page, bootstrap):
-    page.goto(f"{live_server.url}{map.get_absolute_url()}")
-    page.get_by_title("See data layers").click()
-    page.get_by_role("button", name="Browse data").click()
-    browser = page.locator(".umap-browse-data")
-    expect(browser).to_be_visible()
-    expect(browser.get_by_text("test datalayer")).to_be_visible()
-    expect(browser.get_by_text("one point in france")).to_be_visible()
-    expect(browser.get_by_text("one line in new zeland")).to_be_visible()
-    expect(browser.get_by_text("one polygon in greenland")).to_be_visible()
-
-
 def test_should_sort_features_in_natural_order(live_server, map, page):
     map.settings["properties"]["onLoadPanel"] = "databrowser"
     map.save()
@@ -240,20 +225,18 @@ def test_should_sort_features_in_natural_order(live_server, map, page):
     datalayer_data["features"][2]["properties"]["name"] = "100. a line"
     DataLayerFactory(map=map, data=datalayer_data)
     page.goto(f"{live_server.url}{map.get_absolute_url()}")
-    features = page.locator(".umap-browse-data li")
+    features = page.locator(".umap-browser .datalayer li")
     expect(features).to_have_count(3)
     expect(features.nth(0)).to_have_text("1. a poly")
     expect(features.nth(1)).to_have_text("9. a marker")
     expect(features.nth(2)).to_have_text("100. a line")
 
 
-def test_should_redraw_list_on_feature_delete(live_server, map, page, bootstrap):
-    map.edit_status = Map.ANONYMOUS
-    map.save()
-    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+def test_should_redraw_list_on_feature_delete(live_server, openmap, page, bootstrap):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}")
     # Enable edit
     page.get_by_role("button", name="Edit").click()
-    buttons = page.locator(".umap-browse-data li .feature-delete")
+    buttons = page.locator(".umap-browser .datalayer li .icon-delete")
     expect(buttons).to_have_count(3)
     page.on("dialog", lambda dialog: dialog.accept())
     buttons.nth(0).click()
@@ -269,7 +252,7 @@ def test_should_show_header_for_display_on_load_false(
     datalayer.settings["name"] = "This layer is not loaded"
     datalayer.save()
     page.goto(f"{live_server.url}{map.get_absolute_url()}")
-    browser = page.locator(".umap-browse-data")
+    browser = page.locator(".umap-browser")
     expect(browser).to_be_visible()
     expect(browser.get_by_text("This layer is not loaded")).to_be_visible()
 
@@ -283,7 +266,7 @@ def test_should_use_color_variable(live_server, map, page):
     datalayer_data["features"][2]["properties"]["mycolor"] = "DarkGreen"
     DataLayerFactory(map=map, data=datalayer_data)
     page.goto(f"{live_server.url}{map.get_absolute_url()}")
-    features = page.locator(".umap-browse-data li .feature-color")
+    features = page.locator(".umap-browser .datalayer li .feature-color")
     expect(features).to_have_count(3)
     # DarkGreen
     expect(features.nth(0)).to_have_css("background-color", "rgb(0, 100, 0)")
@@ -299,18 +282,15 @@ def test_should_allow_to_toggle_datalayer_visibility(live_server, map, page, boo
     paths = page.locator(".leaflet-overlay-pane path")
     expect(markers).to_have_count(1)
     expect(paths).to_have_count(2)
-    toggle = page.locator("#umap-ui-container").get_by_title("Show/hide layer")
+    toggle = page.locator(".umap-browser").get_by_title("Show/hide layer")
     toggle.click()
     expect(markers).to_have_count(0)
     expect(paths).to_have_count(0)
 
 
-def test_should_have_edit_buttons_in_edit_mode(live_server, map, page, bootstrap):
-    # Faster than doing a login
-    map.edit_status = Map.ANONYMOUS
-    map.save()
-    page.goto(f"{live_server.url}{map.get_absolute_url()}")
-    browser = page.locator("#umap-ui-container")
+def test_should_have_edit_buttons_in_edit_mode(live_server, openmap, page, bootstrap):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}")
+    browser = page.locator(".umap-browser")
     edit_layer = browser.get_by_title("Edit", exact=True)
     in_table = browser.get_by_title("Edit properties in a table")
     delete_layer = browser.get_by_title("Delete layer")