umap-project 2.8.2__py3-none-any.whl → 2.9.0__py3-none-any.whl

umap/tests/test_map_views.py

@@ -810,6 +810,17 @@ def test_oembed_shared_status_map(client, map, datalayer, share_status):
     assert response.status_code == 403
 
 
+def test_download_does_not_include_delete_datalayers(client, map, datalayer):
+    datalayer.share_status = DataLayer.DELETED
+    datalayer.save()
+    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["layers"] == []
+
+
 def test_oembed_no_url_map(client, map, datalayer):
     url = reverse("map_oembed")
     response = client.get(url)

umap/utils.py

@@ -7,23 +7,39 @@ from django.core.serializers.json import DjangoJSONEncoder
 from django.urls import URLPattern, URLResolver, get_resolver
 
 
-def _urls_for_js(urls=None):
+def _get_url_names(module):
+    def _get_names(resolver):
+        names = []
+        for pattern in resolver.url_patterns:
+            if getattr(pattern, "url_patterns", None):
+                # Do not add "admin" and other third party apps urls.
+                if not pattern.namespace:
+                    names.extend(_get_names(pattern))
+            elif getattr(pattern, "name", None):
+                names.append(pattern.name)
+        return names
+
+    return _get_names(get_resolver(module))
+
+
+def _urls_for_js():
     """
     Return templated URLs prepared for javascript.
     """
-    if urls is None:
-        # prevent circular import
-        from .urls import i18n_urls, urlpatterns
-
-        urls = [
-            url.name for url in urlpatterns + i18n_urls if getattr(url, "name", None)
-        ]
-    urls = dict(zip(urls, [get_uri_template(url) for url in urls]))
+    urls = {}
+    modules = ["umap.urls"]
+    if settings.WEBSOCKET_ENABLED:
+        modules.append("umap.sync.app")
+    for module in modules:
+        names = _get_url_names(module)
+        urls.update(
+            dict(zip(names, [get_uri_template(url, module=module) for url in names]))
+        )
     urls.update(getattr(settings, "UMAP_EXTRA_URLS", {}))
     return urls
 
 
-def get_uri_template(urlname, args=None, prefix=""):
+def get_uri_template(urlname, args=None, prefix="", module=None):
     """
     Utility function to return an URI Template from a named URL in django
     Copied from django-digitalpaper.
@@ -45,7 +61,7 @@ def get_uri_template(urlname, args=None, prefix=""):
         paths = template % dict([p, "{%s}" % p] for p in args)
         return "%s/%s" % (prefix, paths)
 
-    resolver = get_resolver(None)
+    resolver = get_resolver(module)
     parts = urlname.split(":")
     if len(parts) > 1 and parts[0] in resolver.namespace_dict:
         namespace = parts[0]

umap/views.py

@@ -15,7 +15,7 @@ from urllib.request import Request, build_opener
 
 from django.conf import settings
 from django.contrib import messages
-from django.contrib.auth import get_user_model
+from django.contrib.auth import BACKEND_SESSION_KEY, 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
@@ -605,15 +605,22 @@ class MapDetailMixin(SessionMixin):
             "schema": Map.extra_schema,
             "id": self.get_id(),
             "starred": self.is_starred(),
+            "stars": self.stars(),
             "licences": dict((l.name, l.json) for l in Licence.objects.all()),
             "umap_version": VERSION,
             "featuresHaveOwner": settings.UMAP_DEFAULT_FEATURES_HAVE_OWNERS,
             "websocketEnabled": settings.WEBSOCKET_ENABLED,
-            "websocketURI": settings.WEBSOCKET_FRONT_URI,
             "importers": settings.UMAP_IMPORTERS,
             "defaultLabelKeys": settings.UMAP_LABEL_KEYS,
         }
         created = bool(getattr(self, "object", None))
+        if created:
+            properties.update(
+                {
+                    "created_at": self.object.created_at,
+                    "modified_at": self.object.modified_at,
+                }
+            )
         if (created and self.object.owner) or (not created and not user.is_anonymous):
             edit_statuses = Map.EDIT_STATUS
             datalayer_statuses = DataLayer.EDIT_STATUS
@@ -671,6 +678,9 @@ class MapDetailMixin(SessionMixin):
     def is_starred(self):
         return False
 
+    def stars(self):
+        return 0
+
     def get_geojson(self):
         return {
             "geometry": {
@@ -732,14 +742,14 @@ class MapView(MapDetailMixin, PermissionsMixin, DetailView):
     def get_datalayers(self):
         # When initializing datalayers from map, we cannot get the reference version
         # the normal way, which is from the header X-Reference-Version
-        return [dl.metadata(self.request) for dl in self.object.datalayer_set.all()]
+        return [dl.metadata(self.request) for dl in self.object.datalayers]
 
     @property
     def edit_mode(self):
         edit_mode = "disabled"
         if self.object.can_edit(self.request):
             edit_mode = "advanced"
-        elif any(d.can_edit(self.request) for d in self.object.datalayer_set.all()):
+        elif any(d.can_edit(self.request) for d in self.object.datalayers):
             edit_mode = "simple"
         return edit_mode
 
@@ -773,6 +783,9 @@ class MapView(MapDetailMixin, PermissionsMixin, DetailView):
             return False
         return Star.objects.filter(by=user, map=self.object).exists()
 
+    def stars(self):
+        return Star.objects.filter(map=self.object).count()
+
 
 class MapDownload(DetailView):
     model = Map
@@ -1074,7 +1087,9 @@ class ToggleMapStarStatus(View):
         else:
             Star.objects.create(map=map_inst, by=self.request.user)
             status = True
-        return simple_json_response(starred=status)
+        return simple_json_response(
+            starred=status, stars=Star.objects.filter(map=map_inst).count()
+        )
 
 
 class MapShortUrl(RedirectView):
@@ -1293,6 +1308,7 @@ class DataLayerUpdate(FormLessEditMixin, UpdateView):
 
     def form_valid(self, form):
         self.object = form.save()
+        self.object.map.save(update_fields=["modified_at"])
         data = {**self.object.metadata(self.request)}
         if self.request.session.get("needs_reload"):
             data["geojson"] = json.loads(self.object.geojson.read().decode())
@@ -1309,7 +1325,7 @@ class DataLayerDelete(DeleteView):
         self.object = self.get_object()
         if self.object.map != self.kwargs["map_inst"]:
             return HttpResponseForbidden()
-        self.object.delete()
+        self.object.move_to_trash()
         return simple_json_response(info=_("Layer successfully deleted."))
 
 
@@ -1403,3 +1419,18 @@ class LoginPopupEnd(TemplateView):
     """
 
     template_name = "umap/login_popup_end.html"
