umap-project 1.14.0a5__py3-none-any.whl → 2.0.0a1__py3-none-any.whl

umap/views.py

@@ -1,8 +1,10 @@
+import io
 import json
 import mimetypes
 import os
 import re
 import socket
+import zipfile
 from datetime import datetime, timedelta
 from http.client import InvalidURL
 from io import BytesIO
@@ -18,20 +20,23 @@ 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.exceptions import PermissionDenied
 from django.core.mail import send_mail
 from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 from django.core.signing import BadSignature, Signer
 from django.core.validators import URLValidator, ValidationError
 from django.http import (
+    Http404,
     HttpResponse,
     HttpResponseBadRequest,
     HttpResponseForbidden,
     HttpResponsePermanentRedirect,
     HttpResponseRedirect,
+    HttpResponseServerError,
 )
 from django.middleware.gzip import re_accepts_gzip
 from django.shortcuts import get_object_or_404
-from django.urls import reverse, reverse_lazy
+from django.urls import resolve, reverse, reverse_lazy
 from django.utils.encoding import smart_bytes
 from django.utils.http import http_date
 from django.utils.timezone import make_aware
@@ -105,6 +110,12 @@ class PaginatorMixin:
             return [self.list_template_name]
         return super().get_template_names()
 
+    def get(self, *args, **kwargs):
+        response = super().get(*args, **kwargs)
+        if is_ajax(self.request):
+            return simple_json_response(html=response.rendered_content)
+        return response
+
 
 class PublicMapsMixin(object):
     def get_public_maps(self):
@@ -118,13 +129,26 @@ class PublicMapsMixin(object):
         maps = qs.order_by("-modified_at")
         return maps
 
+    def get_highlighted_maps(self):
+        staff = User.objects.filter(is_staff=True)
+        stars = Star.objects.filter(by__in=staff).values("map")
+        qs = Map.public.filter(pk__in=stars)
+        maps = qs.order_by("-modified_at")
+        return maps
+
 
 class Home(PaginatorMixin, TemplateView, PublicMapsMixin):
     template_name = "umap/home.html"
     list_template_name = "umap/map_list.html"
 
     def get_context_data(self, **kwargs):
-        maps = self.get_public_maps()
+        if settings.UMAP_HOME_FEED is None:
+            maps = []
+        elif settings.UMAP_HOME_FEED == "highlighted":
+            maps = self.get_highlighted_maps()
+        else:
+            maps = self.get_public_maps()
+        maps = self.paginate(maps, settings.UMAP_MAPS_PER_PAGE)
 
         demo_map = None
         if hasattr(settings, "UMAP_DEMO_PK"):
@@ -140,8 +164,6 @@ class Home(PaginatorMixin, TemplateView, PublicMapsMixin):
             except Map.DoesNotExist:
                 pass
 
