umap-project 2.9.3__py3-none-any.whl → 3.0.0__py3-none-any.whl

umap/migrations/0027_map_tags.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.1.6 on 2025-02-26 16:18
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("umap", "0026_datalayer_modified_at_datalayer_share_status"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="map",
+            name="tags",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.CharField(max_length=200),
+                blank=True,
+                default=list,
+                size=None,
+            ),
+        ),
+    ]

umap/models.py

@@ -4,6 +4,7 @@ import uuid
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.contrib.gis.db import models
+from django.contrib.postgres.fields import ArrayField
 from django.core.files.base import File
 from django.core.files.storage import storages
 from django.core.signing import Signer
@@ -236,6 +237,7 @@ class Map(NamedModel):
     settings = models.JSONField(
         blank=True, null=True, verbose_name=_("settings"), default=dict
     )
+    tags = ArrayField(models.CharField(max_length=200), blank=True, default=list)
 
     objects = models.Manager()
     public = PublicManager()
@@ -296,6 +298,7 @@ class Map(NamedModel):
             with datalayer.geojson.open("rb") as f:
                 layer = json.loads(f.read())
             if datalayer.settings:
+                datalayer.settings.pop("id", None)
                 layer["_umap_options"] = datalayer.settings
             datalayers.append(layer)
         umapjson["layers"] = datalayers
@@ -415,12 +418,17 @@ class Map(NamedModel):
             datalayer.clone(map_inst=new)
         return new
 
+    def get_tags_display(self):
+        labels = dict(settings.UMAP_TAGS)
+        return [(t, labels.get(t, t)) for t in self.tags]
+
     @classproperty
     def extra_schema(self):
         return {
             "iconUrl": {
                 "default": "%sumap/img/marker.svg" % settings.STATIC_URL,
-            }
+            },
+            "tags": {"choices": sorted(settings.UMAP_TAGS, key=lambda i: i[0])},
         }
 
 
@@ -526,7 +534,10 @@ class DataLayer(NamedModel):
         metadata = self.settings
         if not metadata:
             # Fallback to file for old datalayers.
-            data = json.loads(self.geojson.read().decode())
+            try:
+                data = json.loads(self.geojson.read().decode())
+            except FileNotFoundError:
+                data = {}
             metadata = data.get("_umap_options")
             if not metadata:
                 metadata = {

umap/settings/base.py

@@ -6,6 +6,7 @@ from email.utils import parseaddr
 
 import environ
 from django.conf.locale import LANG_INFO
+from django.utils.translation import gettext_lazy as _
 
 import umap as project_module
 
@@ -290,6 +291,25 @@ UMAP_HOME_FEED = "latest"
 UMAP_IMPORTERS = {}
 UMAP_HOST_INFOS = {}
 UMAP_LABEL_KEYS = ["name", "title"]
+UMAP_TAGS = (
+    ("arts", _("Art and Culture")),
+    ("cycling", _("Cycling")),
+    ("business", _("Business")),
+    ("environment", _("Environment")),
+    ("education", _("Education")),
+    ("food", _("Food and Agriculture")),
+    ("geopolitics", _("Geopolitics")),
+    ("health", _("Health")),
+    ("hiking", _("Hiking")),
+    ("history", _("History")),
+    ("public", _("Public sector")),
+    ("science", _("Science")),
+    ("shopping", _("Shopping")),
+    ("sport", _("Sport and Leisure")),
+    ("travel", _("Travel")),
+    ("transports", _("Transports")),
+    ("tourism", _("Tourism")),
+)
 
 UMAP_READONLY = env("UMAP_READONLY", default=False)
 UMAP_GZIP = True
@@ -340,10 +360,8 @@ LOGGING = {
     },
 }
 
-# WebSocket configuration
+# Real-time editing configuration
 
-WEBSOCKET_ENABLED = env.bool("WEBSOCKET_ENABLED", default=False)
-WEBSOCKET_BACK_HOST = env("WEBSOCKET_BACK_HOST", default="localhost")
-WEBSOCKET_BACK_PORT = env.int("WEBSOCKET_BACK_PORT", default=8001)
+REALTIME_ENABLED = env.bool("REALTIME_ENABLED", default=False)
 
