umap-project 2.0.0a3__py3-none-any.whl → 2.0.3__py3-none-any.whl

umap/locale/it/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@
 # Marco <marcxosm@gmail.com>, 2017
 # lucacorsato <lucors@gmail.com>, 2014
 # lucacorsato <lucors@gmail.com>, 2014
-# Marco <marcxosm@gmail.com>, 2017-2019
+# Marco <marcxosm@gmail.com>, 2017-2019,2024
 # Marco <marcxosm@gmail.com>, 2018
 # Maurizio Napolitano <maurizio.napolitano@okfn.org>, 2013,2017,2023
 # Mirco Zorzo <mircozorzo@gmail.com>, 2020
@@ -22,7 +22,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-02-15 13:53+0000\n"
 "PO-Revision-Date: 2013-11-22 14:00+0000\n"
-"Last-Translator: Francesco Piero Paolicelli <piersoft2@gmail.com>, 2023\n"
+"Last-Translator: Marco <marcxosm@gmail.com>, 2017-2019,2024\n"
 "Language-Team: Italian (http://app.transifex.com/openstreetmap/umap/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -166,7 +166,7 @@ msgstr "%(current_user)s non ha mappe."
 
 #: templates/auth/user_form.html:6
 msgid "My Maps"
-msgstr ""
+msgstr "Le mie mappe"
 
 #: templates/auth/user_form.html:7
 msgid "My Profile"
@@ -316,15 +316,15 @@ msgstr "Nome"
 
 #: templates/umap/map_table.html:7
 msgid "Preview"
-msgstr ""
+msgstr "Anteprima"
 
 #: templates/umap/map_table.html:8
 msgid "Who can see"
-msgstr ""
+msgstr "Chi può vedere"
 
 #: templates/umap/map_table.html:9
 msgid "Who can edit"
-msgstr ""
+msgstr "Chi può modificare"
 
 #: templates/umap/map_table.html:10
 msgid "Last save"
@@ -340,7 +340,7 @@ msgstr "Azioni"
 
 #: templates/umap/map_table.html:25 templates/umap/map_table.html:27
 msgid "Open preview"
-msgstr ""
+msgstr "Apri anteprima"
 
 #: templates/umap/map_table.html:46 templates/umap/map_table.html:48
 msgid "Share"
@@ -356,42 +356,42 @@ msgstr "Download"
 
 #: templates/umap/map_table.html:63 templates/umap/map_table.html:65
 msgid "Clone"
-msgstr ""
+msgstr "Clona"
 
 #: templates/umap/map_table.html:73 templates/umap/map_table.html:75
 msgid "Delete"
-msgstr ""
+msgstr "Elimina"
 
 #: templates/umap/map_table.html:88
 msgid "first"
-msgstr ""
+msgstr "primo"
 
 #: templates/umap/map_table.html:89
 msgid "previous"
-msgstr ""
+msgstr "precedente"
 
 #: templates/umap/map_table.html:98
 #, python-format
 msgid "Page %(maps_number)s of %(num_pages)s"
-msgstr ""
+msgstr "Pagina %(maps_number)s di %(num_pages)s"
 
 #: templates/umap/map_table.html:104
 msgid "next"
-msgstr ""
+msgstr "prossimo"
 
 #: templates/umap/map_table.html:105
 msgid "last"
-msgstr ""
+msgstr "ultimo"
 
 #: templates/umap/map_table.html:113
 #, python-format
 msgid "Lines per page: %(per_page)s"
-msgstr ""
+msgstr "Linee per pagina: %(per_page)s"
 
 #: templates/umap/map_table.html:118
 #, python-format
 msgid "%(count)s maps"
-msgstr ""
+msgstr "%(count)s mappe"
 
 #: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4
 msgid "My Dashboard"
@@ -490,7 +490,7 @@ msgstr "Cerca nelle mie mappe"
 #: templates/umap/user_dashboard.html:11
 #, python-format
 msgid "My Maps (%(count)s)"
