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

umap/__init__.py

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

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

umap/locale/fa_IR/LC_MESSAGES/django.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uMap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-09-04 14:02+0000\n"
+"POT-Creation-Date: 2024-08-30 18:23+0000\n"
 "PO-Revision-Date: 2013-11-22 14:00+0000\n"
 "Last-Translator: imni <iriman@chmail.ir>, 2024\n"
 "Language-Team: Persian (Iran) (http://app.transifex.com/openstreetmap/umap/language/fa_IR/)\n"
@@ -326,19 +326,19 @@ msgstr "این یک نمونهٔ نمایشی است که برای آزمایش
 
 #: templates/umap/content_footer.html:5
 msgid "An OpenStreetMap project"
-msgstr "پروژه‌ای با اوپن‌استریت‌مپ"
+msgstr ""
 
 #: templates/umap/content_footer.html:6
 msgid "version"
-msgstr "نسخه"
+msgstr ""
 
 #: templates/umap/content_footer.html:7
 msgid "Hosted by"
-msgstr "میزبانی‌شده در"
+msgstr ""
 
 #: templates/umap/content_footer.html:8
 msgid "Contact"
-msgstr "تماس"
+msgstr ""
 
 #: templates/umap/content_footer.html:9 templates/umap/navigation.html:25
 msgid "Help"
@@ -373,11 +373,11 @@ msgstr "الهام بگیرید، نقشه‌ها را مرور کنید"
 msgid "You are logged in. Continuing..."
 msgstr "شما وارد شده‌اید. ادامه..."
 
-#: templates/umap/map_list.html:11 views.py:433
+#: templates/umap/map_list.html:10 views.py:433
 msgid "by"
 msgstr "ساختهٔ"
 
-#: templates/umap/map_list.html:20
+#: templates/umap/map_list.html:18
 msgid "More"
 msgstr "بیشتر"
 
@@ -553,12 +553,12 @@ msgstr "جستجو"
 #: templates/umap/team_detail.html:10
 #, python-format
 msgid "Browse %(current_team)s's maps"
-msgstr "مرور نقشه‌های %(current_team)s"
+msgstr ""
 
 #: templates/umap/team_detail.html:22
 #, python-format
 msgid "%(current_team)s has no public maps."
-msgstr "%(current_team)s نقشهٔ عمومی ندارد."
+msgstr ""
 
 #: templates/umap/team_form.html:24
 msgid "Delete this team"

umap/locale/hu/LC_MESSAGES/django.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uMap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-09-04 14:02+0000\n"
+"POT-Creation-Date: 2024-08-30 18:23+0000\n"
 "PO-Revision-Date: 2013-11-22 14:00+0000\n"
 "Last-Translator: Gábor Babos <gabor.babos@gmail.com>, 2017-2019,2023-2024\n"
 "Language-Team: Hungarian (http://app.transifex.com/openstreetmap/umap/language/hu/)\n"
@@ -65,7 +65,7 @@ msgstr "Mindenki"
 
 #: models.py:168 models.py:174 models.py:425
 msgid "Editors and team only"
-msgstr "Csak a szerkesztők és a csoport"
+msgstr ""
 
 #: models.py:169 models.py:426
 msgid "Owner only"
@@ -117,7 +117,7 @@ msgstr "szerkesztők"
 
 #: models.py:207
 msgid "team"
-msgstr "csoport"
+msgstr ""
 
 #: models.py:213 models.py:447
 msgid "edit status"
@@ -323,19 +323,19 @@ msgstr "Ez egy demonstrációs változat, amelyet tesztelésre és még nem nyil
 
 #: templates/umap/content_footer.html:5
 msgid "An OpenStreetMap project"
-msgstr "OpenStreetMap projekt"
+msgstr ""
 
 #: templates/umap/content_footer.html:6
 msgid "version"
-msgstr "verzió"
+msgstr ""
 
 #: templates/umap/content_footer.html:7
 msgid "Hosted by"
-msgstr "Tárhely:"
+msgstr ""
 
 #: templates/umap/content_footer.html:8
 msgid "Contact"
-msgstr "Kapcsolat:"
+msgstr ""
 
 #: templates/umap/content_footer.html:9 templates/umap/navigation.html:25
 msgid "Help"
@@ -356,7 +356,7 @@ msgstr "Saját profil"
 
 #: templates/umap/dashboard_menu.html:13
 msgid "My teams"
