PyPI - umap-project - Versions diffs - 1.10.0__py3-none-any.whl → 1.11.1__py3-none-any.whl - Mend

umap-project 1.10.0py3-none-any.whl → 1.11.1py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of umap-project might be problematic. Click here for more details.

Files changed (181) hide show

umap/__init__.py +1 -1
umap/admin.py +7 -3
umap/autocomplete.py +3 -5
umap/bin/__init__.py +2 -5
umap/decorators.py +4 -5
umap/forms.py +5 -5
umap/locale/en/LC_MESSAGES/django.po +23 -23
umap/locale/fr/LC_MESSAGES/django.mo +0 -0
umap/locale/fr/LC_MESSAGES/django.po +28 -27
umap/management/commands/generate_js_locale.py +9 -11
umap/management/commands/import_pictograms.py +49 -28
umap/managers.py +5 -3
umap/middleware.py +2 -3
umap/migrations/0001_initial.py +204 -56
umap/migrations/0002_tilelayer_tms.py +3 -4
umap/migrations/0003_add_tilelayer.py +13 -9
umap/migrations/0004_add_licence.py +3 -6
umap/migrations/0005_remove_map_tilelayer.py +3 -4
umap/migrations/0006_auto_20190407_0719.py +6 -5
umap/migrations/0007_auto_20190416_1757.py +13 -5
umap/migrations/0008_alter_map_settings.py +0 -1
umap/migrations/0009_star.py +27 -8
umap/migrations/0010_alter_map_edit_status_alter_map_share_status.py +20 -8
umap/migrations/0011_alter_map_edit_status_alter_map_share_status.py +21 -8
umap/migrations/0014_map_created_at.py +1 -1
umap/migrations/0015_alter_pictogram_pictogram.py +17 -0
umap/migrations/0016_pictogram_category.py +17 -0
umap/models.py +9 -7
umap/settings/base.py +1 -4
umap/static/umap/base.css +59 -20
umap/static/umap/content.css +2 -13
umap/static/umap/favicons/apple-touch-icon.png +0 -0
umap/static/umap/favicons/favicon.ico +0 -0
umap/static/umap/favicons/icon-192.png +0 -0
umap/static/umap/favicons/icon-512.png +0 -0
umap/static/umap/favicons/icon.svg +5 -0
umap/static/umap/img/16-white.svg +20 -9
umap/static/umap/img/24-white.svg +2 -2
umap/static/umap/img/source/16-white.svg +25 -13
umap/static/umap/img/source/24-white.svg +5 -5
umap/static/umap/js/umap.controls.js +15 -23
umap/static/umap/js/umap.core.js +33 -24
umap/static/umap/js/umap.features.js +24 -2
umap/static/umap/js/umap.forms.js +182 -84
umap/static/umap/js/umap.icon.js +19 -14
umap/static/umap/js/umap.js +14 -32
umap/static/umap/js/umap.layer.js +13 -2
umap/static/umap/js/umap.popup.js +21 -0
umap/static/umap/locale/am_ET.js +9 -4
umap/static/umap/locale/am_ET.json +9 -4
umap/static/umap/locale/ar.js +9 -4
umap/static/umap/locale/ar.json +9 -4
umap/static/umap/locale/ast.js +9 -4
umap/static/umap/locale/ast.json +9 -4
umap/static/umap/locale/bg.js +9 -4
umap/static/umap/locale/bg.json +9 -4
umap/static/umap/locale/br.js +20 -15
umap/static/umap/locale/br.json +20 -15
umap/static/umap/locale/ca.js +9 -4
umap/static/umap/locale/ca.json +9 -4
umap/static/umap/locale/cs_CZ.js +9 -4
umap/static/umap/locale/cs_CZ.json +9 -4
umap/static/umap/locale/da.js +9 -4
umap/static/umap/locale/da.json +9 -4
umap/static/umap/locale/de.js +9 -4
umap/static/umap/locale/de.json +9 -4
umap/static/umap/locale/el.js +9 -4
umap/static/umap/locale/el.json +9 -4
umap/static/umap/locale/en.js +9 -4
umap/static/umap/locale/en.json +9 -4
umap/static/umap/locale/en_US.json +9 -4
umap/static/umap/locale/es.js +15 -10
umap/static/umap/locale/es.json +15 -10
umap/static/umap/locale/et.js +9 -4
umap/static/umap/locale/et.json +9 -4
umap/static/umap/locale/fa_IR.js +9 -4
umap/static/umap/locale/fa_IR.json +9 -4
umap/static/umap/locale/fi.js +9 -4
umap/static/umap/locale/fi.json +9 -4
umap/static/umap/locale/fr.js +10 -5
umap/static/umap/locale/fr.json +10 -5
umap/static/umap/locale/gl.js +9 -4
umap/static/umap/locale/gl.json +9 -4
umap/static/umap/locale/he.js +9 -4
umap/static/umap/locale/he.json +9 -4
umap/static/umap/locale/hr.js +9 -4
umap/static/umap/locale/hr.json +9 -4
umap/static/umap/locale/hu.js +64 -59
umap/static/umap/locale/hu.json +64 -59
umap/static/umap/locale/id.js +9 -4
umap/static/umap/locale/id.json +9 -4
umap/static/umap/locale/is.js +9 -4
umap/static/umap/locale/is.json +9 -4
umap/static/umap/locale/it.js +9 -4
umap/static/umap/locale/it.json +9 -4
umap/static/umap/locale/ja.js +9 -4
umap/static/umap/locale/ja.json +9 -4
umap/static/umap/locale/ko.js +9 -4
umap/static/umap/locale/ko.json +9 -4
umap/static/umap/locale/lt.js +9 -4
umap/static/umap/locale/lt.json +9 -4
umap/static/umap/locale/ms.js +15 -10
umap/static/umap/locale/ms.json +15 -10
umap/static/umap/locale/nl.js +9 -4
umap/static/umap/locale/nl.json +9 -4
umap/static/umap/locale/no.js +9 -4
umap/static/umap/locale/no.json +9 -4
umap/static/umap/locale/pl.js +9 -4
umap/static/umap/locale/pl.json +9 -4
umap/static/umap/locale/pl_PL.json +9 -4
umap/static/umap/locale/pt.js +9 -4
umap/static/umap/locale/pt.json +9 -4
umap/static/umap/locale/pt_BR.js +9 -4
umap/static/umap/locale/pt_BR.json +9 -4
umap/static/umap/locale/pt_PT.js +9 -4
umap/static/umap/locale/pt_PT.json +9 -4
umap/static/umap/locale/ro.js +9 -4
umap/static/umap/locale/ro.json +9 -4
umap/static/umap/locale/ru.js +9 -4
umap/static/umap/locale/ru.json +9 -4
umap/static/umap/locale/si.js +55 -20
umap/static/umap/locale/si.json +55 -20
umap/static/umap/locale/sk_SK.js +9 -4
umap/static/umap/locale/sk_SK.json +9 -4
umap/static/umap/locale/sl.js +9 -4
umap/static/umap/locale/sl.json +9 -4
umap/static/umap/locale/sr.js +9 -4
umap/static/umap/locale/sr.json +9 -4
umap/static/umap/locale/sv.js +9 -4
umap/static/umap/locale/sv.json +9 -4
umap/static/umap/locale/th_TH.js +9 -4
umap/static/umap/locale/th_TH.json +9 -4
umap/static/umap/locale/tr.js +9 -4
umap/static/umap/locale/tr.json +9 -4
umap/static/umap/locale/uk_UA.js +9 -4
umap/static/umap/locale/uk_UA.json +9 -4
umap/static/umap/locale/vi.js +9 -4
umap/static/umap/locale/vi.json +9 -4
umap/static/umap/locale/vi_VN.json +9 -4
umap/static/umap/locale/zh.js +9 -4
umap/static/umap/locale/zh.json +9 -4
umap/static/umap/locale/zh_CN.json +9 -4
umap/static/umap/locale/zh_TW.Big5.json +9 -4
umap/static/umap/locale/zh_TW.js +9 -4
umap/static/umap/locale/zh_TW.json +9 -4
umap/static/umap/map.css +104 -21
umap/static/umap/nav.css +0 -1
umap/static/umap/test/Controls.js +0 -1
umap/static/umap/test/Feature.js +29 -0
umap/static/umap/test/Map.Export.js +2 -127
umap/static/umap/test/Util.js +10 -0
umap/static/umap/test/_pre.js +2 -3
umap/static/umap/vendors/formbuilder/Leaflet.FormBuilder.js +13 -2
umap/static/umap/vendors/leaflet/leaflet-src.js +7144 -7144
umap/templates/auth/user_form.html +2 -2
umap/templates/base.html +11 -0
umap/templates/umap/map_table.html +3 -3
umap/templatetags/umap_tags.py +32 -34
umap/tests/base.py +4 -4
umap/tests/conftest.py +3 -6
umap/tests/fixtures/circle.svg +4 -0
umap/tests/fixtures/star.svg +4 -0
umap/tests/integration/test_export_map.py +5 -18
umap/tests/integration/test_picto.py +217 -0
umap/tests/integration/test_slideshow.py +70 -0
umap/tests/settings.py +11 -5
umap/tests/test_datalayer.py +7 -6
umap/tests/test_map.py +6 -5
umap/tests/test_map_views.py +82 -10
umap/tests/test_tilelayer.py +17 -11
umap/tests/test_views.py +36 -9
umap/urls.py +27 -4
umap/utils.py +1 -2
umap/views.py +67 -35
umap/wsgi.py +2 -2
{umap_project-1.10.0.dist-info → umap_project-1.11.1.dist-info}/METADATA +11 -9
{umap_project-1.10.0.dist-info → umap_project-1.11.1.dist-info}/RECORD +180 -170
umap/static/favicon.ico +0 -0
{umap_project-1.10.0.dist-info → umap_project-1.11.1.dist-info}/WHEEL +0 -0
{umap_project-1.10.0.dist-info → umap_project-1.11.1.dist-info}/entry_points.txt +0 -0
{umap_project-1.10.0.dist-info → umap_project-1.11.1.dist-info}/licenses/LICENSE +0 -0

