umap-project 2.1.2__py3-none-any.whl → 2.2.0__py3-none-any.whl

umap/__init__.py

@@ -1 +1 @@
-VERSION = "2.1.2"
+VERSION = "2.2.0"

umap/context_processors.py

@@ -7,6 +7,7 @@ def settings(request):
     return {
         "UMAP_FEEDBACK_LINK": djsettings.UMAP_FEEDBACK_LINK,
         "SITE_NAME": djsettings.SITE_NAME,
+        "SITE_URL": djsettings.SITE_URL,
         "ENABLE_ACCOUNT_LOGIN": djsettings.ENABLE_ACCOUNT_LOGIN,
         "UMAP_READONLY": djsettings.UMAP_READONLY,
         "UMAP_DEMO_SITE": djsettings.UMAP_DEMO_SITE,

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-03-25 12:41+0000\n"
+"POT-Creation-Date: 2024-04-24 19:16+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"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "Everyone can edit"
 msgstr ""
 
-#: forms.py:69 models.py:381
+#: forms.py:69 models.py:384
 msgid "Inherit"
 msgstr ""
 
@@ -33,54 +33,50 @@ msgstr ""
 msgid "Site is readonly for maintenance"
 msgstr ""
 
-#: models.py:52
+#: models.py:53
 msgid "name"
 msgstr ""
 
-#: models.py:83
+#: models.py:84
 msgid "details"
 msgstr ""
 
-#: models.py:84
+#: models.py:85
 msgid "Link to a page where the licence is detailed."
 msgstr ""
 
-#: models.py:94
+#: models.py:95
 msgid "URL template using OSM tile format"
 msgstr ""
 
-#: models.py:100
+#: models.py:101
 msgid "Order of the tilelayers in the edit box"
 msgstr ""
 
-#: models.py:146 models.py:382
+#: models.py:147 models.py:385
 msgid "Everyone"
 msgstr ""
 
-#: models.py:147 models.py:153 models.py:383
+#: models.py:148 models.py:154 models.py:386
 msgid "Editors only"
 msgstr ""
 
-#: models.py:148 models.py:384
+#: models.py:149 models.py:387
 msgid "Owner only"
 msgstr ""
 
-#: models.py:151
+#: models.py:152
 msgid "Everyone (public)"
 msgstr ""
 
-#: models.py:152
+#: models.py:153
 msgid "Anyone with link"
 msgstr ""
 
-#: models.py:154
+#: models.py:155
 msgid "Blocked"
 msgstr ""
 
-#: models.py:157 models.py:391
-msgid "description"
-msgstr ""
-
 #: models.py:158
 msgid "center"
 msgstr ""
@@ -113,7 +109,7 @@ msgstr ""
 msgid "editors"
 msgstr ""
 
-#: models.py:186 models.py:405
+#: models.py:186 models.py:408
 msgid "edit status"
 msgstr ""
 
@@ -121,19 +117,23 @@ msgstr ""
 msgid "share status"
 msgstr ""
 
-#: models.py:194 models.py:400
+#: models.py:194 models.py:403
 msgid "settings"
 msgstr ""
 
-#: models.py:322
+#: models.py:325
 msgid "Clone of"
 msgstr ""
 
-#: models.py:395
+#: models.py:394
+msgid "description"
+msgstr ""
+
+#: models.py:398
 msgid "display on load"
 msgstr ""
 
-#: models.py:396
+#: models.py:399
 msgid "Display this layer on load."
 msgstr ""
 
@@ -345,37 +345,37 @@ msgstr ""
 msgid "Clone"
 msgstr ""
 
-#: templates/umap/map_table.html:76 templates/umap/map_table.html:78
+#: templates/umap/map_table.html:77 templates/umap/map_table.html:79
 msgid "Delete"
 msgstr ""
 
-#: templates/umap/map_table.html:91
+#: templates/umap/map_table.html:93
 msgid "first"
 msgstr ""
 
-#: templates/umap/map_table.html:92
+#: templates/umap/map_table.html:94
 msgid "previous"
 msgstr ""
 
-#: templates/umap/map_table.html:100
+#: templates/umap/map_table.html:102
 #, python-format
 msgid "Page %(maps_number)s of %(num_pages)s"
 msgstr ""
 
-#: templates/umap/map_table.html:105
+#: templates/umap/map_table.html:107
 msgid "next"
 msgstr ""
 
-#: templates/umap/map_table.html:106
+#: templates/umap/map_table.html:108
 msgid "last"
 msgstr ""
 
-#: templates/umap/map_table.html:114
+#: templates/umap/map_table.html:116
 #, python-format
 msgid "Lines per page: %(per_page)s"
 msgstr ""
 
-#: templates/umap/map_table.html:119
+#: templates/umap/map_table.html:121
 #, python-format
 msgid "%(count)s maps"
 msgstr ""
@@ -542,10 +542,10 @@ msgstr ""
 msgid "Congratulations, your map has been cloned!"
 msgstr ""
 
-#: views.py:1145
+#: views.py:1146
 msgid "Layer successfully deleted."
 msgstr ""
 
-#: views.py:1167
+#: views.py:1168
 msgid "Permissions updated with success!"
 msgstr ""

umap/migrations/0020_alter_tilelayer_url_template.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.0.2 on 2024-04-17 09:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("umap", "0019_migrate_internal_remote_datalayers"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="tilelayer",
+            name="url_template",
+            field=models.CharField(
+                help_text="URL template using OSM tile format", max_length=400
+            ),
+        ),
+    ]

