umap-project 1.11.0__tar.gz → 1.11.1__tar.gz

{umap_project-1.11.0 → umap_project-1.11.1}/.gitignore

@@ -4,10 +4,12 @@ umap/settings/local/*
 docs/_build
 umap/remote_static
 tmp/*
-node_modules/*
 umap/static/umap/vendors
 site/*
 .pytest_cache/
+node_modules
+umap.conf
+data
 
 ### Python ###
 # Byte-compiled / optimized / DLL files

{umap_project-1.11.0 → umap_project-1.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: umap-project
-Version: 1.11.0
+Version: 1.11.1
 Summary: Create maps with OpenStreetMap layers in a minute and embed them in your site.
 Author-email: Yohan Boniface <yb@enix.org>
 Maintainer-email: David Larlet <david@larlet.fr>
@@ -11,37 +11,39 @@ Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.4
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Requires-Dist: django-agnocomplete==2.2.0
 Requires-Dist: django-compressor==4.3.1
 Requires-Dist: django-environ==0.10.0
 Requires-Dist: django-probes==1.7.0
-Requires-Dist: django>=4.1
+Requires-Dist: django<5,>=4.2
 Requires-Dist: pillow==10.0.1
 Requires-Dist: psycopg2==2.9.6
 Requires-Dist: requests==2.31.0
 Requires-Dist: social-auth-app-django==5.2.0
 Requires-Dist: social-auth-core==4.4.2
 Provides-Extra: dev
-Requires-Dist: black==23.3.0; extra == 'dev'
 Requires-Dist: djlint==1.31.0; extra == 'dev'
 Requires-Dist: hatch==1.7.0; extra == 'dev'
+Requires-Dist: isort==5.12; extra == 'dev'
 Requires-Dist: mkdocs==1.5.2; extra == 'dev'
+Requires-Dist: pymdown-extensions==10.4; extra == 'dev'
+Requires-Dist: ruff==0.1.6; extra == 'dev'
+Requires-Dist: vermin==1.5.2; extra == 'dev'
 Provides-Extra: docker
 Requires-Dist: uwsgi==2.0.21; extra == 'docker'
 Provides-Extra: test
 Requires-Dist: factory-boy==3.2.1; extra == 'test'
-Requires-Dist: playwright==1.38.0; extra == 'test'
+Requires-Dist: playwright<2,>=1.39; extra == 'test'
 Requires-Dist: pytest-django==4.5.2; extra == 'test'
-Requires-Dist: pytest-playwright==0.4.2; extra == 'test'
+Requires-Dist: pytest-playwright<1,>=0.4.3; extra == 'test'
+Requires-Dist: pytest-xdist<4,>=3.5.0; extra == 'test'
 Requires-Dist: pytest==6.2.5; extra == 'test'
 Description-Content-Type: text/markdown
 

{umap_project-1.11.0 → umap_project-1.11.1}/pyproject.toml

@@ -23,16 +23,14 @@ classifiers = [
   "Topic :: Software Development :: Libraries :: Python Modules",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.4",
-  "Programming Language :: Python :: 3.5",
-  "Programming Language :: Python :: 3.6",
-  "Programming Language :: Python :: 3.7",
   "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-  "Django>=4.1",
+  "Django>=4.2,<5",
   "django-agnocomplete==2.2.0",
   "django-compressor==4.3.1",
   "django-environ==0.10.0",
@@ -47,17 +45,20 @@ dependencies = [
 [project.optional-dependencies]
 dev = [
   "hatch==1.7.0",
-  "black==23.3.0",
+  "ruff==0.1.6",
   "djlint==1.31.0",
   "mkdocs==1.5.2",
+  "vermin==1.5.2",
+  "pymdown-extensions==10.4",
+  "isort==5.12",
 ]
 test = [
   "factory-boy==3.2.1",
-  "playwright==1.38.0",
+  "playwright>=1.39,<2",
   "pytest==6.2.5",
   "pytest-django==4.5.2",
-  "pytest-playwright==0.4.2",
-
+  "pytest-playwright>=0.4.3,<1",
+  "pytest-xdist>=3.5.0,<4",
 ]
 docker = [
   "uwsgi==2.0.21",

umap_project-1.11.1/umap/__init__.py

@@ -0,0 +1 @@
+VERSION = "1.11.1"

{umap_project-1.11.0 → umap_project-1.11.1}/umap/admin.py

@@ -1,10 +1,14 @@
 from django.contrib.gis import admin
-from .models import Map, DataLayer, Pictogram, TileLayer, Licence
+
+from .models import DataLayer, Licence, Map, Pictogram, TileLayer
 
 
 class TileLayerAdmin(admin.ModelAdmin):
-    list_display = ('name', 'rank', )
-    list_editable = ('rank', )
+    list_display = (
+        "name",
+        "rank",
+    )
+    list_editable = ("rank",)
 
 
 class MapAdmin(admin.GISModelAdmin):

{umap_project-1.11.0 → umap_project-1.11.1}/umap/autocomplete.py

@@ -1,11 +1,9 @@
+from agnocomplete.core import AgnocompleteModel
+from agnocomplete.register import register
 from django.conf import settings
 from django.contrib.auth import get_user_model
 
 
-from agnocomplete.register import register
-from agnocomplete.core import AgnocompleteModel
-
-
 @register
 class AutocompleteUser(AgnocompleteModel):
     model = get_user_model()
@@ -13,5 +11,5 @@ class AutocompleteUser(AgnocompleteModel):
 
     def item(self, current_item):
         data = super().item(current_item)
-        data['url'] = current_item.get_url()
+        data["url"] = current_item.get_url()
         return data

{umap_project-1.11.0 → umap_project-1.11.1}/umap/bin/__init__.py

@@ -5,12 +5,9 @@ from django.core import management
 
 
 def main():
-    os.environ.setdefault(
-        "DJANGO_SETTINGS_MODULE",
-        "umap.settings"
-    )
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "umap.settings")
     management.execute_from_command_line()
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()

{umap_project-1.11.0 → umap_project-1.11.1}/umap/decorators.py

@@ -1,13 +1,12 @@
 from functools import wraps
 
-from django.urls import reverse_lazy
-from django.shortcuts import get_object_or_404
-from django.http import HttpResponseForbidden
 from django.conf import settings
+from django.http import HttpResponseForbidden
+from django.shortcuts import get_object_or_404
+from django.urls import reverse_lazy
 
-from .views import simple_json_response
 from .models import Map
-
+from .views import simple_json_response
 
 LOGIN_URL = getattr(settings, "LOGIN_URL", "login")
 LOGIN_URL = reverse_lazy(LOGIN_URL) if not LOGIN_URL.startswith("/") else LOGIN_URL

{umap_project-1.11.0 → umap_project-1.11.1}/umap/forms.py

@@ -1,12 +1,12 @@
 from django import forms
-from django.contrib.gis.geos import Point
-from django.contrib.auth import get_user_model
-from django.utils.translation import gettext_lazy as _
-from django.template.defaultfilters import slugify
 from django.conf import settings
+from django.contrib.auth import get_user_model
+from django.contrib.gis.geos import Point
 from django.forms.utils import ErrorList
+from django.template.defaultfilters import slugify
+from django.utils.translation import gettext_lazy as _
 
-from .models import Map, DataLayer
+from .models import DataLayer, Map
 
 DEFAULT_LATITUDE = (
     settings.LEAFLET_LATITUDE if hasattr(settings, "LEAFLET_LATITUDE") else 51

{umap_project-1.11.0 → umap_project-1.11.1}/umap/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-20 10:27+0000\n"
+"POT-Creation-Date: 2023-11-27 08:30+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
 msgid "Inherit"
 msgstr ""
 
-#: middleware.py:14
+#: middleware.py:13
 msgid "Site is readonly for maintenance"
 msgstr ""
 
@@ -290,7 +290,7 @@ msgstr ""
 msgid "You are logged in. Continuing..."
 msgstr ""
 
-#: templates/umap/map_list.html:9 views.py:302
+#: templates/umap/map_list.html:9 views.py:290
 msgid "by"
 msgstr ""
 
@@ -431,52 +431,52 @@ msgstr ""
 msgid "You have no map yet."
 msgstr ""
 
-#: views.py:307
+#: views.py:295
 msgid "View the map"
 msgstr ""
 
-#: views.py:682
+#: views.py:670
 msgid "Map has been updated!"
 msgstr ""
 
-#: views.py:707
+#: views.py:695
 msgid "Map editors updated with success!"
 msgstr ""
 
-#: views.py:745
+#: views.py:733
 #, python-format
 msgid "The uMap edit link for your map: %(map_name)s"
 msgstr ""
 
-#: views.py:748
+#: views.py:736
 #, python-format
 msgid "Here is your secret edit link: %(link)s"
 msgstr ""
 
-#: views.py:754
+#: views.py:742
 #, python-format
 msgid "Email sent to %(email)s"
 msgstr ""
 
-#: views.py:765
+#: views.py:753
 msgid "Only its owner can delete the map."
 msgstr ""
 
-#: views.py:788
+#: views.py:776
 #, python-format
 msgid ""
 "Your map has been cloned! If you want to edit this map from another "
 "computer, please use this link: %(anonymous_url)s"
 msgstr ""
 
-#: views.py:793
+#: views.py:781
 msgid "Congratulations, your map has been cloned!"
 msgstr ""
 
-#: views.py:982
+#: views.py:970
 msgid "Layer successfully deleted."
 msgstr ""
 
-#: views.py:1004
+#: views.py:992
 msgid "Permissions updated with success!"
 msgstr ""

{umap_project-1.11.0 → umap_project-1.11.1}/umap/management/commands/generate_js_locale.py

@@ -1,24 +1,23 @@
 from pathlib import Path
 
-from django.core.management.base import BaseCommand
 from django.conf import settings
+from django.core.management.base import BaseCommand
 from django.template.loader import render_to_string
 from django.utils.translation import to_locale
 
-ROOT = Path(settings.PROJECT_DIR) / 'static/umap/locale/'
+ROOT = Path(settings.PROJECT_DIR) / "static/umap/locale/"
 
 
 class Command(BaseCommand):
-
     def handle(self, *args, **options):
-        self.verbosity = options['verbosity']
+        self.verbosity = options["verbosity"]
         for code, name in settings.LANGUAGES:
             code = to_locale(code)
             if self.verbosity > 0:
                 print("Processing", name)
-            path = ROOT / '{code}.json'.format(code=code)
+            path = ROOT / "{code}.json".format(code=code)
             if not path.exists():
-                print(path, 'does not exist.', 'Skipping')
+                print(path, "does not exist.", "Skipping")
             else:
                 with path.open(encoding="utf-8") as f:
                     if self.verbosity > 1:
@@ -26,12 +25,11 @@ class Command(BaseCommand):
                     self.render(code, f.read())
 
     def render(self, code, json):
-        path = ROOT / '{code}.js'.format(code=code)
+        path = ROOT / "{code}.js".format(code=code)
         with path.open("w", encoding="utf-8") as f:
-            content = render_to_string('umap/locale.js', {
-                "locale": json,
-                "locale_code": code
-            })
+            content = render_to_string(
+                "umap/locale.js", {"locale": json, "locale_code": code}
+            )
             if self.verbosity > 1:
                 print("Exporting to", path)
             f.write(content)

{umap_project-1.11.0 → umap_project-1.11.1}/umap/management/commands/import_pictograms.py

@@ -59,7 +59,7 @@ class Command(BaseCommand):
                 else:
                     picto = Pictogram()
                     picto.name = name
-                if (path.name != self.path.name):  # Subfolders only
+                if path.name != self.path.name:  # Subfolders only
                     picto.category = path.name
                 picto.attribution = self.attribution
                 with (path / filename).open("rb") as f:

umap_project-1.11.1/umap/managers.py

@@ -0,0 +1,10 @@
+from django.db.models import Manager
+
+
+class PublicManager(Manager):
+    def get_queryset(self):
+        return (
+            super(PublicManager, self)
+            .get_queryset()
+            .filter(share_status=self.model.PUBLIC)
+        )

{umap_project-1.11.0 → umap_project-1.11.1}/umap/middleware.py

@@ -5,13 +5,12 @@ from django.utils.translation import gettext as _
 
 
 def readonly_middleware(get_response):
-
     if not settings.UMAP_READONLY:
         raise MiddlewareNotUsed
 
     def middleware(request):
-        if request.method not in ['GET', 'OPTIONS']:
-            return HttpResponseForbidden(_('Site is readonly for maintenance'))
+        if request.method not in ["GET", "OPTIONS"]:
+            return HttpResponseForbidden(_("Site is readonly for maintenance"))
 
         return get_response(request)
 

umap_project-1.11.1/umap/migrations/0001_initial.py

@@ -0,0 +1,255 @@
+# Generated by Django 2.0.5 on 2018-05-19 09:27
+
+import django.contrib.gis.db.models.fields
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+import umap.fields
+import umap.models
+
+
+class Migration(migrations.Migration):
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="DataLayer",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=200, verbose_name="name")),
+                (
+                    "description",
+                    models.TextField(blank=True, null=True, verbose_name="description"),
+                ),
+                (
+                    "geojson",
+                    models.FileField(
+                        blank=True, null=True, upload_to=umap.models.upload_to
+                    ),
+                ),
+                (
+                    "display_on_load",
+                    models.BooleanField(
+                        default=False,
+                        help_text="Display this layer on load.",
+                        verbose_name="display on load",
+                    ),
+                ),
+                ("rank", models.SmallIntegerField(default=0)),
+            ],
+            options={
+                "ordering": ("rank",),
+            },
+        ),
+        migrations.CreateModel(
+            name="Licence",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=200, verbose_name="name")),
+                (
+                    "details",
+                    models.URLField(
+                        help_text="Link to a page where the licence is detailed.",
+                        verbose_name="details",
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ("name",),
+                "abstract": False,
+            },
+        ),
+        migrations.CreateModel(
+            name="Map",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=200, verbose_name="name")),
+                ("slug", models.SlugField()),
+                (
+                    "description",
+                    models.TextField(blank=True, null=True, verbose_name="description"),
+                ),
+                (
+                    "center",
+                    django.contrib.gis.db.models.fields.PointField(
+                        geography=True, srid=4326, verbose_name="center"
+                    ),
+                ),
+                ("zoom", models.IntegerField(default=7, verbose_name="zoom")),
+                (
+                    "locate",
+                    models.BooleanField(
+                        default=False,
+                        help_text="Locate user on load?",
+                        verbose_name="locate",
+                    ),
+                ),
+                ("modified_at", models.DateTimeField(auto_now=True)),
+                (
+                    "edit_status",
+                    models.SmallIntegerField(
+                        choices=[
+                            (1, "Everyone can edit"),
+                            (2, "Only editors can edit"),
+                            (3, "Only owner can edit"),
+                        ],
+                        default=3,
+                        verbose_name="edit status",
+                    ),
+                ),
+                (
+                    "share_status",
+                    models.SmallIntegerField(
+                        choices=[
+                            (1, "everyone (public)"),
+                            (2, "anyone with link"),
+                            (3, "editors only"),
+                        ],
+                        default=1,
+                        verbose_name="share status",
+                    ),
+                ),
+                (
+                    "settings",
+                    umap.fields.DictField(
+                        blank=True, null=True, verbose_name="settings"
+                    ),
+                ),
+                (
+                    "editors",
+                    models.ManyToManyField(
+                        blank=True, to=settings.AUTH_USER_MODEL, verbose_name="editors"
+                    ),
+                ),
+                (
+                    "licence",
+                    models.ForeignKey(
+                        default=umap.models.get_default_licence,
+                        help_text="Choose the map licence.",
+                        on_delete=django.db.models.deletion.SET_DEFAULT,
+                        to="umap.Licence",
+                        verbose_name="licence",
+                    ),
+                ),
+                (
+                    "owner",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.PROTECT,
+                        related_name="owned_maps",
+                        to=settings.AUTH_USER_MODEL,
+                        verbose_name="owner",
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ("name",),
+                "abstract": False,
+            },
+        ),
+        migrations.CreateModel(
+            name="Pictogram",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=200, verbose_name="name")),
+                ("attribution", models.CharField(max_length=300)),
+                ("pictogram", models.ImageField(upload_to="pictogram")),
+            ],
+            options={
+                "ordering": ("name",),
+                "abstract": False,
+            },
+        ),
+        migrations.CreateModel(
+            name="TileLayer",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=200, verbose_name="name")),
+                (
+                    "url_template",
+                    models.CharField(
+                        help_text="URL template using OSM tile format", max_length=200
+                    ),
+                ),
+                ("minZoom", models.IntegerField(default=0)),
+                ("maxZoom", models.IntegerField(default=18)),
+                ("attribution", models.CharField(max_length=300)),
+                (
+                    "rank",
+                    models.SmallIntegerField(
+                        blank=True,
+                        help_text="Order of the tilelayers in the edit box",
+                        null=True,
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ("rank", "name"),
+            },
+        ),
+        migrations.AddField(
+            model_name="map",
+            name="tilelayer",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="maps",
+                to="umap.TileLayer",
+                verbose_name="background",
+            ),
+        ),
+        migrations.AddField(
+            model_name="datalayer",
+            name="map",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE, to="umap.Map"
+            ),
+        ),
+    ]

{umap_project-1.11.0 → umap_project-1.11.1}/umap/migrations/0002_tilelayer_tms.py

@@ -4,15 +4,14 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('umap', '0001_initial'),
+        ("umap", "0001_initial"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='tilelayer',
-            name='tms',
+            model_name="tilelayer",
+            name="tms",
             field=models.BooleanField(default=False),
         ),
     ]