umap-project 1.11.0__py3-none-any.whl → 1.11.1__py3-none-any.whl

umap/migrations/0004_add_licence.py

@@ -5,18 +5,15 @@ from django.db import migrations
 
 
 def add_licence(apps, *args):
-    Licence = apps.get_model('umap', 'Licence')
+    Licence = apps.get_model("umap", "Licence")
     if Licence.objects.count():
         return
-    Licence(
-        name='ODbL',
-        details='http://opendatacommons.org/licenses/odbl/').save()
+    Licence(name="ODbL", details="http://opendatacommons.org/licenses/odbl/").save()
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('umap', '0003_add_tilelayer'),
+        ("umap", "0003_add_tilelayer"),
     ]
 
     operations = [

umap/migrations/0005_remove_map_tilelayer.py

@@ -4,14 +4,13 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('umap', '0004_add_licence'),
+        ("umap", "0004_add_licence"),
     ]
 
     operations = [
         migrations.RemoveField(
-            model_name='map',
-            name='tilelayer',
+            model_name="map",
+            name="tilelayer",
         ),
     ]

umap/migrations/0006_auto_20190407_0719.py

@@ -5,15 +5,16 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('umap', '0005_remove_map_tilelayer'),
+        ("umap", "0005_remove_map_tilelayer"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='map',
-            name='settings',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict, null=True, verbose_name='settings'),
+            model_name="map",
+            name="settings",
+            field=django.contrib.postgres.fields.jsonb.JSONField(
+                blank=True, default=dict, null=True, verbose_name="settings"
+            ),
         ),
     ]

umap/migrations/0007_auto_20190416_1757.py

@@ -4,15 +4,23 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('umap', '0006_auto_20190407_0719'),
+        ("umap", "0006_auto_20190407_0719"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='map',
-            name='share_status',
-            field=models.SmallIntegerField(choices=[(1, 'everyone (public)'), (2, 'anyone with link'), (3, 'editors only'), (9, 'blocked')], default=1, verbose_name='share status'),
+            model_name="map",
+            name="share_status",
+            field=models.SmallIntegerField(
+                choices=[
+                    (1, "everyone (public)"),
+                    (2, "anyone with link"),
+                    (3, "editors only"),
+                    (9, "blocked"),
+                ],
+                default=1,
+                verbose_name="share status",
+            ),
         ),
     ]

umap/migrations/0008_alter_map_settings.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("umap", "0007_auto_20190416_1757"),
     ]

umap/migrations/0009_star.py

@@ -1,25 +1,44 @@
 # Generated by Django 4.1.7 on 2023-05-05 18:02
 
+import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('umap', '0008_alter_map_settings'),
+        ("umap", "0008_alter_map_settings"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Star',
+            name="Star",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('at', models.DateTimeField(auto_now=True)),
-                ('by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='stars', to=settings.AUTH_USER_MODEL)),
-                ('map', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='umap.map')),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("at", models.DateTimeField(auto_now=True)),
+                (
+                    "by",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="stars",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "map",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to="umap.map"
+                    ),
+                ),
             ],
         ),
     ]

umap/migrations/0010_alter_map_edit_status_alter_map_share_status.py

@@ -4,20 +4,32 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('umap', '0009_star'),
+        ("umap", "0009_star"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='map',
-            name='edit_status',
-            field=models.SmallIntegerField(choices=[(1, 'Everyone'), (2, 'Editors only'), (3, 'Owner only')], default=3, verbose_name='edit status'),
+            model_name="map",
+            name="edit_status",
+            field=models.SmallIntegerField(
+                choices=[(1, "Everyone"), (2, "Editors only"), (3, "Owner only")],
+                default=3,
+                verbose_name="edit status",
+            ),
         ),
         migrations.AlterField(
-            model_name='map',
-            name='share_status',
-            field=models.SmallIntegerField(choices=[(1, 'Everyone (public)'), (2, 'Anyone with link'), (3, 'Editors only'), (9, 'Blocked')], default=1, verbose_name='share status'),
+            model_name="map",
+            name="share_status",
+            field=models.SmallIntegerField(
+                choices=[
+                    (1, "Everyone (public)"),
+                    (2, "Anyone with link"),
+                    (3, "Editors only"),
+                    (9, "Blocked"),
+                ],
+                default=1,
+                verbose_name="share status",
+            ),
         ),
     ]

umap/migrations/0011_alter_map_edit_status_alter_map_share_status.py

