umap-project 2.6.0__tar.gz → 2.6.0b1__tar.gz

{umap_project-2.6.0 → umap_project-2.6.0b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: umap-project
-Version: 2.6.0
+Version: 2.6.0b1
 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,10 +19,10 @@ Requires-Python: >=3.10
 Requires-Dist: django-agnocomplete==2.2.0
 Requires-Dist: django-environ==0.11.2
 Requires-Dist: django-probes==1.7.0
-Requires-Dist: django==5.1.1
+Requires-Dist: django==5.1
 Requires-Dist: pillow==10.4.0
 Requires-Dist: psycopg==3.2.1
-Requires-Dist: pydantic==2.9.1
+Requires-Dist: pydantic==2.8.2
 Requires-Dist: rcssmin==1.1.2
 Requires-Dist: requests==2.32.3
 Requires-Dist: rjsmin==1.2.2
@@ -33,11 +33,11 @@ Provides-Extra: dev
 Requires-Dist: djlint==1.35.2; extra == 'dev'
 Requires-Dist: hatch==1.12.0; extra == 'dev'
 Requires-Dist: isort==5.13.2; extra == 'dev'
-Requires-Dist: mkdocs-material==9.5.34; extra == 'dev'
+Requires-Dist: mkdocs-material==9.5.33; extra == 'dev'
 Requires-Dist: mkdocs-static-i18n==1.2.3; extra == 'dev'
 Requires-Dist: mkdocs==1.6.1; extra == 'dev'
 Requires-Dist: pymdown-extensions==10.9; extra == 'dev'
-Requires-Dist: ruff==0.6.4; extra == 'dev'
+Requires-Dist: ruff==0.6.3; extra == 'dev'
 Requires-Dist: vermin==1.6.0; extra == 'dev'
 Provides-Extra: docker
 Requires-Dist: uwsgi==2.0.26; extra == 'docker'
@@ -45,7 +45,7 @@ Provides-Extra: test
 Requires-Dist: factory-boy==3.3.1; extra == 'test'
 Requires-Dist: playwright>=1.39; extra == 'test'
 Requires-Dist: pytest-django==4.9.0; extra == 'test'
-Requires-Dist: pytest-playwright==0.5.2; extra == 'test'
+Requires-Dist: pytest-playwright==0.5.1; extra == 'test'
 Requires-Dist: pytest-xdist<4,>=3.5.0; extra == 'test'
 Requires-Dist: pytest==8.3.2; extra == 'test'
 Description-Content-Type: text/markdown

{umap_project-2.6.0 → umap_project-2.6.0b1}/pyproject.toml

@@ -28,13 +28,13 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-  "Django==5.1.1",
+  "Django==5.1",
   "django-agnocomplete==2.2.0",
   "django-environ==0.11.2",
   "django-probes==1.7.0",
   "Pillow==10.4.0",
   "psycopg==3.2.1",
-  "pydantic==2.9.1",
+  "pydantic==2.8.2",
   "requests==2.32.3",
   "rcssmin==1.1.2",
   "rjsmin==1.2.2",
@@ -46,10 +46,10 @@ dependencies = [
 [project.optional-dependencies]
 dev = [
   "hatch==1.12.0",
-  "ruff==0.6.4",
+  "ruff==0.6.3",
   "djlint==1.35.2",
   "mkdocs==1.6.1",
-  "mkdocs-material==9.5.34",
+  "mkdocs-material==9.5.33",
   "mkdocs-static-i18n==1.2.3",
   "vermin==1.6.0",
   "pymdown-extensions==10.9",
@@ -60,7 +60,7 @@ test = [
   "playwright>=1.39",
   "pytest==8.3.2",
   "pytest-django==4.9.0",
-  "pytest-playwright==0.5.2",
+  "pytest-playwright==0.5.1",
   "pytest-xdist>=3.5.0,<4",
 ]
 docker = [

umap_project-2.6.0b1/umap/__init__.py

@@ -0,0 +1 @@
+VERSION = "2.6.0b1"

{umap_project-2.6.0 → umap_project-2.6.0b1}/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_project-2.6.0 → umap_project-2.6.0b1}/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_project-2.6.0 → umap_project-2.6.0b1}/umap/static/umap/js/modules/data/features.js

@@ -98,8 +98,8 @@ class Feature {
     this.pushGeometry()
   }
 
-  isOnScreen(bounds) {
-    return this.ui?.isOnScreen(bounds)
+  isOnScreen() {
+    return this.ui?.isOnScreen()
   }
 
   pushGeometry() {
@@ -261,7 +261,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.ui.isOnScreen()) this.zoomTo(event)
   }
 
   getAdvancedEditActions(container) {
@@ -508,12 +508,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(',')
@@ -685,8 +680,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()
     }
   }
 

{umap_project-2.6.0 → umap_project-2.6.0b1}/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_project-2.6.0 → umap_project-2.6.0b1}/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))
     }
@@ -156,6 +148,7 @@ const FeatureMixin = {
 
 const PointMixin = {
   isOnScreen: function (bounds) {
+    bounds = bounds || this._map.getBounds()
     return bounds.contains(this.getCenter())
   },
 }
@@ -288,21 +281,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 +376,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({
@@ -442,6 +420,7 @@ const PathMixin = {
   ],
 
   isOnScreen: function (bounds) {
+    bounds = bounds || this._map.getBounds()
     return bounds.overlaps(this.getBounds())
   },
 }

{umap_project-2.6.0 → umap_project-2.6.0b1}/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_project-2.6.0 → umap_project-2.6.0b1}/umap/static/umap/locale/en.js

@@ -504,9 +504,7 @@ const locale = {
     "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",
-    "Copy as GeoJSON": "Copy as GeoJSON",
-    "Please zoom in to edit the geometry": "Please zoom in to edit the geometry"
+    "Display the open browser control": "Display the open browser control"
 }
 L.registerLocale("en", locale)
 L.setLocale("en")