umap-project 3.1.2__py3-none-any.whl → 3.3.0__py3-none-any.whl

umap/__init__.py

@@ -1 +1 @@
-VERSION = "3.1.2"
+VERSION = "3.3.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-08-14 15:22+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"
@@ -324,7 +324,7 @@ msgstr ""
 msgid "%(current_user)s has no starred maps yet."
 msgstr ""
 
-#: templates/base.html:13
+#: templates/base.html:16
 msgid ""
 "uMap lets you create maps with OpenStreetMap layers in a minute and embed "
 "them in your site."
@@ -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:867
 msgid "See full screen"
 msgstr ""
 
-#: views.py:1007
+#: views.py:1010
 msgid "Map editors updated with success!"
 msgstr ""
 
-#: views.py:1043
+#: views.py:1046
 #, python-format
 msgid "The uMap edit link for your map: %(map_name)s"
 msgstr ""
 
-#: views.py:1046
+#: views.py:1049
 #, python-format
 msgid "Here is your secret edit link: %(link)s"
 msgstr ""
 
-#: views.py:1053
+#: views.py:1056
 #, python-format
 msgid "Can't send email to %(email)s"
 msgstr ""
 
-#: views.py:1056
+#: views.py:1059
 #, python-format
 msgid "Email sent to %(email)s"
 msgstr ""
 
-#: views.py:1067
+#: views.py:1070
 msgid "Only its owner can delete the map."
 msgstr ""
 
-#: views.py:1073
+#: views.py:1076
 msgid "Map successfully deleted."
 msgstr ""
 
-#: views.py:1099
+#: views.py:1102
 #, 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:1107
 msgid "Congratulations, your map has been cloned!"
 msgstr ""
 
-#: views.py:1358
+#: views.py:1361
 msgid "Layer successfully deleted."
 msgstr ""
 
-#: views.py:1380
+#: views.py:1383
 msgid "Permissions updated with success!"
 msgstr ""
+
+#: views.py:1400
+msgid "Generic"
+msgstr ""

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/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/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/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/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/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 = {}
 
 
 # =============================================================================
@@ -388,3 +389,5 @@ LOGGING = {
 REALTIME_ENABLED = env.bool("REALTIME_ENABLED", default=False)
 
 REDIS_URL = env("REDIS_URL", default="redis://localhost:6379")
+
+OPENROUTESERVICE_APIKEY = env("OPENROUTESERVICE_APIKEY", default=None)

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;
 }

umap/static/umap/css/contextmenu.css

@@ -1,6 +1,5 @@
 .umap-contextmenu {
     background-color: var(--background-color);
-    padding: calc(var(--box-padding) / 2) calc(var(--box-padding) / 2);
     position: fixed;
     z-index: var(--zindex-contextmenu);
     border-radius: var(--border-radius);
@@ -8,13 +7,34 @@
     display: flex;
     flex-direction: column;
 }
+
+.umap-contextmenu>li {
+    background-color: var(--background-color);
+    padding-left: calc(var(--box-padding) / 2);
+    padding-right: calc(var(--box-padding) / 2);
+}
+
+.umap-contextmenu>li:last-of-type {
+    padding-bottom: calc(var(--box-padding) / 2);
+    border-radius: 0 0 var(--border-radius) var(--border-radius);
+}
+
+.umap-contextmenu>li:first-of-type {
+    border-radius: var(--border-radius) var(--border-radius) 0 0;
+}
+
+.umap-contextmenu>li:first-of-type:not(.dark) {
+    padding-top: calc(var(--box-padding) / 2);
+}
+
 .umap-contextmenu-rows {
     flex-direction: row;
     align-items: center;
     justify-content: center;
     align-content: center;
 }
-.umap-contextmenu:not(.umap-contextmenu-rows) li + li {
+
+.umap-contextmenu:not(.umap-contextmenu-rows)>li+li {
     margin-top: var(--text-margin);
 }
 
@@ -23,6 +43,42 @@
     margin-bottom: var(--text-margin);
 }
 
+.umap-contextmenu .dark li button .icon:hover,
 .dark.umap-contextmenu li button .icon:hover {
     background-color: var(--color-mediumGray);
 }
+
+.umap-contextmenu .icon-bar {
+    display: flex;
+    flex-direction: row;
+}
+
+.umap-contextmenu .icon-bar button {
+    padding: 2px;
+}
+
+.umap-contextmenu .icon-bar hr {
+    transform: rotate(90deg);
+    width: 16px;
+    margin: auto 0px;
+}
+
+.umap-contextmenu.tooltip-bottom-left,
+.umap-contextmenu.tooltip-bottom-left>li:last-of-type {
+    border-bottom-left-radius: unset;
+}
+
+.umap-contextmenu.tooltip-bottom-right,
+.umap-contextmenu.tooltip-bottom-right>li:last-of-type {
+    border-bottom-right-radius: unset;
+}
+
+.umap-contextmenu.tooltip-top-left,
+.umap-contextmenu.tooltip-top-left>li:first-of-type {
+    border-top-left-radius: unset;
+}
+
+.umap-contextmenu.tooltip-top-right,
+.umap-contextmenu.tooltip-top-right>li:first-of-type {
+    border-top-right-radius: unset;
+}