@@ -1,24 +1,37 @@
 # Generated by Django 4.2.2 on 2023-08-07 06:07
 
 from django.db import migrations, models
+
 import umap.models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('umap', '0010_alter_map_edit_status_alter_map_share_status'),
+        ("umap", "0010_alter_map_edit_status_alter_map_share_status"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='map',
-            name='edit_status',
-            field=models.SmallIntegerField(choices=[(1, 'Everyone'), (2, 'Editors only'), (3, 'Owner only')], default=umap.models.get_default_edit_status, verbose_name='edit status'),
+            model_name="map",
+            name="edit_status",
+            field=models.SmallIntegerField(
+                choices=[(1, "Everyone"), (2, "Editors only"), (3, "Owner only")],
+                default=umap.models.get_default_edit_status,
+                verbose_name="edit status",
+            ),
         ),
         migrations.AlterField(
-            model_name='map',
-            name='share_status',
-            field=models.SmallIntegerField(choices=[(1, 'Everyone (public)'), (2, 'Anyone with link'), (3, 'Editors only'), (9, 'Blocked')], default=umap.models.get_default_share_status, verbose_name='share status'),
+            model_name="map",
+            name="share_status",
+            field=models.SmallIntegerField(
+                choices=[
+                    (1, "Everyone (public)"),
+                    (2, "Anyone with link"),
+                    (3, "Editors only"),
+                    (9, "Blocked"),
+                ],
+                default=umap.models.get_default_share_status,
+                verbose_name="share status",
+            ),
         ),
     ]

umap/migrations/0014_map_created_at.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.2.2 on 2023-09-27 08:50
 
-from django.db import migrations, models
 import django.utils.timezone
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

umap/models.py

@@ -1,14 +1,14 @@
 import os
 import time
 
+from django.conf import settings
 from django.contrib.auth.models import User
 from django.contrib.gis.db import models
-from django.conf import settings
-from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
+from django.core.files.base import File
 from django.core.signing import Signer
 from django.template.defaultfilters import slugify
-from django.core.files.base import File
+from django.urls import reverse
+from django.utils.translation import gettext_lazy as _
 
 from .managers import PublicManager
 
@@ -380,7 +380,7 @@ class DataLayer(NamedModel):
         }
         obj["id"] = self.pk
         obj["permissions"] = {"edit_status": self.edit_status}
-        obj["editMode"] = "advanced" if self.can_edit(user, request) else 'disabled'
+        obj["editMode"] = "advanced" if self.can_edit(user, request) else "disabled"
         return obj
 
     def clone(self, map_inst=None):
@@ -436,7 +436,7 @@ class DataLayer(NamedModel):
         root = self.storage_root()
         names = self.geojson.storage.listdir(root)[1]
         for name in names:
-            if name.startswith(f'{self.pk}_') and name.endswith(".gz"):
+            if name.startswith(f"{self.pk}_") and name.endswith(".gz"):
                 self.geojson.storage.delete(os.path.join(root, name))
 
     def can_edit(self, user=None, request=None):

umap/settings/base.py

@@ -4,7 +4,6 @@ from email.utils import parseaddr
 
 import environ
 from django.conf.locale import LANG_INFO
-from django.template.defaultfilters import slugify
 
 env = environ.Env()
 
@@ -244,9 +243,7 @@ UMAP_MAPS_PER_PAGE = 5
 UMAP_MAPS_PER_SEARCH = 25
 UMAP_MAPS_PER_PAGE_OWNER = 10
 UMAP_SEARCH_CONFIGURATION = "simple"
-UMAP_FEEDBACK_LINK = (
-    "https://wiki.openstreetmap.org/wiki/UMap#Feedback_and_help"  # noqa
-)
+UMAP_FEEDBACK_LINK = "https://wiki.openstreetmap.org/wiki/UMap#Feedback_and_help"
 USER_MAPS_URL = "user_maps"
 DATABASES = {"default": env.db(default="postgis://localhost:5432/umap")}
 UMAP_DEFAULT_SHARE_STATUS = None

umap/static/umap/base.css

@@ -202,6 +202,8 @@ button.flat,
     padding: 0;
     text-align: left;
     min-height: inherit;
