umap-project 2.6.0b0__py3-none-any.whl → 2.6.0b1__py3-none-any.whl

umap/__init__.py

@@ -1 +1 @@
-VERSION = "2.6.0b0"
+VERSION = "2.6.0b1"

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: 2024-08-30 18:23+0000\n"
+"POT-Creation-Date: 2024-09-04 14:02+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"
@@ -368,11 +368,11 @@ msgstr ""
 msgid "You are logged in. Continuing..."
 msgstr ""
 
-#: templates/umap/map_list.html:10 views.py:433
+#: templates/umap/map_list.html:11 views.py:433
 msgid "by"
 msgstr ""
 
-#: templates/umap/map_list.html:18
+#: templates/umap/map_list.html:20
 msgid "More"
 msgstr ""
 

umap/settings/base.py

@@ -51,6 +51,12 @@ LANG_INFO.update(
             "name": "Malay",
             "name_local": "Bahasa Melayu",
         },
+        "fa-ir": {
+            "bidi": True,
+            "code": "fa-ir",
+            "name": "Persian (Iran)",
+            "name_local": "فارسی",
+        },
     }
 )
 # Local time zone for this installation. Choices can be found here:

umap/static/umap/js/modules/autocomplete.js

@@ -306,15 +306,11 @@ export const SingleMixin = (Base) =>
         textContent: '×',
       })
       this.input.style.display = 'none'
-      DomEvent.on(
-        close,
-        'click',
-        function () {
-          this.selectedContainer.innerHTML = ''
-          this.input.style.display = 'block'
-        },
-        this
-      )
+      DomEvent.on(close, 'click', () => {
+        this.selectedContainer.innerHTML = ''
+        this.input.style.display = 'block'
+        this.options.on_unselect(result)
+      })
       this.hide()
     }
   }

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

@@ -98,6 +98,10 @@ class Feature {
     this.pushGeometry()
   }
 
+  isOnScreen() {
+    return this.ui?.isOnScreen()
+  }
+
   pushGeometry() {
     this.ui.setLatLngs(this.toLatLngs())
   }
@@ -257,7 +261,7 @@ class Feature {
       builder.helpers['properties.name'].input.focus()
     })
     this.map.editedFeature = this
-    if (!this.isOnScreen()) this.zoomTo(event)
+    if (!this.ui.isOnScreen()) this.zoomTo(event)
   }
 
   getAdvancedEditActions(container) {
@@ -661,11 +665,6 @@ export class Point extends Feature {
       super.zoomTo(event)
     }
   }