-msgstr ""
+msgstr "Le mie mappe (%(count)s)"
 
 #: templates/umap/user_dashboard.html:13
 msgid "My profile"
@@ -498,12 +498,12 @@ msgstr "Mio profilo"
 
 #: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23
 msgid "Map’s title"
-msgstr ""
+msgstr "Titolo della mappa"
 
 #: templates/umap/user_dashboard.html:32
 #, python-format
 msgid "Download %(count)s maps"
-msgstr ""
+msgstr "Scarica %(count)s mappe"
 
 #: templates/umap/user_dashboard.html:42
 msgid "You have no map yet."
@@ -515,7 +515,7 @@ msgstr "Visualizza la mappa"
 
 #: views.py:704
 msgid "See full screen"
-msgstr ""
+msgstr "Vedi a schermo interno"
 
 #: views.py:803
 msgid "Map editors updated with success!"

umap/locale/ms/LC_MESSAGES/django.po

@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Yaya - Nurul Azeera Hidayah @ Muhammad Nur Hidayat Yasuyoshi (MNH48) <admin@mnh48.moe>, 2021,2023
+# Yaya - Nurul Azeera Hidayah @ Muhammad Nur Hidayat Yasuyoshi (MNH48) <admin@mnh48.moe>, 2021,2023-2024
 # Yaya - Nurul Azeera Hidayah @ Muhammad Nur Hidayat Yasuyoshi (MNH48) <admin@mnh48.moe>, 2021
 msgid ""
 msgstr ""
@@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-02-15 13:53+0000\n"
 "PO-Revision-Date: 2013-11-22 14:00+0000\n"
-"Last-Translator: Yaya - Nurul Azeera Hidayah @ Muhammad Nur Hidayat Yasuyoshi (MNH48) <admin@mnh48.moe>, 2021,2023\n"
+"Last-Translator: Yaya - Nurul Azeera Hidayah @ Muhammad Nur Hidayat Yasuyoshi (MNH48) <admin@mnh48.moe>, 2021,2023-2024\n"
 "Language-Team: Malay (http://app.transifex.com/openstreetmap/umap/language/ms/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -155,7 +155,7 @@ msgstr "%(current_user)s tidak mempunyai peta."
 
 #: templates/auth/user_form.html:6
 msgid "My Maps"
-msgstr ""
+msgstr "Peta Saya"
 
 #: templates/auth/user_form.html:7
 msgid "My Profile"
@@ -305,15 +305,15 @@ msgstr "Nama"
 
 #: templates/umap/map_table.html:7
 msgid "Preview"
-msgstr ""
+msgstr "Pralihat"
 
 #: templates/umap/map_table.html:8
 msgid "Who can see"
-msgstr ""
+msgstr "Siapa boleh lihat"
 
 #: templates/umap/map_table.html:9
 msgid "Who can edit"
-msgstr ""
+msgstr "Siapa boleh sunting"
 
 #: templates/umap/map_table.html:10
 msgid "Last save"
@@ -329,7 +329,7 @@ msgstr "Tindakan"
 
 #: templates/umap/map_table.html:25 templates/umap/map_table.html:27
 msgid "Open preview"
-msgstr ""
+msgstr "Buka pralihat"
 
 #: templates/umap/map_table.html:46 templates/umap/map_table.html:48
 msgid "Share"
@@ -345,42 +345,42 @@ msgstr "Muat turun"
 
 #: templates/umap/map_table.html:63 templates/umap/map_table.html:65
 msgid "Clone"
-msgstr ""
+msgstr "Klon"
 
 #: templates/umap/map_table.html:73 templates/umap/map_table.html:75
 msgid "Delete"
-msgstr ""
+msgstr "Padam"
 
 #: templates/umap/map_table.html:88
 msgid "first"
-msgstr ""
+msgstr "pertama"
 
 #: templates/umap/map_table.html:89
 msgid "previous"
-msgstr ""
+msgstr "sebelumnya"
 
 #: templates/umap/map_table.html:98
 #, python-format
 msgid "Page %(maps_number)s of %(num_pages)s"