+    width: initial;
+    display: initial;
     text-decoration: underline;
 }
 .help-text, .helptext {

umap/static/umap/js/umap.core.js

@@ -698,12 +698,14 @@ L.U.Orderable = L.Evented.extend({
   },
 
   onDragOver: function (e) {
+    L.DomEvent.stop(e)
     if (e.preventDefault) e.preventDefault() // Necessary. Allows us to drop.
     e.dataTransfer.dropEffect = 'move'
     return false
   },
 
   onDragEnter: function (e) {
+    L.DomEvent.stop(e)
     // e.target is the current hover target.
     const dst = this.findTarget(e.target)
     if (!dst || dst === this.src) return

umap/static/umap/js/umap.features.js

@@ -680,8 +680,8 @@ L.U.Marker = L.Marker.extend({
   appendEditFieldsets: function (container) {
     L.U.FeatureMixin.appendEditFieldsets.call(this, container)
     const coordinatesOptions = [
-      ['_latlng.lat', { handler: 'FloatInput', label: L._('Latitude'), step: 'any' }],
-      ['_latlng.lng', { handler: 'FloatInput', label: L._('Longitude'), step: 'any' }],
+      ['_latlng.lat', { handler: 'FloatInput', label: L._('Latitude') }],
+      ['_latlng.lng', { handler: 'FloatInput', label: L._('Longitude') }],
     ]
     const builder = new L.U.FormBuilder(this, coordinatesOptions, {
       callback: function () {

umap/static/umap/js/umap.js

@@ -688,7 +688,11 @@ L.U.Map.include({
       // FIXME An invalid hash will cause the load to fail
       this._hash.update()
     } else if (this.options.defaultView === 'locate' && !this.options.noControl) {
-      this.once('locationerror', this._setDefaultCenter)
+      // When using locate as default map view AND activating easing
+      // Leaflet.locate will ask the map view to compute transition to user
+      // position, so in this case we do need a default center, so let's
+      // set it anyway
+      this._setDefaultCenter()
       this._controls.locate.start()
     } else if (this.options.defaultView === 'data') {
       this.onceDataLoaded(() => {
@@ -1744,16 +1748,16 @@ L.U.Map.include({
     this.permissions.addOwnerLink('span', container)
     if (this.options.captionMenus) {
       L.DomUtil.createButton(
-        'umap-about-link',
+        'umap-about-link flat',
         container,
-        ` — ${L._('About')}`,
+        L._('About'),
         this.displayCaption,
         this
       )
       L.DomUtil.createButton(
-        'umap-open-browser-link',
+        'umap-open-browser-link flat',
         container,
-        ` | ${L._('Browse data')}`,
+        L._('Browse data'),
         this.openBrowser,
         this
       )

umap/static/umap/js/umap.layer.js

@@ -1347,13 +1347,14 @@ L.U.DataLayer = L.Evented.extend({
       const date = new Date(parseInt(data.at, 10))
       const content = `${date.toLocaleString(L.lang)} (${parseInt(data.size) / 1000}Kb)`
       const el = L.DomUtil.create('div', 'umap-datalayer-version', versionsContainer)
-      const a = L.DomUtil.createButton(
+      const button = L.DomUtil.createButton(
         '',
         el,
-        L._('Restore this version'),
+        '',
         () => this.restore(data.name),
         this
       )
+      button.title = L._('Restore this version')
       L.DomUtil.add('span', '', el, content)
     }
 

umap/static/umap/map.css

@@ -600,6 +600,13 @@ ul.photon-autocomplete {
 .umap-main-edit-toolbox h3 {
     display: inline;
 }
+.umap-caption-bar button {
+    margin-left: 10px;
+}
+.umap-caption-bar button + button:before {
+    content: '|';
+    padding-right: 10px;
+}
 .umap-main-edit-toolbox .umap-user {
     color: #fff;
 }
@@ -724,18 +731,14 @@ ul.photon-autocomplete {
     padding: 5px 0;
     border-bottom: 1px solid #202425;
 }
-.umap-datalayer-version a {
+.umap-datalayer-version button {
     display: inline-block;
-    width: 20px;
-    height: 20px;
-    margin-left: 5px;
-    background-position: -123px -75px;
+    width: 24px;
+    min-height: 24px;
+    background-position: -122px -73px;
     background-repeat: no-repeat;
     background-image: url('./img/16-white.svg');
-    vertical-align: middle;
-    margin-right: 5px;
-    border: 1px solid #202425;
-    background-color: #2c3233;
+    margin-right: 10px;
 }
 
 
@@ -1207,7 +1210,9 @@ a.add-datalayer:hover,
 .umap-popup-footer li.next:before {
     background-position: -5px -77px;
 }
-
+.umap-popup a:hover {
+    text-decoration: underline;
+}
 
 /* ************* */
 /* Marker's Icon */
@@ -1298,7 +1303,6 @@ a.add-datalayer:hover,
     vertical-align: middle;
     color: white;
     font-weight: bold;
-    font-size: 1.2rem;
 }
 .umap-circle-icon {
     border: 1px solid white;
@@ -1620,8 +1624,13 @@ a.add-datalayer:hover,
     height: 36px;
     line-height: 34px;
 }
+/* Links are blue by default  */
 .leaflet-container a {
-    color:  #323737;
+    color: #0078a8;
+}
+/* But not in controls  */
+.leaflet-bar a {
+    color: black;
 }
 
 /* ****** */

umap/static/umap/vendors/formbuilder/Leaflet.FormBuilder.js

@@ -124,12 +124,14 @@ L.FormBuilder = L.Evented.extend({
 
 L.FormBuilder.Element = L.Evented.extend({
 
+    options: {},
+
     initialize: function (builder, field, options) {
         this.builder = builder;
         this.obj = this.builder.obj;
         this.form = this.builder.form;
         this.field = field;
-        this.options = options;
+        L.setOptions(this, options);
         this.fieldEls = this.field.split('.');
         this.name = this.builder.getName(field);
         this.parentNode = this.getParentNode();
@@ -340,10 +342,20 @@ L.FormBuilder.FloatMixin = {
 };
 
 L.FormBuilder.FloatInput = L.FormBuilder.Input.extend({
+
+    options: {
+        step: 'any'
+    },
+
     includes: [L.FormBuilder.FloatMixin]
 });
 
 L.FormBuilder.BlurFloatInput = L.FormBuilder.BlurInput.extend({
+
+    options: {
+        step: 'any'
+    },
+
     includes: [L.FormBuilder.FloatMixin]
 });
 

umap/templates/auth/user_form.html

@@ -3,7 +3,7 @@
 {% block maincontent %}
   <div class="col wide">
     <h2 class="section tabs">
-      <a href="{% url 'user_dashboard' %}">{% trans "My Dashboard" %}</a> | {% trans "My Profile" %}
+      <a href="{% url "user_dashboard" %}">{% trans "My Dashboard" %}</a> | {% trans "My Profile" %}
     </h2>
   </div>
   <div class="wrapper">
@@ -16,7 +16,7 @@
       <form id="user_form" method="post">
         {% csrf_token %}
         {{ form }}
-        <input type="submit" value="{% trans 'Save' %}" />
+        <input type="submit" value="{% trans "Save" %}" />
       </form>
     </div>
     {% if backends.backends|length %}

umap/templates/base.html

@@ -16,9 +16,15 @@
     <meta name="viewport"
           content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     {# See https://evilmartians.com/chronicles/how-to-favicon-in-2021-six-files-that-fit-most-needs #}
-    <link rel="icon" href="{{ STATIC_URL }}umap/favicons/favicon.ico" sizes="32x32">
-    <link rel="icon" href="{{ STATIC_URL }}umap/favicons/icon.svg" type="image/svg+xml">
-    <link rel="apple-touch-icon" href="{{ STATIC_URL }}umap/favicons/apple-touch-icon.png"><!-- 180×180 -->
+    <link rel="icon"
+          href="{{ STATIC_URL }}umap/favicons/favicon.ico"
+          sizes="32x32">
+    <link rel="icon"
+          href="{{ STATIC_URL }}umap/favicons/icon.svg"
+          type="image/svg+xml">
+    <link rel="apple-touch-icon"
+          href="{{ STATIC_URL }}umap/favicons/apple-touch-icon.png">
+    <!-- 180×180 -->
     <link rel="manifest" href="/manifest.webmanifest">
   </head>
   <body class="{% block body_class %}{% endblock body_class %}">

umap/templates/umap/map_table.html

@@ -25,9 +25,9 @@
           <a href="{{ map_inst.owner.get_url }}">{{ map_inst.owner }}</a>
         </td>
         <td>
-          <a href="{{ map_inst.get_absolute_url }}?share">{% translate "Share" %}</a>
-          <a href="{{ map_inst.get_absolute_url }}?edit">{% translate "Edit" %}</a>
-          <a href="{{ map_inst.get_absolute_url }}?download">{% translate "Download" %}</a>
+          <a href="{{ map_inst.get_absolute_url }}?share">{% translate "Share" %}</a> |
+          <a href="{{ map_inst.get_absolute_url }}?edit">{% translate "Edit" %}</a> |
+          <a href="{% url 'map_download' map_inst.pk %}">{% translate "Download" %}</a>
         </td>
       </tr>
     {% endfor %}