-msgstr "Csoportjaim"
+msgstr ""
 
 #: templates/umap/home.html:14
 msgid "Map of the uMaps"
@@ -370,11 +370,11 @@ msgstr "Szerezzen ihletet, böngésszen a térképek között!"
 msgid "You are logged in. Continuing..."
 msgstr "Be van jelentkezve. Továbblépés…"
 
-#: templates/umap/map_list.html:11 views.py:433
+#: templates/umap/map_list.html:10 views.py:433
 msgid "by"
 msgstr "– készítette:"
 
-#: templates/umap/map_list.html:20
+#: templates/umap/map_list.html:18
 msgid "More"
 msgstr "Még több"
 
@@ -550,20 +550,20 @@ msgstr "Keresés"
 #: templates/umap/team_detail.html:10
 #, python-format
 msgid "Browse %(current_team)s's maps"
-msgstr "%(current_team)s csoport térképeinek böngészése"
+msgstr ""
 
 #: templates/umap/team_detail.html:22
 #, python-format
 msgid "%(current_team)s has no public maps."
-msgstr "%(current_team)s csoportnak nincs nyilvános térképe."
+msgstr ""
 
 #: templates/umap/team_form.html:24
 msgid "Delete this team"
-msgstr "Csoport törlése"
+msgstr ""
 
 #: templates/umap/team_form.html:47
 msgid "Add user"
-msgstr "Felhasználó hozzáadása"
+msgstr ""
 
 #: templates/umap/user_dashboard.html:9 templates/umap/user_dashboard.html:25
 msgid "Search my maps"
@@ -584,20 +584,20 @@ msgstr "Önnek még nincs térképe."
 
 #: templates/umap/user_teams.html:17
 msgid "Users"
-msgstr "Felhasználók"
+msgstr ""
 
 #: templates/umap/user_teams.html:48
 msgid "New team"
-msgstr "Új csoport"
+msgstr ""
 
 #: views.py:235
 msgid "Cannot delete a team with more than one member"
-msgstr "Egynél több tagú csoport nem törölhető"
+msgstr ""
 
 #: views.py:239
 #, python-format
 msgid "Team “%(name)s” has been deleted"
-msgstr "%(name)s csoport törölve"
+msgstr ""
 
 #: views.py:438
 msgid "View the map"

umap/settings/base.py

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

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

@@ -98,10 +98,6 @@ class Feature {
     this.pushGeometry()
   }
 
-  isOnScreen(bounds) {
-    return this.ui?.isOnScreen(bounds)
-  }
-
   pushGeometry() {
     this.ui.setLatLngs(this.toLatLngs())
   }
@@ -261,7 +257,7 @@ class Feature {
       builder.helpers['properties.name'].input.focus()
     })
     this.map.editedFeature = this
-    if (!this.ui.isOnScreen(this.map.getBounds())) this.zoomTo(event)
+    if (!this.isOnScreen()) this.zoomTo(event)
   }
 
   getAdvancedEditActions(container) {
@@ -508,12 +504,7 @@ class Feature {
 
   matchFilter(filter, keys) {
     filter = filter.toLowerCase()
-    // When user hasn't touched settings, when a feature has no name
-    // it will use the datalayer's name, so let's make the filtering
-    // consistent.
-    //  Also, if the user has defined a labelKey with vars, let's
-    // compute before filtering
-    if (Utils.hasVar(keys) || keys === 'displayName') {
+    if (Utils.hasVar(keys)) {
       return this.getDisplayName().toLowerCase().indexOf(filter) !== -1
     }
     keys = keys.split(',')
@@ -670,6 +661,11 @@ export class Point extends Feature {
       super.zoomTo(event)
     }
   }
+
+  isOnScreen(bounds) {
+    bounds = bounds || this.map.getBounds()
+    return bounds.contains(this.toLatLngs())
+  }
 }
 
 class Path extends Feature {
@@ -685,8 +681,8 @@ class Path extends Feature {
 
   edit(event) {
     if (this.map.editEnabled) {
+      if (!this.ui.editEnabled()) this.ui.enableEdit()
       super.edit(event)
-      if (!this.ui.editEnabled()) this.ui.makeGeometryEditable()
     }
   }
 
@@ -757,6 +753,11 @@ 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/data/layer.js

@@ -1115,7 +1115,7 @@ export class DataLayer {
     if (this.map.options.filterKey) return this.map.options.filterKey
     if (this.getOption('labelKey')) return this.getOption('labelKey')
     if (this.map.options.sortKey) return this.map.options.sortKey
-    return 'displayName'
+    return 'name'
   }
 
   renderLegend(container) {

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

@@ -25,20 +25,10 @@ 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: labels.join(', '),
+      label: `${item.properties.name}`,
     })
   }
 }
@@ -52,10 +42,11 @@ 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'), {
@@ -64,15 +55,10 @@ export class Importer {
         'Type area name, or let empty to load data in current map view'
       ),
       on_select: (choice) => {
-        this.boundaryChoice = choice
-      },
-      on_unselect: (choice) => {
-        this.boundaryChoice = null
+        boundary = choice.item.value
+        boundaryName = choice.item.label
       },
     })
