umap-project 3.4.0b2__py3-none-any.whl → 3.4.0b3__py3-none-any.whl

umap/__init__.py

@@ -1 +1 @@
-VERSION = "3.4.0b2"
+VERSION = "3.4.0b3"

umap/locale/da/LC_MESSAGES/django.po

@@ -424,13 +424,13 @@ msgid ""
 "Oops, I didn't mean it, I want to <a href=\"%(login_url)s\" "
 "class=\"login\">create an account</a> or <a href=\"%(login_url)s\" "
 "class=\"login\">log in</a> (no worry, we'll attach the map to your account)."
-msgstr ""
+msgstr "Ups, det var ikke meningen, jeg vil gerne <a href=\"%(login_url)s\" class=\"login\">oprette en konto</a> eller <a href=\"%(login_url)s\" class=\"login\">logge ind</a> (bare rolig, vi knytter kortet til din konto)."
 
 #: templates/umap/components/alerts/alert.html:35
 msgid ""
 "Yes, I want to continue editing anonymously, I will save the secret edit "
 "link to be able to edit this map later or on another device"
-msgstr ""
+msgstr "Ja, jeg vil fortsætte med at redigere anonymt. Jeg gemmer det hemmelige redigeringslink, så jeg kan redigere dette kort senere eller på en anden enhed."
 
 #: templates/umap/components/alerts/alert.html:39
 msgid "Here is your secret link to edit the map, please keep it safe:"

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-10-14 15:28+0000\n"
+"POT-Creation-Date: 2025-10-17 06:00+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"
@@ -41,7 +41,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: models.py:63 models.py:503
+#: models.py:63 models.py:507
 msgid "description"
 msgstr ""
 
@@ -61,23 +61,23 @@ msgstr ""
 msgid "Order of the tilelayers in the edit box"
 msgstr ""
 
-#: models.py:176 models.py:497
+#: models.py:176 models.py:501
 msgid "Only editable with secret edit link"
 msgstr ""
 
-#: models.py:177 models.py:498
+#: models.py:177 models.py:502
 msgid "Everyone can edit"
 msgstr ""
 
-#: models.py:180 models.py:491
+#: models.py:180 models.py:495
 msgid "Everyone"
 msgstr ""
 
-#: models.py:181 models.py:190 models.py:492
+#: models.py:181 models.py:190 models.py:496
 msgid "Editors and team only"
 msgstr ""
 
-#: models.py:182 models.py:493
+#: models.py:182 models.py:497
 msgid "Owner only"
 msgstr ""
 
@@ -97,7 +97,7 @@ msgstr ""
 msgid "Blocked"
 msgstr ""
 
-#: models.py:192 models.py:487
+#: models.py:192 models.py:491
 msgid "Deleted"
 msgstr ""
 
@@ -137,15 +137,15 @@ msgstr ""
 msgid "team"
 msgstr ""
 
-#: models.py:230 models.py:519
+#: models.py:230 models.py:523
 msgid "edit status"
 msgstr ""
 
-#: models.py:235 models.py:524
+#: models.py:235 models.py:528
 msgid "share status"
 msgstr ""
 
-#: models.py:238 models.py:514
+#: models.py:238 models.py:518
 msgid "settings"
 msgstr ""
 
@@ -161,15 +161,15 @@ msgstr ""
 msgid "Clone of"
 msgstr ""
 
-#: models.py:486 models.py:490 models.py:496
+#: models.py:490 models.py:494 models.py:500
 msgid "Inherit"
 msgstr ""
 
-#: models.py:509
+#: models.py:513
 msgid "display on load"
 msgstr ""
 
-#: models.py:510
+#: models.py:514
 msgid "Display this layer on load."
 msgstr ""
 

umap/migrations/0018_datalayer_uuid.py

@@ -57,6 +57,6 @@ class Migration(migrations.Migration):
             ),
         ),
         # When applying the migration backwards, we need to drop the pk index
-        # Before addding a new one.
+        # Before adding a new one.
         migrations.RunSQL(migrations.RunSQL.noop, reverse_sql=drop_index),
     ]

umap/models.py

@@ -289,7 +289,7 @@ class Map(NamedModel):
         self.save()
 
     def delete(self, **kwargs):
-        # Explicitely call datalayers.delete, so we can deal with removing files
+        # Explicitly call datalayers.delete, so we can deal with removing files
         # (the cascade delete would not call the model delete method)
         # Use datalayer_set so to get also the deleted ones.
         for datalayer in self.datalayer_set.all():