umap/templates/auth/user_form.html CHANGED Viewed

@@ -3,7 +3,7 @@
 {% block maincontent %}
   <div class="col wide">
     <h2 class="section tabs">
-      <a href="{% url 'user_dashboard' %}">{% trans "My Dashboard" %}</a> | {% trans "My Profile" %}
+      <a href="{% url "user_dashboard" %}">{% trans "My Dashboard" %}</a> | {% trans "My Profile" %}
     </h2>
   </div>
   <div class="wrapper">
@@ -16,7 +16,7 @@
       <form id="user_form" method="post">
         {% csrf_token %}
         {{ form }}
-        <input type="submit" value="{% trans 'Save' %}" />
+        <input type="submit" value="{% trans "Save" %}" />
       </form>
     </div>
     {% if backends.backends|length %}

umap/templates/base.html CHANGED Viewed

@@ -15,6 +15,17 @@
     {% endblock extra_head %}
     <meta name="viewport"
           content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+    {# See https://evilmartians.com/chronicles/how-to-favicon-in-2021-six-files-that-fit-most-needs #}
+    <link rel="icon"
+          href="{{ STATIC_URL }}umap/favicons/favicon.ico"
+          sizes="32x32">
+    <link rel="icon"
+          href="{{ STATIC_URL }}umap/favicons/icon.svg"
+          type="image/svg+xml">
+    <link rel="apple-touch-icon"
+          href="{{ STATIC_URL }}umap/favicons/apple-touch-icon.png">
+    <!-- 180×180 -->
+    <link rel="manifest" href="/manifest.webmanifest">
   </head>
   <body class="{% block body_class %}{% endblock body_class %}">
     {% block header %}

umap/templates/umap/map_table.html CHANGED Viewed

@@ -25,9 +25,9 @@
           <a href="{{ map_inst.owner.get_url }}">{{ map_inst.owner }}</a>
         </td>
         <td>
-          <a href="{{ map_inst.get_absolute_url }}?share">{% translate "Share" %}</a>
-          <a href="{{ map_inst.get_absolute_url }}?edit">{% translate "Edit" %}</a>
-          <a href="{{ map_inst.get_absolute_url }}?download">{% translate "Download" %}</a>
+          <a href="{{ map_inst.get_absolute_url }}?share">{% translate "Share" %}</a> |
+          <a href="{{ map_inst.get_absolute_url }}?edit">{% translate "Edit" %}</a> |
+          <a href="{% url 'map_download' map_inst.pk %}">{% translate "Download" %}</a>
         </td>
       </tr>
     {% endfor %}

umap/templatetags/umap_tags.py CHANGED Viewed

@@ -10,53 +10,50 @@ from ..views import _urls_for_js
 register = template.Library()
-@register.inclusion_tag('umap/css.html')
+@register.inclusion_tag("umap/css.html")
 def umap_css():
-    return {
-        "STATIC_URL": settings.STATIC_URL
-    }
+    return {"STATIC_URL": settings.STATIC_URL}
-@register.inclusion_tag('umap/js.html')
+@register.inclusion_tag("umap/js.html")
 def umap_js(locale=None):
-    return {
-        "STATIC_URL": settings.STATIC_URL,
-        "locale": locale
-    }
+    return {"STATIC_URL": settings.STATIC_URL, "locale": locale}
-@register.inclusion_tag('umap/map_fragment.html')
+@register.inclusion_tag("umap/map_fragment.html")
 def map_fragment(map_instance, **kwargs):
     layers = DataLayer.objects.filter(map=map_instance)
     datalayer_data = [c.metadata() for c in layers]
     map_settings = map_instance.settings
     if "properties" not in map_settings:
-        map_settings['properties'] = {}
-    map_settings['properties'].update({
-        'tilelayers': [TileLayer.get_default().json],
-        'datalayers': datalayer_data,
-        'urls': _urls_for_js(),
-        'STATIC_URL': settings.STATIC_URL,
-        "editMode": 'disabled',
-        'hash': False,
-        'attributionControl': False,
-        'scrollWheelZoom': False,
-        'umapAttributionControl': False,
-        'noControl': True,
-        'umap_id': map_instance.pk,
-        'onLoadPanel': "none",
-        'captionBar': False,
-        'default_iconUrl': "%sumap/img/marker.png" % settings.STATIC_URL,
-        'slideshow': {}
-    })
-    map_settings['properties'].update(kwargs)
-    prefix = kwargs.pop('prefix', None) or 'map'
-    page = kwargs.pop('page', None) or ''
+        map_settings["properties"] = {}
+    map_settings["properties"].update(
+        {
+            "tilelayers": [TileLayer.get_default().json],
+            "datalayers": datalayer_data,
+            "urls": _urls_for_js(),
+            "STATIC_URL": settings.STATIC_URL,
+            "editMode": "disabled",
+            "hash": False,
+            "attributionControl": False,
+            "scrollWheelZoom": False,
+            "umapAttributionControl": False,
+            "noControl": True,
+            "umap_id": map_instance.pk,
+            "onLoadPanel": "none",
+            "captionBar": False,
+            "default_iconUrl": "%sumap/img/marker.png" % settings.STATIC_URL,
+            "slideshow": {},
+        }
+    )
+    map_settings["properties"].update(kwargs)
+    prefix = kwargs.pop("prefix", None) or "map"
+    page = kwargs.pop("page", None) or ""
     unique_id = prefix + str(page) + "_" + str(map_instance.pk)
     return {
         "map_settings": json.dumps(map_settings),
         "map": map_instance,
-        "unique_id": unique_id
+        "unique_id": unique_id,
     }
@@ -73,7 +70,7 @@ def tilelayer_preview(tilelayer):
 @register.filter
 def notag(s):
-    return s.replace('<', '&lt;')
+    return s.replace("<", "&lt;")
 @register.simple_tag(takes_context=True)
@@ -86,5 +83,6 @@ def paginate_querystring(context, page):
 @register.filter
 def ipdb(what):
     import ipdb
     ipdb.set_trace()
-    return ''
+    return ""

umap/tests/base.py CHANGED Viewed

@@ -1,5 +1,5 @@
-import json
 import copy
+import json
 import factory
 from django.contrib.auth import get_user_model
@@ -71,13 +71,11 @@ class MapFactory(factory.django.DjangoModelFactory):
             "properties": {
                 "datalayersControl": True,
                 "description": "Which is just the Danube, at the end",
-                "displayCaptionOnLoad": False,
-                "displayDataBrowserOnLoad": False,
                 "displayPopupFooter": False,
                 "licence": "",
                 "miniMap": False,
                 "moreControl": True,
-                "name": "Cruising on the Donau",
+                "name": name,
                 "scaleControl": True,
                 "tilelayer": {
                     "attribution": "\xa9 OSM Contributors",
@@ -100,6 +98,7 @@ class MapFactory(factory.django.DjangoModelFactory):
     def _adjust_kwargs(cls, **kwargs):
         # Make sure there is no persistency
         kwargs["settings"] = copy.deepcopy(kwargs["settings"])
+        kwargs["settings"]["properties"]["name"] = kwargs["name"]
         return kwargs
     class Meta:
@@ -125,6 +124,7 @@ class DataLayerFactory(factory.django.DjangoModelFactory):
                 **DataLayerFactory.settings._defaults,
                 **kwargs["settings"],
             }
+        data.setdefault("_umap_options", {})
         data["_umap_options"]["name"] = kwargs["name"]
         kwargs["geojson"] = ContentFile(json.dumps(data), "foo.json")
         return kwargs

umap/tests/conftest.py CHANGED Viewed

@@ -9,10 +9,10 @@ from umap.models import Map
 from .base import (
     DataLayerFactory,
+    LicenceFactory,
     MapFactory,
-    UserFactory,
     TileLayerFactory,
-    LicenceFactory,
+    UserFactory,
 )
 TMP_ROOT = tempfile.mkdtemp()
@@ -24,11 +24,8 @@ def pytest_configure(config):
     settings.MEDIA_ROOT = TMP_ROOT
-def pytest_unconfigure(config):
-    shutil.rmtree(TMP_ROOT, ignore_errors=True)
 def pytest_runtest_teardown():
+    shutil.rmtree(TMP_ROOT, ignore_errors=True)
     cache.clear()

umap/tests/fixtures/circle.svg ADDED Viewed

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="circle" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M14,7.5c0,3.5899-2.9101,6.5-6.5,6.5S1,11.0899,1,7.5S3.9101,1,7.5,1S14,3.9101,14,7.5z"/>
+</svg>

umap/tests/fixtures/star.svg ADDED Viewed

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="star" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path id="path4749-2-8-2" d="M7.5,0l-2,5h-5l4,3.5l-2,6l5-3.5&#xA;&#x9;l5,3.5l-2-6l4-3.5h-5L7.5,0z"/>
+</svg>

umap/tests/integration/test_export_map.py CHANGED Viewed

@@ -9,12 +9,12 @@ pytestmark = pytest.mark.django_db
 def test_umap_export(map, live_server, datalayer, page):
     page.goto(f"{live_server.url}{map.get_absolute_url()}?share")
-    button = page.get_by_role("button", name="Download data")
-    expect(button).to_be_visible()
+    link = page.get_by_role("link", name="Download full data")
+    expect(link).to_be_visible()
     with page.expect_download() as download_info:
-        button.click()
+        link.click()
     download = download_info.value
-    assert download.suggested_filename == "test_map.umap"
+    assert download.suggested_filename == "umap_backup_test-map.umap"
     path = Path("/tmp/") / download.suggested_filename
     download.save_as(path)
     downloaded = json.loads(path.read_text())
@@ -29,14 +29,12 @@ def test_umap_export(map, live_server, datalayer, page):
                 "_umap_options": {
                     "browsable": True,
                     "displayOnLoad": True,
-                    "editMode": "disabled",
-                    "inCaption": True,
                     "name": "test datalayer",
                 },
                 "features": [
                     {
                         "geometry": {
-                            "coordinates": [13.688965, 48.552978],
+                            "coordinates": [13.68896484375, 48.55297816440071],
                             "type": "Point",
                         },
                         "properties": {
@@ -51,25 +49,14 @@ def test_umap_export(map, live_server, datalayer, page):
             }
         ],
         "properties": {
-            "captionBar": False,
-            "captionMenus": True,
             "datalayersControl": True,
             "description": "Which is just the Danube, at the end",
             "displayPopupFooter": False,
-            "easing": False,
-            "embedControl": True,
-            "fullscreenControl": True,
             "licence": "",
-            "limitBounds": {},
             "miniMap": False,
             "moreControl": True,
             "name": "test map",
-            "overlay": None,
-            "permanentCreditBackground": True,
             "scaleControl": True,
-            "scrollWheelZoom": True,
-            "searchControl": True,
-            "slideshow": {},
             "tilelayer": {
                 "attribution": "© OSM Contributors",
                 "maxZoom": 18,

umap/tests/integration/test_picto.py ADDED Viewed

@@ -0,0 +1,217 @@
+from pathlib import Path
+import pytest
+from django.core.files.base import ContentFile
+from playwright.sync_api import expect
+from umap.models import Map, Pictogram
+from ..base import DataLayerFactory
+pytestmark = pytest.mark.django_db
+DATALAYER_DATA = {
+    "type": "FeatureCollection",
+    "features": [
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [13.68896484375, 48.55297816440071],
+            },
+            "properties": {"_umap_options": {"color": "DarkCyan"}, "name": "Here"},
+        }
+    ],
+    "_umap_options": {"displayOnLoad": True, "name": "FooBarFoo"},
+}
+FIXTURES = Path(__file__).parent.parent / "fixtures"
+@pytest.fixture
+def pictos():
+    path = FIXTURES / "star.svg"
+    Pictogram(name="star", pictogram=ContentFile(path.read_text(), path.name)).save()
+    path = FIXTURES / "circle.svg"
+    Pictogram(name="circle", pictogram=ContentFile(path.read_text(), path.name)).save()
+def test_can_change_picto_at_map_level(map, live_server, page, pictos):
+    # Faster than doing a login
+    map.edit_status = Map.ANONYMOUS
+    map.save()
+    DataLayerFactory(map=map, data=DATALAYER_DATA)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
+    marker = page.locator(".umap-div-icon img")
+    expect(marker).to_have_count(1)
+    # Should have default img
+    expect(marker).to_have_attribute("src", "/static/umap/img/marker.png")
+    edit_settings = page.get_by_title("Edit map settings")
+    expect(edit_settings).to_be_visible()
+    edit_settings.click()
+    shape_settings = page.get_by_text("Default shape properties")
+    expect(shape_settings).to_be_visible()
+    shape_settings.click()
+    define = page.locator(".umap-field-iconUrl .define")
+    undefine = page.locator(".umap-field-iconUrl .undefine")
+    expect(define).to_be_visible()
+    expect(undefine).to_be_hidden()
+    define.click()
+    symbols = page.locator(".umap-pictogram-choice")
+    expect(symbols).to_have_count(2)
+    search = page.locator(".umap-pictogram-body input")
+    search.type("star")
+    expect(symbols).to_have_count(1)
+    symbols.click()
+    expect(marker).to_have_attribute("src", "/uploads/pictogram/star.svg")
+    undefine.click()
+    expect(marker).to_have_attribute("src", "/static/umap/img/marker.png")
+def test_can_change_picto_at_datalayer_level(map, live_server, page, pictos):
+    # Faster than doing a login
+    map.edit_status = Map.ANONYMOUS
+    map.settings["properties"]["iconUrl"] = "/uploads/pictogram/star.svg"
+    map.save()
+    DataLayerFactory(map=map, data=DATALAYER_DATA)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
+    marker = page.locator(".umap-div-icon img")
+    expect(marker).to_have_count(1)
+    # Should have default img
+    expect(marker).to_have_attribute("src", "/uploads/pictogram/star.svg")
+    # Edit datalayer
+    marker.click(modifiers=["Control", "Shift"])
+    settings = page.get_by_text("Layer properties")
+    expect(settings).to_be_visible()
+    shape_settings = page.get_by_text("Shape properties")
+    expect(shape_settings).to_be_visible()
+    shape_settings.click()
+    define = page.locator(".umap-field-iconUrl .define")
+    undefine = page.locator(".umap-field-iconUrl .undefine")
+    expect(define).to_be_visible()
+    expect(undefine).to_be_hidden()
+    define.click()
+    symbols = page.locator(".umap-pictogram-choice")
+    expect(symbols).to_have_count(2)
+    search = page.locator(".umap-pictogram-body input")
+    search.type("circle")
+    expect(symbols).to_have_count(1)
+    symbols.click()
+    expect(marker).to_have_attribute("src", "/uploads/pictogram/circle.svg")
+    undefine.click()
+    expect(marker).to_have_attribute("src", "/uploads/pictogram/star.svg")
+def test_can_change_picto_at_marker_level(map, live_server, page, pictos):
+    # Faster than doing a login
+    map.edit_status = Map.ANONYMOUS
+    map.settings["properties"]["iconUrl"] = "/uploads/pictogram/star.svg"
+    map.save()
+    DataLayerFactory(map=map, data=DATALAYER_DATA)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
+    marker = page.locator(".umap-div-icon img")
+    expect(marker).to_have_count(1)
+    # Should have default img
+    expect(marker).to_have_attribute("src", "/uploads/pictogram/star.svg")
+    # Edit marker
+    marker.click(modifiers=["Shift"])
+    settings = page.get_by_text("Feature properties")
+    expect(settings).to_be_visible()
+    shape_settings = page.get_by_text("Shape properties")
+    expect(shape_settings).to_be_visible()
+    shape_settings.click()
+    define = page.locator(".umap-field-iconUrl .define")
+    undefine = page.locator(".umap-field-iconUrl .undefine")
+    expect(define).to_be_visible()
+    expect(undefine).to_be_hidden()
+    define.click()
+    symbols = page.locator(".umap-pictogram-choice")
+    expect(symbols).to_have_count(2)
+    search = page.locator(".umap-pictogram-body input")
+    search.type("circle")
+    expect(symbols).to_have_count(1)
+    symbols.click()
+    expect(marker).to_have_attribute("src", "/uploads/pictogram/circle.svg")
+    undefine.click()
+    expect(marker).to_have_attribute("src", "/uploads/pictogram/star.svg")
+def test_can_use_remote_url_as_picto(map, live_server, page, pictos):
+    # Faster than doing a login
+    map.edit_status = Map.ANONYMOUS
+    map.save()
+    DataLayerFactory(map=map, data=DATALAYER_DATA)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
+    marker = page.locator(".umap-div-icon img")
+    expect(marker).to_have_count(1)
+    # Should have default img
+    expect(marker).to_have_attribute("src", "/static/umap/img/marker.png")
+    edit_settings = page.get_by_title("Edit map settings")
+    expect(edit_settings).to_be_visible()
+    edit_settings.click()
+    shape_settings = page.get_by_text("Default shape properties")
+    expect(shape_settings).to_be_visible()
+    shape_settings.click()
+    define = page.locator(".umap-field-iconUrl .define")
+    expect(define).to_be_visible()
+    define.click()
+    url_tab = page.get_by_role("button", name="URL")
+    input_el = page.get_by_placeholder("Add image URL")
+    expect(input_el).to_be_hidden()
+    expect(url_tab).to_be_visible()
+    url_tab.click()
+    expect(input_el).to_be_visible()
+    input_el.fill("https://foo.bar/img.jpg")
+    input_el.blur()
+    expect(marker).to_have_attribute("src", "https://foo.bar/img.jpg")
+    # Now close and reopen the form, it should still be the URL tab
+    close = page.locator("#umap-ui-container").get_by_title("Close")
+    expect(close).to_be_visible()
+    close.click()
+    edit_settings.click()
+    shape_settings.click()
+    modify = page.locator(".umap-field-iconUrl").get_by_text("Change")
+    expect(modify).to_be_visible()
+    modify.click()
+    # Should be on URL tab
+    expect(input_el).to_be_visible()
+def test_can_use_char_as_picto(map, live_server, page, pictos):
+    # Faster than doing a login
+    map.edit_status = Map.ANONYMOUS
+    map.save()
+    DataLayerFactory(map=map, data=DATALAYER_DATA)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
+    marker = page.locator(".umap-div-icon span")
+    # Should have default img, so not a span
+    expect(marker).to_have_count(0)
+    edit_settings = page.get_by_title("Edit map settings")
+    expect(edit_settings).to_be_visible()
+    edit_settings.click()
+    shape_settings = page.get_by_text("Default shape properties")
+    expect(shape_settings).to_be_visible()
+    shape_settings.click()
+    define = page.locator(".umap-field-iconUrl .define")
+    define.click()
+    url_tab = page.get_by_role("button", name="Emoji & Character")
+    input_el = page.get_by_placeholder("Type char or paste emoji")
+    expect(input_el).to_be_hidden()
+    expect(url_tab).to_be_visible()
+    url_tab.click()
+    expect(input_el).to_be_visible()
+    input_el.fill("♩")
+    input_el.blur()
+    expect(marker).to_have_count(1)
+    expect(marker).to_have_text("♩")
+    # Now close and reopen the form, it should still be the URL tab
+    close = page.locator("#umap-ui-container").get_by_title("Close")
+    expect(close).to_be_visible()
+    close.click()
+    edit_settings.click()
+    shape_settings.click()
+    preview = page.locator(".umap-pictogram-choice")
+    expect(preview).to_be_visible()
+    preview.click()
+    # Should be on URL tab
+    expect(input_el).to_be_visible()

umap/tests/integration/test_slideshow.py ADDED Viewed

@@ -0,0 +1,70 @@
+from pathlib import Path
+import pytest
+from django.core.files.base import ContentFile
+from playwright.sync_api import expect
+from umap.models import Map, Pictogram
+from ..base import DataLayerFactory
+pytestmark = pytest.mark.django_db
+DATALAYER_DATA = {
+    "type": "FeatureCollection",
+    "features": [
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [13.6, 48.5],
+            },
+            "properties": {"name": "1st Point"},
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [13.7, 48.4],
+            },
+            "properties": {"name": "2d Point"},
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [13.5, 48.6],
+            },
+            "properties": {"name": "3d Point"},
+        },
+    ],
+}
+def test_can_use_slideshow_manually(map, live_server, page):
+    map.settings["properties"]["slideshow"] = {"active": True, "delay": 5000}
+    map.save()
+    DataLayerFactory(map=map, data=DATALAYER_DATA)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    first_point = page.get_by_text("1st Point")
+    second_point = page.get_by_text("2d Point")
+    third_point = page.get_by_text("3d Point")
+    expect(first_point).to_be_hidden()
+    expect(second_point).to_be_hidden()
+    expect(third_point).to_be_hidden()
+    next_ = page.get_by_title("Zoom to the next")
+    expect(next_).to_be_visible()
+    next_.click()
+    expect(first_point).to_be_visible()
+    next_.click()
+    expect(first_point).to_be_hidden()
+    expect(second_point).to_be_visible()
+    next_.click()
+    expect(first_point).to_be_hidden()
+    expect(second_point).to_be_hidden()
+    expect(third_point).to_be_visible()
+    next_.click()
+    expect(first_point).to_be_visible()
+    expect(second_point).to_be_hidden()
+    expect(third_point).to_be_hidden()

