umap-project 1.10.0__py3-none-any.whl → 1.11.1__py3-none-any.whl

umap/__init__.py

@@ -1 +1 @@
-VERSION = "1.10.0"
+VERSION = "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/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/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/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/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/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-10-12 06:55+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"
@@ -25,11 +25,11 @@ msgstr ""
 msgid "Everyone can edit"
 msgstr ""
 
-#: forms.py:69 models.py:318
+#: forms.py:69 models.py:320
 msgid "Inherit"
 msgstr ""
 
-#: middleware.py:14
+#: middleware.py:13
 msgid "Site is readonly for maintenance"
 msgstr ""
 
@@ -53,15 +53,15 @@ msgstr ""
 msgid "Order of the tilelayers in the edit box"
 msgstr ""
 
-#: models.py:142 models.py:319
+#: models.py:142 models.py:321
 msgid "Everyone"
 msgstr ""
 
-#: models.py:143 models.py:149 models.py:320
+#: models.py:143 models.py:149 models.py:322
 msgid "Editors only"
 msgstr ""
 
-#: models.py:144 models.py:321
+#: models.py:144 models.py:323
 msgid "Owner only"
 msgstr ""
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Blocked"
 msgstr ""
 
-#: models.py:153 models.py:325
+#: models.py:153 models.py:327
 msgid "description"
 msgstr ""
 
@@ -113,7 +113,7 @@ msgstr ""
 msgid "editors"
 msgstr ""
 
-#: models.py:182 models.py:339
+#: models.py:182 models.py:341
 msgid "edit status"
 msgstr ""
 
@@ -121,7 +121,7 @@ msgstr ""
 msgid "share status"
 msgstr ""
 
-#: models.py:190 models.py:334
+#: models.py:190 models.py:336
 msgid "settings"
 msgstr ""
 
@@ -129,11 +129,11 @@ msgstr ""
 msgid "Clone of"
 msgstr ""
 
-#: models.py:329
+#: models.py:331
 msgid "display on load"
 msgstr ""
 
-#: models.py:330
+#: models.py:332
 msgid "Display this layer on load."
 msgstr ""
 
@@ -290,7 +290,7 @@ msgstr ""
 msgid "You are logged in. Continuing..."
 msgstr ""
 
-#: templates/umap/map_list.html:9 views.py:303
+#: 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:308
+#: views.py:295
 msgid "View the map"
 msgstr ""
 
-#: views.py:659
+#: views.py:670
 msgid "Map has been updated!"
 msgstr ""
 
-#: views.py:684
+#: views.py:695
 msgid "Map editors updated with success!"
 msgstr ""
 
-#: views.py:722
+#: views.py:733
 #, python-format
 msgid "The uMap edit link for your map: %(map_name)s"
 msgstr ""
 
-#: views.py:725
+#: views.py:736
 #, python-format
 msgid "Here is your secret edit link: %(link)s"
 msgstr ""
 
-#: views.py:731
+#: views.py:742
 #, python-format
 msgid "Email sent to %(email)s"
 msgstr ""
 
-#: views.py:742
+#: views.py:753
 msgid "Only its owner can delete the map."
 msgstr ""
 
-#: views.py:765
+#: 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:770
+#: views.py:781
 msgid "Congratulations, your map has been cloned!"
 msgstr ""
 
-#: views.py:959
+#: views.py:970
 msgid "Layer successfully deleted."
 msgstr ""
 
-#: views.py:981
+#: views.py:992
 msgid "Permissions updated with success!"
 msgstr ""

umap/locale/fr/LC_MESSAGES/django.po

@@ -14,6 +14,7 @@
 # severin.menard <severin.menard@protonmail.com>, 2014
 # spf, 2019
 # spf, 2019
+# Syl Martin, 2023
 # Philippe Verdy, 2017
 # yohanboniface <yohanboniface@free.fr>, 2013-2014,2018-2019,2023
 # YOHAN BONIFACE <yb@enix.org>, 2012
@@ -22,9 +23,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uMap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-22 16:21+0000\n"
+"POT-Creation-Date: 2023-10-12 06:55+0000\n"
 "PO-Revision-Date: 2013-11-22 14:00+0000\n"