umap/settings/local.py.sample

@@ -59,7 +59,7 @@ SOCIAL_AUTH_REDIRECT_IS_HTTPS = True
 SOCIAL_AUTH_RAISE_EXCEPTIONS = False
 SOCIAL_AUTH_BACKEND_ERROR_URL = "/"
 
-# If you want to add a playgroud map, add its primary key
+# If you want to add a playground map, add its primary key
 # UMAP_DEMO_PK = 204
 # If you want to add a showcase map on the home page, add its primary key
 # UMAP_SHOWCASE_PK = 1156

umap/static/umap/css/form.css

@@ -162,7 +162,6 @@ input[type="submit"] {
     background-color: var(--color-mediumGray);
 }
 
-.dark .anonymous:hover,
 .dark .button.anonymous:hover,
 .dark [type="button"].anonymous:hover {
     background-color: var(--color-veryDarkViolet);
@@ -782,12 +781,13 @@ input[type=hidden].blur+[type="button"] {
     border-radius: initial;
 }
 
-.copiable-input button {
+.copiable-input button[type=button] {
     background-color: var(--background-color);
     color: var(--text-color);
     border: 2px solid var(--color-darkBlue);
     border-left: none;
     width: 40px;
+    height: 40px;
 }
 
 input.highlightable:not(:placeholder-shown) {

umap/static/umap/js/components/base.js

@@ -12,7 +12,7 @@ export class uMapElement extends HTMLElement {
 
   /**
    * Retrieves a clone of the content template either using the `template`
-   * attribute or an id mathing the name of the component:
+   * attribute or an id matching the name of the component:
    *
    * `umap-alert` component => `umap-alert-template` template id lookup.
    */

umap/static/umap/js/modules/browser.js

@@ -97,8 +97,8 @@ export default class Browser {
   }
 
   toggleBadge() {
-    Utils.toggleBadge(this.filtersTitle, this.hasFilters())
-    Utils.toggleBadge('.umap-control-browse', this.hasFilters())
+    Utils.toggleBadge(this.filtersTitle, this.hasActiveFilters())
+    Utils.toggleBadge('.umap-control-browse', this.hasActiveFilters())
   }
 
   onFormChange() {
@@ -118,8 +118,8 @@ export default class Browser {
     return !!document.querySelector('.on .umap-browser')
   }
 
-  hasFilters() {
-    return !!this.options.filter || this._umap.hasFilters()
+  hasActiveFilters() {
+    return !!this.options.filter || this._umap.hasActiveFilters()
   }
 
   onMoveEnd() {

umap/static/umap/js/modules/data/features.js

@@ -93,7 +93,7 @@ class Feature {
 
   get fields() {
     // Fields are user defined properties
-    return [...this.datalayer.fields.all(), ...this._umap.fields.all()]
+    return [...this._umap.fields.all(), ...this.datalayer.fields.all()]
   }
 
   setter(key, value) {

umap/static/umap/js/modules/data/fields.js

@@ -0,0 +1,280 @@
+import * as Utils from '../utils.js'
+import { translate } from '../i18n.js'
+import Orderable from '../orderable.js'
+import { uMapAlert as Alert } from '../../components/alerts/alert.js'
+import { Form } from '../form/builder.js'
+
+export const getDefaultFields = () => [
+  { key: U.DEFAULT_LABEL_KEY, type: 'String' },
+  { key: 'description', type: 'Text' },
+]
+
+export class Fields extends Map {
+  constructor(parent, dialog) {
+    super()
+    this.parent = parent
+    this.dialog = dialog
+    this.parent.properties.fields ??= []
+    this.pull()
+  }
+
+  isDefault() {
+    const keys = Array.from(this.keys())
+    const defaultKeys = getDefaultFields().map((field) => field.key)
+    return (
+      keys.length === defaultKeys.length &&
+      keys.every((value, index) => value === defaultKeys[index])
+    )
+  }
+
+  pull() {
+    this.clear()
+    for (const field of this.parent.properties.fields) {
+      this.add(field)
+    }
+  }
+
+  push() {
+    this.parent.properties.fields = this.all().map((field) => {
+      // We don't want to keep the reference, otherwise editing
+      // it will also change the old value
+      return { ...field }
+    })
+  }
+
+  async commit() {
+    return new Promise((resolve) => {
+      const oldFields = Utils.CopyJSON(this.parent.properties.fields)
+      resolve()
+      this.push()
+      this.parent.sync.update(
+        'properties.fields',
+        this.parent.properties.fields,
+        oldFields
+      )
+    })
+  }
+
+  add(field) {
+    if (!field?.key) {
+      console.error('Invalid field', field)
+      return
+    }
+    field.type ??= 'String'
+    // Copy object, so not to affect original
+    // when edited.
+    this.set(field.key, { ...field })
+    this.push()
+  }
+
+  delete(key) {
+    super.delete(key)
+    this.push()
+  }
+
+  all() {
+    return Array.from(this.values())
+  }
+
+  edit(container) {
+    const [root, { ul, add, manageFilters }] = Utils.loadTemplateWithRefs(`
+      <details id="fields-management">
+        <summary><h4>${translate('Manage Fields')}</h4></summary>
+        <fieldset>
+          <ul data-ref=ul></ul>
+          <div class="button-bar half">
+            <button type="button" data-ref=add>${translate('Add a new field')}</button>
+            <button type="button" data-ref="manageFilters">${translate('Manage filters')}</button>
+          </div>
+        </fieldset>
+      </details>
+    `)
+    container.appendChild(root)
+    add.hidden = this.parent.isRemoteLayer?.()
+    add.addEventListener('click', () => {
+      this.editField().then(() => {
+        this.parent.edit().then((panel) => {
+          panel.scrollTo('details#fields-management')
+        })
+      })
+    })
+    manageFilters.addEventListener('click', () => this.parent.filters.edit())
+    for (const field of this.all()) {
+      const [row, { edit, del, addFilter, editFilter }] = Utils.loadTemplateWithRefs(
+        `<li class="orderable with-toolbox" data-key="${field.key}">
+          <span>
+            <i class="icon icon-16 icon-field-${field.type}" title="${field.type}"></i>
+            ${field.key}
+          </span>
+          <span>
+            <button class="icon icon-16 icon-edit" title="${translate('Edit this field')}" data-ref=edit></button>
+            <button class="icon icon-16 icon-filters" title="${translate('Edit filter')}" data-ref=editFilter></button>
+            <button class="icon icon-16 icon-filters-empty" title="${translate('Add a filter for this field')}" data-ref=addFilter></button>
+            <button class="icon icon-16 icon-delete" title="${translate('Delete this field')}" data-ref=del></button>
+            <i class="icon icon-16 icon-drag" title="${translate('Drag to reorder')}"></i>
+          </span>
+        </li>`
+      )
+      editFilter.hidden = !this.parent.filters.has(field.key)
+      addFilter.hidden = this.parent.filters.has(field.key)
+      del.hidden = this.parent.isRemoteLayer?.()
+      editFilter.addEventListener('click', () =>
+        this.parent.filters.createFilterForm(field.key)
+      )
+      addFilter.addEventListener('click', () =>
+        this.parent.filters.createFilterForm(field.key)
+      )
+      ul.appendChild(row)
+      edit.addEventListener('click', () => {
+        this.editField(field.key).then(() => {
+          this.parent.edit().then((panel) => {
+            panel.scrollTo('details#fields-management')
+          })
+        })
+      })
+      del.addEventListener('click', () => {
+        this.confirmDelete(field.key).then(() => {
+          this.parent.edit().then((panel) => {
+            panel.scrollTo('details#fields-management')
+          })
+        })
+      })
+    }
+    const onReorder = (src, dst, initialIndex, finalIndex) => {
+      const orderedKeys = Array.from(ul.querySelectorAll('li')).map(
+        (el) => el.dataset.key
+      )
+      const oldFields = Utils.CopyJSON(this.parent.properties.fields)
+      const copy = Object.fromEntries(this)
+      this.clear()
+      for (const key of orderedKeys) {
+        this.add(copy[key])
+      }
+      this.parent.sync.update(
+        'properties.fields',
+        this.parent.properties.fields,
+        oldFields
+      )
+    }
+    const orderable = new Orderable(ul, onReorder)
+  }
+
+  async editField(name) {
+    if (!name && this.parent.isRemoteLayer?.()) return
+    const FIELD_TYPES = [
+      ['String', translate('Short text')],
+      ['Text', translate('Text')],
+      ['Number', translate('Number')],
+      ['Date', translate('Date')],
+      ['Datetime', translate('Date and time')],
+      ['Enum', translate('List of values')],
+      ['Boolean', translate('Yes / No')],
+    ]
+    const field = this.get(name) || {}
+    const metadatas = [
+      [
+        'key',
+        {
+          handler: 'BlurInput',
+          label: translate('Field Name'),
+          disabled: this.parent.isRemoteLayer?.(),
+        },
+      ],
+      [
+        'type',
+        {
+          handler: 'Select',
+          selectOptions: FIELD_TYPES,
+          label: translate('Field Type'),
+        },
+      ],
+    ]
+    const form = new Form(field, metadatas)
+
+    const [container, { body, addFilter }] = Utils.loadTemplateWithRefs(`
+      <div>
+        <h3>${translate('Manage field')}</h3>
+        <div data-ref=body></div>
+        <button type="button" data-ref=addFilter hidden><i class="icon icon-16 icon-filters"></i>${translate('Add filter for this field')}</button>
+      </div>
+    `)
+    body.appendChild(form.build())
+    if (this.parent.filters) {
+      addFilter.addEventListener('click', () => {
+        this.dialog.accept().then(() => {
+          this.parent.filters.createFilterForm(field.key)
+        })
+      })
+      addFilter.hidden = false
+    }
+
+    return this.dialog.open({ template: container }).then(() => {
+      if (!this.validateName(field.key, field.key !== name)) {
+        this.pull()
+        return
+      }
+      this.parent.sync.startBatch()
+      const oldFields = Utils.CopyJSON(this.parent.properties.fields)
+      if (!name) {
+        this.add(field)
+      } else if (name !== field.key) {
+        this.clear()
+        // Keep order on rename
+        for (const old of oldFields) {
+          if (old.key === name) {
+            this.add(field)
+          } else {
+            this.add(old)
+          }
+        }
+        this.parent.renameField(name, field.key)
+      } else {
+        this.push()
+      }
+      this.parent.sync.update(
+        'properties.fields',
+        this.parent.properties.fields,
+        oldFields
+      )
+      this.parent.sync.commitBatch()
+      this.parent.render(['properties.fields'])
+    })
+  }
+
+  validateName(name, isNew = false) {
+    if (!name) {
+      Alert.error(translate('Name cannot be empty.'))
+      return false
+    }
+    if (name.includes('.')) {
+      Alert.error(translate('Name “{name}” should not contain a dot.', { name }))
+      return false
+    }
+    if (isNew && this.has(name)) {
+      Alert.error(translate('This name already exists: “{name}”', { name }))
+      return false
+    }
+    return true
+  }
+
+  async confirmDelete(name) {
+    return this.dialog
+      .confirm(translate('Are you sure you want to delete this field on all the data?'))
+      .then(() => {
+        this.parent.sync.startBatch()
+        const oldFields = Utils.CopyJSON(this.parent.properties.fields)
+        this.delete(name)
+        this.push()
+        if (this.parent.filters.has(name)) {
+          this.parent.filters.remove(name)
+        }
+        this.parent.deleteField(name)
+        this.parent.sync.update(
+          'properties.fields',
+          this.parent.properties.fields,
+          oldFields
+        )
+        this.parent.sync.commitBatch()
+      })
+  }
+}

umap/static/umap/js/modules/data/layer.js

@@ -21,8 +21,9 @@ import TableEditor from '../tableeditor.js'
 import * as Utils from '../utils.js'
 import { LineString, Point, Polygon } from './features.js'
 import Rules from '../rules.js'
-import { FeatureManager, FieldManager } from '../managers.js'
+import { FeatureManager } from '../managers.js'
 import { Filters } from '../filters.js'
+import { Fields, getDefaultFields } from './fields.js'
 
 export const LAYER_TYPES = [
   DefaultLayer,
@@ -90,12 +91,9 @@ export class DataLayer {
       if (this.showAtLoad()) this.show()
     }
     if (!this._needsFetch && !this._umap.fields.size) {
-      this.properties.fields = [
-        { key: U.DEFAULT_LABEL_KEY, type: 'String' },
-        { key: 'description', type: 'Text' },
-      ]
+      this.properties.fields = getDefaultFields()
     }
-    this.fields = new FieldManager(this, this._umap.dialog)
+    this.fields = new Fields(this, this._umap.dialog)
     this.filters = new Filters(this, this._umap)
 
     // Only layers that are displayed on load must be hidden/shown
@@ -150,7 +148,7 @@ export class DataLayer {
 
   get fieldKeys() {
     // Needed to get a similar API from layer and uMap, but
-    // uMap whould return concat of all datalayers fields
+    // uMap would return concat of all datalayers fields
     return Array.from(this.fields.keys())
   }
 
@@ -209,7 +207,7 @@ export class DataLayer {
   }
 
   // This method does a targeted update of the UI,
-  // it whould be merged with `render`` method and the
+  // it would be merged with `render`` method and the
   // SCHEMA at some point
   propagate(fields = []) {
     const impacts = {

umap/static/umap/js/modules/domutils.js

@@ -83,11 +83,11 @@ export const hexToRGB = (hex) => {
     .map((x) => Number.parseInt(x, 16))
 }
 
-const CACHE_CONSTRAST = {}
+const CACHE_CONTRAST = {}
 export const contrastedColor = (el, bgcolor) => {
   // Return 0 for black and 1 for white
   // bgcolor is a human color, it can be a any keyword (purple…)
-  if (typeof CACHE_CONSTRAST[bgcolor] !== 'undefined') return CACHE_CONSTRAST[bgcolor]
+  if (typeof CACHE_CONTRAST[bgcolor] !== 'undefined') return CACHE_CONTRAST[bgcolor]
   let rgb = window.getComputedStyle(el).getPropertyValue('background-color')
   rgb = RGBRegex.exec(rgb)
   if (rgb && rgb.length === 4) {
@@ -104,6 +104,6 @@ export const contrastedColor = (el, bgcolor) => {
   }
   if (!rgb) return 1
   const out = contrastWCAG21(rgb)
-  if (bgcolor) CACHE_CONSTRAST[bgcolor] = out
+  if (bgcolor) CACHE_CONTRAST[bgcolor] = out
   return out
 }

umap/static/umap/js/modules/filters.js

@@ -179,7 +179,7 @@ export class Filters {
   }
 
   isActive() {
-    return this.available.values().some((obj) => obj.isActive())
+    return Array.from(this.available.values()).some((obj) => obj.isActive())
   }
 
   // Loop on the data to compute the list of choices, min
@@ -306,7 +306,7 @@ export class Filters {
 
   _listFilters(filters, container, title) {
     const template = `
-      <details open>
+      <details>
         <summary>${title}</summary>
         <ul data-ref=ul></ul>
         <div>
@@ -322,9 +322,8 @@ export class Filters {
           `<li>${translate('Add a field prior to create a filter.')}</li>`
         )
       )
-    }
-    if (!filters.size) {
-      body.open = false
+    } else if (!filters._parent.fields.isDefault()) {
+      body.open = true
     }
     filters.available.forEach((filter, fieldKey) => {
       const [li, { edit, remove }] = Utils.loadTemplateWithRefs(
@@ -442,8 +441,9 @@ export class Filters {
     `)
     body.appendChild(form.build())
     editField.addEventListener('click', () => {
-      this._umap.dialog.accept()
-      this._parent.fields.editField(fieldKey)
+      this._umap.dialog.accept().then(() => {
+        this._parent.fields.editField(fieldKey)
+      })
     })
 
     return this._umap.dialog.open({ template: container }).then(() => {

umap/static/umap/js/modules/help.js

@@ -118,7 +118,7 @@ const ENTRIES = {
     <dt>KML</dt>
     <dd>${translate('Properties imported:')}name, description</dd>
     <dt>CSV</dt>
-    <dd>${translate('Comma, tab or semi-colon separated values. SRS WGS84 is implied. Only Point geometries are imported. The import will look at the column headers for any mention of «lat» and «lon» at the begining of the header, case insensitive. All other column are imported as properties.')}</dd>
+    <dd>${translate('Comma, tab or semi-colon separated values. SRS WGS84 is implied. Only Point geometries are imported. The import will look at the column headers for any mention of «lat» and «lon» at the beginning of the header, case insensitive. All other column are imported as properties.')}</dd>
     <dt>uMap</dt>
     <dd>${translate('Imports all umap data, including layers and settings.')}</dd>
   </div>

umap/static/umap/js/modules/i18n.js

@@ -25,7 +25,7 @@ export function getLocale() {
 }
 
 // @function translate(string: String, data?: Object): String
-// Actually try to translate the `string`, with optionnal variable passed in `data`.
+// Actually try to translate the `string`, with optional variable passed in `data`.
 export function translate(string, data = {}) {
   if (locale && locales[locale] && locales[locale][string] !== undefined) {
     string = locales[locale][string]

umap/static/umap/js/modules/importer.js

@@ -353,7 +353,7 @@ export default class Importer extends Utils.WithTemplate {
 
   async copy() {
     // Format may be guessed from file later.
-    // Usefull in case of multiple files with different formats.
+    // Useful in case of multiple files with different formats.
     if (!this.format && !this.files.length) {
       this.onError(translate('Please choose a format'))
       return false