umap/tests/settings.py CHANGED Viewed

@@ -5,14 +5,20 @@ from umap.settings.base import *  # pylint: disable=W0614,W0401
 SECRET_KEY = "justfortests"
 COMPRESS_ENABLED = False
 FROM_EMAIL = "test@test.org"
-EMAIL_BACKEND = 'django.core.mail.backends.locmem.EmailBackend'
+EMAIL_BACKEND = "django.core.mail.backends.locmem.EmailBackend"
-if "TRAVIS" in os.environ:
+if os.environ.get("GITHUB_ACTIONS", False) == "true":
     DATABASES = {
         "default": {
             "ENGINE": "django.contrib.gis.db.backends.postgis",
-            "NAME": "umap",
-            "PORT": 5433,
-            "USER": "travis",
+            "NAME": "postgres",
+            "USER": "postgres",
+            "HOST": "localhost",
+            "PORT": 5432,
+            "PASSWORD": "postgres",
         }
     }
+PASSWORD_HASHERS = [
+    "django.contrib.auth.hashers.MD5PasswordHasher",
+]

umap/tests/test_datalayer.py CHANGED Viewed

@@ -3,9 +3,10 @@ import os
 import pytest
 from django.core.files.base import ContentFile
-from .base import DataLayerFactory, MapFactory
 from umap.models import DataLayer, Map