-msgstr ""
+msgstr "Halaman %(maps_number)s daripada %(num_pages)s"
 
 #: templates/umap/map_table.html:104
 msgid "next"
-msgstr ""
+msgstr "seterusnya"
 
 #: templates/umap/map_table.html:105
 msgid "last"
-msgstr ""
+msgstr "terakhir"
 
 #: templates/umap/map_table.html:113
 #, python-format
 msgid "Lines per page: %(per_page)s"
-msgstr ""
+msgstr "Baris per halaman: %(per_page)s"
 
 #: templates/umap/map_table.html:118
 #, python-format
 msgid "%(count)s maps"
-msgstr ""
+msgstr "%(count)s peta"
 
 #: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4
 msgid "My Dashboard"
@@ -477,7 +477,7 @@ msgstr "Gelintar peta saya"
 #: templates/umap/user_dashboard.html:11
 #, python-format
 msgid "My Maps (%(count)s)"
-msgstr ""
+msgstr "Peta Saya (%(count)s)"
 
 #: templates/umap/user_dashboard.html:13
 msgid "My profile"
@@ -485,12 +485,12 @@ msgstr "Profil saya"
 
 #: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23
 msgid "Map’s title"
-msgstr ""
+msgstr "Tajuk peta"
 
 #: templates/umap/user_dashboard.html:32
 #, python-format
 msgid "Download %(count)s maps"
-msgstr ""
+msgstr "Muat turun %(count)s peta"
 
 #: templates/umap/user_dashboard.html:42
 msgid "You have no map yet."
@@ -502,7 +502,7 @@ msgstr "Lihat peta"
 
 #: views.py:704
 msgid "See full screen"
-msgstr ""
+msgstr "Lihat skrin penuh"
 
 #: views.py:803
 msgid "Map editors updated with success!"

umap/locale/zh_TW/LC_MESSAGES/django.po

@@ -161,7 +161,7 @@ msgstr "%(current_user)s 沒有任何地圖。"
 
 #: templates/auth/user_form.html:6
 msgid "My Maps"
-msgstr ""
+msgstr "我的地圖"
 
 #: templates/auth/user_form.html:7
 msgid "My Profile"
@@ -315,11 +315,11 @@ msgstr "預纜"
 
 #: templates/umap/map_table.html:8
 msgid "Who can see"
-msgstr ""
+msgstr "誰可以檢視"
 
 #: templates/umap/map_table.html:9
 msgid "Who can edit"
-msgstr ""
+msgstr "誰可以編輯"
 
 #: templates/umap/map_table.html:10
 msgid "Last save"
@@ -351,11 +351,11 @@ msgstr "下載"
 
 #: templates/umap/map_table.html:63 templates/umap/map_table.html:65
 msgid "Clone"
-msgstr ""
+msgstr "複製"
 
 #: templates/umap/map_table.html:73 templates/umap/map_table.html:75
 msgid "Delete"
-msgstr ""
+msgstr "刪除"
 
 #: templates/umap/map_table.html:88
 msgid "first"
@@ -368,7 +368,7 @@ msgstr "先前"
 #: templates/umap/map_table.html:98
 #, python-format
 msgid "Page %(maps_number)s of %(num_pages)s"
-msgstr ""
+msgstr "%(num_pages)s頁的%(maps_number)s"
 
 #: templates/umap/map_table.html:104
 msgid "next"
@@ -381,12 +381,12 @@ msgstr "最後"
 #: templates/umap/map_table.html:113
 #, python-format
 msgid "Lines per page: %(per_page)s"
-msgstr ""
+msgstr "每頁行數：%(per_page)s"
 
 #: templates/umap/map_table.html:118
 #, python-format
 msgid "%(count)s maps"
-msgstr ""
+msgstr "%(count)s地圖"
 
 #: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4
 msgid "My Dashboard"