-
-  isOnScreen(bounds) {
-    bounds = bounds || this.map.getBounds()
-    return bounds.contains(this.toLatLngs())
-  }
 }
 
 class Path extends Feature {
@@ -753,11 +752,6 @@ class Path extends Feature {
     return items
   }
 
-  isOnScreen(bounds) {
-    bounds = bounds || this.map.getBounds()
-    return bounds.overlaps(this.bounds)
-  }
-
   zoomTo({ easing, callback }) {
     // Use bounds instead of centroid for paths.
     easing = easing || this.map.getOption('easing')

umap/static/umap/js/modules/importers/overpass.js

@@ -25,10 +25,20 @@ class Autocomplete extends SingleMixin(BaseAjax) {
   }
 
   createResult(item) {
+    const labels = [item.properties.name]
+    if (item.properties.county) {
+      labels.push(item.properties.county)
+    }
+    if (item.properties.state) {
+      labels.push(item.properties.state)
+    }
+    if (item.properties.country) {
+      labels.push(item.properties.country)
+    }
     return super.createResult({
       // Overpass convention to get their id from an osm one.
       value: item.properties.osm_id + 3600000000,
-      label: `${item.properties.name}`,
+      label: labels.join(', '),
     })
   }
 }
@@ -42,11 +52,10 @@ export class Importer {
       options?.searchUrl ||
       'https://photon.komoot.io/api?q={q}&layer=county&layer=city&layer=state'
     this.id = 'overpass'
+    this.boundaryChoice = null
   }
 
   async open(importer) {
-    let boundary = null
-    let boundaryName = null
     const container = DomUtil.create('div')
     container.innerHTML = TEMPLATE
     this.autocomplete = new Autocomplete(container.querySelector('#area'), {
@@ -55,10 +64,15 @@ export class Importer {
         'Type area name, or let empty to load data in current map view'
       ),
       on_select: (choice) => {
-        boundary = choice.item.value
-        boundaryName = choice.item.label
+        this.boundaryChoice = choice
+      },
+      on_unselect: (choice) => {
+        this.boundaryChoice = null
       },
     })
+    if (this.boundaryChoice) {
+      this.autocomplete.displaySelected(this.boundaryChoice)
+    }
     this.map.help.parse(container)
 
     const confirm = (form) => {
@@ -69,10 +83,10 @@ export class Importer {
       let tags = form.tags
       if (!tags.startsWith('[')) tags = `[${tags}]`
       let area = '{south},{west},{north},{east}'
-      if (boundary) area = `area:${boundary}`
+      if (this.boundaryChoice) area = `area:${this.boundaryChoice.item.value}`
       const query = `[out:json];nwr${tags}(${area});out ${form.out};`
       importer.url = `${this.baseUrl}?data=${query}`
-      if (boundary) importer.layerName = boundaryName
+      if (this.boundaryChoice) importer.layerName = this.boundaryChoice.item.label
       importer.format = 'osm'
     }
 
@@ -81,7 +95,7 @@ export class Importer {
         template: container,
         className: `${this.id} importer dark`,
         accept: translate('Choose this data'),
-        cancel: false
+        cancel: false,
       })
       .then(confirm)
   }

umap/static/umap/js/modules/rendering/ui.js

@@ -146,9 +146,16 @@ const FeatureMixin = {
   getPopupToolbarAnchor: () => [0, 0],
 }
 
+const PointMixin = {
+  isOnScreen: function (bounds) {
+    bounds = bounds || this._map.getBounds()
+    return bounds.contains(this.getCenter())
+  },
+}
+
 export const LeafletMarker = Marker.extend({
   parentClass: Marker,
-  includes: [FeatureMixin],
+  includes: [FeatureMixin, PointMixin],
 
   initialize: function (feature, latlng) {
     FeatureMixin.initialize.call(this, feature, latlng)
@@ -411,6 +418,11 @@ const PathMixin = {
     'dashArray',
     'interactive',
   ],
+
+  isOnScreen: function (bounds) {
+    bounds = bounds || this._map.getBounds()
+    return bounds.overlaps(this.getBounds())
+  },
 }
 
 export const LeafletPolyline = Polyline.extend({
@@ -552,7 +564,7 @@ export const MaskPolygon = LeafletPolygon.extend({
 
 export const CircleMarker = BaseCircleMarker.extend({
   parentClass: BaseCircleMarker,
-  includes: [FeatureMixin, PathMixin],
+  includes: [FeatureMixin, PathMixin, PointMixin],
   initialize: function (feature, latlng) {
     if (Array.isArray(latlng) && !(latlng[0] instanceof Number)) {
       // Must be a line or polygon
@@ -570,4 +582,8 @@ export const CircleMarker = BaseCircleMarker.extend({
   getCenter: function () {
     return this._latlng
   },
+  // FIXME when Leaflet.Editable knows about CircleMarker
+  editEnabled: () => false,
+  enableEdit: () => {}, // No-op
+  disableEdit: () => {}, // No-op
 })

umap/static/umap/js/modules/schema.js

@@ -81,7 +81,7 @@ export const SCHEMA = {
     impacts: ['ui'],
     nullable: true,
     handler: 'DataLayersControl',
-    label: translate('Display the data layers control'),
+    label: translate('Display the open browser control'),
     default: true,
   },
   defaultView: {

umap/static/umap/js/umap.controls.js

@@ -795,13 +795,14 @@ U.TileLayerControl = L.Control.IconLayers.extend({
         }
       })
     }
+    this._allLayers = layers
     L.Control.IconLayers.prototype.setLayers.call(this, layers.slice(0, this.maxShown))
     if (this.map.selected_tilelayer) this.setActiveLayer(this.map.selected_tilelayer)
   },
 
   _createLayerElements: function () {
     L.Control.IconLayers.prototype._createLayerElements.call(this)
-    if (Object.keys(this._layers) <= this.maxShown) return
+    if (Object.keys(this._allLayers).length <= this.maxShown) return
     const lastRow = this._container.querySelector(
       '.leaflet-iconLayers-layersRow:last-child'
     )

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

@@ -902,8 +902,8 @@ L.FormBuilder.MultiChoice = L.FormBuilder.Element.extend({
     if (!this.container.querySelector(`input[type="radio"][value="${value}"]`)) {
       value = this.options.default !== undefined ? this.options.default : this.default
     }
-    const choices = this.getChoices().map(([value, label]) => value)
-    if (choices.includes(value)) {
+    const choices = this.getChoices().map(([value, label]) => `${value}`)
+    if (choices.includes(`${value}`)) {
       this.container.querySelector(`input[type="radio"][value="${value}"]`).checked =
         true
     }
@@ -925,8 +925,8 @@ L.FormBuilder.MultiChoice = L.FormBuilder.Element.extend({
       `${this.className} by${choices.length}`,
       this.parentNode
     )
-    for (let i = 0; i < choices.length; i++) {
-      this.addChoice(choices[i][0], choices[i][1], i)
+    for (const [i, [value, label]] of choices.entries()) {
+      this.addChoice(value, label, i)
     }
     this.fetch()
   },
@@ -958,8 +958,12 @@ L.FormBuilder.TernaryChoices = L.FormBuilder.MultiChoice.extend({
       case false:
         value = false
         break
-      default:
+      case 'null':
+      case null:
         value = null
+        break
+      default:
+        value = undefined
     }
     return value
   },

umap/static/umap/js/umap.js

@@ -144,7 +144,10 @@ U.Map = L.Map.extend({
       delete this.options.displayDataBrowserOnLoad
     }
     if (this.options.datalayersControl === 'expanded') {
-      this.options.onLoadPanel = 'datalayers'
+      if (!this.options.onLoadPanel) {
+        this.options.onLoadPanel = 'datalayers'
+      }
+      delete this.options.datalayersControl
     }
     if (this.options.onLoadPanel === 'facet') {
       this.options.onLoadPanel = 'datafilters'
@@ -280,7 +283,9 @@ U.Map = L.Map.extend({
     // Specific case for datalayersControl
     // which accepts "expanded" value, on top of true/false/null
     if (L.Util.queryString('datalayersControl') === 'expanded') {
-      options.onLoadPanel = 'datalayers'
+      if (!options.onLoadPanel) {
+        options.onLoadPanel = 'datalayers'
+      }
     }
   },
 

umap/static/umap/locale/am_ET.js

@@ -115,7 +115,6 @@ const locale = {
     "display name": "ስሙን አሳይ",
     "Display on load": "በመጫን ላይ እያለ አሳይ",
     "Display the control to open OpenStreetMap editor": "Display the control to open OpenStreetMap editor",
-    "Display the data layers control": "Display the data layers control",
     "Display the embed control": "Display the embed control",
     "Display the fullscreen control": "Display the fullscreen control",
     "Display the locate control": "Display the locate control",
@@ -498,7 +497,14 @@ const locale = {
     "Found {count} rows. Are you sure you want to delete all?": "Found {count} rows. Are you sure you want to delete all?",
     "Expression is empty": "Expression is empty",
     "OK": "OK",
-    "Cancel": "Cancel"
+    "Cancel": "Cancel",
+    "Attach map to a team": "Attach map to a team",
+    "Display the polygon inverted": "Display the polygon inverted",
+    "Proportional circles": "Proportional circles",
+    "Property name to compute circles": "Property name to compute circles",
+    "Min circle radius": "Min circle radius",
+    "Max circle radius": "Max circle radius",
+    "Display the open browser control": "Display the open browser control"
 }
 L.registerLocale("am_ET", locale)
 L.setLocale("am_ET")

umap/static/umap/locale/am_ET.json

@@ -115,7 +115,6 @@
     "display name": "ስሙን አሳይ",
     "Display on load": "በመጫን ላይ እያለ አሳይ",
     "Display the control to open OpenStreetMap editor": "Display the control to open OpenStreetMap editor",
-    "Display the data layers control": "Display the data layers control",
     "Display the embed control": "Display the embed control",
     "Display the fullscreen control": "Display the fullscreen control",
     "Display the locate control": "Display the locate control",
@@ -498,5 +497,12 @@
     "Found {count} rows. Are you sure you want to delete all?": "Found {count} rows. Are you sure you want to delete all?",
     "Expression is empty": "Expression is empty",
     "OK": "OK",
-    "Cancel": "Cancel"
+    "Cancel": "Cancel",
+    "Attach map to a team": "Attach map to a team",
+    "Display the polygon inverted": "Display the polygon inverted",
+    "Proportional circles": "Proportional circles",
+    "Property name to compute circles": "Property name to compute circles",
+    "Min circle radius": "Min circle radius",
+    "Max circle radius": "Max circle radius",
+    "Display the open browser control": "Display the open browser control"
 }

umap/static/umap/locale/ar.js

@@ -115,7 +115,6 @@ const locale = {
     "display name": "display name",
     "Display on load": "Display on load",
     "Display the control to open OpenStreetMap editor": "Display the control to open OpenStreetMap editor",
-    "Display the data layers control": "Display the data layers control",
     "Display the embed control": "Display the embed control",
     "Display the fullscreen control": "Display the fullscreen control",
     "Display the locate control": "Display the locate control",
@@ -498,7 +497,14 @@ const locale = {
     "Found {count} rows. Are you sure you want to delete all?": "Found {count} rows. Are you sure you want to delete all?",
     "Expression is empty": "Expression is empty",
     "OK": "OK",
-    "Cancel": "Cancel"
+    "Cancel": "Cancel",
+    "Attach map to a team": "Attach map to a team",
+    "Display the polygon inverted": "Display the polygon inverted",
+    "Proportional circles": "Proportional circles",
+    "Property name to compute circles": "Property name to compute circles",
+    "Min circle radius": "Min circle radius",
+    "Max circle radius": "Max circle radius",
+    "Display the open browser control": "Display the open browser control"
 }
 L.registerLocale("ar", locale)
 L.setLocale("ar")

umap/static/umap/locale/ar.json

@@ -115,7 +115,6 @@
     "display name": "display name",
     "Display on load": "Display on load",
     "Display the control to open OpenStreetMap editor": "Display the control to open OpenStreetMap editor",
-    "Display the data layers control": "Display the data layers control",
     "Display the embed control": "Display the embed control",
     "Display the fullscreen control": "Display the fullscreen control",
     "Display the locate control": "Display the locate control",
@@ -498,5 +497,12 @@
     "Found {count} rows. Are you sure you want to delete all?": "Found {count} rows. Are you sure you want to delete all?",
     "Expression is empty": "Expression is empty",
     "OK": "OK",
-    "Cancel": "Cancel"
+    "Cancel": "Cancel",
+    "Attach map to a team": "Attach map to a team",
+    "Display the polygon inverted": "Display the polygon inverted",
+    "Proportional circles": "Proportional circles",
+    "Property name to compute circles": "Property name to compute circles",
+    "Min circle radius": "Min circle radius",
+    "Max circle radius": "Max circle radius",
+    "Display the open browser control": "Display the open browser control"
 }

umap/static/umap/locale/ast.js

@@ -115,7 +115,6 @@ const locale = {
     "display name": "display name",
     "Display on load": "Display on load",
     "Display the control to open OpenStreetMap editor": "Display the control to open OpenStreetMap editor",
-    "Display the data layers control": "Display the data layers control",
     "Display the embed control": "Display the embed control",
     "Display the fullscreen control": "Display the fullscreen control",
     "Display the locate control": "Display the locate control",
@@ -498,7 +497,14 @@ const locale = {
     "Found {count} rows. Are you sure you want to delete all?": "Found {count} rows. Are you sure you want to delete all?",
     "Expression is empty": "Expression is empty",
     "OK": "OK",
-    "Cancel": "Cancel"
+    "Cancel": "Cancel",
+    "Attach map to a team": "Attach map to a team",
+    "Display the polygon inverted": "Display the polygon inverted",
+    "Proportional circles": "Proportional circles",
+    "Property name to compute circles": "Property name to compute circles",
+    "Min circle radius": "Min circle radius",
+    "Max circle radius": "Max circle radius",
+    "Display the open browser control": "Display the open browser control"
 }
 L.registerLocale("ast", locale)
 L.setLocale("ast")

umap/static/umap/locale/ast.json

@@ -115,7 +115,6 @@
     "display name": "display name",
     "Display on load": "Display on load",
     "Display the control to open OpenStreetMap editor": "Display the control to open OpenStreetMap editor",
-    "Display the data layers control": "Display the data layers control",
     "Display the embed control": "Display the embed control",
     "Display the fullscreen control": "Display the fullscreen control",
     "Display the locate control": "Display the locate control",
@@ -498,5 +497,12 @@
     "Found {count} rows. Are you sure you want to delete all?": "Found {count} rows. Are you sure you want to delete all?",
     "Expression is empty": "Expression is empty",
     "OK": "OK",
-    "Cancel": "Cancel"
+    "Cancel": "Cancel",
+    "Attach map to a team": "Attach map to a team",
+    "Display the polygon inverted": "Display the polygon inverted",
+    "Proportional circles": "Proportional circles",
+    "Property name to compute circles": "Property name to compute circles",
+    "Min circle radius": "Min circle radius",
+    "Max circle radius": "Max circle radius",
+    "Display the open browser control": "Display the open browser control"
 }

umap/static/umap/locale/bg.js

@@ -115,7 +115,6 @@ const locale = {
     "display name": "показвано име",
     "Display on load": "Дисплей на зареждане",
     "Display the control to open OpenStreetMap editor": "Display the control to open OpenStreetMap editor",
-    "Display the data layers control": "Display the data layers control",
     "Display the embed control": "Display the embed control",
     "Display the fullscreen control": "Показване управлението за цял екран",
     "Display the locate control": "Display the locate control",
@@ -498,7 +497,14 @@ const locale = {
     "Found {count} rows. Are you sure you want to delete all?": "Found {count} rows. Are you sure you want to delete all?",
     "Expression is empty": "Expression is empty",
     "OK": "OK",
-    "Cancel": "Cancel"
+    "Cancel": "Cancel",
+    "Attach map to a team": "Attach map to a team",
+    "Display the polygon inverted": "Display the polygon inverted",
+    "Proportional circles": "Proportional circles",
+    "Property name to compute circles": "Property name to compute circles",
+    "Min circle radius": "Min circle radius",
+    "Max circle radius": "Max circle radius",
+    "Display the open browser control": "Display the open browser control"
 }
 L.registerLocale("bg", locale)
 L.setLocale("bg")

umap/static/umap/locale/bg.json

@@ -115,7 +115,6 @@
     "display name": "показвано име",
     "Display on load": "Дисплей на зареждане",
     "Display the control to open OpenStreetMap editor": "Display the control to open OpenStreetMap editor",
-    "Display the data layers control": "Display the data layers control",
     "Display the embed control": "Display the embed control",
     "Display the fullscreen control": "Показване управлението за цял екран",
     "Display the locate control": "Display the locate control",
@@ -498,5 +497,12 @@
     "Found {count} rows. Are you sure you want to delete all?": "Found {count} rows. Are you sure you want to delete all?",
     "Expression is empty": "Expression is empty",
     "OK": "OK",
-    "Cancel": "Cancel"
+    "Cancel": "Cancel",
+    "Attach map to a team": "Attach map to a team",
+    "Display the polygon inverted": "Display the polygon inverted",
+    "Proportional circles": "Proportional circles",
+    "Property name to compute circles": "Property name to compute circles",
+    "Min circle radius": "Min circle radius",
+    "Max circle radius": "Max circle radius",
+    "Display the open browser control": "Display the open browser control"
 }

umap/static/umap/locale/br.js

@@ -115,7 +115,6 @@ const locale = {
     "display name": "anv diskwel",
     "Display on load": "Diskwel en ur gargañ",
     "Display the control to open OpenStreetMap editor": "Diskwel an afell evit digeriñ an aozer OpenStreetMap",
-    "Display the data layers control": "Diskwel panell ar gwiskadoù roadennoù",
     "Display the embed control": "Diskwel an afell \"enframmañ\"",
     "Display the fullscreen control": "Diskwel an afell \"skramm a-bezh\"",
     "Display the locate control": "Diskwel an afell \"lec'hiañ\"",
@@ -498,7 +497,14 @@ const locale = {
     "Found {count} rows. Are you sure you want to delete all?": "Found {count} rows. Are you sure you want to delete all?",
     "Expression is empty": "Expression is empty",
     "OK": "Mat eo",
-    "Cancel": "Nullañ"
+    "Cancel": "Nullañ",
+    "Attach map to a team": "Attach map to a team",
+    "Display the polygon inverted": "Display the polygon inverted",
+    "Proportional circles": "Proportional circles",
+    "Property name to compute circles": "Property name to compute circles",
+    "Min circle radius": "Min circle radius",
+    "Max circle radius": "Max circle radius",
+    "Display the open browser control": "Display the open browser control"
 }
 L.registerLocale("br", locale)
 L.setLocale("br")

umap/static/umap/locale/br.json

@@ -115,7 +115,6 @@
     "display name": "anv diskwel",
     "Display on load": "Diskwel en ur gargañ",
     "Display the control to open OpenStreetMap editor": "Diskwel an afell evit digeriñ an aozer OpenStreetMap",
-    "Display the data layers control": "Diskwel panell ar gwiskadoù roadennoù",
     "Display the embed control": "Diskwel an afell \"enframmañ\"",
     "Display the fullscreen control": "Diskwel an afell \"skramm a-bezh\"",
     "Display the locate control": "Diskwel an afell \"lec'hiañ\"",
@@ -498,5 +497,12 @@
     "Found {count} rows. Are you sure you want to delete all?": "Found {count} rows. Are you sure you want to delete all?",
     "Expression is empty": "Expression is empty",
     "OK": "Mat eo",
-    "Cancel": "Nullañ"
+    "Cancel": "Nullañ",
+    "Attach map to a team": "Attach map to a team",
+    "Display the polygon inverted": "Display the polygon inverted",
+    "Proportional circles": "Proportional circles",
+    "Property name to compute circles": "Property name to compute circles",
+    "Min circle radius": "Min circle radius",
+    "Max circle radius": "Max circle radius",
+    "Display the open browser control": "Display the open browser control"
 }