+from .base import DataLayerFactory, MapFactory
 pytestmark = pytest.mark.django_db
@@ -63,13 +64,13 @@ def test_should_remove_old_versions_on_save(datalayer, map, settings):
     settings.UMAP_KEEP_VERSIONS = 3
     root = datalayer.storage_root()
     before = len(datalayer.geojson.storage.listdir(root)[1])
-    newer = f'{root}/{datalayer.pk}_1440924889.geojson'
-    medium = f'{root}/{datalayer.pk}_1440923687.geojson'
-    older = f'{root}/{datalayer.pk}_1440918637.geojson'
-    other = f'{root}/123456_1440918637.geojson'
+    newer = f"{root}/{datalayer.pk}_1440924889.geojson"
+    medium = f"{root}/{datalayer.pk}_1440923687.geojson"
+    older = f"{root}/{datalayer.pk}_1440918637.geojson"
+    other = f"{root}/123456_1440918637.geojson"
     for path in [medium, newer, older, other]:
         datalayer.geojson.storage.save(path, ContentFile("{}"))
-        datalayer.geojson.storage.save(path + '.gz', ContentFile("{}"))
+        datalayer.geojson.storage.save(path + ".gz", ContentFile("{}"))
     assert len(datalayer.geojson.storage.listdir(root)[1]) == 8 + before
     datalayer.save()
     files = datalayer.geojson.storage.listdir(root)[1]

