umap-project 2.1.3__tar.gz → 2.2.0__tar.gz

{umap_project-2.1.3 → umap_project-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: umap-project
-Version: 2.1.3
+Version: 2.2.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>
@@ -19,32 +19,32 @@ 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.0.3
-Requires-Dist: pillow==10.2.0
+Requires-Dist: django==5.0.4
+Requires-Dist: pillow==10.3.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.4.0
-Requires-Dist: social-auth-core==4.5.3
+Requires-Dist: social-auth-app-django==5.4.1
+Requires-Dist: social-auth-core==4.5.4
 Provides-Extra: dev
 Requires-Dist: djlint==1.34.1; extra == 'dev'
-Requires-Dist: hatch==1.9.4; extra == 'dev'
+Requires-Dist: hatch==1.9.7; extra == 'dev'
 Requires-Dist: isort==5.13.2; extra == 'dev'
-Requires-Dist: mkdocs-material==9.5.15; extra == 'dev'
+Requires-Dist: mkdocs-material==9.5.18; extra == 'dev'
 Requires-Dist: mkdocs==1.5.3; extra == 'dev'
-Requires-Dist: pymdown-extensions==10.7.1; extra == 'dev'
-Requires-Dist: ruff==0.3.4; extra == 'dev'
+Requires-Dist: pymdown-extensions==10.8.1; extra == 'dev'
+Requires-Dist: ruff==0.4.2; extra == 'dev'
 Requires-Dist: vermin==1.6.0; extra == 'dev'
 Provides-Extra: docker
-Requires-Dist: uwsgi==2.0.24; extra == 'docker'
+Requires-Dist: uwsgi==2.0.25.1; extra == 'docker'
 Provides-Extra: test
 Requires-Dist: factory-boy==3.2.1; extra == 'test'
 Requires-Dist: playwright>=1.39; extra == 'test'
 Requires-Dist: pytest-django==4.8.0; extra == 'test'
 Requires-Dist: pytest-playwright==0.4.4; extra == 'test'
 Requires-Dist: pytest-xdist<4,>=3.5.0; extra == 'test'
-Requires-Dist: pytest==8.1.1; extra == 'test'
+Requires-Dist: pytest==8.2.0; extra == 'test'
 Description-Content-Type: text/markdown
 
 # uMap project

{umap_project-2.1.3 → umap_project-2.2.0}/pyproject.toml

@@ -28,40 +28,40 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-  "Django==5.0.3",
+  "Django==5.0.4",
   "django-agnocomplete==2.2.0",
   "django-environ==0.11.2",
   "django-probes==1.7.0",
-  "Pillow==10.2.0",
+  "Pillow==10.3.0",
   "psycopg==3.1.18",
   "requests==2.31.0",
   "rcssmin==1.1.2",
   "rjsmin==1.2.2",
-  "social-auth-core==4.5.3",
-  "social-auth-app-django==5.4.0",
+  "social-auth-core==4.5.4",
+  "social-auth-app-django==5.4.1",
 ]
 
 [project.optional-dependencies]
 dev = [
-  "hatch==1.9.4",
-  "ruff==0.3.4",
+  "hatch==1.9.7",
+  "ruff==0.4.2",
   "djlint==1.34.1",
   "mkdocs==1.5.3",
-  "mkdocs-material==9.5.15",
+  "mkdocs-material==9.5.18",
   "vermin==1.6.0",
-  "pymdown-extensions==10.7.1",
+  "pymdown-extensions==10.8.1",
   "isort==5.13.2",
 ]
 test = [
   "factory-boy==3.2.1",
   "playwright>=1.39",
-  "pytest==8.1.1",
+  "pytest==8.2.0",
   "pytest-django==4.8.0",
   "pytest-playwright==0.4.4",
   "pytest-xdist>=3.5.0,<4",
 ]
 docker = [
-  "uwsgi==2.0.24",
+  "uwsgi==2.0.25.1",
 ]
 
 [project.scripts]

umap_project-2.2.0/umap/__init__.py

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

{umap_project-2.1.3 → umap_project-2.2.0}/umap/context_processors.py

