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

umap/templatetags/umap_tags.py

@@ -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

@@ -1,5 +1,5 @@
-import json
 import copy
+import json
 
 import factory
 from django.contrib.auth import get_user_model
@@ -124,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

@@ -77,4 +77,3 @@ def datalayer(map):
 @pytest.fixture
 def tilelayer():
     return TileLayerFactory()
-

umap/tests/integration/test_picto.py

@@ -1,8 +1,8 @@
 from pathlib import Path
 
 import pytest
-from playwright.sync_api import expect
 from django.core.files.base import ContentFile
+from playwright.sync_api import expect
 
 from umap.models import Map, Pictogram
 

umap/tests/integration/test_slideshow.py

@@ -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

@@ -5,15 +5,17 @@ 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",
         }
     }
 

umap/tests/test_datalayer.py

@@ -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

@@ -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/tests/test_map_views.py

@@ -3,8 +3,8 @@ import json
 import pytest
 from django.contrib.auth import get_user_model
 from django.core import mail
-from django.urls import reverse
 from django.core.signing import Signer
+from django.urls import reverse
 
 from umap.models import DataLayer, Map, Star
 
@@ -275,9 +275,7 @@ def test_owner_cannot_access_map_with_share_status_blocked(client, map):
     assert response.status_code == 403
 
 
-def test_non_editor_cannot_access_map_if_share_status_private(
-    client, map, user
-):  # noqa
+def test_non_editor_cannot_access_map_if_share_status_private(client, map, user):  # noqa
     url = reverse("map", args=(map.slug, map.pk))
     map.share_status = map.PRIVATE
     map.save()
@@ -355,9 +353,7 @@ def test_anonymous_update_without_cookie_fails(client, anonymap, post_data):  #
 
 
 @pytest.mark.usefixtures("allow_anonymous")
-def test_anonymous_update_with_cookie_should_work(
-    cookieclient, anonymap, post_data
-):  # noqa
+def test_anonymous_update_with_cookie_should_work(cookieclient, anonymap, post_data):  # noqa
     url = reverse("map_update", kwargs={"map_id": anonymap.pk})
     # POST only mendatory fields
     name = "new map name"