@@ -483,7 +483,7 @@ msgstr "搜尋我的地圖"
 #: templates/umap/user_dashboard.html:11
 #, python-format
 msgid "My Maps (%(count)s)"
-msgstr ""
+msgstr "我的地圖 (%(count)s)"
 
 #: templates/umap/user_dashboard.html:13
 msgid "My profile"
@@ -491,12 +491,12 @@ msgstr "我的個人檔案"
 
 #: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23
 msgid "Map’s title"
-msgstr ""
+msgstr "地圖標題"
 
 #: templates/umap/user_dashboard.html:32
 #, python-format
 msgid "Download %(count)s maps"
-msgstr ""
+msgstr "下載%(count)s地圖"
 
 #: templates/umap/user_dashboard.html:42
 msgid "You have no map yet."
@@ -508,7 +508,7 @@ msgstr "檢視地圖"
 
 #: views.py:704
 msgid "See full screen"
-msgstr ""
+msgstr "檢視全螢幕"
 
 #: views.py:803
 msgid "Map editors updated with success!"

umap/management/commands/import_pictograms.py

@@ -62,6 +62,6 @@ class Command(BaseCommand):
                 if path.name != self.path.name:  # Subfolders only
                     picto.category = path.name
                 picto.attribution = self.attribution
-                with (path / filename).open("rb") as f:
+                with (filename).open("rb") as f:
                     picto.pictogram.save(filename.name, File(f), save=True)
                 self.stdout.write(f"✔ Imported pictogram {filename}.")

umap/settings/base.py

