umap-project 2.6.0b2__py3-none-any.whl → 2.6.1__py3-none-any.whl

umap/__init__.py

@@ -1 +1 @@
-VERSION = "2.6.0b2"
+VERSION = "2.6.1"

umap/decorators.py

@@ -33,12 +33,11 @@ def can_edit_map(view_func):
     @wraps(view_func)
     def wrapper(request, *args, **kwargs):
         map_inst = get_object_or_404(Map, pk=kwargs["map_id"])
-        user = request.user
         kwargs["map_inst"] = map_inst  # Avoid rerequesting the map in the view
         if map_inst.edit_status >= map_inst.COLLABORATORS:
-            can_edit = map_inst.can_edit(user=user, request=request)
+            can_edit = map_inst.can_edit(request=request)
             if not can_edit:
-                if map_inst.owner and not user.is_authenticated:
+                if map_inst.owner and not request.user.is_authenticated:
                     return simple_json_response(login_required=str(LOGIN_URL))
                 return HttpResponseForbidden()
         return view_func(request, *args, **kwargs)

umap/locale/fa_IR/LC_MESSAGES/django.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uMap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-30 18:23+0000\n"
+"POT-Creation-Date: 2024-09-04 14:02+0000\n"
 "PO-Revision-Date: 2013-11-22 14:00+0000\n"
 "Last-Translator: imni <iriman@chmail.ir>, 2024\n"
 "Language-Team: Persian (Iran) (http://app.transifex.com/openstreetmap/umap/language/fa_IR/)\n"
@@ -326,19 +326,19 @@ msgstr "این یک نمونهٔ نمایشی است که برای آزمایش
 
 #: templates/umap/content_footer.html:5
 msgid "An OpenStreetMap project"
-msgstr ""
+msgstr "پروژه‌ای با اوپن‌استریت‌مپ"
 
 #: templates/umap/content_footer.html:6
 msgid "version"
-msgstr ""
+msgstr "نسخه"
 
 #: templates/umap/content_footer.html:7
 msgid "Hosted by"
-msgstr ""
+msgstr "میزبانی‌شده در"
 
 #: templates/umap/content_footer.html:8
 msgid "Contact"
-msgstr ""
+msgstr "تماس"
 
 #: templates/umap/content_footer.html:9 templates/umap/navigation.html:25
 msgid "Help"
@@ -373,11 +373,11 @@ msgstr "الهام بگیرید، نقشه‌ها را مرور کنید"
 msgid "You are logged in. Continuing..."
 msgstr "شما وارد شده‌اید. ادامه..."
 
-#: templates/umap/map_list.html:10 views.py:433
+#: templates/umap/map_list.html:11 views.py:433
 msgid "by"
 msgstr "ساختهٔ"
 
-#: templates/umap/map_list.html:18
+#: templates/umap/map_list.html:20
 msgid "More"
 msgstr "بیشتر"
 
@@ -553,12 +553,12 @@ msgstr "جستجو"
 #: templates/umap/team_detail.html:10
 #, python-format
 msgid "Browse %(current_team)s's maps"
-msgstr ""
+msgstr "مرور نقشه‌های %(current_team)s"
 
 #: templates/umap/team_detail.html:22
 #, python-format
 msgid "%(current_team)s has no public maps."
-msgstr ""
+msgstr "%(current_team)s نقشهٔ عمومی ندارد."
 
 #: templates/umap/team_form.html:24
 msgid "Delete this team"

umap/models.py

@@ -281,8 +281,10 @@ class Map(NamedModel):
     def get_author(self):
         return self.team or self.owner
 
-    def is_owner(self, user=None, request=None):
-        if user and self.owner == user:
+    def is_owner(self, request=None):
+        if not request:
+            return False
+        if request.user and self.owner == request.user:
             return True
         return self.is_anonymous_owner(request)
 
@@ -297,14 +299,16 @@ class Map(NamedModel):
             has_anonymous_cookie = False
         return has_anonymous_cookie
 
-    def can_delete(self, user=None, request=None):
-        if self.owner and user != self.owner:
+    def can_delete(self, request=None):
+        if not request:
+            return False
+        if self.owner and request.user != self.owner:
             return False
         if not self.owner and not self.is_anonymous_owner(request):
             return False
         return True
 
-    def can_edit(self, user=None, request=None):
+    def can_edit(self, request=None):
         """
         Define if a user can edit or not the instance, according to his account
         or the request.
@@ -318,12 +322,18 @@ class Map(NamedModel):
             - anyone otherwise (ANONYMOUS)
         """
         can = False
-        if request and not self.owner:
-            if settings.UMAP_ALLOW_ANONYMOUS and self.is_anonymous_owner(request):
-                can = True
-        if self.edit_status == self.ANONYMOUS:
+        if not request:
+            return False
+        user = request.user
+        if (
+            not self.owner
+            and settings.UMAP_ALLOW_ANONYMOUS
+            and self.is_anonymous_owner(request)
+        ):
+            can = True
+        elif self.edit_status == self.ANONYMOUS:
             can = True
-        elif user is None:
+        elif not user.is_authenticated:
             can = False
         elif user == self.owner:
             can = True
@@ -477,7 +487,7 @@ class DataLayer(NamedModel):
         path.append(str(self.map.pk))
         return os.path.join(*path)
 