@@ -7,6 +7,7 @@ def settings(request):
     return {
         "UMAP_FEEDBACK_LINK": djsettings.UMAP_FEEDBACK_LINK,
         "SITE_NAME": djsettings.SITE_NAME,
+        "SITE_URL": djsettings.SITE_URL,
         "ENABLE_ACCOUNT_LOGIN": djsettings.ENABLE_ACCOUNT_LOGIN,
         "UMAP_READONLY": djsettings.UMAP_READONLY,
         "UMAP_DEMO_SITE": djsettings.UMAP_DEMO_SITE,

{umap_project-2.1.3 → umap_project-2.2.0}/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: 2024-03-25 12:41+0000\n"
+"POT-Creation-Date: 2024-04-24 19:16+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"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "Everyone can edit"
 msgstr ""
 
-#: forms.py:69 models.py:381
+#: forms.py:69 models.py:384
 msgid "Inherit"
 msgstr ""
 
@@ -33,54 +33,50 @@ msgstr ""
 msgid "Site is readonly for maintenance"
 msgstr ""
 
-#: models.py:52
+#: models.py:53
 msgid "name"
 msgstr ""
 
-#: models.py:83
+#: models.py:84
 msgid "details"
 msgstr ""
 
-#: models.py:84
+#: models.py:85
 msgid "Link to a page where the licence is detailed."
 msgstr ""
 
-#: models.py:94
+#: models.py:95
 msgid "URL template using OSM tile format"
 msgstr ""
 
-#: models.py:100
+#: models.py:101
 msgid "Order of the tilelayers in the edit box"
 msgstr ""
 
-#: models.py:146 models.py:382
+#: models.py:147 models.py:385
 msgid "Everyone"
 msgstr ""
 
-#: models.py:147 models.py:153 models.py:383
+#: models.py:148 models.py:154 models.py:386
 msgid "Editors only"
 msgstr ""
 
-#: models.py:148 models.py:384
+#: models.py:149 models.py:387
 msgid "Owner only"
 msgstr ""
 
-#: models.py:151
+#: models.py:152
 msgid "Everyone (public)"
 msgstr ""
 
-#: models.py:152
+#: models.py:153
 msgid "Anyone with link"
 msgstr ""
 
-#: models.py:154
+#: models.py:155
 msgid "Blocked"
 msgstr ""
 
-#: models.py:157 models.py:391
-msgid "description"
-msgstr ""
-
 #: models.py:158
 msgid "center"
 msgstr ""
@@ -113,7 +109,7 @@ msgstr ""
 msgid "editors"
 msgstr ""
 
-#: models.py:186 models.py:405
+#: models.py:186 models.py:408
 msgid "edit status"
 msgstr ""
 
@@ -121,19 +117,23 @@ msgstr ""
 msgid "share status"
 msgstr ""
 
-#: models.py:194 models.py:400
+#: models.py:194 models.py:403
 msgid "settings"
 msgstr ""
 
-#: models.py:322
+#: models.py:325
 msgid "Clone of"
 msgstr ""
 
-#: models.py:395
+#: models.py:394
+msgid "description"
+msgstr ""
+
+#: models.py:398
 msgid "display on load"
 msgstr ""
 
-#: models.py:396
+#: models.py:399
 msgid "Display this layer on load."
 msgstr ""
 
@@ -345,37 +345,37 @@ msgstr ""
 msgid "Clone"
 msgstr ""
 
-#: templates/umap/map_table.html:76 templates/umap/map_table.html:78
+#: templates/umap/map_table.html:77 templates/umap/map_table.html:79
 msgid "Delete"
 msgstr ""
 
-#: templates/umap/map_table.html:91
+#: templates/umap/map_table.html:93
 msgid "first"
 msgstr ""
 
-#: templates/umap/map_table.html:92
+#: templates/umap/map_table.html:94
 msgid "previous"
 msgstr ""
 
-#: templates/umap/map_table.html:100
+#: templates/umap/map_table.html:102
 #, python-format
 msgid "Page %(maps_number)s of %(num_pages)s"
 msgstr ""
 
-#: templates/umap/map_table.html:105
+#: templates/umap/map_table.html:107
 msgid "next"
 msgstr ""
 
-#: templates/umap/map_table.html:106
+#: templates/umap/map_table.html:108
 msgid "last"
 msgstr ""
 
-#: templates/umap/map_table.html:114
+#: templates/umap/map_table.html:116
 #, python-format
 msgid "Lines per page: %(per_page)s"
 msgstr ""
 
-#: templates/umap/map_table.html:119
+#: templates/umap/map_table.html:121
 #, python-format
 msgid "%(count)s maps"
 msgstr ""
@@ -542,10 +542,10 @@ msgstr ""
 msgid "Congratulations, your map has been cloned!"
 msgstr ""
 
-#: views.py:1145
+#: views.py:1146
 msgid "Layer successfully deleted."
 msgstr ""
 
-#: views.py:1167
+#: views.py:1168
 msgid "Permissions updated with success!"
 msgstr ""

umap_project-2.2.0/umap/migrations/0020_alter_tilelayer_url_template.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.0.2 on 2024-04-17 09:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("umap", "0019_migrate_internal_remote_datalayers"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="tilelayer",
+            name="url_template",
+            field=models.CharField(
+                help_text="URL template using OSM tile format", max_length=400
+            ),
+        ),
+    ]

