umap-project 2.6.3__py3-none-any.whl → 2.7.0b0__py3-none-any.whl

umap/locale/pt/LC_MESSAGES/django.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uMap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-30 18:23+0000\n"
+"POT-Creation-Date: 2024-10-04 16:35+0000\n"
 "PO-Revision-Date: 2013-11-22 14:00+0000\n"
 "Last-Translator: lecalam, 2024\n"
 "Language-Team: Portuguese (http://app.transifex.com/openstreetmap/umap/language/pt/)\n"
@@ -20,6 +20,10 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
+#: admin.py:16
+msgid "CSV Export"
+msgstr ""
+
 #: forms.py:44 forms.py:70
 msgid "Only editable with secret edit link"
 msgstr "Unicamente editável através de hiperligação secreta"
@@ -28,7 +32,7 @@ msgstr "Unicamente editável através de hiperligação secreta"
 msgid "Everyone can edit"
 msgstr "Todos podem editar"
 
-#: forms.py:69 models.py:423
+#: forms.py:69 models.py:441
 msgid "Inherit"
 msgstr "Herdado"
 
@@ -36,111 +40,111 @@ msgstr "Herdado"
 msgid "Site is readonly for maintenance"
 msgstr "O site está em modo de leitura para manutenção"
 
-#: models.py:54 models.py:73
+#: models.py:55 models.py:74
 msgid "name"
 msgstr "nome"
 
-#: models.py:56 models.py:433
+#: models.py:57 models.py:451
 msgid "description"
 msgstr "descrição"
 
-#: models.py:104
+#: models.py:105
 msgid "details"
 msgstr "detalhes"
 
-#: models.py:105
+#: models.py:106
 msgid "Link to a page where the licence is detailed."
 msgstr "Hiperligação para uma página detalhando a licença."
 
-#: models.py:115
+#: models.py:116
 msgid "URL template using OSM tile format"
 msgstr "Modelo de URL no formato de mosaicos OSM"
 
-#: models.py:121
+#: models.py:122
 msgid "Order of the tilelayers in the edit box"
 msgstr "Ordem das camadas de mosaicos na caixa de edição"
 
-#: models.py:167 models.py:424
+#: models.py:168 models.py:442
 msgid "Everyone"
 msgstr "Todos"
 
-#: models.py:168 models.py:174 models.py:425
+#: models.py:169 models.py:175 models.py:443
 msgid "Editors and team only"
-msgstr ""
+msgstr "Apenas editores e equipa"
 
-#: models.py:169 models.py:426
+#: models.py:170 models.py:444
 msgid "Owner only"
 msgstr "Apenas o proprietário"
 
-#: models.py:172
+#: models.py:173
 msgid "Everyone (public)"
 msgstr "Todos (público)"
 
-#: models.py:173
+#: models.py:174
 msgid "Anyone with link"
 msgstr "Quem tiver a hiperligação"
 
-#: models.py:175
+#: models.py:176
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: models.py:178
+#: models.py:179
 msgid "center"
 msgstr "centro"
 
-#: models.py:179
+#: models.py:180
 msgid "zoom"
 msgstr "zoom"
 
-#: models.py:181
+#: models.py:182
 msgid "locate"
 msgstr "localizar"
 
-#: models.py:181
+#: models.py:182
 msgid "Locate user on load?"
 msgstr "Localizar utilizador no início?"
 
-#: models.py:185
+#: models.py:186
 msgid "Choose the map licence."
 msgstr "Escolha uma licença para o mapa."
 
-#: models.py:186
+#: models.py:187
 msgid "licence"
 msgstr "licença"
 
-#: models.py:197
+#: models.py:198
 msgid "owner"
 msgstr "proprietário"
 
-#: models.py:201
+#: models.py:202
 msgid "editors"
 msgstr "editores"
 
-#: models.py:207
+#: models.py:208
 msgid "team"
-msgstr ""
+msgstr "equipa"
 
-#: models.py:213 models.py:447
+#: models.py:214 models.py:465
 msgid "edit status"
 msgstr "editar estado"
 
-#: models.py:218
+#: models.py:219
 msgid "share status"
 msgstr "partilhar estado"
 
-#: models.py:221 models.py:442
+#: models.py:222 models.py:460
 msgid "settings"
 msgstr "parâmetros"
 
-#: models.py:364
+#: models.py:382
 msgid "Clone of"
 msgstr "Clone de"
 
