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

umap/migrations/0022_add_team.py

@@ -0,0 +1,94 @@
+# Generated by Django 5.1 on 2024-08-15 11:33
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+import umap.models
+
+
+class Migration(migrations.Migration):
+    dependencies = [("umap", "0021_remove_map_description")]
+
+    operations = [
+        migrations.CreateModel(
+            name="Team",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "name",
+                    models.CharField(max_length=200, unique=True, verbose_name="name"),
+                ),
+                (
+                    "description",
+                    models.TextField(blank=True, null=True, verbose_name="description"),
+                ),
+                (
+                    "users",
+                    models.ManyToManyField(
+                        related_name="teams", to=settings.AUTH_USER_MODEL
+                    ),
+                ),
+            ],
+        ),
+        migrations.AddField(
+            model_name="map",
+            name="team",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="umap.team",
+                verbose_name="team",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="datalayer",
+            name="edit_status",
+            field=models.SmallIntegerField(
+                choices=[
+                    (0, "Inherit"),
+                    (1, "Everyone"),
+                    (2, "Editors and team only"),
+                    (3, "Owner only"),
+                ],
+                default=0,
+                verbose_name="edit status",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="map",
+            name="edit_status",
+            field=models.SmallIntegerField(
+                choices=[
+                    (1, "Everyone"),
+                    (2, "Editors and team 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 and team only"),
+                    (9, "Blocked"),
+                ],
+                default=umap.models.get_default_share_status,
+                verbose_name="share status",
+            ),
+        ),
+    ]

umap/models.py

@@ -49,6 +49,26 @@ def get_default_edit_status():
     return settings.UMAP_DEFAULT_EDIT_STATUS or Map.OWNER
 
 
+class Team(models.Model):
+    name = models.CharField(
+        max_length=200, verbose_name=_("name"), unique=True, blank=False, null=False
+    )
+    description = models.TextField(blank=True, null=True, verbose_name=_("description"))
+    users = models.ManyToManyField(User, related_name="teams")
+
+    def __unicode__(self):
+        return self.name
+
+    def __str__(self):
+        return self.name
+
+    def get_url(self):
+        return reverse("team_maps", kwargs={"pk": self.pk})
+
+    def get_metadata(self):
+        return {"id": self.pk, "name": self.name, "url": self.get_url()}
+
+
 class NamedModel(models.Model):
     name = models.CharField(max_length=200, verbose_name=_("name"))
 
