umap-project 3.0.5__tar.gz → 3.0.6__tar.gz

{umap_project-3.0.5 → umap_project-3.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: umap-project
-Version: 3.0.5
+Version: 3.0.6
 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,9 +19,9 @@ 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.1.8
+Requires-Dist: django==5.2.1
 Requires-Dist: pillow==11.2.1
-Requires-Dist: psycopg==3.2.6
+Requires-Dist: psycopg==3.2.8
 Requires-Dist: rcssmin==1.2.1
 Requires-Dist: requests==2.32.3
 Requires-Dist: rjsmin==1.2.4
@@ -34,15 +34,15 @@ Requires-Dist: isort==6.0.1; extra == 'dev'
 Requires-Dist: mkdocs-material==9.6.12; 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.14.3; extra == 'dev'
-Requires-Dist: ruff==0.11.6; extra == 'dev'
+Requires-Dist: pymdown-extensions==10.15; extra == 'dev'
+Requires-Dist: ruff==0.11.9; extra == 'dev'
 Requires-Dist: vermin==1.6.0; extra == 'dev'
 Provides-Extra: docker
 Requires-Dist: uvicorn==0.34.2; extra == 'docker'
 Provides-Extra: s3
 Requires-Dist: django-storages[s3]==1.14.6; extra == 's3'
 Provides-Extra: sync
-Requires-Dist: pydantic==2.11.3; extra == 'sync'
+Requires-Dist: pydantic==2.11.4; extra == 'sync'
 Requires-Dist: redis==5.2.1; extra == 'sync'
 Requires-Dist: websockets==15.0.1; extra == 'sync'
 Provides-Extra: test

{umap_project-3.0.5 → umap_project-3.0.6}/pyproject.toml

@@ -28,12 +28,12 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-  "Django==5.1.8",
+  "Django==5.2.1",
   "django-agnocomplete==2.2.0",
   "django-environ==0.12.0",
   "django-probes==1.7.0",
   "Pillow==11.2.1",
-  "psycopg==3.2.6",
+  "psycopg==3.2.8",
   "requests==2.32.3",
   "rcssmin==1.2.1",
   "rjsmin==1.2.4",
@@ -44,13 +44,13 @@ dependencies = [
 [project.optional-dependencies]
 dev = [
   "hatch==1.14.1",
-  "ruff==0.11.6",
+  "ruff==0.11.9",
   "djlint==1.36.4",
   "mkdocs==1.6.1",
   "mkdocs-material==9.6.12",
   "mkdocs-static-i18n==1.3.0",
   "vermin==1.6.0",
-  "pymdown-extensions==10.14.3",
+  "pymdown-extensions==10.15",
   "isort==6.0.1",
 ]
 test = [
@@ -71,7 +71,7 @@ s3 = [
   "django-storages[s3]==1.14.6",
 ]
 sync = [
-  "pydantic==2.11.3",
+  "pydantic==2.11.4",
   "redis==5.2.1",
   "websockets==15.0.1",
 ]

umap_project-3.0.6/umap/__init__.py

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

{umap_project-3.0.5 → umap_project-3.0.6}/umap/locale/it/LC_MESSAGES/django.po

@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uMap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-03-03 17:36+0000\n"
+"POT-Creation-Date: 2025-04-25 15:38+0000\n"
 "PO-Revision-Date: 2013-11-22 14:00+0000\n"
 "Last-Translator: Marco <marcxosm@gmail.com>, 2017-2019,2024-2025\n"
 "Language-Team: Italian (http://app.transifex.com/openstreetmap/umap/language/it/)\n"
@@ -48,137 +48,205 @@ msgstr "Il sito in sola lettura per manutenzione"
 msgid ""
 "Using “%(name)s” to authenticate is deprecated and will be removed soon. "
 "Please configure another provider below before losing access to your account"
-" and maps."
-msgstr ""
+" and maps. Then, please logout and login again with the new provider."
+msgstr "L’uso di “%(name)s” per autenticarsi è scoraggiato e verrà presto rimosso. Configura un altro fornitore qua sotto prima di perdere l’accesso alla tua utenza e alle tue mappe. Dopo di ciò, esci e rientra con il nuovo fornitore."
 
-#: models.py:60 models.py:79
+#: models.py:61 models.py:80
 msgid "name"
 msgstr "nome"
 
-#: models.py:62 models.py:485
+#: models.py:63 models.py:493
 msgid "description"
 msgstr "descrizione"
 
-#: models.py:110
+#: models.py:111
 msgid "details"
 msgstr "dettagli"
 
-#: models.py:111
+#: models.py:112
 msgid "Link to a page where the licence is detailed."
 msgstr "Link alla pagina con i dettagli della licenza"
 
-#: models.py:121
+#: models.py:122
 msgid "URL template using OSM tile format"
 msgstr "Modello dell'URL usando il formato delle tile OSM"
 
-#: models.py:127
+#: models.py:128
 msgid "Order of the tilelayers in the edit box"
 msgstr "Ordine degli sfondi (tilelayers) nel box di modifica"
 
-#: models.py:175 models.py:479
+#: models.py:176 models.py:487
 msgid "Only editable with secret edit link"
 msgstr "Modificabile solo con il link segreto"
 
-#: models.py:176 models.py:480
+#: models.py:177 models.py:488
 msgid "Everyone can edit"
 msgstr "Chiunque può modificare"
 
-#: models.py:179 models.py:473
+#: models.py:180 models.py:481
 msgid "Everyone"
 msgstr "Chiunque"
 
-#: models.py:180 models.py:189 models.py:474
+#: models.py:181 models.py:190 models.py:482
 msgid "Editors and team only"
 msgstr "Soltanto editor e team"
 
-#: models.py:181 models.py:475
+#: models.py:182 models.py:483
 msgid "Owner only"
 msgstr "Solo chi ha la proprietà"
 
-#: models.py:184
+#: models.py:185
 msgid "Draft (private)"
 msgstr "Bozza (privata)"
 
-#: models.py:185
+#: models.py:186
 msgid "Everyone (public)"
 msgstr "Chiunque (pubblico)"
 
-#: models.py:188
+#: models.py:189
 msgid "Anyone with link"
 msgstr "Chiunque abbia il link"
 
-#: models.py:190
+#: models.py:191
 msgid "Blocked"
 msgstr "Bloccata"
 
-#: models.py:191 models.py:469
+#: models.py:192 models.py:477
 msgid "Deleted"
 msgstr "Eliminato"
 
-#: models.py:194
+#: models.py:195
 msgid "center"
 msgstr "centra"
 
-#: models.py:195
+#: models.py:196
 msgid "zoom"
 msgstr "zoom"
 
-#: models.py:197
+#: models.py:198
 msgid "locate"
 msgstr "localizza"
 
-#: models.py:197
+#: models.py:198
 msgid "Locate user on load?"
 msgstr "Geolocalizzare l'utente al caricamento?"
 
-#: models.py:201
+#: models.py:202
 msgid "Choose the map licence."
 msgstr "Scegliere una licenza per la mappa."
 
-#: models.py:202
+#: models.py:203
 msgid "licence"
 msgstr "licenza"
 
-#: models.py:213
+#: models.py:214
 msgid "owner"
 msgstr "proprietario"
 
-#: models.py:217
+#: models.py:218
 msgid "editors"
 msgstr "contributore"
 
-#: models.py:223
+#: models.py:224
 msgid "team"
 msgstr "team"
 
-#: models.py:229 models.py:501
+#: models.py:230 models.py:509
 msgid "edit status"
 msgstr "stato della modifica"
 
-#: models.py:234 models.py:506
+#: models.py:235 models.py:514
 msgid "share status"
 msgstr "stato condivisione"
 
-#: models.py:237 models.py:496
+#: models.py:238 models.py:504
 msgid "settings"
 msgstr "impostazioni"
 
-#: models.py:407
+#: models.py:410
 msgid "Clone of"
 msgstr "Duplicata da "
 
-#: models.py:468 models.py:472 models.py:478
+#: models.py:476 models.py:480 models.py:486
 msgid "Inherit"
 msgstr "Inherit"
 
-#: models.py:491
+#: models.py:499
 msgid "display on load"
 msgstr "mostra al caricamento"
 
-#: models.py:492
+#: models.py:500
 msgid "Display this layer on load."
 msgstr "Visualizza questo layer al caricamento."
 
+#: settings/base.py:296
+msgid "Art and Culture"
+msgstr "Arte e cultura"
+
+#: settings/base.py:297
+msgid "Cycling"
+msgstr "Ciclismo"
+
+#: settings/base.py:298
+msgid "Business"
+msgstr "Economia"
+
+#: settings/base.py:299
+msgid "Environment"
+msgstr "Ambiente"
+
+#: settings/base.py:300
+msgid "Education"
+msgstr "Educazione"
+
+#: settings/base.py:301
+msgid "Food and Agriculture"
+msgstr "Alimentazione e agricoltura"
+
+#: settings/base.py:302
+msgid "Geopolitics"
+msgstr "Geo-politica"
+
+#: settings/base.py:303
+msgid "Health"
+msgstr "Salute"
+
+#: settings/base.py:304
+msgid "Hiking"
+msgstr "Escursionismo"
+
+#: settings/base.py:305
+msgid "History"
+msgstr "Storia"
+
+#: settings/base.py:306
+msgid "Public sector"
+msgstr "Settore pubblico"
+
+#: settings/base.py:307
+msgid "Science"
+msgstr "Scienza"
+
+#: settings/base.py:308
+msgid "Shopping"
+msgstr "Acquisti"
+
+#: settings/base.py:309
+msgid "Sport and Leisure"
+msgstr "Sport e tempo libero"
+
+#: settings/base.py:310
+msgid "Travel"
+msgstr "Viaggi"
+
+#: settings/base.py:311
+msgid "Transports"
+msgstr "Trasporti"
+
+#: settings/base.py:312
+msgid "Tourism"
+msgstr "Turismo"
+
 #: templates/403.html:8
 msgid ""
 "<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" "
@@ -234,7 +302,7 @@ msgstr "È una buona abitudine connettere il tuo account a più di un fornitore,
 #: templates/auth/user_stars.html:6
 #, python-format
 msgid "%(current_user)s’s starred maps"
-msgstr ""
+msgstr "Le mappe speciali di %(current_user)s"
 
 #: templates/auth/user_stars.html:12
 #, python-format
@@ -258,7 +326,7 @@ msgstr "Login"
 
 #: templates/registration/login.html:22
 msgid "To save and easily find your maps, identify yourself."
-msgstr "Identificati per salva re e trovare facilmente le tue mappe"
+msgstr "Identificati per salvare e trovare facilmente le tue mappe."
 
 #: templates/registration/login.html:25
 msgid "Please log in with your account:"
@@ -274,7 +342,7 @@ msgstr "Password"
 
 #: templates/registration/login.html:52
 msgid "Please choose a provider:"
-msgstr "Scegli un fornitore"
+msgstr "Scegli un fornitore:"
 
 #: templates/umap/about.html:5 templates/umap/navigation.html:22
 msgid "About"
@@ -431,7 +499,7 @@ msgstr "I miei team"
 msgid "Map of the uMaps"
 msgstr "Mappe create con uMap"
 
-#: templates/umap/home.html:24
+#: templates/umap/home.html:25
 msgid "Get inspired, browse maps"
 msgstr "Prendi ispirazione, visualizza mappe"
 
@@ -439,11 +507,15 @@ msgstr "Prendi ispirazione, visualizza mappe"
 msgid "You are logged in. Continuing..."
 msgstr "Utente loggato. Continuare..."
 
-#: templates/umap/map_list.html:11 views.py:437
+#: templates/umap/map_list.html:18 views.py:444
 msgid "by"
 msgstr "di"
 
-#: templates/umap/map_list.html:20
+#: templates/umap/map_list.html:22
+msgid "See the map"
+msgstr "Vedi la mappa"
+
+#: templates/umap/map_list.html:28
 msgid "More"
 msgstr "Altre mappe"
 
@@ -603,11 +675,15 @@ msgstr[0] "%(count)s mappa trovata"
 msgstr[1] "%(count)s mappe trovate"
 msgstr[2] "%(count)s mappe trovate:"
 
-#: templates/umap/search.html:28
+#: templates/umap/search.html:30
 msgid "No map found."
 msgstr "Nessuna mappa trovata."
 
-#: templates/umap/search.html:33
+#: templates/umap/search.html:36
+msgid "Latest created maps in category"
+msgstr "Le ultime mappe create della categoria"
+
+#: templates/umap/search.html:43
 msgid "Latest created maps"
 msgstr "Ultime mappe create"
 
@@ -615,18 +691,22 @@ msgstr "Ultime mappe create"
 msgid "Search maps"
 msgstr "Cerca mappe"
 
-#: templates/umap/search_bar.html:16
+#: templates/umap/search_bar.html:14
+msgid "Any category"
+msgstr "Qualsiasi categoria"
+
+#: templates/umap/search_bar.html:19
 msgid "Search"
 msgstr "Cerca"
 
 #: templates/umap/team_confirm_delete.html:6
 msgid "Team deletion"
-msgstr ""
+msgstr "Cancellazione del team"
 
 #: templates/umap/team_detail.html:6
 #, python-format
 msgid "%(current_team)s’s maps"
-msgstr ""
+msgstr "Le mappe di %(current_team)s"
 
 #: templates/umap/team_detail.html:14
 #, python-format
@@ -636,7 +716,7 @@ msgstr "Sfoglia mappe team %(current_team)s"
 #: templates/umap/team_detail.html:26
 #, python-format
 msgid "%(current_team)s has no public maps."
-msgstr "%(current_team)snon ha mappe pubbliche"
+msgstr "%(current_team)s non ha mappe pubbliche."
 
 #: templates/umap/team_form.html:6
 msgid "Create or edit a team"
@@ -679,70 +759,70 @@ msgstr "Utenti"
 msgid "New team"
 msgstr "Nuovo team"
 
-#: views.py:234
+#: views.py:235
 msgid "Cannot delete a team with more than one member"
 msgstr "Non si può eliminare un team con più di un membro"
 
-#: views.py:238
+#: views.py:239
 #, python-format
 msgid "Team “%(name)s” has been deleted"
-msgstr "il team \"%(name)s\" è stato cancellato"
+msgstr "Il team “%(name)s” è stato cancellato"
 
-#: views.py:442
+#: views.py:449
 msgid "View the map"
 msgstr "Visualizza la mappa"
 
-#: views.py:838
+#: views.py:845
 msgid "See full screen"
 msgstr "Vedi a schermo interno"
 
-#: views.py:981
+#: views.py:988
 msgid "Map editors updated with success!"
 msgstr "Aggiornato l'elenco degli editor abilitati alla modifica della mappa!"
 
-#: views.py:1017
+#: views.py:1024
 #, python-format
 msgid "The uMap edit link for your map: %(map_name)s"
 msgstr "Link uMap per la modifica della tua mappa: %(map_name)s"
 
-#: views.py:1020
+#: views.py:1027
 #, python-format
 msgid "Here is your secret edit link: %(link)s"
 msgstr "Qui il tuo link segreto: %(link)s"
 
-#: views.py:1027
+#: views.py:1034
 #, python-format
 msgid "Can't send email to %(email)s"
 msgstr "Non riesco ad inviare email a 1%(email)s"
 
-#: views.py:1030
+#: views.py:1037
 #, python-format
 msgid "Email sent to %(email)s"
 msgstr "Email inviata a %(email)s"
 
-#: views.py:1041
+#: views.py:1048
 msgid "Only its owner can delete the map."
 msgstr "Solo il proprietario può eliminare la mappa."
 
-#: views.py:1044
+#: views.py:1054
 msgid "Map successfully deleted."
 msgstr "La mappa è stata eliminata definitivamente."
 
-#: views.py:1070
+#: views.py:1080
 #, 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 "La mappa è stata clonata! Per modificarla usando un altro computer, si deve utilizzare questo link: %(anonymous_url)s"
 
-#: views.py:1075
+#: views.py:1085
 msgid "Congratulations, your map has been cloned!"
 msgstr "Perfetto, la tua mappa è stata clonata!"
 
-#: views.py:1329
+#: views.py:1339
 msgid "Layer successfully deleted."
 msgstr "Layer eliminato correttamente"
 
-#: views.py:1351
+#: views.py:1361
 msgid "Permissions updated with success!"
 msgstr "Autorizzazioni aggiornate con successo!"

{umap_project-3.0.5 → umap_project-3.0.6}/umap/static/umap/js/modules/help.js

@@ -175,6 +175,10 @@ const ENTRIES = {
     <div>${translate('For more complex needs, see')} <a href="https://overpass-turbo.eu/">https://overpass-turbo.eu/</a></div>
   </div>
   `,
+
+  sync: translate(
+    'Activate collaborative live editing on this map. Other users must reload the map after changing this setting.'
+  ),
 }
 
 export default class Help {

{umap_project-3.0.5 → umap_project-3.0.6}/umap/static/umap/locale/en.js

@@ -543,7 +543,8 @@ const locale = {
     "Back to list": "Back to list",
     "Toggle rule": "Toggle rule",
     "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
+    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes.",
+    "Activate collaborative live editing on this map. Other users must reload the map after changing this setting.": "Activate collaborative live editing on this map. Other users must reload the map after changing this setting."
 }
 L.registerLocale("en", locale)
 L.setLocale("en")

{umap_project-3.0.5 → umap_project-3.0.6}/umap/static/umap/locale/en.json

@@ -543,5 +543,6 @@
     "Back to list": "Back to list",
     "Toggle rule": "Toggle rule",
     "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
+    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes.",
+    "Activate collaborative live editing on this map. Other users must reload the map after changing this setting.": "Activate collaborative live editing on this map. Other users must reload the map after changing this setting."
 }

{umap_project-3.0.5 → umap_project-3.0.6}/umap/templates/umap/map_init.html

@@ -4,10 +4,12 @@
 <div id="map">
 </div>
 <!-- djlint:off -->
+<script id="map-settings" data-settings="{{ map_settings|escape }}"></script>
 <script defer type="module">
     {% autoescape off %}
     import Umap from '{% static "umap/js/modules/umap.js" %}'
     {% endautoescape %}
-    U.MAP = new Umap("map", {{ map_settings|notag|safe }})
+    U.SETTINGS = JSON.parse(document.getElementById('map-settings').dataset.settings)
+    U.MAP = new Umap("map", U.SETTINGS)
 </script>
 <!-- djlint:on -->

{umap_project-3.0.5 → umap_project-3.0.6}/umap/tests/integration/test_basics.py

@@ -61,13 +61,21 @@ def test_cannot_put_script_tag_in_datalayer_name_or_description(
     page.locator(".umap-field-description textarea").fill(
         '<p>before <script>alert("attack")</script> after</p>'
     )
-    page.get_by_role("button", name="Save").click()
+    page.wait_for_timeout(300)  # Wait for debounce
+    with page.expect_response(re.compile(".*/datalayer/create/.*")):
+        page.get_by_role("button", name="Save").click()
     page.get_by_role("button", name="About").click()
     # Title should contain raw HTML (we are using textContent)
     expect(page.get_by_text('<script>alert("attack")</script>')).to_be_visible()
     # Description should contain escaped HTML
     expect(page.get_by_text("before after")).to_be_visible()
 
+    # Reload the map
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}")
+    page.get_by_role("button", name="About").click()
+    expect(page.get_by_text('<script>alert("attack")</script>')).to_be_visible()
+    expect(page.get_by_text("before after")).to_be_visible()
+
 
 def test_login_from_map_page(live_server, page, tilelayer, settings, user, context):
     settings.ENABLE_ACCOUNT_LOGIN = True

{umap_project-3.0.5 → umap_project-3.0.6}/umap/views.py

@@ -668,7 +668,7 @@ class MapDetailMixin(SessionMixin):
             geojson["properties"] = {}
         geojson["properties"].update(properties)
         geojson["properties"]["datalayers"] = self.get_datalayers()
-        context["map_settings"] = json_dumps(geojson, indent=settings.DEBUG)
+        context["map_settings"] = json_dumps(geojson, indent=settings.DEBUG or None)
         self.set_preconnect(geojson["properties"], context)
         return context
 

umap_project-3.0.5/umap/__init__.py

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