-#: models.py:437
+#: models.py:455
 msgid "display on load"
 msgstr "mostrar no início"
 
-#: models.py:438
+#: models.py:456
 msgid "Display this layer on load."
 msgstr "Mostrar esta camada ao carregar."
 
@@ -324,19 +328,19 @@ msgstr "Esta é uma versão de demonstração, utilizada para testes e pré-lan
 
 #: templates/umap/content_footer.html:5
 msgid "An OpenStreetMap project"
-msgstr ""
+msgstr "Um projeto OpenStreetMap"
 
 #: templates/umap/content_footer.html:6
 msgid "version"
-msgstr ""
+msgstr "versão"
 
 #: templates/umap/content_footer.html:7
 msgid "Hosted by"
-msgstr ""
+msgstr "Alojado por"
 
 #: templates/umap/content_footer.html:8
 msgid "Contact"
-msgstr ""
+msgstr "Contacto"
 
 #: templates/umap/content_footer.html:9 templates/umap/navigation.html:25
 msgid "Help"
@@ -351,13 +355,13 @@ msgstr "Meus mapas (%(count)s)"
 msgid "My Maps"
 msgstr "Meus mapas"
 
-#: templates/umap/dashboard_menu.html:11
+#: templates/umap/dashboard_menu.html:12
 msgid "My profile"
 msgstr "Meu perfil"
 
-#: templates/umap/dashboard_menu.html:13
+#: templates/umap/dashboard_menu.html:15
 msgid "My teams"
-msgstr ""
+msgstr "Minhas equipas"
 
 #: templates/umap/home.html:14
 msgid "Map of the uMaps"
@@ -371,11 +375,11 @@ msgstr "Inspire-se, explore os mapas"
 msgid "You are logged in. Continuing..."
 msgstr "Sucesso na identificação. Continuando..."
 
-#: templates/umap/map_list.html:10 views.py:433
+#: templates/umap/map_list.html:11 views.py:433
 msgid "by"
 msgstr "por"
 
-#: templates/umap/map_list.html:18
+#: templates/umap/map_list.html:20
 msgid "More"
 msgstr "Mais"
 
@@ -552,20 +556,20 @@ msgstr "Procurar"
 #: templates/umap/team_detail.html:10
 #, python-format
 msgid "Browse %(current_team)s's maps"
-msgstr ""
+msgstr "Ver mapas de %(current_team)s"
 
 #: templates/umap/team_detail.html:22
 #, python-format
 msgid "%(current_team)s has no public maps."
-msgstr ""
+msgstr "%(current_team)s não tem mapas públicos."
 
 #: templates/umap/team_form.html:24
 msgid "Delete this team"
-msgstr ""
+msgstr "Eliminar esta equipa"
 
 #: templates/umap/team_form.html:47
 msgid "Add user"
-msgstr ""
+msgstr "Adicionar utilizador"
 
 #: templates/umap/user_dashboard.html:9 templates/umap/user_dashboard.html:25
 msgid "Search my maps"
@@ -586,76 +590,76 @@ msgstr "Ainda não tem nenhum mapa."
 
 #: templates/umap/user_teams.html:17
 msgid "Users"
-msgstr ""
+msgstr "Utilizadores"
 
 #: templates/umap/user_teams.html:48
 msgid "New team"
-msgstr ""
+msgstr "Nova equipa"
 
 #: views.py:235
 msgid "Cannot delete a team with more than one member"
-msgstr ""
+msgstr "Não é possível eliminar uma equipa com mais de um membro"
 
 #: views.py:239
 #, python-format
 msgid "Team “%(name)s” has been deleted"
-msgstr ""
+msgstr "A equipa “%(name)s” foi eliminada"
 
 #: views.py:438
 msgid "View the map"
 msgstr "Ver o mapa"
 
-#: views.py:824
+#: views.py:818
 msgid "See full screen"
 msgstr "Ver em ecrã inteiro"
 
-#: views.py:953
+#: views.py:950
 msgid "Map editors updated with success!"
 msgstr "Os editores do mapa foram atualizados com sucesso!"
 
-#: views.py:989
+#: views.py:986
 #, python-format
 msgid "The uMap edit link for your map: %(map_name)s"
 msgstr "A hiperligação de edição do uMap para o seu mapa: %(map_name)s"
 
-#: views.py:992
+#: views.py:989
 #, python-format
 msgid "Here is your secret edit link: %(link)s"
 msgstr "Aqui está a hiperligação de edição secreta: %(link)s"
 