@@ -137,7 +157,7 @@ class Map(NamedModel):
     """
 
     ANONYMOUS = 1
-    EDITORS = 2
+    COLLABORATORS = 2
     OWNER = 3
     PUBLIC = 1
     OPEN = 2
@@ -145,13 +165,13 @@ class Map(NamedModel):
     BLOCKED = 9
     EDIT_STATUS = (
         (ANONYMOUS, _("Everyone")),
-        (EDITORS, _("Editors only")),
+        (COLLABORATORS, _("Editors and team only")),
         (OWNER, _("Owner only")),
     )
     SHARE_STATUS = (
         (PUBLIC, _("Everyone (public)")),
         (OPEN, _("Anyone with link")),
-        (PRIVATE, _("Editors only")),
+        (PRIVATE, _("Editors and team only")),
         (BLOCKED, _("Blocked")),
     )
     slug = models.SlugField(db_index=True)
@@ -180,6 +200,13 @@ class Map(NamedModel):
     editors = models.ManyToManyField(
         settings.AUTH_USER_MODEL, blank=True, verbose_name=_("editors")
     )
+    team = models.ForeignKey(
+        Team,
+        blank=True,
+        null=True,
+        verbose_name=_("team"),
+        on_delete=models.SET_NULL,
+    )
     edit_status = models.SmallIntegerField(
         choices=EDIT_STATUS,
         default=get_default_edit_status,
@@ -251,6 +278,9 @@ class Map(NamedModel):
         path = reverse("map_anonymous_edit_url", kwargs={"signature": signature})
         return settings.SITE_URL + path
 
+    def get_author(self):
+        return self.team or self.owner
+
     def is_owner(self, user=None, request=None):
         if user and self.owner == user:
             return True
@@ -281,7 +311,7 @@ class Map(NamedModel):
 
         In owner mode:
             - only owner by default (OWNER)
-            - any editor if mode is EDITORS
+            - any editor or team member if mode is COLLABORATORS
             - anyone otherwise (ANONYMOUS)
         In anonymous owner mode:
             - only owner (has ownership cookie) by default (OWNER)
@@ -297,8 +327,9 @@ class Map(NamedModel):
             can = False
         elif user == self.owner:
             can = True
-        elif self.edit_status == self.EDITORS and user in self.editors.all():
-            can = True
+        elif self.edit_status == self.COLLABORATORS:
+            if user in self.editors.all() or self.team in user.teams.all():
+                can = True
         return can
 
     def can_view(self, request):
@@ -308,12 +339,15 @@ class Map(NamedModel):
             can = True
         elif self.share_status in [self.PUBLIC, self.OPEN]:
             can = True
+        elif not request.user.is_authenticated:
+            can = False
         elif request.user == self.owner:
             can = True
         else:
             can = not (
                 self.share_status == self.PRIVATE
                 and request.user not in self.editors.all()
+                and self.team not in request.user.teams.all()
             )
         return can
 
@@ -383,12 +417,12 @@ class DataLayer(NamedModel):
 
     INHERIT = 0
     ANONYMOUS = 1
-    EDITORS = 2
+    COLLABORATORS = 2
     OWNER = 3
     EDIT_STATUS = (
         (INHERIT, _("Inherit")),
         (ANONYMOUS, _("Everyone")),
-        (EDITORS, _("Editors only")),
+        (COLLABORATORS, _("Editors and team only")),
         (OWNER, _("Owner only")),
     )
     uuid = models.UUIDField(
@@ -538,8 +572,9 @@ class DataLayer(NamedModel):
             can = True
         elif user is not None and user == self.map.owner:
             can = True
-        elif self.edit_status == self.EDITORS and user in self.map.editors.all():
-            can = True
+        elif user is not None and self.edit_status == self.COLLABORATORS:
+            if user in self.map.editors.all() or self.map.team in user.teams.all():
+                can = True
         return can
 
 

umap/settings/__init__.py

@@ -41,5 +41,7 @@ if path:
                         globals()["TEMPLATES"][0]["DIRS"] = [value]
                 elif key == "UMAP_CUSTOM_STATICS":
                     globals()["STATICFILES_DIRS"].insert(0, value)
+                elif key == "UMAP_FEEDBACK_LINK":
+                    globals()["UMAP_HELP_URL"] = value
                 else:
                     globals()[key] = value

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:
@@ -152,7 +158,7 @@ WSGI_APPLICATION = "umap.wsgi.application"
 
 LOGIN_URL = "/login/"
 LOGOUT_URL = "/logout/"
-LOGIN_REDIRECT_URL = "/"
+LOGIN_REDIRECT_URL = "login_popup_end"
 
 STATIC_URL = "/static/"
 MEDIA_URL = "/uploads/"
@@ -251,7 +257,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"
+UMAP_HELP_URL = "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
@@ -259,6 +265,7 @@ UMAP_DEFAULT_EDIT_STATUS = None
 UMAP_DEFAULT_FEATURES_HAVE_OWNERS = False
 UMAP_HOME_FEED = "latest"
 UMAP_IMPORTERS = {}
+UMAP_HOST_INFOS = {}
 
 UMAP_READONLY = env("UMAP_READONLY", default=False)
 UMAP_GZIP = True

umap/static/umap/base.css

@@ -119,13 +119,13 @@ dt {
     margin-bottom: 2rem;
 }
 .col {
-    float: left;
+    float: inline-start;
 }
 .right {
     float: right;
 }
 .col + .col {
-    padding-left: 20px;
+    padding-inline-start: 20px;
 }
 .half {
     width: 50%;
@@ -143,7 +143,7 @@ dt {
     width: 100%;
 }
 .col + .wide {
-    padding-left: inherit;
+    padding-inline-start: inherit;
 }
 .mshow, .tshow {
     display: none;
@@ -186,7 +186,7 @@ input[type="range"] {
     width: 100%;
 }
 input[type="radio"] {
-    margin-right: var(--text-margin);
+    margin-inline-end: var(--text-margin);
 }
 input[type="checkbox"] {
     margin: 0 var(--text-margin);
@@ -272,7 +272,7 @@ button.flat,
     border: none;
     background-color: inherit;
     padding: 0;
-    text-align: left;
+    text-align: start;
     min-height: inherit;
     width: initial;
     display: initial;
@@ -345,7 +345,7 @@ input + .error {
 input[type="file"] + .error {
     margin-top: 0;
 }
-input:invalid {
+input[value]:invalid {
     border-color: red;
     background-color: darkred;
 }
@@ -356,8 +356,8 @@ input:invalid {
 }
 details {
     margin-bottom: 5px;
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px;
+    border-start-start-radius: 4px;
+    border-start-end-radius: 4px;
 }
 .dark details {
     border: 1px solid #222;
@@ -392,7 +392,7 @@ fieldset legend {
 }
 [data-badge]:after {
     position: absolute;
-    right: -6px;
+    inset-inline-end: -6px;
     top: -6px;
     min-width: 8px;
     min-height: 8px;
@@ -417,7 +417,7 @@ input.switch:empty {
 input.switch:empty ~ label {
     white-space: nowrap;
     position: relative;
-    float: left;
+    float: inline-start;
     line-height: 2em;
     height: 2em;
     text-indent: 6em;
@@ -436,7 +436,7 @@ input.switch:empty ~ label:after {
     display: block;
     top: 0;
     bottom: 0;
-    left: 0;
+    inset-inline-start: 0;
     content: ' ';
     width: 6em;
     -webkit-transition: all 100ms ease-in;
@@ -451,7 +451,7 @@ input.switch:empty ~ label:after {
 }
 input.switch:empty ~ label:after {
     width: 3em;
-    margin-left: 0.1em;
+    margin-inline-start: 0.1em;
     background-color: #ededed;
     content: "OFF";
     text-indent: 3.5em;
@@ -472,7 +472,7 @@ input.switch:checked ~ label:before {
     color: var(--color-darkGray);
     content: "ON";
     text-indent: 0.7em;
-    text-align: left;
+    text-align: start;
     font-weight: bold;
 }
 .dark input.switch:checked ~ label:before {
@@ -480,7 +480,7 @@ input.switch:checked ~ label:before {
     background-color: var(--color-accent);
 }
 input.switch:checked ~ label:after {
-    margin-left: 3em;
+    margin-inline-start: 3em;
 }
 .button-bar, .umap-multiplechoice {
     margin-top: 5px;
@@ -552,21 +552,21 @@ input.switch:checked ~ label:after {
 .umap-field-iconUrl .action-button,
 .inheritable .define,
 .inheritable .undefine {
-    float: right;
+    float: inline-end;
     width: initial;
     min-height: 18px;
     line-height: 18px;
     margin-bottom: 0;
 }
 .inheritable .quick-actions {
-    float: right;
+    float: inline-end;
 }
 .inheritable .quick-actions .formbox {
     margin-bottom: 0;
 }
 .inheritable .quick-actions input {
     width: 100px;
-    margin-right: 5px;
+    margin-inline-end: 5px;
 }
 .inheritable .define,
 .inheritable.undefined .undefine,
@@ -581,7 +581,7 @@ i.info {
     background-image: url('./img/16.svg');
     background-position: -170px -50px;
     display: inline-block;
-    margin-left: 5px;
+    margin-inline-start: 5px;
     vertical-align: middle;
     width: 16px;
     height: 18px;
@@ -592,8 +592,7 @@ i.info {
 .with-transition {
     transition: all .7s;
 }
-
-.umap-delete:before, .umap-empty:before, .umap-to-polygon:before,
+.umap-empty:before, .umap-to-polygon:before,
 .umap-clone:before, .umap-edit:before, .umap-download:before,
 .umap-to-polyline:before {
     background-repeat: no-repeat;
@@ -605,7 +604,7 @@ i.info {
     vertical-align: bottom;
     content: " ";
 }
-.dark .umap-delete:before, .dark .umap-empty:before,
+.dark .umap-empty:before,
 .dark .umap-to-polygon:before,
 .dark .umap-clone:before,
 .dark .umap-edit:before, .dark .umap-download:before,
@@ -614,25 +613,19 @@ i.info {
     vertical-align: middle;
 }
 .umap-to-polygon:before {
-    background-position: -80px -48px;
+    background-position: -72px -42px;
 }
 .umap-to-polyline:before {
-    background-position: -120px -48px;
+    background-position: -106px -42px;
 }
 .umap-clone:before {
-    background-position: -150px -78px;
-}
-.umap-delete:before {
-    background-position: -32px -8px;
-}
-.umap-edit:before {
-    background-position: -6px -6px;
+    background-position: -144px -78px;
 }
 .umap-empty:before {
-    background-position: -110px -78px;
+    background-position: -108px -78px;
 }
 .umap-download:before {
-    background-position: -77px -78px;
+    background-position: -72px -78px;
 }
 .permissions-panel,
 .umap-upload,
@@ -711,7 +704,7 @@ i.info {
 
 .umap-pictogram-choice .leaflet-marker-icon {
     bottom: 0;
-    left: 30px;
+    inset-inline-start: 30px;
     position: absolute;
 }
 .umap-color-picker {
@@ -727,14 +720,14 @@ i.info {
     padding: 0;
     margin: 0;
     cursor: pointer;
-    float: left;
+    float: inline-start;
 }
 input.blur {
     width: calc(100% - 40px);
     display: inline-block;
     vertical-align: middle;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
+    border-start-end-radius: 0;
+    border-end-end-radius: 0;
 }
 .blur + .button:before,
 .blur + [type="button"]:before {
@@ -747,8 +740,8 @@ input.blur {
     display: inline-block;
     vertical-align: middle;
     line-height: 18px;
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
+    border-start-start-radius: 0;
+    border-end-start-radius: 0;
     box-sizing: border-box;
 }
 input[type=hidden].blur + .button,
@@ -763,9 +756,7 @@ input[type=hidden].blur + [type="button"] {
     border-radius: initial;
 }
 .copiable-input button {
-    background-repeat: no-repeat;
-    background-image: url('./img/16.svg');
-    background-position: -141px -140px;
+    background-position: -46px -92px;
     display: inline;
     padding: 0 10px;
     height: 32px;

umap/static/umap/content.css

@@ -50,7 +50,7 @@ body.login header {
     background-size: 92px 92px;
     height: 92px;
     width: 92px;
-    margin-right: 10px;
+    margin-inline-end: 10px;
 }
 .login-grid .login-github {
     background-image: url("./github.png");
@@ -107,7 +107,7 @@ body.login header {
 .umap-features-list li:before {
     content: "✔";
     color: #323E56;
-    padding-right: 5px;
+    padding-inline-end: 5px;
 }
 .summary {
     background-color: #eee;
@@ -133,9 +133,11 @@ h2.section {
     text-align: center;
 }
 h2.tabs {
+    display: flex;
+    justify-content: space-around;
     text-transform: uppercase;
     color: var(--color-darkBlue);
-    text-align: left;
+    text-align: start;
     padding-top: 28px;
 }
 h2.tabs a {
@@ -144,13 +146,13 @@ h2.tabs a {
     text-decoration-thickness: 3px;
     text-decoration-skip-ink: none;
     text-underline-offset: 7px;
-    margin-right: 2rem;
+    display: inline-block;
 }
 h2.tabs a:not(.selected) {
     font-weight: normal;
     color: var(--color-darkBlue);
     text-decoration: none;
-    margin-right: 0;
+    margin-inline-end: 0;
 }
 h2.tabs a:hover {
     text-decoration: underline;
@@ -192,26 +194,15 @@ input[type="submit"],
 .button-primary {
     font-weight: bold;
 }
-.wrapper input[type="submit"]:hover {
-    background-color: #35537c;
-}
 .wrapper .neutral, .wrapper input[type="submit"].neutral {
     background-color: var(--button-neutral-background);
     color: var(--button-neutral-color);
 }
-.wrapper.somber {
-    background-color: #2E3641;
-    color: #efefef;
-    padding-top: 20px;
-    margin-top: 20px;
-}
-.wrapper.somber .row {
-    margin-top: 0;
-}
 .wrapper .button,
 .wrapper input {
     height: 56px;
     line-height: 43px;
+    font-weight: bold;
 }
 
 /* **************************** */
@@ -272,13 +263,11 @@ ul.umap-autocomplete {
     border: 1px solid #202425;
     padding: 7px;
     color: #eeeeec;
-}
-.umap-multiresult li + li {
-    margin-top: 7px;
+    margin-bottom: 7px;
 }
 .umap-singleresult div .close,
 .umap-multiresult li .close {
-    float: right;
+    float: inline-end;
     cursor: pointer;
 }
 
@@ -358,6 +347,11 @@ ul.umap-autocomplete {
 .content .icon-delete {
     background-image: url('./img/icon-delete.svg');
 }
+html[dir="rtl"] .content .icon-edit,
+html[dir="rtl"] .content .icon-share,
+html[dir="rtl"] .content .icon-delete {
+  background-position: initial; /* this takes precedence over similar selector in icon.css and fixes position */
+}
 .table-header {
     display: flex;
     justify-content: space-between;
@@ -427,8 +421,8 @@ ul.umap-autocomplete {
 .table-wrapper table thead tr th,
 .table-wrapper table th[scope="row"] {
     color: var(--color-darkBlue);
-    text-align: left;
-    padding-left: 2px;
+    text-align: start;
+    padding-inline-start: 2px;
 }
 .table-wrapper table thead tr th {
     line-height: 1.2;
@@ -525,7 +519,7 @@ dialog::backdrop {
     }
     .twide {
         width: 100%;
-        padding-left: 0!important;
+        padding-inline-start: 0!important;
     }
     .tthird {
         width: 33.3333%;
@@ -542,7 +536,7 @@ dialog::backdrop {
 }
 @media only screen and (max-width: 639px) {
     .mwide {
-        padding-left: 0!important;
+        padding-inline-start: 0!important;
         width: 100%;
     }
     .mwide + .mwide {