umap/migrations/0021_remove_map_description.py

@@ -0,0 +1,16 @@
+# Generated by Django 5.0.4 on 2024-04-24 07:50
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("umap", "0020_alter_tilelayer_url_template"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="map",
+            name="description",
+        ),
+    ]

umap/models.py

@@ -92,7 +92,7 @@ class Licence(NamedModel):
 
 class TileLayer(NamedModel):
     url_template = models.CharField(
-        max_length=200, help_text=_("URL template using OSM tile format")
+        max_length=400, help_text=_("URL template using OSM tile format")
     )
     minZoom = models.IntegerField(default=0)
     maxZoom = models.IntegerField(default=18)
@@ -155,7 +155,6 @@ class Map(NamedModel):
         (BLOCKED, _("Blocked")),
     )
     slug = models.SlugField(db_index=True)
-    description = models.TextField(blank=True, null=True, verbose_name=_("description"))
     center = models.PointField(geography=True, verbose_name=_("center"))
     zoom = models.IntegerField(default=7, verbose_name=_("zoom"))
     locate = models.BooleanField(
@@ -198,6 +197,13 @@ class Map(NamedModel):
     objects = models.Manager()
     public = PublicManager()
 
+    @property
+    def description(self):
+        try:
+            return self.settings["properties"]["description"]
+        except KeyError:
+            return ""
+
     @property
     def preview_settings(self):
         layers = self.datalayer_set.all()
@@ -213,13 +219,9 @@ class Map(NamedModel):
                 "STATIC_URL": settings.STATIC_URL,
                 "editMode": "disabled",
                 "hash": False,
-                "attributionControl": False,
                 "scrollWheelZoom": False,
-                "umapAttributionControl": False,
                 "noControl": True,
                 "umap_id": self.pk,
-                "onLoadPanel": "none",
-                "captionBar": False,
                 "schema": self.extra_schema,
                 "slideshow": {},
             }
@@ -443,6 +445,8 @@ class DataLayer(NamedModel):
             "name": self.name,
             "displayOnLoad": self.display_on_load,
         }
+        if self.old_id:
+            obj["old_id"] = self.old_id
         obj["id"] = self.pk
         obj["permissions"] = {"edit_status": self.edit_status}
         obj["editMode"] = "advanced" if self.can_edit(user, request) else "disabled"