-        maps = self.paginate(maps, settings.UMAP_MAPS_PER_PAGE)
-
         return {
             "maps": maps,
             "demo_map": demo_map,
@@ -268,20 +290,44 @@ class UserDashboard(PaginatorMixin, DetailView, SearchMixin):
         return qs.order_by("-modified_at")
 
     def get_context_data(self, **kwargs):
-        kwargs.update(
-            {
-                "q": self.request.GET.get("q"),
-                "maps": self.paginate(
-                    self.get_maps(), settings.UMAP_MAPS_PER_PAGE_OWNER
-                ),
-            }
-        )
+        page = self.paginate(self.get_maps(), settings.UMAP_MAPS_PER_PAGE_OWNER)
+        kwargs.update({"q": self.request.GET.get("q"), "maps": page})
         return super().get_context_data(**kwargs)
 
 
 user_dashboard = UserDashboard.as_view()
 
 
+class UserDownload(DetailView, SearchMixin):
+    model = User
+
+    def get_object(self):
+        return self.get_queryset().get(pk=self.request.user.pk)
+
+    def get_maps(self):
+        qs = Map.objects.filter(id__in=self.request.GET.getlist("map_id"))
+        qs = qs.filter(owner=self.object).union(qs.filter(editors=self.object))
+        return qs.order_by("-modified_at")
+
+    def render_to_response(self, context, *args, **kwargs):
+        zip_buffer = io.BytesIO()
+        with zipfile.ZipFile(zip_buffer, "a", zipfile.ZIP_DEFLATED, False) as zip_file:
+            for map_ in self.get_maps():
+                umapjson = map_.generate_umapjson(self.request)
+                geojson_file = io.StringIO(json.dumps(umapjson))
+                file_name = f"umap_backup_{map_.slug}_{map_.pk}.umap"
+                zip_file.writestr(file_name, geojson_file.getvalue())
+
+        response = HttpResponse(zip_buffer.getvalue(), content_type="application/zip")
+        response[
+            "Content-Disposition"
+        ] = 'attachment; filename="umap_backup_complete.zip"'
+        return response
+
+
+user_download = UserDownload.as_view()
+
+
 class MapsShowCase(View):
     def get(self, *args, **kwargs):
         maps = Map.public.filter(center__distance_gt=(DEFAULT_CENTER, D(km=1)))
@@ -315,7 +361,6 @@ showcase = MapsShowCase.as_view()
 
 def validate_url(request):
     assert request.method == "GET"
-    assert is_ajax(request)
     url = request.GET.get("url")
     assert url
     try:
@@ -421,14 +466,28 @@ class MapDetailMixin:
     model = Map
     pk_url_kwarg = "map_id"
 
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
+    def set_preconnect(self, properties, context):
+        # Try to extract the tilelayer domain, in order to but a preconnect meta.
+        url_template = properties.get("tilelayer", {}).get("url_template")
+        # Not explicit tilelayer set, take the first of the list, which will be
+        # used by frontend too.
+        if not url_template:
+            tilelayers = properties.get("tilelayers")
+            if tilelayers:
+                url_template = tilelayers[0].get("url_template")
+        if url_template:
+            domain = urlparse(url_template).netloc
+            # Do not try to preconnect on domains with variables
+            if domain and "{" not in domain:
+                context["preconnect_domains"] = [f"//{domain}"]
+
+    def get_map_properties(self):
         user = self.request.user
         properties = {
             "urls": _urls_for_js(),
             "tilelayers": TileLayer.get_list(),
             "editMode": self.edit_mode,
-            "default_iconUrl": "%sumap/img/marker.png" % settings.STATIC_URL,  # noqa
+            "default_iconUrl": "%sumap/img/marker.svg" % settings.STATIC_URL,  # noqa
             "umap_id": self.get_umap_id(),
             "starred": self.is_starred(),
             "licences": dict((l.name, l.json) for l in Licence.objects.all()),
@@ -452,6 +511,17 @@ class MapDetailMixin:
         if self.get_short_url():
             properties["shortUrl"] = self.get_short_url()
 
+        if not user.is_anonymous:
+            properties["user"] = {
+                "id": user.pk,
+                "name": str(user),
+                "url": reverse("user_dashboard"),
+            }
+        return properties
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        properties = self.get_map_properties()
         if settings.USE_I18N:
             lang = settings.LANGUAGE_CODE
             # Check attr in case the middleware is not active
@@ -461,18 +531,13 @@ class MapDetailMixin:
             locale = to_locale(lang)
             properties["locale"] = locale
             context["locale"] = locale
-        if not user.is_anonymous:
-            properties["user"] = {
-                "id": user.pk,
-                "name": str(user),
-                "url": reverse("user_dashboard"),
-            }
-        map_settings = self.get_geojson()
-        if "properties" not in map_settings:
-            map_settings["properties"] = {}
-        map_settings["properties"].update(properties)
-        map_settings["properties"]["datalayers"] = self.get_datalayers()
-        context["map_settings"] = json.dumps(map_settings, indent=settings.DEBUG)
+        geojson = self.get_geojson()
+        if "properties" not in geojson:
+            geojson["properties"] = {}
+        geojson["properties"].update(properties)
+        geojson["properties"]["datalayers"] = self.get_datalayers()
+        context["map_settings"] = json.dumps(geojson, indent=settings.DEBUG)
+        self.set_preconnect(geojson["properties"], context)
         return context
 
     def get_datalayers(self):
@@ -525,6 +590,16 @@ class PermissionsMixin:
 
 
 class MapView(MapDetailMixin, PermissionsMixin, DetailView):
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["oembed_absolute_uri"] = self.request.build_absolute_uri(
+            reverse("map_oembed")
+        )
+        context["absolute_uri"] = self.request.build_absolute_uri(
+            self.object.get_absolute_url()
+        )
+        return context
+
     def get(self, request, *args, **kwargs):
         self.object = self.get_object()
         canonical = self.get_canonical_url()
@@ -588,24 +663,60 @@ class MapDownload(DetailView):
         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)
+        umapjson = self.object.generate_umapjson(self.request)
+        response = simple_json_response(**umapjson)
         response[
             "Content-Disposition"
         ] = f'attachment; filename="umap_backup_{self.object.slug}.umap"'
         return response
 
 
+class MapOEmbed(View):
+    def get(self, request, *args, **kwargs):
+        data = {"type": "rich", "version": "1.0"}
+        format_ = request.GET.get("format", "json")
+        if format_ != "json":
+            response = HttpResponseServerError("Only `json` format is implemented.")
+            response.status_code = 501
+            return response
+
+        url = request.GET.get("url")
+        if not url:
+            raise Http404("Missing `url` parameter.")
+
+        parsed_url = urlparse(url)
+        netloc = parsed_url.netloc
+        allowed_hosts = settings.ALLOWED_HOSTS
+        if parsed_url.hostname not in allowed_hosts and allowed_hosts != ["*"]:
+            raise Http404("Host not allowed.")
+
+        url_path = parsed_url.path
+        view, args, kwargs = resolve(url_path)
+        if "slug" not in kwargs or "map_id" not in kwargs:
+            raise Http404("Invalid URL path.")
+
+        map_ = Map.objects.get(id=kwargs["map_id"], slug=kwargs["slug"])
+
+        if map_.share_status != Map.PUBLIC:
+            raise PermissionDenied("This map is not public.")
+
+        map_url = map_.get_absolute_url()
+        label = _("See full screen")
+        height = 300
+        data["height"] = height
+        width = 800
+        data["width"] = width
+        # TODISCUSS: do we keep width=100% by default for the iframe?
+        html = (
+            f'<iframe width="100%" height="{height}px" '
+            f'frameborder="0" allowfullscreen allow="geolocation" '
+            f'src="//{netloc}{map_url}"></iframe>'
+            f'<p><a href="//{netloc}{map_url}">{label}</a></p>'
+        )
+        data["html"] = html
+        return simple_json_response(**data)
+
+
 class MapViewGeoJSON(MapView):
     def get_canonical_url(self):
         return reverse("map_geojson", args=(self.object.pk,))
@@ -618,6 +729,15 @@ class MapNew(MapDetailMixin, TemplateView):
     template_name = "umap/map_detail.html"
 
 
+class MapPreview(MapDetailMixin, TemplateView):
+    template_name = "umap/map_detail.html"
+
+    def get_map_properties(self):
+        properties = super().get_map_properties()
+        properties["preview"] = True
+        return properties
+
+
 class MapCreate(FormLessEditMixin, PermissionsMixin, CreateView):
     model = Map
     form_class = MapSettingsForm
@@ -738,12 +858,14 @@ class MapDelete(DeleteView):
 
     def form_valid(self, form):
         self.object = self.get_object()
-        if self.object.owner and self.request.user != self.object.owner:
+        if not self.object.can_delete(self.request.user, self.request):
             return HttpResponseForbidden(_("Only its owner can delete the map."))
-        if not self.object.owner and not self.object.is_anonymous_owner(self.request):
-            return HttpResponseForbidden()
         self.object.delete()
-        return simple_json_response(redirect="/")
+        home_url = reverse("home")
+        if is_ajax(self.request):
+            return simple_json_response(redirect=home_url)
+        else:
+            return HttpResponseRedirect(form.data.get("next") or home_url)
 
 
 class MapClone(PermissionsMixin, View):
@@ -755,7 +877,10 @@ class MapClone(PermissionsMixin, View):
             return HttpResponseForbidden()
         owner = self.request.user if self.request.user.is_authenticated else None
         self.object = kwargs["map_inst"].clone(owner=owner)
-        response = simple_json_response(redirect=self.object.get_absolute_url())
+        if is_ajax(self.request):
+            response = simple_json_response(redirect=self.object.get_absolute_url())
+        else:
+            response = HttpResponseRedirect(self.object.get_absolute_url())
         if not self.request.user.is_authenticated:
             key, value = self.object.signed_cookie_elements
             response.set_signed_cookie(
@@ -1086,8 +1211,6 @@ def webmanifest(request):
 
 def logout(request):
     do_logout(request)
-    if is_ajax(request):
-        return simple_json_response(redirect="/")
     return HttpResponseRedirect("/")
 
 

{umap_project-1.14.0a5.dist-info → umap_project-2.0.0a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: umap-project
-Version: 1.14.0a5
+Version: 2.0.0a1
 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,33 +11,31 @@ Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3 :: Only
-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-Python: >=3.10
 Requires-Dist: django-agnocomplete==2.2.0
-Requires-Dist: django-environ==0.10.0
+Requires-Dist: django-environ==0.11.2
 Requires-Dist: django-probes==1.7.0
-Requires-Dist: django==4.2
-Requires-Dist: pillow==10.0.1
-Requires-Dist: psycopg2==2.9.6
+Requires-Dist: django==5.0.2
+Requires-Dist: pillow==10.2.0
+Requires-Dist: psycopg==3.1.18
 Requires-Dist: rcssmin==1.1.2
 Requires-Dist: requests==2.31.0
 Requires-Dist: rjsmin==1.2.2
-Requires-Dist: social-auth-app-django==5.2.0
-Requires-Dist: social-auth-core==4.4.2
+Requires-Dist: social-auth-app-django==5.4.0
+Requires-Dist: social-auth-core==4.5.2
 Provides-Extra: dev
 Requires-Dist: djlint==1.34.1; extra == 'dev'
-Requires-Dist: hatch==1.9.1; extra == 'dev'
+Requires-Dist: hatch==1.9.3; extra == 'dev'
 Requires-Dist: isort==5.12; extra == 'dev'
-Requires-Dist: mkdocs-material==9.4.14; extra == 'dev'
+Requires-Dist: mkdocs-material==9.5.7; extra == 'dev'
 Requires-Dist: mkdocs==1.5.3; 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'
+Requires-Dist: pymdown-extensions==10.7; extra == 'dev'
+Requires-Dist: ruff==0.2.0; extra == 'dev'
+Requires-Dist: vermin==1.6.0; extra == 'dev'
 Provides-Extra: docker
 Requires-Dist: uwsgi==2.0.23; extra == 'docker'
 Provides-Extra: test