umap_project-2.2.0/umap/migrations/0021_remove_map_description.py

@@ -0,0 +1,16 @@
+# Generated by Django 5.0.4 on 2024-04-24 07:50
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("umap", "0020_alter_tilelayer_url_template"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="map",
+            name="description",
+        ),
+    ]

{umap_project-2.1.3 → umap_project-2.2.0}/umap/models.py

@@ -92,7 +92,7 @@ class Licence(NamedModel):
 
 class TileLayer(NamedModel):
     url_template = models.CharField(
-        max_length=200, help_text=_("URL template using OSM tile format")
+        max_length=400, help_text=_("URL template using OSM tile format")
     )
     minZoom = models.IntegerField(default=0)
     maxZoom = models.IntegerField(default=18)
@@ -155,7 +155,6 @@ class Map(NamedModel):
         (BLOCKED, _("Blocked")),
     )
     slug = models.SlugField(db_index=True)
-    description = models.TextField(blank=True, null=True, verbose_name=_("description"))
     center = models.PointField(geography=True, verbose_name=_("center"))
     zoom = models.IntegerField(default=7, verbose_name=_("zoom"))
     locate = models.BooleanField(
@@ -198,6 +197,13 @@ class Map(NamedModel):
     objects = models.Manager()
     public = PublicManager()
 
+    @property
+    def description(self):
+        try:
+            return self.settings["properties"]["description"]
+        except KeyError:
+            return ""
+
     @property
     def preview_settings(self):
         layers = self.datalayer_set.all()
@@ -213,13 +219,9 @@ class Map(NamedModel):
                 "STATIC_URL": settings.STATIC_URL,
                 "editMode": "disabled",
                 "hash": False,
-                "attributionControl": False,
                 "scrollWheelZoom": False,
-                "umapAttributionControl": False,
                 "noControl": True,
                 "umap_id": self.pk,
-                "onLoadPanel": "none",
-                "captionBar": False,
                 "schema": self.extra_schema,
                 "slideshow": {},
             }

{umap_project-2.1.3 → umap_project-2.2.0}/umap/settings/base.py

@@ -239,6 +239,7 @@ UMAP_EXTRA_URLS = {
     "routing": "http://www.openstreetmap.org/directions?engine=osrm_car&route={lat},{lng}&locale={locale}#map={zoom}/{lat}/{lng}",  # noqa
     "ajax_proxy": "/ajax-proxy/?url={url}&ttl={ttl}",
     "search": "https://photon.komoot.io/api/?",
+    "edit_in_osm": "https://www.openstreetmap.org/edit#map={zoom}/{lat}/{lng}",
 }
 UMAP_KEEP_VERSIONS = env.int("UMAP_KEEP_VERSIONS", default=10)
 SITE_URL = env("SITE_URL", default="http://umap.org")