umap/settings/base.py

@@ -239,6 +239,7 @@ UMAP_EXTRA_URLS = {
     "routing": "http://www.openstreetmap.org/directions?engine=osrm_car&route={lat},{lng}&locale={locale}#map={zoom}/{lat}/{lng}",  # noqa
     "ajax_proxy": "/ajax-proxy/?url={url}&ttl={ttl}",
     "search": "https://photon.komoot.io/api/?",
+    "edit_in_osm": "https://www.openstreetmap.org/edit#map={zoom}/{lat}/{lng}",
 }
 UMAP_KEEP_VERSIONS = env.int("UMAP_KEEP_VERSIONS", default=10)
 SITE_URL = env("SITE_URL", default="http://umap.org")

umap/static/umap/base.css

@@ -21,6 +21,9 @@ a {
     text-decoration: none;
     color: SeaGreen;
 }
+button {
+    cursor: pointer;
+}
 hr {
     clear: both;
     width: 100%;
@@ -132,7 +135,7 @@ ul {
 /*    forms    */
 /* *********** */
 input[type="text"], input[type="password"], input[type="date"],
-input[type="datetime"], input[type="email"], input[type="number"],
+input[type="datetime-local"], input[type="email"], input[type="number"],
 input[type="search"], input[type="tel"], input[type="time"],
 input[type="url"], textarea {
     background-color: white;
@@ -160,6 +163,8 @@ input[type="checkbox"] {
 textarea {
     height: inherit;
     padding: 7px;
+    min-height: 15rem;
+    min-height: 6rlh;
 }
 select {
     border: 1px solid #222;
@@ -258,6 +263,9 @@ input[type="checkbox"] + label {
     display: inline;
     padding: 0 14px;
 }
+label input[type="radio"] {
+    margin-right: 10px;
+}
 select + .error,
 input + .error {
     display: block;
@@ -273,12 +281,23 @@ input + .error {
 input[type="file"] + .error {
     margin-top: 0;
 }
+input:invalid {
+    border-color: red;
+    background-color: darkred;
+}
+.dark input, .dark textarea {
+    background-color: #232729;
+    border-color: #1b1f20;
+    color: #efefef;
+}
 .fieldset {
-    border: 1px solid #222;
     margin-bottom: 5px;
     border-top-left-radius: 4px;
     border-top-right-radius: 4px;
 }
+.dark .fieldset {
+    border: 1px solid #222;
+}
 .fieldset .fields {
     visibility: hidden;
     opacity: 0;
@@ -296,7 +315,7 @@ input[type="file"] + .error {
     text-align: left;
     display: block;
     cursor: pointer;
-    background-color: #eee;
+    background-color: var(--color-lightGray);
     height: 30px;
     line-height: 30px;
     margin: 0;
@@ -327,6 +346,11 @@ input[type="file"] + .error {
 .fieldset.toggle.on .legend:before {
     background-position: -144px -51px;
 }
+fieldset legend {
+    font-size: 1.1rem;
+    padding: 0 5px;
+}
+
 /* Switch */
 input.switch:empty {
     display: none;
@@ -528,7 +552,7 @@ i.info {
     background-position: -150px -78px;
 }
 .umap-delete:before {
-    background-position: -40px -8px;
+    background-position: -32px -8px;
 }
 .umap-edit:before {
     background-position: -6px -6px;
@@ -542,12 +566,10 @@ i.info {
 .permissions-panel,
 .umap-upload,
 .umap-share,
-.umap-edit-container,
 .umap-datalayer-container,
 .umap-layer-properties-container,
 .umap-browse-data,
 .umap-facet-search,
-.umap-browse-datalayers,
 .umap-tilelayer-switcher-container {
     padding: 0 10px;
 }
@@ -558,20 +580,29 @@ i.info {
     margin-top: -8px;
     padding: 0 5px;
 }
-.pictogram-tabs {
+.flat-tabs {
     display: flex;
     justify-content: space-around;
     font-size: 1.2em;
-    padding-bottom: 20px;
+    margin-bottom: 20px;
+    border-bottom: 1px solid #bebebe;
 }
-.pictogram-tabs button {
+.flat-tabs button {
     padding: 10px;
-    color: #fff;
     text-decoration: none;
     cursor: pointer;
+    border-bottom: 1px solid transparent;
 }
-.pictogram-tabs .on {
+.flat-tabs button:hover,
+.flat-tabs .on {
     font-weight: bold;
+    border-bottom: 1px solid #444;
+}
+.dark .flat-tabs button {
+    color: #fff;
+}
+.dark .flat-tabs button:hover,
+.dark .flat-tabs .on {
     border-bottom: 1px solid #fff;
 }
 .umap-pictogram-category h6 {
@@ -663,7 +694,7 @@ input[type=hidden].blur + [type="button"] {
 .copiable-input button {
     background-repeat: no-repeat;
     background-image: url('./img/16.svg');
-    background-position: -45px -140px;
+    background-position: -141px -140px;
     display: inline;
     padding: 0 10px;
     height: 32px;
@@ -678,105 +709,10 @@ input[type=hidden].blur + [type="button"] {
 .leaflet-ui-container {
     overflow-x: hidden;
 }
-#umap-ui-container {
-    /* Added for playwright to consider the element as non visible  */
-    /* as being out of the visible viewport is not enough  */
-    visibility: hidden;
-    position: absolute;
-    bottom: 0;
-    padding: 0 10px;
-    border-left: 1px solid var(--color-lightGray);
-    overflow-x: auto;
-    z-index: 1010;
-    background-color: #fff;
-    opacity: 0.98;
-    cursor: initial;
-}
-#umap-ui-container.login-panel {
-    position: fixed;  /* Should not scroll when used in content pages (like home page) */
-    z-index: 1011;  /* Above a map panel if any */
-}
-#umap-ui-container.dark {
-    border-left: 1px solid #222;
-    background-color: var(--color-darkGray);
-    color: #efefef;
-}
-#umap-ui-container.fullwidth {
-    width: 100%;
-    right: -100%;
-    z-index: 10000;
-    padding-left: 0;
-    padding-right: 0;
-}
-.umap-caption-bar-enabled #umap-ui-container {
-    bottom: 46px;
-}
 .leaflet-top,
 .leaflet-right {
     transition: all .7s;
 }
-.umap-ui .leaflet-right {
-    right: 400px;
-}
-#umap-ui-container,
-#umap-alert-container,
-#umap-tooltip-container {
-    -moz-box-sizing:border-box;
-    -webkit-box-sizing:border-box;
-    box-sizing: border-box;
-}
-#umap-ui-container .umap-popup-content img {
-    /* See https://github.com/Leaflet/Leaflet/commit/61d746818b99d362108545c151a27f09d60960ee#commitcomment-6061847 */
-    max-width: 99% !important;
-}
-#umap-ui-container .umap-popup-content {
-    max-height: inherit;
-}
-#umap-ui-container .body {
-    clear: both;
-    height: calc(100% - 54px); /* Minus size of toolbox */
-}
-#umap-ui-container .toolbox {
-    padding: 5px 10px;
-    overflow: hidden;
-    display: flex;
-    flex-direction: row-reverse;
-    font-size: 10px;
-    justify-content: flex-start;
-    gap: 5px;
-}
-#umap-ui-container .toolbox li {
-    color: #2e3436;
-    line-height: 32px;
-    cursor: pointer;
-    float: right;
-    display: inline;
-    padding: 0 7px;
-    border: 1px solid #b6b6b3;
-    border-radius: 2px;
-}
-#umap-ui-container.dark .toolbox li {
-    color: #d3dfeb;
-    border: 1px solid #202425;
-}
-#umap-ui-container .toolbox li:hover {
-    color: #2e3436;
-    background-color: #d4d4d2;
-}
-#umap-ui-container.dark .toolbox li:hover {
-    color: #eeeeec;
-    background-color: #353c3e;
-}
-.dark input, .dark textarea {
-    background-color: #232729;
-    border-color: #1b1f20;
-    /*box-shadow: inset 0 0 0 1px #215d9c;*/
-    color: #efefef;
-}
-input:invalid {
-    border-color: red;
-    background-color: darkred;
-}
 
 
 /* *********** */
@@ -897,27 +833,6 @@ input:invalid {
 /* *********** */
 /* Close link  */
 /* *********** */
-.umap-close-icon {
-    background-repeat: no-repeat;
-    background-image: url('./img/16.svg');
-    background-position: -28px -6px;
-    display: inline;
-    padding: 0 10px;
-    vertical-align: middle;
-}
-.dark .umap-close-icon {
-    background-image: url('./img/16-white.svg');
-}
-.dark .umap-close-link {
-    border: 1px solid #202425;
-    color: #eeeeec;
-    padding: 0 7px;
-    line-height: 32px;
-    background-color: var(--color-darkGray);
-}
-.dark .umap-close-link:hover {
-    background-color: #2e3436;
-}
 #umap-alert-container .umap-close-link {
     color: #fff;
     float: right;
@@ -962,35 +877,7 @@ input:invalid {
 /* *********** */
 /*    Mobile   */
 /* *********** */
-@media all and (orientation:landscape) {
-    .umap-edit-enabled #umap-ui-container {
-        top: 46px;
-    }
-    #umap-ui-container {
-        width: 400px;
-        right: -400px;
-        top:  0;
-    }
-    .umap-ui #umap-ui-container {
-        right: 0;
-        visibility: visible;
-    }
-}
 @media all and (orientation:portrait) {
-    #umap-ui-container {
-        height: 50%;
-        max-height: 400px;
-        width: 100%;
-        bottom: 0;
-        right: -100%;
-    }
-    .umap-ui #umap-ui-container {
-        right: 0;
-        visibility: visible;
-    }
-    .umap-ui .leaflet-right {
-        right: 0;
-    }
     #umap-alert-container {
         width: 100%;
         left: 0;

umap/static/umap/content.css

@@ -17,22 +17,6 @@ input:-moz-placeholder, :-moz-placeholder {
    color: #a5a5a5;
 }
 
-#umap-ui-container textarea {
-    height: 100px;
-    margin-bottom: 14px;
-}
-#umap-ui-container select {
-    margin-bottom: 10px;
-}
-
-#umap-ui-container.warning .button {
-    background-color: #c60f13;
-    border: 1px solid #7f0a0c;
-}
-#umap-ui-container.warning .button:hover {
-    background-color: #970b0e;
-}
-
 
 /* **************** */
 /*    Login icons   */
@@ -194,9 +178,6 @@ h2.tabs a:hover {
     color: #efefef;
     text-decoration: underline;
 }
-body.content #umap-ui-container {
-    background-color: #fff;
-}
 
 
 /* **************************** */
@@ -356,23 +337,24 @@ ul.umap-autocomplete {
     height: 36px;
     width: 36px;
     margin: 3px;
+    background-position: initial;
 }
-.icon-view {
+.content .icon-view {
     background-image: url('./img/icon-view.svg');
 }
-.icon-share {
+.content .icon-share {
     background-image: url('./img/icon-share.svg');
 }
-.icon-edit {
+.content .icon-edit {
     background-image: url('./img/icon-edit.svg');
 }
-.icon-download {
+.content .icon-download {
     background-image: url('./img/icon-download.svg');
 }
-.icon-duplicate {
+.content .icon-duplicate {
     background-image: url('./img/icon-duplicate.svg');
 }
-.icon-delete {
+.content .icon-delete {
     background-image: url('./img/icon-delete.svg');
 }
 .table-header {