@@ -438,9 +434,7 @@ def test_clone_anonymous_map_should_not_be_possible_if_user_is_not_allowed(
 
 
 @pytest.mark.usefixtures("allow_anonymous")
-def test_clone_map_should_be_possible_if_edit_status_is_anonymous(
-    client, anonymap
-):  # noqa
+def test_clone_map_should_be_possible_if_edit_status_is_anonymous(client, anonymap):  # noqa
     assert Map.objects.count() == 1
     url = reverse("map_clone", kwargs={"map_id": anonymap.pk})
     anonymap.edit_status = anonymap.ANONYMOUS

umap/tests/test_tilelayer.py

@@ -6,16 +6,22 @@ pytestmark = pytest.mark.django_db
 
 
 def test_tilelayer_json():
-    tilelayer = TileLayerFactory(attribution='Attribution', maxZoom=19,
-                                 minZoom=0, name='Name', rank=1, tms=True,
-                                 url_template='http://{s}.x.fr/{z}/{x}/{y}')
+    tilelayer = TileLayerFactory(
+        attribution="Attribution",
+        maxZoom=19,
+        minZoom=0,
+        name="Name",
+        rank=1,
+        tms=True,
+        url_template="http://{s}.x.fr/{z}/{x}/{y}",
+    )
     assert tilelayer.json == {
-        'attribution': 'Attribution',
-        'id': tilelayer.id,
-        'maxZoom': 19,
-        'minZoom': 0,
-        'name': 'Name',
-        'rank': 1,
-        'tms': True,
-        'url_template': 'http://{s}.x.fr/{z}/{x}/{y}'
+        "attribution": "Attribution",
+        "id": tilelayer.id,
+        "maxZoom": 19,
+        "minZoom": 0,
+        "name": "Name",
+        "rank": 1,
+        "tms": True,
+        "url_template": "http://{s}.x.fr/{z}/{x}/{y}",
     }

umap/tests/test_views.py

@@ -1,17 +1,18 @@
 import json
 import socket
-from datetime import date, timedelta
+from datetime import date, datetime, timedelta
 
 import pytest
 from django.conf import settings
 from django.contrib.auth import get_user, get_user_model
-from django.urls import reverse
 from django.test import RequestFactory
+from django.urls import reverse
+from django.utils.timezone import make_aware
 
 from umap import VERSION
 from umap.views import validate_url
 
-from .base import UserFactory, MapFactory
+from .base import MapFactory, UserFactory
 
 User = get_user_model()
 
@@ -186,9 +187,9 @@ def test_stats_empty(client):
 
 @pytest.mark.django_db
 def test_stats_basic(client, map, datalayer, user2):
-    map.owner.last_login = date.today()
+    map.owner.last_login = make_aware(datetime.now())
     map.owner.save()
-    user2.last_login = date.today() - timedelta(days=8)
+    user2.last_login = make_aware(datetime.now()) - timedelta(days=8)
     user2.save()
     response = client.get(reverse("stats"))
     assert json.loads(response.content.decode()) == {
@@ -280,7 +281,7 @@ def test_user_dashboard_display_user_maps(client, map):
     assert map.name in body
     assert f"{map.get_absolute_url()}?edit" in body
     assert f"{map.get_absolute_url()}?share" in body
-    assert f"{map.get_absolute_url()}?download" in body
+    assert f"/map/{map.pk}/download" in body
     assert "Everyone (public)" in body
     assert "Owner only" in body
 

umap/urls.py

@@ -1,5 +1,4 @@
 from django.conf import settings
-from django.urls import include, path, re_path
 from django.conf.urls.i18n import i18n_patterns
 from django.conf.urls.static import static
 from django.contrib import admin
@@ -7,16 +6,17 @@ from django.contrib.auth import views as auth_views
 from django.contrib.auth.decorators import login_required
 from django.contrib.staticfiles.storage import staticfiles_storage
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+from django.urls import include, path, re_path
 from django.views.decorators.cache import cache_control, cache_page, never_cache
 from django.views.decorators.csrf import ensure_csrf_cookie
 from django.views.generic.base import RedirectView
 
 from . import views
 from .decorators import (
-    jsonize_view,
-    login_required_if_not_anonymous_allowed,
     can_edit_map,
     can_view_map,
+    jsonize_view,
+    login_required_if_not_anonymous_allowed,
 )
 from .utils import decorated_patterns
 

umap/utils.py

@@ -1,8 +1,7 @@
 import gzip
 import os
 
-from django.urls import get_resolver
-from django.urls import URLPattern, URLResolver
+from django.urls import URLPattern, URLResolver, get_resolver
 
 
 def get_uri_template(urlname, args=None, prefix=""):

umap/views.py

@@ -3,16 +3,17 @@ import mimetypes
 import os
 import re
 import socket
-from datetime import date, timedelta
+from datetime import datetime, timedelta
 from http.client import InvalidURL
 from pathlib import Path
-from urllib.error import URLError
-from urllib.parse import quote
+from urllib.error import HTTPError, URLError
+from urllib.parse import quote, urlparse
+from urllib.request import Request, build_opener
 
 from django.conf import settings
 from django.contrib import messages
-from django.contrib.auth import logout as do_logout
 from django.contrib.auth import get_user_model
+from django.contrib.auth import logout as do_logout
 from django.contrib.gis.measure import D
 from django.contrib.postgres.search import SearchQuery, SearchVector
 from django.contrib.staticfiles.storage import staticfiles_storage
@@ -33,6 +34,7 @@ from django.shortcuts import get_object_or_404
 from django.urls import reverse, reverse_lazy
 from django.utils.encoding import smart_bytes
 from django.utils.http import http_date
+from django.utils.timezone import make_aware
 from django.utils.translation import gettext as _
 from django.utils.translation import to_locale
 from django.views.decorators.cache import cache_control
@@ -45,13 +47,13 @@ from django.views.generic.list import ListView
 
 from . import VERSION
 from .forms import (
+    DEFAULT_CENTER,
     DEFAULT_LATITUDE,
     DEFAULT_LONGITUDE,
-    DEFAULT_CENTER,
-    DataLayerForm,
-    DataLayerPermissionsForm,
     AnonymousDataLayerPermissionsForm,
     AnonymousMapPermissionsForm,
+    DataLayerForm,
+    DataLayerPermissionsForm,
     FlatErrorList,
     MapSettingsForm,
     SendLinkForm,
@@ -61,16 +63,6 @@ from .forms import (
 from .models import DataLayer, Licence, Map, Pictogram, Star, TileLayer
 from .utils import get_uri_template, gzip_file, is_ajax
 
-try:
-    # python3
-    from urllib.parse import urlparse
-    from urllib.request import Request, build_opener
-    from urllib.error import HTTPError
-except ImportError:
-    from urlparse import urlparse
-    from urllib2 import Request, HTTPError, build_opener
-
-
 User = get_user_model()
 
 
@@ -140,8 +132,6 @@ class Home(PaginatorMixin, TemplateView, PublicMapsMixin):
                 demo_map = Map.public.get(pk=settings.UMAP_DEMO_PK)
             except Map.DoesNotExist:
                 pass
-            else:
-                maps = maps.exclude(id=demo_map.pk)
 
         showcase_map = None
         if hasattr(settings, "UMAP_SHOWCASE_PK"):
@@ -149,8 +139,6 @@ class Home(PaginatorMixin, TemplateView, PublicMapsMixin):
                 showcase_map = Map.public.get(pk=settings.UMAP_SHOWCASE_PK)
             except Map.DoesNotExist:
                 pass
-            else:
-                maps = maps.exclude(id=showcase_map.pk)
 
         maps = self.paginate(maps, settings.UMAP_MAPS_PER_PAGE)
 
@@ -407,7 +395,7 @@ def _urls_for_js(urls=None):
     """
     if urls is None:
         # prevent circular import
-        from .urls import urlpatterns, i18n_urls
+        from .urls import i18n_urls, urlpatterns
 
         urls = [
             url.name for url in urlpatterns + i18n_urls if getattr(url, "name", None)
@@ -1023,7 +1011,7 @@ class PictogramJSONList(ListView):
 
 
 def stats(request):
-    last_week = date.today() - timedelta(days=7)
+    last_week = make_aware(datetime.now()) - timedelta(days=7)
     return simple_json_response(
         **{
             "version": VERSION,

umap/wsgi.py

@@ -15,13 +15,13 @@ framework.
 """
 import os
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE",
-                      "umap.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "umap.settings")
 
 # This application object is used by any WSGI server configured to use this
 # file. This includes Django's development server, if the WSGI_APPLICATION
 # setting points here.
 from django.core.wsgi import get_wsgi_application
+
 application = get_wsgi_application()
 
 # Apply WSGI middleware here.

{umap_project-1.11.0.dist-info → umap_project-1.11.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: umap-project
-Version: 1.11.0
+Version: 1.11.1
 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>
@@ -11,37 +11,39 @@ Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.4
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Requires-Dist: django-agnocomplete==2.2.0
 Requires-Dist: django-compressor==4.3.1
 Requires-Dist: django-environ==0.10.0
 Requires-Dist: django-probes==1.7.0
-Requires-Dist: django>=4.1
+Requires-Dist: django<5,>=4.2
 Requires-Dist: pillow==10.0.1
 Requires-Dist: psycopg2==2.9.6
 Requires-Dist: requests==2.31.0
 Requires-Dist: social-auth-app-django==5.2.0
 Requires-Dist: social-auth-core==4.4.2
 Provides-Extra: dev
-Requires-Dist: black==23.3.0; extra == 'dev'
 Requires-Dist: djlint==1.31.0; extra == 'dev'
 Requires-Dist: hatch==1.7.0; extra == 'dev'
+Requires-Dist: isort==5.12; extra == 'dev'
 Requires-Dist: mkdocs==1.5.2; extra == 'dev'
+Requires-Dist: pymdown-extensions==10.4; extra == 'dev'
+Requires-Dist: ruff==0.1.6; extra == 'dev'
+Requires-Dist: vermin==1.5.2; extra == 'dev'
 Provides-Extra: docker
 Requires-Dist: uwsgi==2.0.21; extra == 'docker'
 Provides-Extra: test
 Requires-Dist: factory-boy==3.2.1; extra == 'test'
-Requires-Dist: playwright==1.38.0; extra == 'test'
+Requires-Dist: playwright<2,>=1.39; extra == 'test'
 Requires-Dist: pytest-django==4.5.2; extra == 'test'
-Requires-Dist: pytest-playwright==0.4.2; extra == 'test'
+Requires-Dist: pytest-playwright<1,>=0.4.3; extra == 'test'
+Requires-Dist: pytest-xdist<4,>=3.5.0; extra == 'test'
 Requires-Dist: pytest==6.2.5; extra == 'test'
 Description-Content-Type: text/markdown