-    def metadata(self, user=None, request=None):
+    def metadata(self, request=None):
         # Retrocompat: minimal settings for maps not saved after settings property
         # has been introduced
         obj = self.settings or {
@@ -488,7 +498,7 @@ class DataLayer(NamedModel):
             obj["old_id"] = self.old_id
         obj["id"] = self.pk
         obj["permissions"] = {"edit_status": self.edit_status}
-        obj["editMode"] = "advanced" if self.can_edit(user, request) else "disabled"
+        obj["editMode"] = "advanced" if self.can_edit(request) else "disabled"
         return obj
 
     def clone(self, map_inst=None):
@@ -557,22 +567,25 @@ class DataLayer(NamedModel):
             if name.startswith(prefixes) and name.endswith(".gz"):
                 self.geojson.storage.delete(os.path.join(root, name))
 
-    def can_edit(self, user=None, request=None):
+    def can_edit(self, request=None):
         """
         Define if a user can edit or not the instance, according to his account
         or the request.
         """
         if self.edit_status == self.INHERIT:
-            return self.map.can_edit(user, request)
+            return self.map.can_edit(request)
         can = False
+        if not request:
+            return False
+        user = request.user
         if not self.map.owner:
             if settings.UMAP_ALLOW_ANONYMOUS and self.map.is_anonymous_owner(request):
                 can = True
         if self.edit_status == self.ANONYMOUS:
             can = True
-        elif user is not None and user == self.map.owner:
+        elif user.is_authenticated and user == self.map.owner:
             can = True
-        elif user is not None and self.edit_status == self.COLLABORATORS:
+        elif user.is_authenticated and self.edit_status == self.COLLABORATORS:
             if user in self.map.editors.all() or self.map.team in user.teams.all():
                 can = True
         return can

umap/static/umap/js/modules/data/features.js

@@ -508,7 +508,12 @@ class Feature {
 
   matchFilter(filter, keys) {
     filter = filter.toLowerCase()
-    if (Utils.hasVar(keys)) {
+    // When user hasn't touched settings, when a feature has no name
+    // it will use the datalayer's name, so let's make the filtering
+    // consistent.
+    //  Also, if the user has defined a labelKey with vars, let's
+    // compute before filtering
+    if (Utils.hasVar(keys) || keys === 'displayName') {
       return this.getDisplayName().toLowerCase().indexOf(filter) !== -1
     }
     keys = keys.split(',')

umap/static/umap/js/modules/data/layer.js

@@ -1115,7 +1115,7 @@ export class DataLayer {
     if (this.map.options.filterKey) return this.map.options.filterKey
     if (this.getOption('labelKey')) return this.getOption('labelKey')
     if (this.map.options.sortKey) return this.map.options.sortKey
-    return 'name'
+    return 'displayName'
   }
 
   renderLegend(container) {

umap/static/umap/locale/eu.js

@@ -498,13 +498,15 @@ const locale = {
     "Expression is empty": "Esamoldea hutsa dago",
     "OK": "Ados",
     "Cancel": "Utzi",
-    "Attach map to a team": "Attach map to a team",
-    "Display the polygon inverted": "Display the polygon inverted",
-    "Proportional circles": "Proportional circles",
+    "Attach map to a team": "Erantsi mapa talde bati",
+    "Display the polygon inverted": "Bistaratu poligonoa alderantziz",
+    "Proportional circles": "Zirkulu proportzionalak",
     "Property name to compute circles": "Property name to compute circles",
-    "Min circle radius": "Min circle radius",
-    "Max circle radius": "Max circle radius",
-    "Display the open browser control": "Display the open browser control"
+    "Min circle radius": "Zirkuluaren gutxieneko erradioa",
+    "Max circle radius": "Zirkuluaren gehieneko erradioa",
+    "Display the open browser control": "Display the open browser control",
+    "Copy as GeoJSON": "Kopiatu GeoJSON gisa",
+    "Please zoom in to edit the geometry": "Mesedez, handitu geometria editatzeko"
 }
 L.registerLocale("eu", locale)
 L.setLocale("eu")

umap/static/umap/locale/eu.json

@@ -498,11 +498,13 @@
     "Expression is empty": "Esamoldea hutsa dago",
     "OK": "Ados",
     "Cancel": "Utzi",
-    "Attach map to a team": "Attach map to a team",
-    "Display the polygon inverted": "Display the polygon inverted",
-    "Proportional circles": "Proportional circles",
+    "Attach map to a team": "Erantsi mapa talde bati",
+    "Display the polygon inverted": "Bistaratu poligonoa alderantziz",
+    "Proportional circles": "Zirkulu proportzionalak",
     "Property name to compute circles": "Property name to compute circles",
-    "Min circle radius": "Min circle radius",
-    "Max circle radius": "Max circle radius",
-    "Display the open browser control": "Display the open browser control"
+    "Min circle radius": "Zirkuluaren gutxieneko erradioa",
+    "Max circle radius": "Zirkuluaren gehieneko erradioa",
+    "Display the open browser control": "Display the open browser control",
+    "Copy as GeoJSON": "Kopiatu GeoJSON gisa",
+    "Please zoom in to edit the geometry": "Mesedez, handitu geometria editatzeko"
 }

umap/static/umap/locale/fa_IR.js

@@ -160,7 +160,7 @@ const locale = {
     "fill color": "رنگ پرکردن",
     "fill opacity": "شفافیت پرشدگی",
     "fill": "پرکردن",
-    "Fit all data": "Fit all data",
+    "Fit all data": "گنجیدن همهٔ داده‌ها",
     "Format": "قالب",
     "From zoom": "از زوم",
     "full backup": "پشتیبان کامل",
@@ -218,7 +218,7 @@ const locale = {
     "Link to…": "پیوند به…",
     "Link with text: [[http://example.com|text of the link]]": "پیوند با متن:\n[[http://example.com|text of the link]]",
     "Long credits": "یادکردهای بلند",
-    "Longitude": "عرض جغرافیایی",
+    "Longitude": "طول جغرافیایی",
     "Make main shape": "شکل اصلی را ایجاد کنید",
     "Manage layers": "مدیریت لایه‌ها",
     "Manual": "دستی",
@@ -237,7 +237,7 @@ const locale = {
     "max zoom": "بیشینهٔ بزرگنمایی",
     "Measure distances": "اندازه‌گیری مسافت‌ها",
     "Merge lines": "ادغام خطوط",
-    "mi": "مایل",
+    "mi": "mi",
     "miles": "مایل",
     "min zoom": "کمینهٔ بزرگنمایی",
     "More controls": "دکمه‌های بیشتر",
@@ -304,7 +304,7 @@ const locale = {
     "Save this center and zoom": "ذخیره‌سازی این مرکزیت و بزرگنمایی",
     "Save this location as new feature": "این مکان را به عنوان عنصر جدید ذخیره کنید",
     "Save": "ذخیره",
-    "Saved center and zoom": "مرکزیت و بزرگنمایی ذخیره شد",
+    "Saved center and zoom": "مرکزیت و بزرگنمایی ذخیره‌شده",
     "Search location": "جستجوی مکان",
     "Search": "جستجو",
     "Secret edit link:": "پیوند محرمانه برای ویرایش:",
@@ -354,14 +354,14 @@ const locale = {
     "Type char or paste emoji": "نویسه‌ای بنویسید یا شکلکی بچسبانید",
     "Type of layer": "نوع لایه",
     "Unable to detect format of file {filename}": "قالب فایل {filename} تشخیص داده نشد",
-    "Untitled layer": "لایهٔ بدون عنوان",
-    "Untitled map": "نقشهٔ بدون عنوان",
+    "Untitled layer": "لایهٔ بی‌عنوان",
+    "Untitled map": "نقشهٔ بی‌عنوان",
     "Update permissions and editors": "روزآمدسازی مجوزها و ویرایشگران",
     "Update permissions": "روزآمدسازی مجوزها",
     "Update who can see and edit the map": "چه کسی می‌تواند نقشه را ببیند و ویرایش کند",
     "Url": "نشانی اینترنتی",
     "URL": "URL",
-    "Use current bounds": "از کران‌های فعلی استفاده شود",
+    "Use current bounds": "استفاده از کران‌های فعلی",
     "Use placeholders with feature properties between brackets, eg. {name}, they will be dynamically replaced by the corresponding values.": "هر کدام از ویژگی‌های عنصر را بین آکولاد قرار دهید و جانگهدار بسازید. مثال: {name}. این جانگهدارها به طور پویا به مقدار متناظرشان تغییر می‌کنند.",
     "User content credits": "یادکردهای محتوای کاربر",
     "User interface options": "گزینه‌های رابط کاربری",
@@ -500,11 +500,13 @@ const locale = {
     "Cancel": "لغو",
     "Attach map to a team": "Attach map to a team",
     "Display the polygon inverted": "Display the polygon inverted",
-    "Proportional circles": "Proportional circles",
-    "Property name to compute circles": "Property name to compute circles",
-    "Min circle radius": "Min circle radius",
-    "Max circle radius": "Max circle radius",
-    "Display the open browser control": "Display the open browser control"
+    "Proportional circles": "دایره‌های نسبی",
+    "Property name to compute circles": "نام ویژگی برای محاسبهٔ دایره‌ها",
+    "Min circle radius": "کمترین شعاع دایره",
+    "Max circle radius": "بیشتری شعاع دایره",
+    "Display the open browser control": "نمایش دکمهٔ بازکردن مرورگر",
+    "Copy as GeoJSON": "Copy as GeoJSON",
+    "Please zoom in to edit the geometry": "لطفاً برای ویرایش هندسه زوم کنید"
 }
 L.registerLocale("fa_IR", locale)
 L.setLocale("fa_IR")

umap/static/umap/locale/fa_IR.json

@@ -160,7 +160,7 @@
     "fill color": "رنگ پرکردن",
     "fill opacity": "شفافیت پرشدگی",
     "fill": "پرکردن",
-    "Fit all data": "Fit all data",
+    "Fit all data": "گنجیدن همهٔ داده‌ها",
     "Format": "قالب",
     "From zoom": "از زوم",
     "full backup": "پشتیبان کامل",
@@ -218,7 +218,7 @@
     "Link to…": "پیوند به…",
     "Link with text: [[http://example.com|text of the link]]": "پیوند با متن:\n[[http://example.com|text of the link]]",
     "Long credits": "یادکردهای بلند",
-    "Longitude": "عرض جغرافیایی",
+    "Longitude": "طول جغرافیایی",
     "Make main shape": "شکل اصلی را ایجاد کنید",
     "Manage layers": "مدیریت لایه‌ها",
     "Manual": "دستی",
@@ -237,7 +237,7 @@
     "max zoom": "بیشینهٔ بزرگنمایی",
     "Measure distances": "اندازه‌گیری مسافت‌ها",
     "Merge lines": "ادغام خطوط",
-    "mi": "مایل",
+    "mi": "mi",
     "miles": "مایل",
     "min zoom": "کمینهٔ بزرگنمایی",
     "More controls": "دکمه‌های بیشتر",
@@ -304,7 +304,7 @@
     "Save this center and zoom": "ذخیره‌سازی این مرکزیت و بزرگنمایی",
     "Save this location as new feature": "این مکان را به عنوان عنصر جدید ذخیره کنید",
     "Save": "ذخیره",
-    "Saved center and zoom": "مرکزیت و بزرگنمایی ذخیره شد",
+    "Saved center and zoom": "مرکزیت و بزرگنمایی ذخیره‌شده",
     "Search location": "جستجوی مکان",
     "Search": "جستجو",
     "Secret edit link:": "پیوند محرمانه برای ویرایش:",
@@ -354,14 +354,14 @@
     "Type char or paste emoji": "نویسه‌ای بنویسید یا شکلکی بچسبانید",
     "Type of layer": "نوع لایه",
     "Unable to detect format of file {filename}": "قالب فایل {filename} تشخیص داده نشد",
-    "Untitled layer": "لایهٔ بدون عنوان",
-    "Untitled map": "نقشهٔ بدون عنوان",
+    "Untitled layer": "لایهٔ بی‌عنوان",
+    "Untitled map": "نقشهٔ بی‌عنوان",
     "Update permissions and editors": "روزآمدسازی مجوزها و ویرایشگران",
     "Update permissions": "روزآمدسازی مجوزها",
     "Update who can see and edit the map": "چه کسی می‌تواند نقشه را ببیند و ویرایش کند",
     "Url": "نشانی اینترنتی",
     "URL": "URL",
-    "Use current bounds": "از کران‌های فعلی استفاده شود",
+    "Use current bounds": "استفاده از کران‌های فعلی",
     "Use placeholders with feature properties between brackets, eg. {name}, they will be dynamically replaced by the corresponding values.": "هر کدام از ویژگی‌های عنصر را بین آکولاد قرار دهید و جانگهدار بسازید. مثال: {name}. این جانگهدارها به طور پویا به مقدار متناظرشان تغییر می‌کنند.",
     "User content credits": "یادکردهای محتوای کاربر",
     "User interface options": "گزینه‌های رابط کاربری",
@@ -500,9 +500,11 @@
     "Cancel": "لغو",
     "Attach map to a team": "Attach map to a team",
     "Display the polygon inverted": "Display the polygon inverted",
-    "Proportional circles": "Proportional circles",
-    "Property name to compute circles": "Property name to compute circles",
-    "Min circle radius": "Min circle radius",
-    "Max circle radius": "Max circle radius",
-    "Display the open browser control": "Display the open browser control"
+    "Proportional circles": "دایره‌های نسبی",
+    "Property name to compute circles": "نام ویژگی برای محاسبهٔ دایره‌ها",
+    "Min circle radius": "کمترین شعاع دایره",
+    "Max circle radius": "بیشتری شعاع دایره",
+    "Display the open browser control": "نمایش دکمهٔ بازکردن مرورگر",
+    "Copy as GeoJSON": "Copy as GeoJSON",
+    "Please zoom in to edit the geometry": "لطفاً برای ویرایش هندسه زوم کنید"
 }

umap/templatetags/umap_tags.py

@@ -45,7 +45,7 @@ def tilelayer_preview(tilelayer):
 
 @register.filter
 def can_delete_map(map, request):
-    return map.can_delete(request.user, request)
+    return map.can_delete(request)
 
 
 @register.filter

umap/tests/conftest.py

@@ -90,3 +90,8 @@ def datalayer(map):
 @pytest.fixture
 def tilelayer():
     return TileLayerFactory()
+
+
+@pytest.fixture
+def fake_request(rf):
+    return rf.get("/")

umap/tests/integration/test_browser.py

@@ -176,6 +176,26 @@ def test_filter_works_with_variable_in_labelKey(live_server, page, map):
     expect(paths).to_have_count(1)  # Only polygon
 
 
+def test_filter_works_with_missing_name(live_server, page, map):
+    map.settings["properties"]["onLoadPanel"] = "databrowser"
+    map.save()
+    data = deepcopy(DATALAYER_DATA)
+    del data["features"][0]["properties"]["name"]
+    DataLayerFactory(map=map, data=data, name="foobar")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    expect(page.get_by_title("Features in this layer: 3")).to_be_visible()
+    markers = page.locator(".leaflet-marker-icon")
+    paths = page.locator(".leaflet-overlay-pane path")
+    expect(markers).to_have_count(1)
+    expect(paths).to_have_count(2)
+    page.locator(".filters summary").click()
+    filter_ = page.locator("input[name='filter']")
+    expect(filter_).to_be_visible()
+    filter_.type("foob")
+    expect(markers).to_have_count(1)
+    expect(paths).to_have_count(0)
+
+
 def test_data_browser_can_show_only_visible_features(live_server, page, bootstrap, map):
     # Zoom on France
     page.goto(f"{live_server.url}{map.get_absolute_url()}#6/51.000/2.000")

umap/tests/test_datalayer.py

@@ -1,7 +1,7 @@
-import os
 from pathlib import Path
 
 import pytest
+from django.contrib.auth.models import AnonymousUser
 from django.core.files.base import ContentFile
 
 from umap.models import DataLayer, Map
@@ -100,28 +100,33 @@ def test_should_remove_old_versions_on_save(map, settings):
     assert names == [Path(datalayer.geojson.name).name, newer, medium]
 
 
-def test_anonymous_cannot_edit_in_editors_mode(datalayer):
+def test_anonymous_cannot_edit_in_editors_mode(datalayer, fake_request):
     datalayer.edit_status = DataLayer.COLLABORATORS
     datalayer.save()
-    assert not datalayer.can_edit()
+    fake_request.user = AnonymousUser()
+    assert not datalayer.can_edit(fake_request)
 
 
-def test_owner_can_edit_in_editors_mode(datalayer, user):
+def test_owner_can_edit_in_editors_mode(datalayer, user, fake_request):
     datalayer.edit_status = DataLayer.COLLABORATORS
     datalayer.save()
-    assert datalayer.can_edit(datalayer.map.owner)
+    fake_request.user = datalayer.map.owner
+    assert datalayer.can_edit(fake_request)
 
 
-def test_editor_can_edit_in_collaborators_mode(datalayer, user):
+def test_editor_can_edit_in_collaborators_mode(datalayer, user, fake_request):
     map = datalayer.map
     map.editors.add(user)
     map.save()
     datalayer.edit_status = DataLayer.COLLABORATORS
     datalayer.save()
-    assert datalayer.can_edit(user)
+    fake_request.user = user
+    assert datalayer.can_edit(fake_request)
 
 
-def test_team_members_can_edit_in_collaborators_mode(datalayer, user, team):
+def test_team_members_can_edit_in_collaborators_mode(
+    datalayer, user, team, fake_request
+):
     user.teams.add(team)
     user.save()
     map = datalayer.map
@@ -129,60 +134,69 @@ def test_team_members_can_edit_in_collaborators_mode(datalayer, user, team):
     map.save()
     datalayer.edit_status = DataLayer.COLLABORATORS
     datalayer.save()
-    assert datalayer.can_edit(user)
+    fake_request.user = user
+    assert datalayer.can_edit(fake_request)
 
 
-def test_anonymous_can_edit_in_public_mode(datalayer):
+def test_anonymous_can_edit_in_public_mode(datalayer, fake_request):
     datalayer.edit_status = DataLayer.ANONYMOUS
     datalayer.save()
-    assert datalayer.can_edit()
+    fake_request.user = AnonymousUser()
+    assert datalayer.can_edit(fake_request)
 
 
-def test_owner_can_edit_in_public_mode(datalayer, user):
+def test_owner_can_edit_in_public_mode(datalayer, user, fake_request):
     datalayer.edit_status = DataLayer.ANONYMOUS
     datalayer.save()
-    assert datalayer.can_edit(datalayer.map.owner)
+    fake_request.user = datalayer.map.owner
+    assert datalayer.can_edit(fake_request)
 
 
-def test_editor_can_edit_in_public_mode(datalayer, user):
+def test_editor_can_edit_in_public_mode(datalayer, user, fake_request):
     map = datalayer.map
     map.editors.add(user)
     map.save()
     datalayer.edit_status = DataLayer.ANONYMOUS
     datalayer.save()
-    assert datalayer.can_edit(user)
+    fake_request.user = user
+    assert datalayer.can_edit(fake_request)
 
 
-def test_anonymous_cannot_edit_in_anonymous_owner_mode(datalayer):
+def test_anonymous_cannot_edit_in_anonymous_owner_mode(datalayer, fake_request):
     datalayer.edit_status = DataLayer.OWNER
     datalayer.save()
     map = datalayer.map
     map.owner = None
     map.save()
-    assert not datalayer.can_edit()
+    fake_request.user = AnonymousUser()
+    assert not datalayer.can_edit(fake_request)
 
 
-def test_owner_can_edit_in_inherit_mode_and_map_in_owner_mode(datalayer):
+def test_owner_can_edit_in_inherit_mode_and_map_in_owner_mode(datalayer, fake_request):
     datalayer.edit_status = DataLayer.INHERIT
     datalayer.save()
     map = datalayer.map
     map.edit_status = Map.OWNER
     map.save()
-    assert datalayer.can_edit(map.owner)
+    fake_request.user = map.owner
+    assert datalayer.can_edit(fake_request)
 
 
-def test_editors_cannot_edit_in_inherit_mode_and_map_in_owner_mode(datalayer, user):
+def test_editors_cannot_edit_in_inherit_mode_and_map_in_owner_mode(
+    datalayer, user, fake_request
+):
     datalayer.edit_status = DataLayer.INHERIT
     datalayer.save()
     map = datalayer.map
     map.editors.add(user)
     map.edit_status = Map.OWNER
     map.save()
-    assert not datalayer.can_edit(user)
+    fake_request.user = user
+    assert not datalayer.can_edit(fake_request)
 
 
 def test_team_members_cannot_edit_in_inherit_mode_and_map_in_owner_mode(
-    datalayer, user, team
+    datalayer, user, team, fake_request
 ):
     datalayer.edit_status = DataLayer.INHERIT
     datalayer.save()
@@ -192,50 +206,66 @@ def test_team_members_cannot_edit_in_inherit_mode_and_map_in_owner_mode(
     map.team = team
     map.edit_status = Map.OWNER
     map.save()
-    assert not datalayer.can_edit(user)
+    fake_request.user = user
+    assert not datalayer.can_edit(fake_request)
 
 
-def test_anonymous_cannot_edit_in_inherit_mode_and_map_in_owner_mode(datalayer):
+def test_anonymous_cannot_edit_in_inherit_mode_and_map_in_owner_mode(
+    datalayer, fake_request
+):
     datalayer.edit_status = DataLayer.INHERIT
     datalayer.save()
     map = datalayer.map
     map.edit_status = Map.OWNER
     map.save()
-    assert not datalayer.can_edit()
+    fake_request.user = AnonymousUser()
+    assert not datalayer.can_edit(fake_request)
 
 
-def test_owner_can_edit_in_inherit_mode_and_map_in_editors_mode(datalayer):
+def test_owner_can_edit_in_inherit_mode_and_map_in_editors_mode(
+    datalayer, fake_request
+):
     datalayer.edit_status = DataLayer.INHERIT
     datalayer.save()
     map = datalayer.map
     map.edit_status = Map.COLLABORATORS
     map.save()
-    assert datalayer.can_edit(map.owner)
+    fake_request.user = map.owner
+    assert datalayer.can_edit(fake_request)
 
 
-def test_editors_can_edit_in_inherit_mode_and_map_in_editors_mode(datalayer, user):
+def test_editors_can_edit_in_inherit_mode_and_map_in_editors_mode(
+    datalayer, user, fake_request
+):
     datalayer.edit_status = DataLayer.INHERIT
     datalayer.save()
     map = datalayer.map
     map.editors.add(user)
     map.edit_status = Map.COLLABORATORS
     map.save()
-    assert datalayer.can_edit(user)
+    fake_request.user = user
+    assert datalayer.can_edit(fake_request)
 
 
-def test_anonymous_cannot_edit_in_inherit_mode_and_map_in_editors_mode(datalayer):
+def test_anonymous_cannot_edit_in_inherit_mode_and_map_in_editors_mode(
+    datalayer, fake_request
+):
     datalayer.edit_status = DataLayer.INHERIT
     datalayer.save()
     map = datalayer.map
     map.edit_status = Map.COLLABORATORS
     map.save()
-    assert not datalayer.can_edit()
+    fake_request.user = AnonymousUser()
+    assert not datalayer.can_edit(fake_request)
 
 
-def test_anonymous_can_edit_in_inherit_mode_and_map_in_public_mode(datalayer):
+def test_anonymous_can_edit_in_inherit_mode_and_map_in_public_mode(
+    datalayer, fake_request
+):
     datalayer.edit_status = DataLayer.INHERIT
     datalayer.save()
     map = datalayer.map
     map.edit_status = Map.ANONYMOUS
     map.save()
-    assert datalayer.can_edit()
+    fake_request.user = AnonymousUser()
+    assert datalayer.can_edit(fake_request)

umap/tests/test_map.py

@@ -9,63 +9,69 @@ from .base import MapFactory
 pytestmark = pytest.mark.django_db
 
 
-def test_anonymous_can_edit_if_status_anonymous(map):
-    anonymous = AnonymousUser()
+def test_anonymous_can_edit_if_status_anonymous(map, fake_request):
     map.edit_status = map.ANONYMOUS
     map.save()
-    assert map.can_edit(anonymous)
+    fake_request.user = AnonymousUser()
+    assert map.can_edit(fake_request)
 
 
-def test_anonymous_cannot_edit_if_not_status_anonymous(map):
-    anonymous = AnonymousUser()
+def test_anonymous_cannot_edit_if_not_status_anonymous(map, fake_request):
     map.edit_status = map.OWNER
     map.save()
-    assert not map.can_edit(anonymous)
+    fake_request.user = AnonymousUser()
+    assert not map.can_edit(fake_request)
 
 
-def test_non_editors_can_edit_if_status_anonymous(map, user):
+def test_non_editors_can_edit_if_status_anonymous(map, user, fake_request):
     assert map.owner != user
     map.edit_status = map.ANONYMOUS
     map.save()
-    assert map.can_edit(user)
+    fake_request.user = user
+    assert map.can_edit(fake_request)
 
 
-def test_non_editors_cannot_edit_if_not_status_anonymous(map, user):
+def test_non_editors_cannot_edit_if_not_status_anonymous(map, user, fake_request):
     map.edit_status = map.OWNER
     map.save()
-    assert not map.can_edit(user)
+    fake_request.user = user
+    assert not map.can_edit(fake_request)
 
 
-def test_editors_cannot_edit_if_status_owner(map, user):
+def test_editors_cannot_edit_if_status_owner(map, user, fake_request):
     map.edit_status = map.OWNER
     map.editors.add(user)
     map.save()
-    assert not map.can_edit(user)
+    fake_request.user = user
+    assert not map.can_edit(fake_request)
 
 
-def test_editors_can_edit_if_status_collaborators(map, user):
+def test_editors_can_edit_if_status_collaborators(map, user, fake_request):
     map.edit_status = map.COLLABORATORS
     map.editors.add(user)
     map.save()
-    assert map.can_edit(user)
+    fake_request.user = user
+    assert map.can_edit(fake_request)
 
 
-def test_team_members_cannot_edit_if_status_owner(map, user, team):
+def test_team_members_cannot_edit_if_status_owner(map, user, team, fake_request):
     user.teams.add(team)
     user.save()
     map.edit_status = map.OWNER
     map.team = team
     map.save()
-    assert not map.can_edit(user)
+    fake_request.user = user
+    assert not map.can_edit(fake_request)
 
 
-def test_team_members_can_edit_if_status_collaborators(map, user, team):
+def test_team_members_can_edit_if_status_collaborators(map, user, team, fake_request):
     user.teams.add(team)
     user.save()
     map.edit_status = map.COLLABORATORS
     map.team = team
     map.save()
-    assert map.can_edit(user)
+    fake_request.user = user
+    assert map.can_edit(fake_request)
 
 
 def test_logged_in_user_should_be_allowed_for_anonymous_map_with_anonymous_edit_status(
@@ -77,14 +83,17 @@ def test_logged_in_user_should_be_allowed_for_anonymous_map_with_anonymous_edit_
     url = reverse("map_update", kwargs={"map_id": map.pk})
     request = rf.get(url)
     request.user = user
-    assert map.can_edit(user, request)
+    assert map.can_edit(request)
 
 
-def test_anonymous_user_should_not_be_allowed_for_anonymous_map(map, user, rf):  # noqa
+def test_anonymous_user_should_not_be_allowed_for_anonymous_map(
+    map, user, fake_request
+):
     map.owner = None
     map.edit_status = map.OWNER
     map.save()
-    assert not map.can_edit()
+    fake_request.user = AnonymousUser()
+    assert not map.can_edit(fake_request)
 
 
 def test_clone_should_return_new_instance(map, user):

umap/views.py

@@ -546,7 +546,7 @@ class SessionMixin:
         data = {}
         user = self.request.user
         if hasattr(self, "object"):
-            data["is_owner"] = self.object.is_owner(user, self.request)
+            data["is_owner"] = self.object.is_owner(self.request)
         if user.is_anonymous:
             return data
         return {
@@ -725,20 +725,14 @@ class MapView(MapDetailMixin, PermissionsMixin, DetailView):
         return self.object.get_absolute_url()
 
     def get_datalayers(self):
-        return [
-            dl.metadata(self.request.user, self.request)
-            for dl in self.object.datalayer_set.all()
-        ]
+        return [dl.metadata(self.request) for dl in self.object.datalayer_set.all()]
 
     @property
     def edit_mode(self):
         edit_mode = "disabled"
-        if self.object.can_edit(self.request.user, self.request):
+        if self.object.can_edit(self.request):
             edit_mode = "advanced"
-        elif any(
-            d.can_edit(self.request.user, self.request)
-            for d in self.object.datalayer_set.all()
-        ):
+        elif any(d.can_edit(self.request) for d in self.object.datalayer_set.all()):
             edit_mode = "simple"
         return edit_mode
 
@@ -901,7 +895,7 @@ def get_websocket_auth_token(request, map_id, map_inst):
     map_object: Map = Map.objects.get(pk=map_id)
 
     permissions = ["edit"]
-    if map_object.is_owner(request.user, request):
+    if map_object.is_owner(request):
         permissions.append("owner")
 
     if request.user.is_authenticated:
@@ -959,7 +953,7 @@ class AttachAnonymousMap(View):
         if (
             self.object.owner
             or not self.object.is_anonymous_owner(self.request)
-            or not self.object.can_edit(self.request.user, self.request)
+            or not self.object.can_edit(self.request)
             or not self.request.user.is_authenticated
         ):
             return HttpResponseForbidden()
@@ -976,7 +970,7 @@ class SendEditLink(FormLessEditMixin, FormView):
         if (
             self.object.owner
             or not self.object.is_anonymous_owner(self.request)
-            or not self.object.can_edit(self.request.user, self.request)
+            or not self.object.can_edit(self.request)
         ):
             return HttpResponseForbidden()
         form = self.get_form()
@@ -1009,7 +1003,7 @@ class MapDelete(DeleteView):
 
     def form_valid(self, form):
         self.object = self.get_object()
-        if not self.object.can_delete(self.request.user, self.request):
+        if not self.object.can_delete(self.request):
             return HttpResponseForbidden(_("Only its owner can delete the map."))
         self.object.delete()
         home_url = reverse("home")
@@ -1186,9 +1180,7 @@ class DataLayerCreate(FormLessEditMixin, GZipMixin, CreateView):
         form.instance.map = self.kwargs["map_inst"]
         self.object = form.save()
         # Simple response with only metadata (including new id)
-        response = simple_json_response(
-            **self.object.metadata(self.request.user, self.request)
-        )
+        response = simple_json_response(**self.object.metadata(self.request))
         response["X-Datalayer-Version"] = self.version
         return response
 
@@ -1242,7 +1234,7 @@ class DataLayerUpdate(FormLessEditMixin, GZipMixin, UpdateView):
         if self.object.map.pk != int(self.kwargs["map_id"]):
             return HttpResponseForbidden()
 
-        if not self.object.can_edit(user=self.request.user, request=self.request):
+        if not self.object.can_edit(request=self.request):
             return HttpResponseForbidden()
 
         reference_version = self.request.headers.get("X-Datalayer-Reference")
@@ -1262,7 +1254,7 @@ class DataLayerUpdate(FormLessEditMixin, GZipMixin, UpdateView):
 
     def form_valid(self, form):
         self.object = form.save()
-        data = {**self.object.metadata(self.request.user, self.request)}
+        data = {**self.object.metadata(self.request)}
         if self.request.session.get("needs_reload"):
             data["geojson"] = json.loads(self.object.geojson.read().decode())
             self.request.session["needs_reload"] = False

{umap_project-2.6.0b2.dist-info → umap_project-2.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: umap-project
-Version: 2.6.0b2
+Version: 2.6.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>
@@ -19,10 +19,10 @@ Requires-Python: >=3.10
 Requires-Dist: django-agnocomplete==2.2.0
 Requires-Dist: django-environ==0.11.2
 Requires-Dist: django-probes==1.7.0
-Requires-Dist: django==5.1
+Requires-Dist: django==5.1.1
 Requires-Dist: pillow==10.4.0
 Requires-Dist: psycopg==3.2.1
-Requires-Dist: pydantic==2.8.2
+Requires-Dist: pydantic==2.9.1
 Requires-Dist: rcssmin==1.1.2
 Requires-Dist: requests==2.32.3
 Requires-Dist: rjsmin==1.2.2
@@ -33,11 +33,11 @@ Provides-Extra: dev
 Requires-Dist: djlint==1.35.2; extra == 'dev'
 Requires-Dist: hatch==1.12.0; extra == 'dev'
 Requires-Dist: isort==5.13.2; extra == 'dev'
-Requires-Dist: mkdocs-material==9.5.33; extra == 'dev'
+Requires-Dist: mkdocs-material==9.5.34; extra == 'dev'
 Requires-Dist: mkdocs-static-i18n==1.2.3; extra == 'dev'
 Requires-Dist: mkdocs==1.6.1; extra == 'dev'
 Requires-Dist: pymdown-extensions==10.9; extra == 'dev'
-Requires-Dist: ruff==0.6.3; extra == 'dev'
+Requires-Dist: ruff==0.6.4; extra == 'dev'
 Requires-Dist: vermin==1.6.0; extra == 'dev'
 Provides-Extra: docker
 Requires-Dist: uwsgi==2.0.26; extra == 'docker'
@@ -45,7 +45,7 @@ Provides-Extra: test
 Requires-Dist: factory-boy==3.3.1; extra == 'test'
 Requires-Dist: playwright>=1.39; extra == 'test'
 Requires-Dist: pytest-django==4.9.0; extra == 'test'
-Requires-Dist: pytest-playwright==0.5.1; extra == 'test'
+Requires-Dist: pytest-playwright==0.5.2; extra == 'test'
 Requires-Dist: pytest-xdist<4,>=3.5.0; extra == 'test'
 Requires-Dist: pytest==8.3.2; extra == 'test'
 Description-Content-Type: text/markdown

{umap_project-2.6.0b2.dist-info → umap_project-2.6.1.dist-info}/RECORD

@@ -1,18 +1,18 @@
-umap/__init__.py,sha256=iw8_56v34cOA8cil0skIng0HnLHzqqzo3IiTem7TSvc,20
+umap/__init__.py,sha256=ro6AJSaqPxSqAiAh2RHXql8v0t7TVU5xIp6-hIVrO9Y,18
 umap/admin.py,sha256=BSZydLskm87WOovG1dnJztkuFTRKA8zxffUDBzJ4PHE,864
 umap/apps.py,sha256=5ssKqPUuNJlapaBmr4LY_HDb7J1NFCT3wzythxQOOfs,109
 umap/autocomplete.py,sha256=WUsbsVBl_KzzEzxB4g3rAoS5-eEvCZGtelVzXeOFV90,444
 umap/context_processors.py,sha256=tpFuobOUj75OaheysJMIt-Xnq0CFQOMY38e_vohX6dE,534
-umap/decorators.py,sha256=95tsPKWtK-Hdy0wcUdB_UdCCiXs8onmEw6XDLj-4H-U,2373
+umap/decorators.py,sha256=t3YdQLuV0WrqMo2bHEbhkpzmxZe0gRNtzUvczruCn-A,2342
 umap/fields.py,sha256=c32tKWKF8aThrCXDJblwo0n9n2ET6hxBYzEupfr0B4o,900
 umap/forms.py,sha256=geBn_IVvhbpfswkOZyA1RMgoD6AV33ic9N7gH1M92oE,3994
 umap/managers.py,sha256=-lBK0xYFRDfX76qDRdLnZOA8jEPYseEwIj8QOiHVM4w,243
 umap/middleware.py,sha256=p8EPW_gYW8Wh2lk0DNIAkZQbYlBZugW7Yq4iiA7L4aE,514
-umap/models.py,sha256=efPfdunwTjKWdnC9WGTQ2n2XAbPt7K6w37q9_A6-ogo,18811
+umap/models.py,sha256=5hCRqQN7pDqK4u_EOqog6nFNtspHUydQDNGmmdZZuyg,19065
 umap/storage.py,sha256=mxFcenC1JECmpNy4H0e7vX8GObDZVXzs1RPjQFWNd5k,2473
 umap/urls.py,sha256=OPJ47SOnVMmczfpMBYfKbf6UvCYWCm8sp36K2jczwUE,7476
 umap/utils.py,sha256=19i8ibi-1IXxafT4k_yOHMhD-DsPH74Ll9qw-UrUkM4,5856
-umap/views.py,sha256=ZrE5WFoTbemRscekTKoFGdYtfJp5yYydDRGsYKL5-gs,45387
+umap/views.py,sha256=kkKsaVJ9oqhv3fCYfyVrDXdzFvIqTkC3MUHbbBghWv0,45101
 umap/websocket_server.py,sha256=igM05T95y7IqidPy8nVrCwbydj_xcCEAqwjZPb0mxyA,3023
 umap/wsgi.py,sha256=IopIgnDZbCus3XpSetTHnra9VyzWi0Y2tJo-CmfTWCY,1132
 umap/bin/__init__.py,sha256=iA3ON4A6NCpenrn3q2OgefUKF5QRFIQS-FtS0pxruI8,234
@@ -44,8 +44,8 @@ umap/locale/et/LC_MESSAGES/django.mo,sha256=vGMEot_LXQAQPvJESjgOFeyOgzEzYWYKP0HX
 umap/locale/et/LC_MESSAGES/django.po,sha256=344_8a7EH06mtLYRIGIIKiFrg8HRWmVdVMJl9pV1oso,12435
 umap/locale/eu/LC_MESSAGES/django.mo,sha256=guogxd6hL3SbGClGr7QPv0fr1nAaRa4YPY-7C-MAKUA,11101
 umap/locale/eu/LC_MESSAGES/django.po,sha256=l9zlOHgIkGnH39nSwqf1ydTnQZ3cNdJ8Uo1iyYpBvX8,17674
-umap/locale/fa_IR/LC_MESSAGES/django.mo,sha256=QRnrHXPvibiXJ6F53jhT8YLXC6BAwhTXZ8XvNmIIeqM,13581
-umap/locale/fa_IR/LC_MESSAGES/django.po,sha256=IkMp1JTU5k7mtK1o_5xc61KditzLBRzlxVLGksnQPOw,20245
+umap/locale/fa_IR/LC_MESSAGES/django.mo,sha256=t4H1hC7blrnjOwIxILrqRuDsRAm_C8w3Z-KQBbCbLnk,14040
+umap/locale/fa_IR/LC_MESSAGES/django.po,sha256=hjk92LrZvSeOP-DzQpj_mp6ik97KiAXqANa7hQnOqbc,20435
 umap/locale/fi/LC_MESSAGES/django.mo,sha256=-p9kvtfjdJKrbSMEfpdvoZ6jEX_njf-0uqzlvydbhOo,4856
 umap/locale/fi/LC_MESSAGES/django.po,sha256=Saq5PpycYhmutr6CWPQNYI4UwQbSdxrCWxapwotaB3c,12823
 umap/locale/fr/LC_MESSAGES/django.mo,sha256=Sn8nXuBFRj4FltY3td4IakYJRpxnkoaZQ7ykctp7AKw,12248
@@ -239,8 +239,8 @@ umap/static/umap/js/modules/slideshow.js,sha256=fMpQ93VU7Uc9Mhxary_vrAdAK8g_P5Ch
 umap/static/umap/js/modules/tableeditor.js,sha256=o8t6zheQcaZ9Ybp67W8AFnMJvbHgLuJsOXXQajCwX7U,9788
 umap/static/umap/js/modules/urls.js,sha256=Y_8KJ8CqMDCgV_0E9mc6oohODvRgoNHBx_avL85SR8g,838
 umap/static/umap/js/modules/utils.js,sha256=TzRJEqlvNpPgv-gqIisWLOv4LtfzvoAeEi1NnD_hPRE,11378
-umap/static/umap/js/modules/data/features.js,sha256=49THaqEI-FYPq9UK-g_ziN4yP2y0ZgZTBiYLFHIBlQI,26010
-umap/static/umap/js/modules/data/layer.js,sha256=c-lEbIfYd23IGSWyD-iYKuDwYsz60dzyX1xXSDp15-c,33188
+umap/static/umap/js/modules/data/features.js,sha256=W3v7rwgs-ypvcc3neYcxyMOyqbxxGIGY79ahd1zoQzE,26291
+umap/static/umap/js/modules/data/layer.js,sha256=hcEgr1xlIayfMOTGNRIWP9BwluZAnqgoJ1RSAcVZeLw,33195
 umap/static/umap/js/modules/importers/communesfr.js,sha256=GuBriig7n3-AmtBWByrD43S12bQS_vr6VPlEw3bCL0g,1316
 umap/static/umap/js/modules/importers/datasets.js,sha256=StZbRiq_1vqe0OO1w66k5Lwzju8RntmHpWe9HWIDfRE,1372
 umap/static/umap/js/modules/importers/geodatamine.js,sha256=FtrHMVntY4pPelw0uDZCbDVxy5er1ZzDc80zcDpvRnc,2949
@@ -288,10 +288,10 @@ umap/static/umap/locale/es.js,sha256=mC8vLIXS026NP7HjIOShBlPZKGtfgKH7p_4GmNgCpa0
 umap/static/umap/locale/es.json,sha256=dAH6Yo6iWVSmO5roUs9qH4ANjw6IwnCMQwYyuAefuGM,31506
 umap/static/umap/locale/et.js,sha256=TKMGYlcb-D8KW8WVXGIAR8wDdgqCmi6pb9GXMbpYFEU,29465
 umap/static/umap/locale/et.json,sha256=CPkjYxDD3SsBVyiKO24OREw4l3QVOebdXtLakyNyKyo,29400
-umap/static/umap/locale/eu.js,sha256=fGE1911GyTM9MD1aHGh4Zzy2nFRPxCLVo-Ij7Zv19A0,31144
-umap/static/umap/locale/eu.json,sha256=v4MHfe9NBnKW1M_5PjVtEfUiDq-zlbv-XkV-Rjg67uM,31079
-umap/static/umap/locale/fa_IR.js,sha256=tdSTeOKlBOpwHiMVsRom1Wio3cnOHotkYn_Oot_Uizc,37870
-umap/static/umap/locale/fa_IR.json,sha256=1InhRKruKSo7V0bfXB0DVnJEl6Kv5pSua6tvA8vteWA,37799
+umap/static/umap/locale/eu.js,sha256=mE1wggWHJHTvuGV-ssScN93um8ULnb_PSgIn32D2O1Y,31311
+umap/static/umap/locale/eu.json,sha256=5sdH-hXljmu6fM-M514QouLN7B0hf1Oc-pojsgC9zS0,31246
+umap/static/umap/locale/fa_IR.js,sha256=3gEG9DjMeGMQZg2Nm7xxghr1loWodtjC1UFGkvO02aA,38112
+umap/static/umap/locale/fa_IR.json,sha256=pbxwHf1S63wo5YyTkOnKKANrcNAuObeOI01eO7Tl6z8,38041
 umap/static/umap/locale/fi.js,sha256=XUIrgmxg9KjmpDwFKRULr-EmyjjTBhWWA_ylX_nSjvw,30137
 umap/static/umap/locale/fi.json,sha256=3suDckLIR0BpLA15zLXPAXEY-DnVlbA-YEfeWqx3zfA,30072
 umap/static/umap/locale/fr.js,sha256=qbhzRxExAYPoRSaOcqcMWNbuhoSgrhJxreQlOXhP1a8,32169
@@ -472,15 +472,15 @@ umap/templates/umap/user_dashboard.html,sha256=pc_5pTzAIW4ggZUl2R6aIKB3cdVFTodBt
 umap/templates/umap/user_teams.html,sha256=MfelqIwoLRVjvX-KpVtwqh0I7pNx3oDRhqmSRdpT4bs,1570
 umap/templates/umap/components/alerts/alert.html,sha256=eQRALES_PzIP3qs16eXq9SGz2KWODr4VY0tyl_hARCw,3482
 umap/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-umap/templatetags/umap_tags.py,sha256=oMXsa80LFM52EcLnF6A_o4_PdvOncLBf33pexaeL8nw,1773
+umap/templatetags/umap_tags.py,sha256=OumX1AI9uWzNP3zbjexTz7lGp10FweW0NRFSsdQ_cuU,1759
 umap/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 umap/tests/base.py,sha256=VsyFT-cqXEL0scSI69WKUdItfagqOZ3t2omINyVpb1M,4471
-umap/tests/conftest.py,sha256=IBjTc6bJVB77C83XJ-vhpUTmTbvyTCUi9p5AHqp-8OY,1570
+umap/tests/conftest.py,sha256=KQCZanCTl1ABLIKOuyxS_cpBoXGiwjDc29jsLBiSWxY,1633
 umap/tests/settings.py,sha256=tY70LMFXyo_WijswqGyeWai7vBzM62k7IA8pkkbc9y4,816
-umap/tests/test_datalayer.py,sha256=lonCoyOH8KVKbq8jjz0jZMfSydaOYthRgQfdQy4qY4M,7561
+umap/tests/test_datalayer.py,sha256=auf3u3BDIPianpn08CHkEsKEGq-frseMagAJc1OxXEM,8552
 umap/tests/test_datalayer_views.py,sha256=oq1azMk0IUgf688a41VJHZO4In7On3Nb72x3wwP_ZVQ,22105
 umap/tests/test_licence.py,sha256=BxNY3gdKhIoc2u5OPmAkmjCp0jJN-Jm-uPOfAZlpOHA,339
-umap/tests/test_map.py,sha256=8jqB5UDHBedMWugEw8dT57vqtziLIdoK-XFku4WVpNo,4464
+umap/tests/test_map.py,sha256=yDSU75RxqCmXyiL90NZbrqvrYtmm6OFoc7SQ0kf0ei0,4874
 umap/tests/test_map_views.py,sha256=1bd8vqVq3hYQ4m00klMi6Blxcy2dGKzHKRAxx85vfHk,31898
 umap/tests/test_merge_features.py,sha256=uLZSW00WAI8_nZS0KPP8gg8U4nnky-XGb-VhhKUxv1M,2275
 umap/tests/test_statics.py,sha256=WJe4DZ-cSfN_wCRD8U9ocl6v5FoXrVwBjU6kI6BOcmY,1252
@@ -510,7 +510,7 @@ umap/tests/integration/conftest.py,sha256=bo-ndi3ARHnkwRGo8fGi6lqTd_LdXWSOpgNyXE
 umap/tests/integration/helpers.py,sha256=vvGX5b-DS2fMVDdeXz1lH2IleZkRHjyL7DVvatJU8Do,344
 umap/tests/integration/test_anonymous_owned_map.py,sha256=nsj9VNJ-uP8gToR-eYxBipE20s3DACfQaddpmvwqUBs,10606
 umap/tests/integration/test_basics.py,sha256=_XC0ojQU_HpBvkIPSt1g_rW1B0vjmAko8FSJ7WOD67M,3760
-umap/tests/integration/test_browser.py,sha256=Vzzqv7i_fH73dKz0qIsyhdKMJRCfnEbwmCGlcFt2D7M,16992
+umap/tests/integration/test_browser.py,sha256=pFPeUlPG5Kpk9EhiHJmSenBpVRI3k15Ad8qBha48YJQ,17820
 umap/tests/integration/test_caption.py,sha256=UykDB2WpyFl0sbXGrSJ1IAJTM0PzYajPyz-XWaqUBws,1795
 umap/tests/integration/test_categorized_layer.py,sha256=1MJopDBMLUd_NN2NVqWoePuNPS42RbNlXOwXeyKdZo8,5586
 umap/tests/integration/test_choropleth.py,sha256=MOgWxPiv39wU7v6kwEJ6sfN3P3xTf_ABQo7hxQa_Y1M,3775
@@ -545,8 +545,8 @@ umap/tests/integration/test_view_marker.py,sha256=sPZBbX5jF8WkbAl3Q9eta7a80E2rPX
 umap/tests/integration/test_view_polygon.py,sha256=I7wR6DUrictIMrCPKajCrruJVLry4ZRDdjSs8q0XaOg,1829
 umap/tests/integration/test_view_polyline.py,sha256=n1QVIdl-Xg9yN9o-Jc6VnPhFAuUspsgY0odiUe_jJC4,1598
 umap/tests/integration/test_websocket_sync.py,sha256=sdMjvZsCImhceQiFvSBHKo4dR6HJPl7-D0NItl2QsNU,10530
-umap_project-2.6.0b2.dist-info/METADATA,sha256=-VTYCkc0BWt6p3N8AWNRrslWOqlUzSOYNVJy2gRv2zA,2679
-umap_project-2.6.0b2.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-umap_project-2.6.0b2.dist-info/entry_points.txt,sha256=gz-KDQfEsMLBae8ABOD3foJsCYGPW1tA4Y394R_1RW8,39
-umap_project-2.6.0b2.dist-info/licenses/LICENSE,sha256=kQtrtRKgiPhcl7aO0-lmvbrNAXu7WHyiXvPrUk-TD2Q,820
-umap_project-2.6.0b2.dist-info/RECORD,,
+umap_project-2.6.1.dist-info/METADATA,sha256=FOZHPJzvEJiZDd6Iu7gY7U2H7PK8F3rEem_CDOHTKVs,2679
+umap_project-2.6.1.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+umap_project-2.6.1.dist-info/entry_points.txt,sha256=gz-KDQfEsMLBae8ABOD3foJsCYGPW1tA4Y394R_1RW8,39
+umap_project-2.6.1.dist-info/licenses/LICENSE,sha256=kQtrtRKgiPhcl7aO0-lmvbrNAXu7WHyiXvPrUk-TD2Q,820
+umap_project-2.6.1.dist-info/RECORD,,