-#: views.py:999
+#: views.py:996
 #, python-format
 msgid "Can't send email to %(email)s"
 msgstr "Não é possível enviar o email para %(email)s"
 
-#: views.py:1002
+#: views.py:999
 #, python-format
 msgid "Email sent to %(email)s"
 msgstr "Email enviado para %(email)s"
 
-#: views.py:1013
+#: views.py:1010
 msgid "Only its owner can delete the map."
 msgstr "Só o proprietário pode eliminar o mapa."
 
-#: views.py:1016
+#: views.py:1013
 msgid "Map successfully deleted."
 msgstr "Mapa eliminado com sucesso."
 
-#: views.py:1042
+#: views.py:1039
 #, 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 "O seu mapa foi clonado! Se quiser editar este mapa noutro computador, por favor utilize esta hiperligação: %(anonymous_url)s"
 
-#: views.py:1047
+#: views.py:1044
 msgid "Congratulations, your map has been cloned!"
 msgstr "Parabéns, o seu mapa foi clonado!"
 
-#: views.py:1282
+#: views.py:1277
 msgid "Layer successfully deleted."
 msgstr "Camada eliminada com sucesso."
 
-#: views.py:1304
+#: views.py:1299
 msgid "Permissions updated with success!"
 msgstr "Permissões atualizadas com sucesso!"

umap/management/commands/clean_tilelayer.py

@@ -0,0 +1,152 @@
+import json
+import sys
+
+from django.core.management.base import BaseCommand
+from django.db import connection
+from psycopg.types.json import Jsonb
+
+from umap.models import Map, TileLayer
+
+
+class Command(BaseCommand):
+    help = """Clean tilelayer in database
+
+    This will simply replace the URL in maps settings:
+    umap clean_tilelayer http://my.old/url/template http://my.new/url/template
+
+    This will replace the whole tilelayer in maps settings by the one with this name:
+    umap clean_tilelayer http://my.old/url/template "some string"
+
+    This will replace the whole tilelayer in maps settings by the one with this id:
+    umap clean_tilelayer http://my.old/url/template an_id
+
+    This will delete the whole tilelayer from maps settings:
+    umap clean_tilelayer http://my.old/url/template
+
+    To get the available tilelayers in db (available for users):
+    umap clean_tilelayer --available
+
+    To get statistics of tilelayers usage in db (including custom ones):
+    umap clean_tilelayer --available
+    """
+
+    def add_arguments(self, parser):
+        parser.add_argument("old", nargs="?", help="url template we want to clean")
+        parser.add_argument(
+            "new", help="what to replace this tilelayer with", nargs="?"
+        )
+        parser.add_argument(
+            "--no-input", action="store_true", help="Do not ask for confirm."
+        )
+        parser.add_argument(
+            "--available", action="store_true", help="List known tilelayers."
+        )
+        parser.add_argument(
+            "--stats", action="store_true", help="Display stats on tilelayer usage."
+        )
+
+    def handle(self, *args, **options):
+        self.no_input = options["no_input"]
+        if options["available"]:
+            self.list_available()
+            sys.exit()
+        if options["stats"]:
+            self.stats()
+            sys.exit()
+        old = options["old"]
+        new = options["new"]
+        if not old:
+            sys.exit("⚠ You must define an url_template")
+
+        count = Map.objects.filter(
+            settings__properties__tilelayer__url_template=old
+        ).count()
+        if not count:
+            self.stdout.write("⚠ No map found. Exiting.")
+            sys.exit()
+        self.stdout.write(f"{count} maps found.")
+        if not new:
+            self.delete(old)
+        elif new.startswith("http"):
+            self.replace_url(old, new)
+        else:
+            # Let's consider it's a name or an id
+            self.replace_tilelayer(old, new)
+
+    def confirm(self, message):
+        if self.no_input:
+            return True
+        result = input("%s (y/N) " % message) or "n"
+        if not result[0].lower() == "y":
+            self.stdout.write("⚠ Action cancelled.")
+            sys.exit()
+        return True
+
+    def delete(self, old):
+        if self.confirm(
+            "Are you sure you want to delete the tilelayer key from all those "
+            "maps settings ?"
+        ):
+            with connection.cursor() as cursor:
+                ret = cursor.execute(
+                    "UPDATE umap_map "
+                    "SET settings['properties'] = (settings->'properties') - 'tilelayer'"
+                    "WHERE settings->'properties'->'tilelayer'->'url_template' = %s",
+                    [Jsonb(old)],
+                )
+            self.stdout.write(f"✔ Deleted {old} from {ret.rowcount} maps.")
+
+    def replace_url(self, old, new):
+        if self.confirm(
+            f"Are you sure you want to replace '{old}'' by '{new}'' from all those "
+            "map settings ?"
+        ):
+            with connection.cursor() as cursor:
+                ret = cursor.execute(
+                    "UPDATE umap_map "
+                    "SET settings['properties']['tilelayer']['url_template'] = %s "
+                    "WHERE settings->'properties'->'tilelayer'->'url_template' = %s",
+                    [Jsonb(new), Jsonb(old)],
+                )
+            self.stdout.write(f"✔ Replaced {old} by {new} in {ret.rowcount} maps.")
+
+    def replace_tilelayer(self, old, new):
+        try:
+            tilelayer = TileLayer.objects.get(name=new)
+        except TileLayer.DoesNotExist:
+            try:
+                tilelayer = TileLayer.objects.get(id=new)
+            except (TileLayer.DoesNotExist, ValueError):
+                sys.exit(f"⚠ Cannot find a TileLayer with name or id = '{new}'.")
+        if self.confirm(
+            f"Are you sure you want to replace {old} by '{tilelayer.name}' "
+            "from all those map settings ?"
+        ):
+            with connection.cursor() as cursor:
+                ret = cursor.execute(
+                    "UPDATE umap_map "
+                    "SET settings['properties']['tilelayer'] = %s "
+                    "WHERE settings->'properties'->'tilelayer'->'url_template' = %s",
+                    [Jsonb(tilelayer.json), Jsonb(old)],
+                )
+            self.stdout.write(
+                f"✔ Replaced {old} by {tilelayer.name} in {ret.rowcount} maps."
+            )
+
+    def list_available(self):
+        tilelayers = TileLayer.objects.all()
+        for tilelayer in tilelayers:
+            print(f"{tilelayer.pk} '{tilelayer.name}' {tilelayer.url_template}")
+
+    def stats(self):
+        with connection.cursor() as cursor:
+            cursor.execute(
+                "SELECT COUNT(*) as count, "
+                "settings->'properties'->'tilelayer'->'url_template' as url "
+                "FROM umap_map "
+                "GROUP BY settings->'properties'->'tilelayer'->'url_template' "
+                "ORDER BY count DESC"
+            )
+            res = cursor.fetchall()
+        for count, url in res:
+            print(f"{count}\t{url}")