-"Last-Translator: yohanboniface <yohanboniface@free.fr>, 2013-2014,2018-2019,2023\n"
+"Last-Translator: Syl Martin, 2023\n"
 "Language-Team: French (http://app.transifex.com/openstreetmap/umap/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,7 +41,7 @@ msgstr "Modifiable seulement avec le lien de modification secret"
 msgid "Everyone can edit"
 msgstr "Tout le monde peut modifier"
 
-#: forms.py:69 models.py:317
+#: forms.py:69 models.py:318
 msgid "Inherit"
 msgstr "Par défaut"
 
@@ -68,15 +69,15 @@ msgstr "Modèle d'URL au format des tuiles OSM"
 msgid "Order of the tilelayers in the edit box"
 msgstr "Ordre des calques de tuiles dans le panneau de modification"
 
-#: models.py:142 models.py:318
+#: models.py:142 models.py:319
 msgid "Everyone"
 msgstr "Tout le monde"
 
-#: models.py:143 models.py:149 models.py:319
+#: models.py:143 models.py:149 models.py:320
 msgid "Editors only"
 msgstr "Éditeurs uniquement"
 
-#: models.py:144 models.py:320
+#: models.py:144 models.py:321
 msgid "Owner only"
 msgstr "Propriétaire uniquement"
 
@@ -92,7 +93,7 @@ msgstr "Quiconque a le lien"
 msgid "Blocked"
 msgstr "Bloquée"
 
-#: models.py:153 models.py:324
+#: models.py:153 models.py:325
 msgid "description"
 msgstr "description"
 
@@ -120,35 +121,35 @@ msgstr "Choisir une licence pour la carte"
 msgid "licence"
 msgstr "licence"
 
-#: models.py:172
+#: models.py:173
 msgid "owner"
 msgstr "créateur"
 
-#: models.py:176
+#: models.py:177
 msgid "editors"
 msgstr "éditeurs"
 
-#: models.py:181 models.py:338
+#: models.py:182 models.py:339
 msgid "edit status"
 msgstr "statut de modification"
 
-#: models.py:186
+#: models.py:187
 msgid "share status"
 msgstr "qui a accès"
 
-#: models.py:189 models.py:333
+#: models.py:190 models.py:334
 msgid "settings"
 msgstr "réglages"
 
-#: models.py:268
+#: models.py:269
 msgid "Clone of"
 msgstr "Clone de"
 
-#: models.py:328
+#: models.py:329
 msgid "display on load"
 msgstr "afficher au chargement."
 
-#: models.py:329
+#: models.py:330
 msgid "Display this layer on load."
 msgstr "Afficher ce calque au chargement."
 
@@ -254,7 +255,7 @@ msgstr "Gérer les options de la carte : afficher une minicarte, géolocaliser l
 
 #: templates/umap/about_summary.html:25
 msgid "Batch import geostructured data (geojson, gpx, kml, osm...)"
-msgstr "Import des données géographiques en masse (geojson, gpx, kml, osm...)"
+msgstr "Importer des données géographiques en masse (geojson, gpx, kml, osm...)"
 
 #: templates/umap/about_summary.html:26
 msgid "Choose the license for your data"
@@ -282,7 +283,7 @@ msgstr "Tester la démo"
 msgid ""
 "This instance of uMap is currently in read only mode, no creation/edit is "
 "allowed."
-msgstr "uMap est actuelle en mode lecture seule, aucune création ou modification n'est possible."
+msgstr "uMap est actuellement en mode lecture seule, aucune création ou modification n'est possible."
 
 #: templates/umap/content.html:31
 #, python-format
@@ -451,48 +452,48 @@ msgstr "Vous n'avez pas encore de carte."
 msgid "View the map"
 msgstr "Voir la carte"
 
-#: views.py:658
+#: views.py:659
 msgid "Map has been updated!"
 msgstr "La carte a été mise à jour !"
 
-#: views.py:683
+#: views.py:684
 msgid "Map editors updated with success!"
 msgstr "Éditeurs de la carte mis à jour !"
 
-#: views.py:721
+#: views.py:722
 #, python-format
 msgid "The uMap edit link for your map: %(map_name)s"
 msgstr "La lien d'édition uMap pour votre carte %(map_name)s"
 
-#: views.py:724
+#: views.py:725
 #, python-format
 msgid "Here is your secret edit link: %(link)s"
 msgstr "Voici votre lien d'édition secret: %(link)s"
 