@@ -128,9 +128,9 @@ INSTALLED_APPS = (
 DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
 
 EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
-FROM_EMAIL = None
+DEFAULT_FROM_EMAIL = None
 # https://docs.djangoproject.com/en/4.2/releases/4.1/#forms
-FORM_RENDERER = "django.forms.renderers.DjangoDivFormRenderer"
+FORM_RENDERER = "django.forms.renderers.DjangoTemplates"
 
 # =============================================================================
 # Calculation of directories relative to the project module location

umap/static/umap/base.css

@@ -31,7 +31,7 @@ hr {
     -moz-border-left-colors: none;
     -moz-border-right-colors: none;
     -moz-border-top-colors: none;
-    border-color: #ddd;
+    border-color: var(--color-lightGray);
     border-image: none;
     border-style: solid;
     border-width: 1px 0 0;
@@ -223,7 +223,7 @@ button.flat,
     padding: 7px 7px;
     margin-bottom: 14px;
     background: #393F3F;
-    color: #ddd;
+    color: var(--color-lightGray);
     font-size: 10px;
     border-radius: 0 2px;
 }
@@ -264,7 +264,7 @@ input + .error {
     padding: 7px 7px;
     margin-top: -14px;
     margin-bottom: 14px;
-    background: #ddd;
+    background: var(--color-lightGray);
     color: #fff;
     background-color: #cc0000;
     font-size: 11px;
@@ -685,7 +685,7 @@ input[type=hidden].blur + [type="button"] {
     position: absolute;
     bottom: 0;
     padding: 0 10px;
-    border-left: 1px solid #ddd;
+    border-left: 1px solid var(--color-lightGray);
     overflow-x: auto;
     z-index: 1010;
     background-color: #fff;
@@ -698,7 +698,7 @@ input[type=hidden].blur + [type="button"] {
 }
 #umap-ui-container.dark {
     border-left: 1px solid #222;
-    background-color: #323737;
+    background-color: var(--color-darkGray);
     color: #efefef;
 }
 #umap-ui-container.fullwidth {
@@ -913,7 +913,7 @@ input:invalid {
     color: #eeeeec;
     padding: 0 7px;
     line-height: 32px;
-    background-color: #323737;
+    background-color: var(--color-darkGray);
 }
 .dark .umap-close-link:hover {
     background-color: #2e3436;

umap/static/umap/content.css

@@ -150,12 +150,12 @@ h2.section {
 }
 h2.tabs {
     text-transform: uppercase;
-    color: #263B58;
+    color: var(--color-darkBlue);
     text-align: left;
     padding-top: 28px;
 }
 h2.tabs a {
-    color: #263B58;
+    color: var(--color-darkBlue);
     text-decoration: underline;
     text-decoration-thickness: 3px;
     text-decoration-skip-ink: none;
@@ -164,7 +164,7 @@ h2.tabs a {
 }
 h2.tabs a:not(.selected) {
     font-weight: normal;
-    color: #263B58;
+    color: var(--color-darkBlue);
     text-decoration: none;
     margin-right: 0;
 }
@@ -205,8 +205,8 @@ body.content #umap-ui-container {
 
 input[type="submit"],
 .button {
-    background-color: #B9F5D2;
-    color: #263B58;
+    background-color: var(--button-primary-background);
+    color: var(--button-primary-color);
 }
 .button-primary {
     font-weight: bold;
@@ -215,8 +215,8 @@ input[type="submit"],
     background-color: #35537c;
 }
 .wrapper .neutral, .wrapper input[type="submit"].neutral {
-    background-color: #ddd;
-    color: #323737;
+    background-color: var(--button-neutral-background);
+    color: var(--button-neutral-color);
 }
 .wrapper.somber {
     background-color: #2E3641;
@@ -399,7 +399,7 @@ ul.umap-autocomplete {
     }
 }
 .table-header form input {
-    border: 2px solid #263B58;
+    border: 2px solid var(--color-darkBlue);
     border-radius: 0;
     padding: .5rem 1rem;
     margin-bottom: 0;
@@ -410,7 +410,7 @@ ul.umap-autocomplete {
     width: 30ch;
 }
 .table-header form input[type="submit"] {
-    background-color: #263B58;
+    background-color: var(--color-darkBlue);
     color: white;
     font-weight: bold;
 }
@@ -419,8 +419,8 @@ ul.umap-autocomplete {
     width: inherit;
     display: inline;
     padding: .5rem 1rem;
-    border: 2px solid #263B58;
-    color: #263B58;
+    border: 2px solid var(--color-darkBlue);
+    color: var(--color-darkBlue);
     font-weight: bold;
     background-color: initial;
     margin-bottom: 0;
@@ -443,7 +443,7 @@ ul.umap-autocomplete {
 .table-wrapper table a,
 .table-wrapper table thead tr th,
 .table-wrapper table th[scope="row"] {
-    color: #263B58;
+    color: var(--color-darkBlue);
     text-align: left;
     padding-left: 2px;
 }
@@ -469,7 +469,7 @@ ul.umap-autocomplete {
 .table-wrapper table input[type="submit"] {
     display: inline;
     background-color: transparent;
-    color: #263B58;
+    color: var(--color-darkBlue);
     padding: 0;
     width: inherit;
     height: 1rem;
@@ -527,7 +527,7 @@ dialog::backdrop {
     padding: 1rem;
 }
 .pagination a {
-    color: #263B58;
+    color: var(--color-darkBlue);
     text-decoration: underline;
 }
 

umap/static/umap/js/umap.forms.js

@@ -672,9 +672,9 @@ L.FormBuilder.IconUrl = L.FormBuilder.BlurInput.extend({
   },
 
   addCategory: function (items, name) {
-    const parent = L.DomUtil.create('div', 'umap-pictogram-category'),
-      grid = L.DomUtil.create('div', 'umap-pictogram-grid', parent)
+    const parent = L.DomUtil.create('div', 'umap-pictogram-category')
     if (name) L.DomUtil.add('h6', '', parent, name)
+    const grid = L.DomUtil.create('div', 'umap-pictogram-grid', parent)
     let status = false
     for (let item of items) {
       status = this.addIconPreview(item, grid) || status

umap/static/umap/js/umap.js

@@ -125,18 +125,12 @@ U.Map = L.Map.extend({
     // To be used in javascript APIs
     if (geojson.properties.lang) L.lang = geojson.properties.lang
 
-    // Don't let default autocreation of controls
-    const zoomControl =
-      typeof geojson.properties.zoomControl !== 'undefined'
-        ? geojson.properties.zoomControl
-        : true
+    this.setOptionsFromQueryString(geojson.properties)
+    // Prevent default creation of controls
+    const zoomControl = geojson.properties.zoomControl
+    const fullscreenControl = geojson.properties.fullscreenControl
     geojson.properties.zoomControl = false
-    const fullscreenControl =
-      typeof geojson.properties.fullscreenControl !== 'undefined'
-        ? geojson.properties.fullscreenControl
-        : true
     geojson.properties.fullscreenControl = false
-    this.setOptionsFromQueryString(geojson.properties)
 
     L.Map.prototype.initialize.call(this, el, geojson.properties)
     U.DEFAULT_ICON_URL = this.options.default_iconUrl
@@ -401,7 +395,7 @@ U.Map = L.Map.extend({
     this._controls.search = new U.SearchControl()
     this._controls.embed = new L.Control.Embed(this, this.options.embedOptions)
     this._controls.tilelayersChooser = new U.TileLayerChooser(this)
-    this._controls.star = new U.StarControl(this)
+    if (this.options.user) this._controls.star = new U.StarControl(this)
     this._controls.editinosm = new L.Control.EditInOSM({
       position: 'topleft',
       widgetOptions: {
@@ -468,6 +462,7 @@ U.Map = L.Map.extend({
       status = this.options[`${name}Control`]
       if (status === false) continue
       control = this._controls[name]
+      if (!control) continue
       control.addTo(this)
       if (status === undefined || status === null)
         L.DomUtil.addClass(control._container, 'display-on-more')
@@ -1129,7 +1124,7 @@ U.Map = L.Map.extend({
     }
   },
 
-  sendEditLink: function () {
+  sendEditLink: async function () {
     const input = this.ui._alert.querySelector('input')
     const email = input.value
 
@@ -1137,29 +1132,25 @@ U.Map = L.Map.extend({
     formData.append('email', email)
 
     const url = this.urls.get('map_send_edit_link', { map_id: this.options.umap_id })
-    this.post(url, {
-      data: formData,
-    })
+    await this.server.post(url, {}, formData)
   },
 
-  star: function () {
+  star: async function () {
     if (!this.options.umap_id)
       return this.ui.alert({
         content: L._('Please save the map first'),
         level: 'error',
       })
     const url = this.urls.get('map_star', { map_id: this.options.umap_id })
-    this.post(url, {
-      context: this,
-      callback: function (data) {
-        this.options.starred = data.starred
-        let msg = data.starred
-          ? L._('Map has been starred')
-          : L._('Map has been unstarred')
-        this.ui.alert({ content: msg, level: 'info' })
-        this.renderControls()
-      },
-    })
+    const [data, response, error] = await this.server.post(url)
+    if (!error) {
+      this.options.starred = data.starred
+      let msg = data.starred
+        ? L._('Map has been starred')
+        : L._('Map has been unstarred')
+      this.ui.alert({ content: msg, level: 'info' })
+      this.renderControls()
+    }
   },
 
   geometry: function () {

umap/static/umap/js/umap.popup.js

@@ -324,7 +324,7 @@ U.PopupTemplate.OSM = U.PopupTemplate.Default.extend({
         L.DomUtil.element('a', { href: `mailto:${email}`, textContent: email })
       )
     }
-    const id = props['@id']
+    const id = props['@id'] || props['id']
     if (id) {
       L.DomUtil.add(
         'div',

umap/static/umap/js/umap.share.js

@@ -226,6 +226,8 @@ U.IframeExporter = L.Evented.extend({
     const datalayers = []
     if (this.options.viewCurrentFeature && this.map.currentFeature) {
       this.queryString.feature = this.map.currentFeature.getSlug()
+    } else {
+      delete this.queryString.feature
     }
     if (this.options.keepCurrentDatalayers) {
       this.map.eachDataLayer((datalayer) => {