umap/management/commands/purge_purgatory.py

@@ -0,0 +1,28 @@
+import time
+from pathlib import Path
+
+from django.conf import settings
+from django.core.management.base import BaseCommand
+
+
+class Command(BaseCommand):
+    help = "Remove old files from purgatory. Eg.: umap purge_purgatory --days 7"
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "--days",
+            help="Number of days to consider files for removal",
+            default=30,
+            type=int,
+        )
+
+    def handle(self, *args, **options):
+        days = options["days"]
+        root = Path(settings.UMAP_PURGATORY_ROOT)
+        threshold = time.time() - days * 86400
+        for path in root.iterdir():
+            stats = path.stat()
+            filestamp = stats.st_mtime
+            if filestamp < threshold:
+                path.unlink()
+                print(f"Removed old file {path}")

umap/models.py

@@ -3,6 +3,7 @@ import operator
 import os
 import time
 import uuid
+from pathlib import Path
 
 from django.conf import settings
 from django.contrib.auth.models import User
@@ -255,6 +256,13 @@ class Map(NamedModel):
         )
         return map_settings
 
+    def delete(self, **kwargs):
+        # Explicitely call datalayers.delete, so we can deal with removing files
+        # (the cascade delete would not call the model delete method)
+        for datalayer in self.datalayer_set.all():
+            datalayer.delete()
+        return super().delete(**kwargs)
+
     def generate_umapjson(self, request):
         umapjson = self.settings
         umapjson["type"] = "umap"
@@ -462,7 +470,9 @@ class DataLayer(NamedModel):
 
     def save(self, force_insert=False, force_update=False, **kwargs):
         is_new = not bool(self.pk)
-        super(DataLayer, self).save(force_insert, force_update, **kwargs)
+        super(DataLayer, self).save(
+            force_insert=force_insert, force_update=force_update, **kwargs
+        )
 
         if is_new:
             force_insert, force_update = False, True