-#: views.py:730
+#: views.py:731
 #, python-format
 msgid "Email sent to %(email)s"
 msgstr "Courriel envoyé à %(email)s"
 
-#: views.py:741
+#: views.py:742
 msgid "Only its owner can delete the map."
 msgstr "Seul le créateur de la carte peut la supprimer."
 
-#: views.py:764
+#: views.py:765
 #, 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:769
+#: views.py:770
 msgid "Congratulations, your map has been cloned!"
 msgstr "Votre carte a été dupliquée !"
 
-#: views.py:958
+#: views.py:959
 msgid "Layer successfully deleted."
 msgstr "Calque supprimé."
 
-#: views.py:980
+#: views.py:981
 msgid "Permissions updated with success!"
 msgstr "Les permissions ont bien été modifiées !"

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/management/commands/import_pictograms.py

@@ -1,4 +1,4 @@
-import os
+from pathlib import Path
 
 from django.core.files import File
 from django.core.management.base import BaseCommand
@@ -7,40 +7,61 @@ from umap.models import Pictogram
 
 
 class Command(BaseCommand):
-    help = 'Import pictograms from a folder'
+    help = "Import pictograms from a folder"
 
     def add_arguments(self, parser):
-        parser.add_argument('path')
-        parser.add_argument('--attribution', required=True,
-                            help='Attribution of the imported pictograms')
-        parser.add_argument('--suffix',
-                            help='Optional suffix to add to each name')
-        parser.add_argument('--force', action='store_true',
-                            help='Update picto if it already exists.')
+        parser.add_argument("path")
+        parser.add_argument(
+            "--attribution",
+            required=True,
+            help="Attribution of the imported pictograms",
+        )
+        parser.add_argument(
+            "--extensions",
+            help="Optional list of extensins to process",
+            nargs="+",
+            default=[".svg"],
+        )
+        parser.add_argument(
+            "--exclude",
+            help="Optional list of files or dirs to exclude",
+            nargs="+",
+            default=["font"],
+        )
+        parser.add_argument(
+            "--force", action="store_true", help="Update picto if it already exists."
+        )
 
     def handle(self, *args, **options):
-        path = options['path']
-        attribution = options['attribution']
-        suffix = options['suffix']
-        force = options['force']
-        for filename in os.listdir(path):
-            if filename.endswith("-24.png"):
-                name = self.extract_name(filename)
-                if suffix:
-                    name = '{name}{suffix}'.format(name=name, suffix=suffix)
+        self.path = Path(options["path"])
+        self.attribution = options["attribution"]
+        self.extensions = options["extensions"]
+        self.force = options["force"]
+        self.exclude = options["exclude"]
+        self.handle_directory(self.path)
+
+    def handle_directory(self, path):
+        for filename in path.iterdir():
+            if filename.name in self.exclude:
+                continue
+            if filename.is_dir():
+                self.handle_directory(filename)
+                continue
+            if filename.suffix in self.extensions:
+                name = filename.stem
                 picto = Pictogram.objects.filter(name=name).last()
                 if picto:
-                    if not force:
-                        self.stdout.write(u"⚠ Pictogram with name '{name}' already exists. Skipping.".format(name=name))  # noqa
+                    if not self.force:
+                        self.stdout.write(
+                            f"⚠ Pictogram with name '{name}' already exists. Skipping."
+                        )
                         continue
                 else:
                     picto = Pictogram()
                     picto.name = name
-                filepath = os.path.join(path, filename)
-                with open(filepath, 'rb') as f:
-                    picto.attribution = attribution
-                    picto.pictogram.save(filename, File(f), save=True)
-                    self.stdout.write(u"✔ Imported pictogram {filename}.".format(filename=filename))  # noqa
-
-    def extract_name(self, filename):
-        return filename[:-7].replace('-', ' ')
+                if path.name != self.path.name:  # Subfolders only
+                    picto.category = path.name
+                picto.attribution = self.attribution
+                with (path / filename).open("rb") as f:
+                    picto.pictogram.save(filename.name, File(f), save=True)
+                self.stdout.write(f"✔ Imported pictogram {filename}.")

umap/managers.py

@@ -2,7 +2,9 @@ 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)
+        return (
+            super(PublicManager, self)
+            .get_queryset()
+            .filter(share_status=self.model.PUBLIC)
+        )

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)