-    if (this.boundaryChoice) {
-      this.autocomplete.displaySelected(this.boundaryChoice)
-    }
     this.map.help.parse(container)
 
     const confirm = (form) => {
@@ -83,10 +69,10 @@ export class Importer {
       let tags = form.tags
       if (!tags.startsWith('[')) tags = `[${tags}]`
       let area = '{south},{west},{north},{east}'
-      if (this.boundaryChoice) area = `area:${this.boundaryChoice.item.value}`
+      if (boundary) area = `area:${boundary}`
       const query = `[out:json];nwr${tags}(${area});out ${form.out};`
       importer.url = `${this.baseUrl}?data=${query}`
-      if (this.boundaryChoice) importer.layerName = this.boundaryChoice.item.label
+      if (boundary) importer.layerName = boundaryName
       importer.format = 'osm'
     }
 
@@ -95,7 +81,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

@@ -93,21 +93,13 @@ const FeatureMixin = {
   getContextMenuItems: function (event) {
     const permalink = this.feature.getPermalink()
     let items = []
-    if (permalink) {
+    if (permalink)
       items.push({
         text: translate('Permalink'),
         callback: () => {
           window.open(permalink)
         },
       })
-    }
-    items.push({
-      text: translate('Copy as GeoJSON'),
-      callback: () => {
-        L.Util.copyToClipboard(JSON.stringify(this.feature.toGeoJSON()))
-        this._map.tooltip.open({ content: L._('✅ Copied!') })
-      },
-    })
     if (this._map.editEnabled && !this.feature.isReadOnly()) {
       items = items.concat(this.getContextMenuEditItems(event))
     }
@@ -154,15 +146,9 @@ const FeatureMixin = {
   getPopupToolbarAnchor: () => [0, 0],
 }
 
-const PointMixin = {
-  isOnScreen: function (bounds) {
-    return bounds.contains(this.getCenter())
-  },
-}
-
 export const LeafletMarker = Marker.extend({
   parentClass: Marker,
-  includes: [FeatureMixin, PointMixin],
+  includes: [FeatureMixin],
 
   initialize: function (feature, latlng) {
     FeatureMixin.initialize.call(this, feature, latlng)
@@ -288,21 +274,6 @@ const PathMixin = {
     }
   },
 
-  makeGeometryEditable: function () {
-    if (this._map.editedFeature !== this.feature) {
-      this.disableEdit()
-      return
-    }
-    this._map.once('moveend', this.makeGeometryEditable, this)
-    const pointsCount = this._parts.reduce((acc, part) => acc + part.length, 0)
-    if (pointsCount > 100 && this._map.getZoom() < this._map.getMaxZoom()) {
-      this._map.tooltip.open({ content: L._('Please zoom in to edit the geometry') })
-      this.disableEdit()
-    } else {
-      this.enableEdit()
-    }
-  },
-
   addInteractions: function () {
     FeatureMixin.addInteractions.call(this)
     this.on('editable:disable', this.onCommit)
@@ -398,7 +369,7 @@ const PathMixin = {
   getContextMenuEditItems: function (event) {
     const items = FeatureMixin.getContextMenuEditItems.call(this, event)
     if (
-      this._map?.editedFeature !== this.feature &&
+      this._map?.editedFeature !== this &&
       this.feature.isSameClass(this._map.editedFeature)
     ) {
       items.push({
@@ -440,10 +411,6 @@ const PathMixin = {
     'dashArray',
     'interactive',
   ],
-
-  isOnScreen: function (bounds) {
-    return bounds.overlaps(this.getBounds())
-  },
 }
 
 export const LeafletPolyline = Polyline.extend({
@@ -585,7 +552,7 @@ export const MaskPolygon = LeafletPolygon.extend({
 
 export const CircleMarker = BaseCircleMarker.extend({
   parentClass: BaseCircleMarker,
-  includes: [FeatureMixin, PathMixin, PointMixin],
+  includes: [FeatureMixin, PathMixin],
   initialize: function (feature, latlng) {
     if (Array.isArray(latlng) && !(latlng[0] instanceof Number)) {
       // Must be a line or polygon
@@ -603,8 +570,4 @@ 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/rules.js

@@ -3,8 +3,6 @@ import { translate } from './i18n.js'
 import * as Utils from './utils.js'
 import { AutocompleteDatalist } from './autocomplete.js'
 
-const EMPTY_VALUES = ['', undefined, null]
-
 class Rule {
   get condition() {
     return this._condition
@@ -77,22 +75,13 @@ class Rule {
     if (vars.length !== 2) return
     this.key = vars[0]
     this.expected = vars[1]
-    if (EMPTY_VALUES.includes(this.expected)) {
-      this.cast = (v) => EMPTY_VALUES.includes(v)
-    }
     // Special cases where we want to be lousy when checking isNaN without
     // coercing to a Number first because we handle multiple types.
     // See https://developer.mozilla.org/en-US/docs/Web/JavaScript/
     // Reference/Global_Objects/Number/isNaN
     // biome-ignore lint/suspicious/noGlobalIsNan: expected might not be a number.
-    else if (!isNaN(this.expected)) {
-      this.cast = Number.parseFloat
-    } else if (['true', 'false'].includes(this.expected)) {
-      this.cast = (v) => {
-        if (`${v}`.toLowerCase() === 'true') return true
-        if (`${v}`.toLowerCase() === 'false') return false
-      }
-    }
+    if (!isNaN(this.expected)) this.cast = Number.parseFloat
+    else if (['true', 'false'].includes(this.expected)) this.cast = (v) => !!v
     this.expected = this.cast(this.expected)
   }
 
@@ -144,9 +133,7 @@ class Rule {
         autocomplete.suggestions = [`${value}=`, `${value}!=`, `${value}>`, `${value}<`]
       } else if (value.endsWith('=')) {
         const key = value.split('!')[0].split('=')[0]
-        autocomplete.suggestions = this.map
-          .sortedValues(key)
-          .map((str) => `${value}${str || ''}`)
+        autocomplete.suggestions = this.map.sortedValues(key).map((str) => `${value}${str || ''}`)
       }
     })
     this.map.editPanel.open({ content: container })

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

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

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

@@ -795,14 +795,13 @@ 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._allLayers).length <= this.maxShown) return
+    if (Object.keys(this._layers) <= 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 (const [i, [value, label]] of choices.entries()) {
-      this.addChoice(value, label, i)
+    for (let i = 0; i < choices.length; i++) {
+      this.addChoice(choices[i][0], choices[i][1], i)
     }
     this.fetch()
   },
@@ -958,12 +958,8 @@ L.FormBuilder.TernaryChoices = L.FormBuilder.MultiChoice.extend({
       case false:
         value = false
         break
-      case 'null':
-      case null:
-        value = null
-        break
       default:
-        value = undefined
+        value = null
     }
     return value
   },

umap/static/umap/js/umap.js

@@ -144,10 +144,7 @@ U.Map = L.Map.extend({
       delete this.options.displayDataBrowserOnLoad
     }
     if (this.options.datalayersControl === 'expanded') {
-      if (!this.options.onLoadPanel) {
-        this.options.onLoadPanel = 'datalayers'
-      }
-      delete this.options.datalayersControl
+      this.options.onLoadPanel = 'datalayers'
     }
     if (this.options.onLoadPanel === 'facet') {
       this.options.onLoadPanel = 'datafilters'
@@ -283,9 +280,7 @@ 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') {
-      if (!options.onLoadPanel) {
-        options.onLoadPanel = 'datalayers'
-      }
+      options.onLoadPanel = 'datalayers'
     }
   },
 

umap/static/umap/locale/am_ET.js

@@ -115,6 +115,7 @@ 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",
@@ -497,14 +498,7 @@ 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",
-    "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"
+    "Cancel": "Cancel"
 }
 L.registerLocale("am_ET", locale)
 L.setLocale("am_ET")