@@ -471,10 +481,25 @@ class DataLayer(NamedModel):
             new_name = self.geojson.storage.save(filename, self.geojson)
             self.geojson.storage.delete(old_name)
             self.geojson.name = new_name
-            super(DataLayer, self).save(force_insert, force_update, **kwargs)
+            super(DataLayer, self).save(
+                force_insert=force_insert, force_update=force_update, **kwargs
+            )
         self.purge_gzip()
         self.purge_old_versions()
 
+    def delete(self, **kwargs):
+        self.purge_gzip()
+        self.to_purgatory()
+        return super().delete(**kwargs)
+
+    def to_purgatory(self):
+        dest = Path(settings.UMAP_PURGATORY_ROOT)
+        dest.mkdir(parents=True, exist_ok=True)
+        src = Path(self.geojson.storage.location) / self.storage_root()
+        for version in self.versions:
+            name = version["name"]
+            (src / name).rename(dest / f"{self.map.pk}_{name}")
+
     def upload_to(self):
         root = self.storage_root()
         name = "%s_%s.geojson" % (self.pk, int(time.time() * 1000))

umap/settings/base.py

@@ -240,6 +240,7 @@ USER_URL_FIELD = "username"
 # Miscellaneous project settings
 # =============================================================================
 UMAP_ALLOW_ANONYMOUS = env.bool("UMAP_ALLOW_ANONYMOUS", default=False)
+UMAP_ALLOW_EDIT_PROFILE = env.bool("UMAP_ALLOW_EDIT_PROFILE", default=True)
 
 UMAP_EXTRA_URLS = {
     "routing": "http://www.openstreetmap.org/directions?engine=osrm_car&route={lat},{lng}&locale={locale}#map={zoom}/{lat}/{lng}",  # noqa
@@ -266,6 +267,7 @@ UMAP_DEFAULT_FEATURES_HAVE_OWNERS = False
 UMAP_HOME_FEED = "latest"
 UMAP_IMPORTERS = {}
 UMAP_HOST_INFOS = {}
+UMAP_PURGATORY_ROOT = "/tmp/umappurgatory"
 
 UMAP_READONLY = env("UMAP_READONLY", default=False)
 UMAP_GZIP = True

umap/static/umap/base.css

@@ -307,9 +307,6 @@ input + .help-text {
 .formbox.with-switch {
     padding-top: 2px;
 }
-.formbox select {
-    width: calc(100% - 14px);
-}
 fieldset.formbox {
     border: none;
     border-top: 1px solid var(--color-lightGray);
@@ -386,6 +383,10 @@ fieldset legend {
     font-size: .9rem;
     padding: 0 5px;
 }
+fieldset.separator {
+    border: none;
+    border-top: 1px solid var(--color-lightGray);
+}
 
 [data-badge] {
     position: relative;
@@ -633,7 +634,6 @@ i.info {
 .umap-datalayer-container,
 .umap-layer-properties-container,
 .umap-browse-data,
-.umap-facet-search,
 .umap-tilelayer-switcher-container {
     padding: 0 10px;
 }

umap/static/umap/css/contextmenu.css

@@ -9,3 +9,8 @@
 .umap-contextmenu li + li {
     margin-top: var(--text-margin);
 }
+
+.umap-contextmenu hr {
+    margin-top: var(--text-margin);
+    margin-bottom: var(--text-margin);
+}

umap/static/umap/css/icon.css

@@ -35,9 +35,11 @@ html[dir="rtl"] .icon {
 .icon-block + span {
     margin-inline-start: 0;
 }
+.icon-16.icon-white,
 .dark .icon-16 {
     background-image: url('../img/16-white.svg');
 }
+.icon-24.icon-white,
 .dark .icon-24 {
     background-image: url('../img/24-white.svg');
 }
@@ -105,10 +107,13 @@ html[dir="rtl"] .icon {
     background-position: calc(var(--tile) * 3) calc(var(--tile) * 5);
 }
 .icon-polygon {
-    background-position: var(--tile) calc(var(--tile) * 5);
+    background-position: var(--tile) calc(var(--tile) * 3);
 }
 .icon-polyline {
-    background-position: 0 calc(var(--tile) * 5);
+    background-position: 0 calc(var(--tile) * 3);
+}
+.icon-profile {
+    background-position: 0 calc(var(--tile) * 4);
 }
 .icon-resize {
     background-position: calc(var(--tile) * 3) calc(var(--tile) * 6);