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

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
@@ -603,3 +597,81 @@ def test_can_send_link_on_anonymous_map_with_cookie(cookieclient, anonymap):
     assert resp.status_code == 200
     assert len(mail.outbox) == 1
     assert mail.outbox[0].subject == "The uMap edit link for your map: test map"
+
+
+def test_download(client, map, datalayer):
+    url = reverse("map_download", args=(map.pk,))
+    response = client.get(url)
+    assert response.status_code == 200
+    # Test response is a json
+    j = json.loads(response.content.decode())
+    assert j["type"] == "umap"
+    assert j["uri"] == f"http://testserver/en/map/test-map_{map.pk}"
+    assert j["geometry"] == {
+        "coordinates": [13.447265624999998, 48.94415123418794],
+        "type": "Point",
+    }
+    assert j["properties"] == {
+        "datalayersControl": True,
+        "description": "Which is just the Danube, at the end",
+        "displayPopupFooter": False,
+        "licence": "",
+        "miniMap": False,
+        "moreControl": True,
+        "name": "test map",
+        "scaleControl": True,
+        "tilelayer": {
+            "attribution": "© OSM Contributors",
+            "maxZoom": 18,
+            "minZoom": 0,
+            "url_template": "http://{s}.osm.fr/{z}/{x}/{y}.png",
+        },
+        "tilelayersControl": True,
+        "zoom": 7,
+        "zoomControl": True,
+    }
+    assert j["layers"] == [
+        {
+            "_umap_options": {
+                "browsable": True,
+                "displayOnLoad": True,
+                "name": "test datalayer",
+            },
+            "features": [
+                {
+                    "geometry": {
+                        "coordinates": [13.68896484375, 48.55297816440071],
+                        "type": "Point",
+                    },
+                    "properties": {
+                        "_umap_options": {"color": "DarkCyan", "iconClass": "Ball"},
+                        "description": "Da place anonymous again 755",
+                        "name": "Here",
+                    },
+                    "type": "Feature",
+                }
+            ],
+            "type": "FeatureCollection",
+        },
+    ]
+
+
+@pytest.mark.parametrize("share_status", [Map.PRIVATE, Map.BLOCKED])
+def test_download_shared_status_map(client, map, datalayer, share_status):
+    map.share_status = share_status
+    map.save()
+    url = reverse("map_download", args=(map.pk,))
+    response = client.get(url)
+    assert response.status_code == 403
+
+
+def test_download_my_map(client, map, datalayer):
+    map.share_status = Map.PRIVATE
+    map.save()
+    client.login(username=map.owner.username, password="123123")
+    url = reverse("map_download", args=(map.pk,))
+    response = client.get(url)
+    assert response.status_code == 200
+    # Test response is a json
+    j = json.loads(response.content.decode())
+    assert j["type"] == "umap"

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
 
@@ -289,8 +290,8 @@ def test_user_dashboard_display_user_maps(client, map):
 def test_user_dashboard_display_user_maps_distinct(client, map):
     # cf https://github.com/umap-project/umap/issues/1325
     anonymap = MapFactory(name="Map witout owner should not appear")
-    user1 = UserFactory(username='user1')
-    user2 = UserFactory(username='user2')
+    user1 = UserFactory(username="user1")
+    user2 = UserFactory(username="user2")
     map.editors.add(user1)
     map.editors.add(user2)
     map.save()
@@ -298,7 +299,7 @@ def test_user_dashboard_display_user_maps_distinct(client, map):
     response = client.get(reverse("user_dashboard"))
     assert response.status_code == 200
     body = response.content.decode()
-    assert body.count(map.name) == 1
+    assert body.count(f'<a href="/en/map/test-map_{map.pk}">test map</a>') == 1
     assert body.count(anonymap.name) == 0
 
 
@@ -364,3 +365,29 @@ def test_user_profile_does_not_allow_to_edit_other_fields(client, map):
     user = User.objects.get(pk=map.owner.pk)
     assert user.email != new_email
     assert user.is_superuser is False
+
+
+def test_favicon_redirection(client):
+    response = client.get("/favicon.ico")
+    assert response.status_code == 302
+    assert response.url == "/static/umap/favicons/favicon.ico"
+
+
+def test_webmanifest(client):
+    response = client.get("/manifest.webmanifest")
+    assert response.status_code == 200
+    assert response["content-type"] == "application/json"
+    assert response.json() == {
+        "icons": [
+            {
+                "sizes": "192x192",
+                "src": "/static/umap/favicons/icon-192.png",
+                "type": "image/png",
+            },
+            {
+                "sizes": "512x512",
+                "src": "/static/umap/favicons/icon-512.png",
+                "type": "image/png",
+            },
+        ]
+    }

umap/urls.py

@@ -1,20 +1,22 @@
 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
 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
 
@@ -39,6 +41,11 @@ urlpatterns = [
     ),
     re_path(r"^i18n/", include("django.conf.urls.i18n")),
     re_path(r"^agnocomplete/", include("agnocomplete.urls")),