+
+    def get(self, *args, **kwargs):
+        backend = self.request.session[BACKEND_SESSION_KEY]
+        if backend in settings.DEPRECATED_AUTHENTICATION_BACKENDS:
+            name = backend.split(".")[-1]
+            messages.error(
+                self.request,
+                _(
+                    "Using “%(name)s” to authenticate is deprecated. "
+                    "Please configure another provider in your profile page."
+                )
+                % {"name": name},
+            )
+            return HttpResponseRedirect(reverse("user_profile"))
+        return super().get(*args, **kwargs)

{umap_project-2.8.2.dist-info → umap_project-2.9.0.dist-info}/METADATA

@@ -1,9 +1,10 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: umap-project
-Version: 2.8.2
+Version: 2.9.0
 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>
+License-File: LICENSE
 Keywords: django,geodjango,leaflet,map,openstreetmap
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
@@ -16,41 +17,40 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.10
 Requires-Dist: django-agnocomplete==2.2.0
-Requires-Dist: django-environ==0.11.2
+Requires-Dist: django-environ==0.12.0
 Requires-Dist: django-probes==1.7.0
-Requires-Dist: django==5.1.4
-Requires-Dist: pillow==11.0.0
-Requires-Dist: psycopg==3.2.3
-Requires-Dist: rcssmin==1.2.0
+Requires-Dist: django==5.1.6
+Requires-Dist: pillow==11.1.0
+Requires-Dist: psycopg==3.2.4
+Requires-Dist: rcssmin==1.2.1
 Requires-Dist: requests==2.32.3
-Requires-Dist: rjsmin==1.2.3
+Requires-Dist: rjsmin==1.2.4
 Requires-Dist: social-auth-app-django==5.4.2
 Requires-Dist: social-auth-core==4.5.4
 Provides-Extra: dev
-Requires-Dist: djlint==1.36.3; extra == 'dev'
+Requires-Dist: djlint==1.36.4; extra == 'dev'
 Requires-Dist: hatch==1.14.0; extra == 'dev'
-Requires-Dist: isort==5.13.2; extra == 'dev'
-Requires-Dist: mkdocs-material==9.5.48; extra == 'dev'
-Requires-Dist: mkdocs-static-i18n==1.2.3; extra == 'dev'
+Requires-Dist: isort==6.0.0; extra == 'dev'
+Requires-Dist: mkdocs-material==9.6.4; extra == 'dev'
+Requires-Dist: mkdocs-static-i18n==1.3.0; extra == 'dev'
 Requires-Dist: mkdocs==1.6.1; extra == 'dev'
-Requires-Dist: pymdown-extensions==10.13; extra == 'dev'
-Requires-Dist: ruff==0.8.4; extra == 'dev'
+Requires-Dist: pymdown-extensions==10.14.3; extra == 'dev'
+Requires-Dist: ruff==0.9.6; extra == 'dev'
 Requires-Dist: vermin==1.6.0; extra == 'dev'
 Provides-Extra: docker
 Requires-Dist: uwsgi==2.0.28; extra == 'docker'
 Provides-Extra: s3
 Requires-Dist: django-storages[s3]==1.14.4; extra == 's3'
 Provides-Extra: sync
-Requires-Dist: channels==4.2.0; extra == 'sync'
-Requires-Dist: daphne==4.1.2; extra == 'sync'
-Requires-Dist: pydantic==2.10.3; extra == 'sync'
-Requires-Dist: websockets==13.1; extra == 'sync'
+Requires-Dist: pydantic==2.10.6; extra == 'sync'
+Requires-Dist: redis==5.2.1; extra == 'sync'
 Provides-Extra: test
-Requires-Dist: factory-boy==3.3.1; extra == 'test'
-Requires-Dist: moto[s3]==5.0.24; extra == 'test'
+Requires-Dist: daphne==4.1.2; extra == 'test'
+Requires-Dist: factory-boy==3.3.3; extra == 'test'
+Requires-Dist: moto[s3]==5.0.28; extra == 'test'
 Requires-Dist: playwright>=1.39; extra == 'test'
-Requires-Dist: pytest-django==4.9.0; extra == 'test'
-Requires-Dist: pytest-playwright==0.6.2; extra == 'test'
+Requires-Dist: pytest-django==4.10.0; extra == 'test'
+Requires-Dist: pytest-playwright==0.7.0; extra == 'test'
 Requires-Dist: pytest-rerunfailures==15.0; extra == 'test'
 Requires-Dist: pytest-xdist<4,>=3.5.0; extra == 'test'
 Requires-Dist: pytest==8.3.4; extra == 'test'