-REDIS_URL = "redis://localhost:6379"
+REDIS_URL = env("REDIS_URL", default="redis://localhost:6379")

umap/static/umap/base.css

@@ -3,9 +3,7 @@
 */
 body, div, ul, ol, li, a, section, nav,
 h1, h2, h3, h4, h5, h6, label,
-hr, input, textarea {
-    -moz-box-sizing:border-box;
-    -webkit-box-sizing:border-box;
+hr, input, textarea, select {
     box-sizing: border-box;
     margin: 0;
     padding: 0;
@@ -19,7 +17,11 @@ h1, h2, h3, h4, h5, h6, label, hr {
 }
 a {
     text-decoration: none;
-    color: #1F5C39;
+    color: var(--link-color);
+}
+a.main {
+    font-weight: bold;
+    text-decoration: underline;
 }
 a[href^="http"]:not(nav.umap-nav a) {
     text-decoration: underline;
@@ -81,10 +83,12 @@ hgroup > * {
 hgroup {
     margin-bottom: var(--box-margin);
 }
-hgroup > :not(:first-child):last-child {
-    font-weight: normal;
+hgroup p,
+hgroup button {
+    margin: 0;
 }
 
+
 /*
 * List
 */
@@ -158,10 +162,23 @@ dt {
 }
 .grid-container {
     display: grid;
-    grid-template-columns: repeat(3, minmax(0, 1fr));
+    --grid-layout-gap: calc(var(--gutter) * 2);
+    --grid-column-count: 3;
+    --grid-item--min-width: 300px;
+
+    /**
+    * Calculated values.
+    */
+    --gap-count: calc(var(--grid-column-count) - 1);
+    --total-gap-width: calc(var(--gap-count) * var(--grid-layout-gap));
+    --grid-item--max-width: calc((100% - var(--total-gap-width)) / var(--grid-column-count));
+
+    grid-template-columns: repeat(auto-fill, minmax(max(var(--grid-item--min-width), var(--grid-item--max-width)), 1fr));
+    grid-gap: var(--grid-layout-gap);
 }
 .grid-container.by4 {
-    grid-template-columns: repeat(4, minmax(0, 1fr));
+    --grid-column-count: 4;
+    --grid-item--min-width: 60px;
 }
 .grid-container > * {
     text-align: center;
@@ -184,6 +201,10 @@ dt {
 /*   Various   */
 /* *********** */
 
+.nobr {
+    white-space: nowrap;
+}
+
 .text {
     word-break: break-word;
     white-space: pre-line;
@@ -202,3 +223,15 @@ dt {
     height: 100vh;
     opacity: 0.5;
 }
+.table-scrollable {
+    background-image: linear-gradient(to right, var(--background-color), var(--background-color)),
+                      linear-gradient(to right, var(--background-color), var(--background-color)),
+                      linear-gradient(to right, rgba(0, 0, 20, .50), rgba(255, 255, 255, 0)),
+                      linear-gradient(to left, rgba(0, 0, 20, .50), rgba(255, 255, 255, 0));
+    background-position: left center, right center, left center, right center;
+    background-repeat: no-repeat;
+    background-size: 20px 100%, 20px 100%, 10px 100%, 10px 100%;
+    background-attachment: local, local, scroll, scroll;
+    display: block;
+    overflow-x: auto;
+}

umap/static/umap/content.css

@@ -16,6 +16,21 @@ input::-webkit-input-placeholder, ::-webkit-input-placeholder {
 input:-moz-placeholder, :-moz-placeholder {
    color: #a5a5a5;
 }
+.search-form {
+    display: flex;
+    align-items: baseline;
+    max-width: 800px;
+    margin: 0 auto;
+}
+.search-form select {
+    max-width: 200px;
+}
+.search-form input[type=submit] {
+    min-width: 200px;
+}
+.flex-break {
+    justify-content: center;
+}
 
 
 /* **************** */
@@ -56,30 +71,12 @@ body.login header {
 .map_fragment {
     width: 100%;
 }
-.map_list .map_fragment,
+.map_fragment,
 .demo_map .map_fragment {
-    height: 210px;
-}
-.map_list .legend {
-    padding-top: 7px;
-    margin-bottom: 28px;
-    text-align: center;
-    font-size: 1.2em;
-}
-.map_list .legend a {
-    color: #222;
-    font-weight: bold;
-}
-.map_list .legend em,
-.map_list .legend em a {
-    color: #444;
-    font-weight: normal;
+    height: var(--map-fragment-height);
 }
-.map_list hr {
-    display: none;
-}
-.map_list .wide + hr {
-    display: block;
+.grid-container hgroup {
+    text-align: left;
 }
 .umap-features-list ul {
     margin-top: 14px;
@@ -164,13 +161,59 @@ h2.tabs a:hover {
     color: #efefef;
     text-decoration: underline;
 }
-
+.more_button {
+    min-height: var(--map-fragment-height);
+}
+.tag-list {
+    margin-top: var(--text-margin);
+    margin-bottom: var(--text-margin);
+    display: flex;
+    flex-wrap: wrap;
+    gap: calc(var(--gutter) / 2 );
+}
+.tag-list li {
+    border: 1px solid var(--color-darkBlue);
+    border-radius: 3vmin;
+    display: inline-block;
+    padding: var(--button-padding-small);
+}
+.tag-list li a {
+    color: var(--color-darkBlue);
+    max-width: 125px;
+    display: inline-block;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    vertical-align: middle;
+    font-size: small;
+    padding: 0 3px;
+}
+.card {
+    border: 1px solid var(--color-lightGray);
+    border-radius: var(--border-radius);
+    padding: var(--box-padding);
+    display: flex;
+    flex-direction: column;
+}
+.card .button {
+    margin-bottom: 0;
+}
+.card hgroup {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    margin-bottom: 0;
+    flex-grow: 1;
+    gap: var(--gutter);
+}
+.card h3 {
+    margin-bottom: 0;
+}
 
 /* **************************** */
 /*            colors            */
 /* **************************** */
 
-input[type="submit"],
 .button {
     background-color: var(--button-primary-background);
     color: var(--button-primary-color);
@@ -362,22 +405,9 @@ html[dir="rtl"] .content .icon-delete {
         align-items: center;
     }
 }
-.table-header form input {
-    border: 2px solid var(--color-darkBlue);
-    border-radius: 0;
-    padding: .5rem 1rem;
-    margin-bottom: 0;
-    line-height: inherit;
-    height: 40px;
-}
 .table-header form input[type="search"] {
     width: 30ch;
 }
-.table-header form input[type="submit"] {
-    background-color: var(--color-darkBlue);
-    color: white;
-    font-weight: bold;
-}
 
 .table-header .button-download {
     width: inherit;
@@ -538,4 +568,9 @@ dialog::backdrop {
     .mhide {
         display: none;
     }
+    .flex-break {
+        flex-direction: column;
+        align-items: center;
+    }
+
 }

umap/static/umap/css/bar.css

@@ -4,6 +4,7 @@
     background-color: var(--color-darkGray);
     width: auto;
     margin-bottom: 0;
+    min-height: initial;
 }
 .umap-main-edit-toolbox [type=button]:hover {
     text-decoration: underline;
@@ -13,12 +14,18 @@
     padding: 0 var(--text-margin);
     background-color: inherit;
 }
+.leaflet-container .edit-undo {
+    margin-left: var(--box-margin);
+}
+.leaflet-container .edit-undo[disabled],
+.leaflet-container .edit-redo[disabled] {
+    filter: invert(.5);
+}
 .leaflet-container .edit-save,
-.leaflet-container .edit-cancel,
 .leaflet-container .edit-disable,
 .leaflet-container .connected-peers
 {
-    display: block;
+    display: inline-block;
     height: 32px;
     line-height: 30px;
     padding: 0 20px;
@@ -39,7 +46,6 @@
     color: var(--color-darkGray);
 }
 
-.leaflet-container .edit-cancel:hover,
 .leaflet-container .edit-disable:hover {
     border: 0.5px solid rgba(153, 153, 153, 0.80);
     text-decoration: none;
@@ -76,19 +82,13 @@
     background: rgba(66, 236, 230, 0.10);
 }
 .leaflet-container .edit-save,
-.leaflet-container .edit-cancel,
-.leaflet-container .edit-disable,
 .umap-edit-enabled .edit-enable {
     display: none;
 }
 .umap-edit-enabled .edit-save,
-.umap-edit-enabled .edit-disable,
-.umap-edit-enabled.umap-is-dirty .edit-cancel {
+.umap-edit-enabled .edit-disable {
     display: inline-block;
 }
-.umap-is-dirty .edit-disable {
-    display: none;
-}
 .umap-caption-bar {
     display: none;
 }
@@ -115,8 +115,6 @@
 .umap-right-edit-toolbox {
     display: flex;
     column-gap: 10px;
-}
-.umap-right-edit-toolbox {
     align-items: center;
 }
 
@@ -135,17 +133,20 @@
     text-indent: -9999px;
 }
 .umap-main-edit-toolbox .map-name {
-    display: inline-block;
+    font-weight: bold;
+    text-align: start;
+}
+.truncate {
+    display: inline-flex;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
-    font-weight: bold;
-    text-align: start;
+}
+.umap-main-edit-toolbox .username {
+    max-width: 100px;
 }
 .umap-main-edit-toolbox .share-status {
     font-style: italic;
-    overflow: hidden;
-    text-overflow: ellipsis;
 }
 .map-name:after {
     content:  '\00a0';
@@ -163,11 +164,13 @@
 .umap-main-edit-toolbox h3 {
     display: inline;
 }
-.umap-caption-bar button {
-    margin-inline-start: 10px;
+.umap-caption-bar .umap-map-author {
+    margin-inline-end: 10px;
 }
-.umap-caption-bar button + button:before {
+.umap-caption-bar > button + button:after,
+.umap-caption-bar > button + button:before {
     content: '|';
+    padding-inline-start: 10px;
     padding-inline-end: 10px;
 }
 .umap-main-edit-toolbox .umap-user:hover {
@@ -196,7 +199,15 @@
     z-index: var(--zindex-panels);
 }
 .umap-caption-bar-enabled .umap-caption-bar {
-    display: block;
+    display: flex;
+    align-items: baseline;
+}
+.umap-caption-bar select {
+    margin-top: 0;
+    line-height: initial;
+    height: initial;
+    width: auto;
+    padding: 0 var(--text-margin);
 }
 .umap-caption-bar-enabled {
     --current-footer-height: var(--footer-height);
@@ -233,3 +244,14 @@
     padding: 0;
     margin: 0;
 }
+@media all and (max-width: 980px) {
+    .umap-main-edit-toolbox button span {
+        display: none;
+    }
+}
+@media all and (max-width: 770px) {
+    .umap-main-edit-toolbox .umap-help-link,
+    .umap-main-edit-toolbox .share-status {
+        display: none !important;
+    }
+}

umap/static/umap/css/dialog.css

@@ -2,7 +2,7 @@
     z-index: var(--zindex-dialog);
     margin: auto;
     margin-top: 100px;
-    width: 40vw;
+    width: var(--dialog-width);
     max-width: 100vw;
     max-height: 50vh;
     padding: 20px;
@@ -14,6 +14,9 @@
     height: fit-content;
     max-height: 90vh;
 }
+.umap-dialog ul + h4 {
+  margin-top: var(--box-margin);
+}
 :where([data-component="no-dialog"]:not([hidden])) {
   display: block;
   position: relative;

umap/static/umap/css/form.css

@@ -7,16 +7,15 @@ input[type="datetime-local"], input[type="email"], input[type="number"],
 input[type="search"], input[type="tel"], input[type="time"], input[type="file"],
 input[type="url"], textarea {
     background-color: white;
-    border: 1px solid #CCCCCC;
-    border-radius: 2px 2px 2px 2px;
-    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1) inset;
-    color: rgba(0, 0, 0, 0.75);
+    border: 2px solid var(--color-darkBlue);
+    color: var(--text-color);
     display: block;
     font-family: inherit;
     margin: 0;
-    margin-bottom: var(--box-margin);
-    padding: 7px;
+    padding: .5rem 1rem;
     width: 100%;
+    line-height: inherit;
+    min-height: 40px;
 }
 input[type="range"] {
     margin-top: 10px;
@@ -47,11 +46,15 @@ input[type=checkbox]:checked:after {
     content: '✓';
     color: var(--color-darkGray);
 }
-
 input[data-modified=true] {
     background-color: var(--color-lightCyan);
     border: 1px solid var(--color-darkGray);
 }
+input + select,
+select + input,
+input + input {
+    border-left: none;
+}
 textarea {
     height: inherit;
     padding: 7px;
@@ -59,16 +62,18 @@ textarea {
     min-height: 6rlh;
 }
 select {
-    border: 1px solid #222;
+    border: 2px solid var(--color-darkBlue);
     width: 100%;
-    height: 28px;
-    line-height: 28px;
-    margin-top: 5px;
-    margin-bottom: var(--box-margin);
+    padding: var(--button-padding);
+    background-color: var(--background-color);
+    color: var(--text-color);
+    min-height: 40px;
 }
 .dark select {
-    color: #efefef;
-    background-color: #393F3F;
+    color: var(--text-color);
+    background-color: var(--color-darkGray);
+    border-color: var(--color-dark);
+    border-width: 1px;
 }
 select[multiple="multiple"] {
     height: auto;
@@ -78,16 +83,16 @@ select[multiple="multiple"] {
 input[type="submit"] {
     display: flex;
     align-items: center;
-    margin-bottom: 14px;
     text-align: center;
-    border-radius: 2px;
-    font-weight: normal;
     cursor: pointer;
     padding: var(--button-padding);
     border: none;
     text-decoration: none;
-    background-color: white;
     justify-content: center;
+    background-color: var(--color-darkBlue);
+    color: white;
+    font-weight: normal;
+    min-height: 40px;
 }
 .dark .button,
 .dark [type="button"] {
@@ -95,6 +100,9 @@ input[type="submit"] {
     color: var(--text-color);
     border: 1px solid #1b1f20;
 }
+.button.primary {
+    font-weight: bold;
+}
 .dark .button.primary:not([disabled]),
 .dark [type="button"].primary:not([disabled]) {
     background-color: var(--color-brightCyan);
@@ -163,6 +171,14 @@ input + .help-text {
 .formbox.with-switch {
     padding-top: 2px;
 }
+.with-switch {
+    overflow: hidden;
+}
+.formbox select,
+.formbox textarea,
+.formbox input {
+    margin-bottom: var(--text-margin);
+}
 fieldset.formbox {
     border: none;
     border-top: 1px solid var(--color-lightGray);
@@ -203,8 +219,9 @@ input[value]:invalid {
     background-color: darkred;
 }
 .dark input, .dark textarea {
-    background-color: #232729;
-    border-color: #1b1f20;
+    background-color: var(--color-darkerGray);
+    border-color: var(--color-dark);
+    border-width: 1px;
     color: #efefef;
 }
 details {
@@ -280,9 +297,6 @@ input.switch:empty ~ label {
     text-indent: 6em;
     margin: 0.2em 0;
     cursor: pointer;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
     user-select: none;
     text-shadow: 0 1px rgba(0, 0, 0, 0.1);
     width: 80px;
@@ -487,15 +501,12 @@ i.info {
     padding: 0 5px;
 }
 .flat-tabs {
-    display: none;
+    display: flex;
     justify-content: space-around;
     font-size: 1.2em;
     margin-bottom: 20px;
     border-bottom: 1px solid #bebebe;
 }
-.flat-tabs:has(.flat) {
-    display: flex;
-}
 .flat-tabs button {
     padding: 10px;
     text-decoration: none;
@@ -534,6 +545,7 @@ i.info {
     display: inline-block;
     color: black;
     font-weight: bold;
+    overflow: hidden;
 }
 .umap-pictogram-choice img {
     vertical-align: middle;
@@ -572,6 +584,7 @@ input.blur {
     vertical-align: middle;
     border-start-end-radius: 0;
     border-end-end-radius: 0;
+    margin-bottom: 0;
 }
 .blur + .button,
 .blur + [type="button"] {