umap-project 3.1.2__tar.gz → 3.2.0__tar.gz

umap_project-3.2.0/PKG-INFO

@@ -0,0 +1,76 @@
+Metadata-Version: 2.4
+Name: umap-project
+Version: 3.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>
+License-File: LICENSE
+Keywords: django,geodjango,leaflet,map,openstreetmap
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3 :: Only
+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.10
+Requires-Dist: django-agnocomplete==2.2.0
+Requires-Dist: django-environ==0.12.0
+Requires-Dist: django-probes==1.7.0
+Requires-Dist: django==5.2.4
+Requires-Dist: pillow==11.3.0
+Requires-Dist: psycopg==3.2.9
+Requires-Dist: rcssmin==1.2.1
+Requires-Dist: requests==2.32.4
+Requires-Dist: rjsmin==1.2.4
+Requires-Dist: social-auth-app-django==5.4.3
+Requires-Dist: social-auth-core==4.5.6
+Provides-Extra: dev
+Requires-Dist: djlint==1.36.4; extra == 'dev'
+Requires-Dist: hatch==1.14.1; extra == 'dev'
+Requires-Dist: isort==6.0.1; extra == 'dev'
+Requires-Dist: mkdocs-material==9.6.15; 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.16; extra == 'dev'
+Requires-Dist: ruff==0.12.2; extra == 'dev'
+Requires-Dist: vermin==1.6.0; extra == 'dev'
+Provides-Extra: docker
+Requires-Dist: uvicorn==0.35.0; extra == 'docker'
+Provides-Extra: s3
+Requires-Dist: django-storages[s3]==1.14.6; extra == 's3'
+Provides-Extra: sync
+Requires-Dist: pydantic==2.11.7; extra == 'sync'
+Requires-Dist: redis==6.2.0; extra == 'sync'
+Requires-Dist: websockets==15.0.1; extra == 'sync'
+Provides-Extra: test
+Requires-Dist: daphne==4.2.0; extra == 'test'
+Requires-Dist: factory-boy==3.3.3; extra == 'test'
+Requires-Dist: moto[s3]==5.1.6; extra == 'test'
+Requires-Dist: playwright>=1.39; extra == 'test'
+Requires-Dist: pytest-django==4.11.1; extra == 'test'
+Requires-Dist: pytest-playwright==0.7.0; extra == 'test'
+Requires-Dist: pytest-rerunfailures==15.1; extra == 'test'
+Requires-Dist: pytest-xdist<4,>=3.5.0; extra == 'test'
+Requires-Dist: pytest==8.4.1; extra == 'test'
+Description-Content-Type: text/markdown
+
+[![Matrix](https://img.shields.io/matrix/umap:matrix.org?server_fqdn=matrix.org&logo=matrix)](https://matrix.to/#/#umap:matrix.org)
+[![Forum](https://img.shields.io/discourse/users?server=https://forum.openstreetmap.fr&label=Forum&logo=discourse)](https://forum.openstreetmap.fr/c/utiliser/umap/29)
+[![Mailing list](https://img.shields.io/badge/Mailing%20list-Subscribe-598dc1?labelColor=white&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAZCAYAAAAmNZ4aAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH5AICEi0F3iqxoQAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdGggR0lNUFeBDhcAAATBSURBVEjHrZbPb5xHHcY/z+z6R+06cRzWJQGCSgKhxPturSIOwIFSIeCEOHHqMZeqkUoLUiH1rvddlEOFxAn4HxAXblwIoEoICRrlfScFi0PVxo0rQtYBJ3ZiZ3ceDruOYid2kqojzeH9vpr5zPc7zzwzAqjXFySpKinYrgABhA0SgBPgYU+wHZMlp6LomMdseuaZhUq1yglJc5I+a/s48BRo1Pa4pHFwD3zb1qbEJnAbWAU+BD4AroA2JN8Ar9tat30zxs6dPcGNxsIYuAaqpaTLMeZdgPn5xbF+P83YOhyCD4EPpRRmJWrArM00+KCkafA0aEvyNWDNZhVYAXXttCKFFfAV26sxdraG4GYNdAS8YfMtiaWiyP/4qCV79tn2ZL+fJiVPSZqymZaYsTkkMZJS2pDCJvgmcA3oSr33lWWtY+A5yechPGnzKni5LPNf8zG1+fnFkZT6o7bmwWtS/1KwMVADpoqifc3mnK16lrUWPi5wr+fRlPSizaiEoRICpDvAUQgTADG2bwKvgz+fZc2fnDrVDh8V2Gi0lGXNOeBXwFKM+fmUwrwdKiEEtoDDNk9sD4ixvSbpR6DnKpX+mXq9Nfr40OYBm9MS50JIrRjzPwFIZGAFu7IFmgBP3juwKNpXbf8Q+Ibk04+Zad3Wm7a/VK3e+F5RdN4bxj8peVyCYPu27RFb07sniDFftvUK6Pl6vfXyo0CzrPl92z8Gn48xf+Xtt39x11xsnrNZB1KIsd2TSBIHs6yl++Ht9yWfkfzVer314kOgp4Hv2vy8LPPf7P5v+yug67bSUDjqgmd093tnK4r8Q4mXJV5oNFrPPxjaehU4Dn4txrzcw6/mwO9KqR+GK+kCnwFV9sqmKPJV4DXwt7Os+ald0EXbt8oyf70sOzcevO8LRyQfs7VcFB0HgBBYBo7aVPcrZVm2u6BfAl+v18+ODCd8KQR+H+P+hpOSjgPrIbgLDEA27wLTDwM3Gm8crFRuXen1xt+SQi3LmjWJ3/b7Xn+Y6ELwF22t2fovQJifPzsGlcugCYmJfc7lnK3DFy68mcoyX+n3fX1rqxcvXsyvSkxnWfPk3n6+WLE1ByzZDMAphcmybF21XQVN7qHWF2xGUqq+tx17552f3VpaOpcGW5BfAcbr9daXHzTeTjOgI7bKGNtbAKEoOqtDR+kCUw9Q63dAG7bKS5daae9ieknygUajdfJ+sJ4CT4D/ebf0gzL+NEh6C3xslwN9Dbhj+28xtvv7C6+zKRFtvlCvNz+xE8yngbUQvLQDXBTnUkr+O+jYPZmetF2z019izHuP4lpFkf9H4nIIZFnW2lb9iOSnbV0sis76DjBApbJxQfKTQ+hhm8/Z4c8xdm49jk8XRbuwCcCw5GEMNAv+ww4r2SWiH0D4ne0TkpbLcvF/H/1KbH4TKEHJ9pmyzNv7gBeOQhgdmInHgVmJGYnplDwlhRFwFSzQFrBp+3oIWrXpAv+WWC6KfGVYuRPDl2mtLNt/3RM8WOnZgymFGUmzwCHgwFDtB+65Pp8AxobdkoOtChAkG3TH5l9AtP2PEFguik5/XzDAqVNvqFIR0mAa2wohkJKlwUNbkofjhZ2242GQoGSTJPopuR9j575j+H+W9nlG4uJsnAAAAABJRU5ErkJggg==)](https://lists.openstreetmap.org/listinfo/umap)
+
+[![Liberapay](https://img.shields.io/liberapay/patrons/uMap.svg?logo=liberapay)](https://liberapay.com/uMap)
+[![OpenCollective](https://img.shields.io/opencollective/all/uMap?logo=opencollective)](https://opencollective.com/uMap)
+[![GitHub Sponsors](https://img.shields.io/github/sponsors/umap-project?logo=github)](https://github.com/sponsors/umap-project)
+
+# uMap project
+
+uMap lets you create maps with OpenStreetMap layers within minutes and embed them in your site.
+*Because we think that the more OSM will be used, the more OSM will be improved.*
+Built on top of Django and Leaflet.
+
+- Have a look at [our website](https://umap-project.org) for an introduction
+- See [our docs](https://docs.umap-project.org/) for technical information
+- Come [chat with us on matrix](https://matrix.to/#/#umap:matrix.org), start a thread on [the forum](https://forum.openstreetmap.fr/c/utiliser/umap/29) or join [the mailing list](https://lists.openstreetmap.org/listinfo/umap)

umap_project-3.2.0/README.md

@@ -0,0 +1,17 @@
+[![Matrix](https://img.shields.io/matrix/umap:matrix.org?server_fqdn=matrix.org&logo=matrix)](https://matrix.to/#/#umap:matrix.org)
+[![Forum](https://img.shields.io/discourse/users?server=https://forum.openstreetmap.fr&label=Forum&logo=discourse)](https://forum.openstreetmap.fr/c/utiliser/umap/29)
+[![Mailing list](https://img.shields.io/badge/Mailing%20list-Subscribe-598dc1?labelColor=white&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAZCAYAAAAmNZ4aAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH5AICEi0F3iqxoQAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdGggR0lNUFeBDhcAAATBSURBVEjHrZbPb5xHHcY/z+z6R+06cRzWJQGCSgKhxPturSIOwIFSIeCEOHHqMZeqkUoLUiH1rvddlEOFxAn4HxAXblwIoEoICRrlfScFi0PVxo0rQtYBJ3ZiZ3ceDruOYid2kqojzeH9vpr5zPc7zzwzAqjXFySpKinYrgABhA0SgBPgYU+wHZMlp6LomMdseuaZhUq1yglJc5I+a/s48BRo1Pa4pHFwD3zb1qbEJnAbWAU+BD4AroA2JN8Ar9tat30zxs6dPcGNxsIYuAaqpaTLMeZdgPn5xbF+P83YOhyCD4EPpRRmJWrArM00+KCkafA0aEvyNWDNZhVYAXXttCKFFfAV26sxdraG4GYNdAS8YfMtiaWiyP/4qCV79tn2ZL+fJiVPSZqymZaYsTkkMZJS2pDCJvgmcA3oSr33lWWtY+A5yechPGnzKni5LPNf8zG1+fnFkZT6o7bmwWtS/1KwMVADpoqifc3mnK16lrUWPi5wr+fRlPSizaiEoRICpDvAUQgTADG2bwKvgz+fZc2fnDrVDh8V2Gi0lGXNOeBXwFKM+fmUwrwdKiEEtoDDNk9sD4ixvSbpR6DnKpX+mXq9Nfr40OYBm9MS50JIrRjzPwFIZGAFu7IFmgBP3juwKNpXbf8Q+Ibk04+Zad3Wm7a/VK3e+F5RdN4bxj8peVyCYPu27RFb07sniDFftvUK6Pl6vfXyo0CzrPl92z8Gn48xf+Xtt39x11xsnrNZB1KIsd2TSBIHs6yl++Ht9yWfkfzVer314kOgp4Hv2vy8LPPf7P5v+yug67bSUDjqgmd093tnK4r8Q4mXJV5oNFrPPxjaehU4Dn4txrzcw6/mwO9KqR+GK+kCnwFV9sqmKPJV4DXwt7Os+ald0EXbt8oyf70sOzcevO8LRyQfs7VcFB0HgBBYBo7aVPcrZVm2u6BfAl+v18+ODCd8KQR+H+P+hpOSjgPrIbgLDEA27wLTDwM3Gm8crFRuXen1xt+SQi3LmjWJ3/b7Xn+Y6ELwF22t2fovQJifPzsGlcugCYmJfc7lnK3DFy68mcoyX+n3fX1rqxcvXsyvSkxnWfPk3n6+WLE1ByzZDMAphcmybF21XQVN7qHWF2xGUqq+tx17552f3VpaOpcGW5BfAcbr9daXHzTeTjOgI7bKGNtbAKEoOqtDR+kCUw9Q63dAG7bKS5daae9ieknygUajdfJ+sJ4CT4D/ebf0gzL+NEh6C3xslwN9Dbhj+28xtvv7C6+zKRFtvlCvNz+xE8yngbUQvLQDXBTnUkr+O+jYPZmetF2z019izHuP4lpFkf9H4nIIZFnW2lb9iOSnbV0sis76DjBApbJxQfKTQ+hhm8/Z4c8xdm49jk8XRbuwCcCw5GEMNAv+ww4r2SWiH0D4ne0TkpbLcvF/H/1KbH4TKEHJ9pmyzNv7gBeOQhgdmInHgVmJGYnplDwlhRFwFSzQFrBp+3oIWrXpAv+WWC6KfGVYuRPDl2mtLNt/3RM8WOnZgymFGUmzwCHgwFDtB+65Pp8AxobdkoOtChAkG3TH5l9AtP2PEFguik5/XzDAqVNvqFIR0mAa2wohkJKlwUNbkofjhZ2242GQoGSTJPopuR9j575j+H+W9nlG4uJsnAAAAABJRU5ErkJggg==)](https://lists.openstreetmap.org/listinfo/umap)
+
+[![Liberapay](https://img.shields.io/liberapay/patrons/uMap.svg?logo=liberapay)](https://liberapay.com/uMap)
+[![OpenCollective](https://img.shields.io/opencollective/all/uMap?logo=opencollective)](https://opencollective.com/uMap)
+[![GitHub Sponsors](https://img.shields.io/github/sponsors/umap-project?logo=github)](https://github.com/sponsors/umap-project)
+
+# uMap project
+
+uMap lets you create maps with OpenStreetMap layers within minutes and embed them in your site.
+*Because we think that the more OSM will be used, the more OSM will be improved.*
+Built on top of Django and Leaflet.
+
+- Have a look at [our website](https://umap-project.org) for an introduction
+- See [our docs](https://docs.umap-project.org/) for technical information
+- Come [chat with us on matrix](https://matrix.to/#/#umap:matrix.org), start a thread on [the forum](https://forum.openstreetmap.fr/c/utiliser/umap/29) or join [the mailing list](https://lists.openstreetmap.org/listinfo/umap)

{umap_project-3.1.2 → umap_project-3.2.0}/pyproject.toml

@@ -28,11 +28,11 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-  "Django==5.2.2",
+  "Django==5.2.4",
   "django-agnocomplete==2.2.0",
   "django-environ==0.12.0",
   "django-probes==1.7.0",
-  "Pillow==11.2.1",
+  "Pillow==11.3.0",
   "psycopg==3.2.9",
   "requests==2.32.4",
   "rcssmin==1.2.1",
@@ -44,34 +44,34 @@ dependencies = [
 [project.optional-dependencies]
 dev = [
   "hatch==1.14.1",
-  "ruff==0.11.13",
+  "ruff==0.12.2",
   "djlint==1.36.4",
   "mkdocs==1.6.1",
-  "mkdocs-material==9.6.14",
+  "mkdocs-material==9.6.15",
   "mkdocs-static-i18n==1.3.0",
   "vermin==1.6.0",
-  "pymdown-extensions==10.15",
+  "pymdown-extensions==10.16",
   "isort==6.0.1",
 ]
 test = [
   "daphne==4.2.0",
   "factory-boy==3.3.3",
   "playwright>=1.39",
-  "pytest==8.4.0",
+  "pytest==8.4.1",
   "pytest-django==4.11.1",
   "pytest-playwright==0.7.0",
   "pytest-rerunfailures==15.1",
   "pytest-xdist>=3.5.0,<4",
-  "moto[s3]==5.1.5"
+  "moto[s3]==5.1.6"
 ]
 docker = [
-  "uvicorn==0.34.3",
+  "uvicorn==0.35.0",
 ]
 s3 = [
   "django-storages[s3]==1.14.6",
 ]
 sync = [
-  "pydantic==2.11.5",
+  "pydantic==2.11.7",
   "redis==6.2.0",
   "websockets==15.0.1",
 ]

umap_project-3.2.0/umap/__init__.py

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

{umap_project-3.1.2 → umap_project-3.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: 2025-06-10 09:19+0000\n"
+"POT-Creation-Date: 2025-07-10 14:12+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"
@@ -530,7 +530,7 @@ msgstr ""
 msgid "template"
 msgstr ""
 
-#: templates/umap/map_list.html:18 views.py:458
+#: templates/umap/map_list.html:18 views.py:459
 msgid "by"
 msgstr ""
 
@@ -809,70 +809,74 @@ msgstr ""
 msgid "No template found."
 msgstr ""
 
-#: views.py:233
+#: views.py:235
 msgid "Cannot delete a team with more than one member"
 msgstr ""
 
-#: views.py:237
+#: views.py:239
 #, python-format
 msgid "Team “%(name)s” has been deleted"
 msgstr ""
 
-#: views.py:463
+#: views.py:464
 msgid "View the map"
 msgstr ""
 
-#: views.py:864
+#: views.py:865
 msgid "See full screen"
 msgstr ""
 
-#: views.py:1007
+#: views.py:1008
 msgid "Map editors updated with success!"
 msgstr ""
 
-#: views.py:1043
+#: views.py:1044
 #, python-format
 msgid "The uMap edit link for your map: %(map_name)s"
 msgstr ""
 
-#: views.py:1046
+#: views.py:1047
 #, python-format
 msgid "Here is your secret edit link: %(link)s"
 msgstr ""
 
-#: views.py:1053
+#: views.py:1054
 #, python-format
 msgid "Can't send email to %(email)s"
 msgstr ""
 
-#: views.py:1056
+#: views.py:1057
 #, python-format
 msgid "Email sent to %(email)s"
 msgstr ""
 
-#: views.py:1067
+#: views.py:1068
 msgid "Only its owner can delete the map."
 msgstr ""
 
-#: views.py:1073
+#: views.py:1074
 msgid "Map successfully deleted."
 msgstr ""
 
-#: views.py:1099
+#: views.py:1100
 #, 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:1104
+#: views.py:1105
 msgid "Congratulations, your map has been cloned!"
 msgstr ""
 
-#: views.py:1358
+#: views.py:1359
 msgid "Layer successfully deleted."
 msgstr ""
 
-#: views.py:1380
+#: views.py:1381
 msgid "Permissions updated with success!"
 msgstr ""
+
+#: views.py:1398
+msgid "Generic"
+msgstr ""

{umap_project-3.1.2 → umap_project-3.2.0}/umap/locale/fr/LC_MESSAGES/django.po

@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uMap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-06-10 09:19+0000\n"
+"POT-Creation-Date: 2025-07-10 14:12+0000\n"
 "PO-Revision-Date: 2013-11-22 14:00+0000\n"
 "Last-Translator: yohanboniface <yohanboniface@free.fr>, 2013-2014,2018-2019,2023-2025\n"
 "Language-Team: French (http://app.transifex.com/openstreetmap/umap/language/fr/)\n"
@@ -547,7 +547,7 @@ msgstr "Vous êtes maintenant identifié. Merci de patienter..."
 msgid "template"
 msgstr "modèle"
 
-#: templates/umap/map_list.html:18 views.py:458
+#: templates/umap/map_list.html:18 views.py:459
 msgid "by"
 msgstr "par"
 
@@ -828,70 +828,74 @@ msgstr "Créer un modèle"
 msgid "No template found."
 msgstr "Aucun modèle trouvé."
 
-#: views.py:233
+#: views.py:235
 msgid "Cannot delete a team with more than one member"
 msgstr "Impossible de supprimer une équipe ayant plus d'un membre"
 
-#: views.py:237
+#: views.py:239
 #, python-format
 msgid "Team “%(name)s” has been deleted"
 msgstr "L'équipe «%(name)s» a été supprimée"
 
-#: views.py:463
+#: views.py:464
 msgid "View the map"
 msgstr "Voir la carte"
 
-#: views.py:864
+#: views.py:865
 msgid "See full screen"
 msgstr "Plein écran"
 
-#: views.py:1007
+#: views.py:1008
 msgid "Map editors updated with success!"
 msgstr "Éditeurs de la carte mis à jour !"
 
-#: views.py:1043
+#: views.py:1044
 #, python-format
 msgid "The uMap edit link for your map: %(map_name)s"
 msgstr "Le lien d'édition uMap pour votre carte : %(map_name)s"
 
-#: views.py:1046
+#: views.py:1047
 #, python-format
 msgid "Here is your secret edit link: %(link)s"
 msgstr "Voici votre lien d'édition secret : %(link)s"
 
-#: views.py:1053
+#: views.py:1054
 #, python-format
 msgid "Can't send email to %(email)s"
 msgstr "Impossible d'envoyer un courriel vers %(email)s"
 
-#: views.py:1056
+#: views.py:1057
 #, python-format
 msgid "Email sent to %(email)s"
 msgstr "Courriel envoyé à %(email)s"
 
-#: views.py:1067
+#: views.py:1068
 msgid "Only its owner can delete the map."
 msgstr "Seul le créateur de la carte peut la supprimer."
 
-#: views.py:1073
+#: views.py:1074
 msgid "Map successfully deleted."
 msgstr "La carte a bien été supprimée."
 
-#: views.py:1099
+#: views.py:1100
 #, 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 "Votre carte a été dupliquée ! Si vous souhaitez la modifier depuis un autre ordinateur, veuillez utiliser ce lien : %(anonymous_url)s"
 
-#: views.py:1104
+#: views.py:1105
 msgid "Congratulations, your map has been cloned!"
 msgstr "Votre carte a été dupliquée !"
 
-#: views.py:1358
+#: views.py:1359
 msgid "Layer successfully deleted."
 msgstr "Calque supprimé."
 
-#: views.py:1380
+#: views.py:1381
 msgid "Permissions updated with success!"
 msgstr "Les permissions ont bien été modifiées !"
+
+#: views.py:1398
+msgid "Generic"
+msgstr "Générique"

umap_project-3.2.0/umap/management/commands/export_pictogram.py

@@ -0,0 +1,29 @@
+import shutil
+import sys
+from pathlib import Path
+
+from django.core.management.base import BaseCommand
+
+from umap.models import Pictogram
+
+
+class Command(BaseCommand):
+    help = "Export pictogram to some given folder."
+
+    def add_arguments(self, parser):
+        parser.add_argument("dest", help="Destination folder to export pictograms")
+
+    def handle(self, *args, **options):
+        dest = Path(options["dest"])
+        if not dest.exists():
+            sys.exit("Destination does not exist", dest)
+
+        for picto in Pictogram.objects.all():
+            parent = dest
+            if picto.category:
+                parent = parent / picto.category.replace("/", "-")
+                parent.mkdir(exist_ok=True)
+            path = parent / Path(picto.pictogram.name).name
+            shutil.copy2(picto.pictogram.path, path)
+            if options["verbosity"] > 1:
+                print("Copied", picto.pictogram.path, "to", path)

{umap_project-3.1.2 → umap_project-3.2.0}/umap/management/commands/migrate_to_S3.py

@@ -1,3 +1,5 @@
+from pathlib import Path
+
 from django.conf import settings
 from django.core.files.storage import FileSystemStorage
 from django.core.management.base import BaseCommand
@@ -25,7 +27,9 @@ class Command(BaseCommand):
             fs_storage = FileSystemStorage()
             for picto in Pictogram.objects.all():
                 fs_path = str(picto.pictogram)
-                picto.pictogram.save(picto.pictogram.name, fs_storage.open(fs_path))
+                picto.pictogram.save(
+                    Path(picto.pictogram.name).name, fs_storage.open(fs_path)
+                )
                 if options["verbosity"] > 1:
                     print("Migrated:", fs_path)
         else:

{umap_project-3.1.2 → umap_project-3.2.0}/umap/management/commands/purge_old_versions.py

@@ -49,14 +49,16 @@ class Command(BaseCommand):
             layer_id = layer.uuid
             layer_name = layer.name
             last_modified = layer.modified_at.date()
-            deleted = 0
+            deleted = layer.geojson.storage.purge_old_versions(
+                layer, keep=1, dry_run=options["dry_run"]
+            )
+            total_deleted += deleted
             if not options["dry_run"]:
-                deleted = layer.geojson.storage.purge_old_versions(layer, keep=1)
                 layer.geojson.storage.purge_gzip(layer)
-                total_deleted += deleted
-            print(
-                f"Deleted {deleted} old versions of `{layer_name}` ({layer_id}), unmodified since {last_modified}"
-            )
+            if (deleted and options["verbosity"] > 0) or options["verbosity"] > 1:
+                print(
+                    f"Deleted {deleted} old versions of `{layer_name}` ({layer_id}), unmodified since {last_modified}"
+                )
         if not options["dry_run"]:
             print(f"Successfully deleted {total_deleted} geojson files.")
         else:

{umap_project-3.1.2 → umap_project-3.2.0}/umap/settings/__init__.py

@@ -1,7 +1,9 @@
 import os
 import sys
 import types
+from pathlib import Path
 
+from django.core.exceptions import ImproperlyConfigured
 from django.utils.termcolors import colorize
 
 from .base import *  # NOQA, default values
@@ -44,4 +46,23 @@ if path:
                 elif key == "UMAP_FEEDBACK_LINK":
                     globals()["UMAP_HELP_URL"] = value
                 else:
+                    if key == "UMAP_PICTOGRAMS_COLLECTIONS" and value:
+                        for name, options in value.items():
+                            # relative path will be looked relatively to the STATIC_ROOT
+                            path = Path(options["path"])
+                            if not path.is_absolute():
+                                continue
+                            if not path.exists():
+                                msg = (
+                                    f"UMAP_PICTOGRAMS_COLLECTIONS defines path {path} but it does "
+                                    "not exist"
+                                )
+                                raise ImproperlyConfigured(msg)
+                            if not (path / "pictograms").exists():
+                                msg = (
+                                    f"UMAP_PICTOGRAMS_COLLECTIONS defines path {path} but it does "
+                                    "not have a 'pictograms' root folder"
+                                )
+                                raise ImproperlyConfigured(msg)
+                            globals()["STATICFILES_DIRS"].append(path)
                     globals()[key] = value

{umap_project-3.1.2 → umap_project-3.2.0}/umap/settings/base.py

@@ -341,6 +341,7 @@ LOCALE_PATHS = [os.path.join(PROJECT_DIR, "locale")]
 LEAFLET_LONGITUDE = env.int("LEAFLET_LONGITUDE", default=2)
 LEAFLET_LATITUDE = env.int("LEAFLET_LATITUDE", default=51)
 LEAFLET_ZOOM = env.int("LEAFLET_ZOOM", default=6)
+UMAP_PICTOGRAMS_COLLECTIONS = {}
 
 
 # =============================================================================

{umap_project-3.1.2 → umap_project-3.2.0}/umap/static/umap/content.css

@@ -113,8 +113,9 @@ h2.section {
     text-align: center;
 }
 h2.tabs {
-    display: flex;
-    justify-content: space-around;
+    display: inline-flex;
+    justify-content: left;
+    gap: 22px;
     text-transform: uppercase;
     color: var(--color-darkBlue);
     text-align: start;
@@ -136,7 +137,11 @@ h2.tabs a:not(.selected) {
 }
 h2.tabs a:hover {
     text-decoration: underline;
+    text-decoration-thickness: 3px;
+    text-decoration-skip-ink: none;
+    text-underline-offset: 7px;
 }
+
 .showcase-map .map_fragment {
     height: 400px;
 }