umap/tests/test_map.py CHANGED Viewed

@@ -50,11 +50,13 @@ def test_editors_can_edit_if_status_editors(map, user):
     assert map.can_edit(user)
-def test_logged_in_user_should_be_allowed_for_anonymous_map_with_anonymous_edit_status(map, user, rf):  # noqa
+def test_logged_in_user_should_be_allowed_for_anonymous_map_with_anonymous_edit_status(
+    map, user, rf
+):  # noqa
     map.owner = None
     map.edit_status = map.ANONYMOUS
     map.save()
-    url = reverse('map_update', kwargs={'map_id': map.pk})
+    url = reverse("map_update", kwargs={"map_id": map.pk})
     request = rf.get(url)
     request.user = user
     assert map.can_edit(user, request)
@@ -70,7 +72,7 @@ def test_anonymous_user_should_not_be_allowed_for_anonymous_map(map, user, rf):
 def test_clone_should_return_new_instance(map, user):
     clone = map.clone()
     assert map.pk != clone.pk
-    assert u"Clone of " + map.name == clone.name
+    assert "Clone of " + map.name == clone.name
     assert map.settings == clone.settings
     assert map.center == clone.center
     assert map.zoom == clone.zoom
@@ -108,8 +110,7 @@ def test_clone_should_clone_datalayers_and_features_too(map, user, datalayer):
 def test_publicmanager_should_get_only_public_maps(map, user, licence):
     map.share_status = map.PUBLIC
     open_map = MapFactory(owner=user, licence=licence, share_status=Map.OPEN)
-    private_map = MapFactory(owner=user, licence=licence,
-                             share_status=Map.PRIVATE)
+    private_map = MapFactory(owner=user, licence=licence, share_status=Map.PRIVATE)
     assert map in Map.public.all()
     assert open_map not in Map.public.all()
     assert private_map not in Map.public.all()

umap-project 1.10.0__py3-none-any.whl → 1.11.1__py3-none-any.whl

Potentially problematic release.

umap-project 1.10.0py3-none-any.whl → 1.11.1py3-none-any.whl