+    re_path(
+        r"^map/(?P<map_id>\d+)/download/",
+        can_view_map(views.MapDownload.as_view()),
+        name="map_download",
+    ),
 ]
 
 i18n_urls = [
@@ -183,7 +190,23 @@ urlpatterns += i18n_patterns(
     re_path(r"^user/(?P<identifier>.+)/$", views.user_maps, name="user_maps"),
     re_path(r"", include(i18n_urls)),
 )
-urlpatterns += (path("stats/", cache_page(60 * 60)(views.stats), name="stats"),)
+urlpatterns += (
+    path("stats/", cache_page(60 * 60)(views.stats), name="stats"),
+    path(
+        "favicon.ico",
+        cache_control(max_age=60 * 60 * 24, immutable=True, public=True)(
+            RedirectView.as_view(
+                url=staticfiles_storage.url("umap/favicons/favicon.ico")
+            )
+        ),
+    ),
+    path(
+        "manifest.webmanifest",
+        cache_control(max_age=60 * 60 * 24, immutable=True, public=True)(
+            views.webmanifest
+        ),
+    ),
+)
 
 if settings.DEBUG and settings.MEDIA_ROOT:
     urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

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,18 +3,20 @@ 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
 from django.core.mail import send_mail
 from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 from django.core.signing import BadSignature, Signer
@@ -32,8 +34,11 @@ 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
+from django.views.decorators.http import require_GET
 from django.views.generic import DetailView, TemplateView, View
 from django.views.generic.base import RedirectView
 from django.views.generic.detail import BaseDetailView
@@ -42,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,
@@ -58,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()
 
 
@@ -137,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"):
@@ -146,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)
 
@@ -202,13 +193,10 @@ class UserMaps(PaginatorMixin, DetailView):
             return settings.UMAP_MAPS_PER_PAGE_OWNER
         return settings.UMAP_MAPS_PER_PAGE
 
-    def get_map_queryset(self):
-        return Map.objects if self.is_owner() else Map.public
-
     def get_maps(self):
-        qs = self.get_map_queryset()
-        qs = qs.filter(Q(owner=self.object) | Q(editors=self.object))
-        return qs.distinct().order_by("-modified_at")
+        qs = Map.public
+        qs = qs.filter(owner=self.object).union(qs.filter(editors=self.object))
+        return qs.order_by("-modified_at")
 
     def get_context_data(self, **kwargs):
         kwargs.update({"maps": self.paginate(self.get_maps(), self.per_page)})
@@ -222,9 +210,8 @@ class UserStars(UserMaps):
     template_name = "auth/user_stars.html"
 
     def get_maps(self):
-        qs = self.get_map_queryset()
         stars = Star.objects.filter(by=self.object).values("map")
-        qs = qs.filter(pk__in=stars)
+        qs = Map.public.filter(pk__in=stars)
         return qs.order_by("-modified_at")
 
 
@@ -408,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)
@@ -419,7 +406,7 @@ def _urls_for_js(urls=None):
 
 
 def simple_json_response(**kwargs):
-    return HttpResponse(json.dumps(kwargs))
+    return HttpResponse(json.dumps(kwargs), content_type="application/json")
 
 
 # ############## #
@@ -469,9 +456,7 @@ class MapDetailMixin:
         else:
             map_statuses = AnonymousMapPermissionsForm.STATUS
             datalayer_statuses = AnonymousDataLayerPermissionsForm.STATUS
-        properties["edit_statuses"] = [
-            (i, str(label)) for i, label in map_statuses
-        ]
+        properties["edit_statuses"] = [(i, str(label)) for i, label in map_statuses]
         properties["datalayer_edit_statuses"] = [
             (i, str(label)) for i, label in datalayer_statuses
         ]
@@ -606,6 +591,32 @@ class MapView(MapDetailMixin, PermissionsMixin, DetailView):
         return Star.objects.filter(by=user, map=self.object).exists()
 
 
+class MapDownload(DetailView):
+    model = Map
+    pk_url_kwarg = "map_id"
+
+    def get_canonical_url(self):
+        return reverse("map_download", args=(self.object.pk,))
+
+    def render_to_response(self, context, *args, **kwargs):
+        geojson = self.object.settings
+        geojson["type"] = "umap"
+        geojson["uri"] = self.request.build_absolute_uri(self.object.get_absolute_url())
+        datalayers = []
+        for datalayer in self.object.datalayer_set.all():
+            with open(datalayer.geojson.path, "rb") as f:
+                layer = json.loads(f.read())
+            if datalayer.settings:
+                layer["_umap_options"] = datalayer.settings
+            datalayers.append(layer)
+        geojson["layers"] = datalayers
+        response = simple_json_response(**geojson)
+        response[
+            "Content-Disposition"
+        ] = f'attachment; filename="umap_backup_{self.object.slug}.umap"'
+        return response
+
+
 class MapViewGeoJSON(MapView):
     def get_canonical_url(self):
         return reverse("map_geojson", args=(self.object.pk,))
@@ -1000,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,
@@ -1016,6 +1027,27 @@ def stats(request):
     )
 
 
+@require_GET
+@cache_control(max_age=60 * 60 * 24, immutable=True, public=True)  # One day.
+def webmanifest(request):
+    return simple_json_response(
+        **{
+            "icons": [
+                {
+                    "src": staticfiles_storage.url("umap/favicons/icon-192.png"),
+                    "type": "image/png",
+                    "sizes": "192x192",
+                },
+                {
+                    "src": staticfiles_storage.url("umap/favicons/icon-512.png"),
+                    "type": "image/png",
+                    "sizes": "512x512",
+                },
+            ]
+        }
+    )
+
+
 def logout(request):
     do_logout(request)
     if is_ajax(request):

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.10.0.dist-info → umap_project-1.11.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: umap-project
-Version: 1.10.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