umap-project 2.3.1__py3-none-any.whl → 2.4.0__py3-none-any.whl

umap/models.py

@@ -251,9 +251,14 @@ class Map(NamedModel):
         path = reverse("map_anonymous_edit_url", kwargs={"signature": signature})
         return settings.SITE_URL + path
 
+    def is_owner(self, user=None, request=None):
+        if user and self.owner == user:
+            return True
+        return self.is_anonymous_owner(request)
+
     def is_anonymous_owner(self, request):
         if not request or self.owner:
-            # edit cookies are only valid while map hasn't owner
+            # edit cookies are only valid while the map doesn't have owner
             return False
         key, value = self.signed_cookie_elements
         try:

umap/settings/base.py

@@ -1,11 +1,14 @@
 """Base settings shared by all environments"""
 
 # Import global settings to make it easier to extend settings.
+import os
 from email.utils import parseaddr
 
 import environ
 from django.conf.locale import LANG_INFO
 
+import umap as project_module
+
 env = environ.Env()
 
 # =============================================================================
@@ -137,9 +140,6 @@ FORM_RENDERER = "django.forms.renderers.DjangoTemplates"
 # Calculation of directories relative to the project module location
 # =============================================================================
 
-import os
-
-import umap as project_module
 
 PROJECT_DIR = os.path.dirname(os.path.realpath(project_module.__file__))
 
@@ -258,6 +258,7 @@ UMAP_DEFAULT_SHARE_STATUS = None
 UMAP_DEFAULT_EDIT_STATUS = None
 UMAP_DEFAULT_FEATURES_HAVE_OWNERS = False
 UMAP_HOME_FEED = "latest"
+UMAP_IMPORTERS = {}
 
 UMAP_READONLY = env("UMAP_READONLY", default=False)
 UMAP_GZIP = True
@@ -306,3 +307,10 @@ LOGGING = {
         },
     },
 }
+
+# WebSocket 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)
+WEBSOCKET_FRONT_URI = env("WEBSOCKET_FRONT_URI", default="ws://localhost:8001")

umap/static/umap/base.css

@@ -60,6 +60,27 @@ kbd {
   display: inline-block;
   white-space: nowrap;
 }
+h3 {
+    font-size: 1rem;
+}
+h4 {
+    font-size: 0.9rem;
+}
+h5 {
+    font-size: 0.8rem;
+}
+h6 {
+    font-size: 0.7rem;
+}
+hgroup > * {
+    margin-bottom: 0;
+}
+hgroup {
+    margin-bottom: var(--box-margin);
+}
+hgroup > :not(:first-child):last-child {
+    font-weight: normal;
+}
 
 /*
 * List
@@ -69,6 +90,9 @@ ul {
     list-style-position:inside;
     list-style-type:none;
 }
+dt {
+    font-weight: bold;
+}
 
 /* ************************************************* */
 /* *********************** GRID ******************** */
@@ -129,14 +153,20 @@ ul {
     margin-right: auto;
     float: none;
 }
-
+.grid-container {
+    display: grid;
+    grid-template-columns: repeat(3, minmax(0, 1fr));
+}
+.grid-container > * {
+    text-align: center;
+}
 
 /* *********** */
 /*    forms    */
 /* *********** */
 input[type="text"], input[type="password"], input[type="date"],
 input[type="datetime-local"], input[type="email"], input[type="number"],
-input[type="search"], input[type="tel"], input[type="time"],
+input[type="search"], input[type="tel"], input[type="time"], input[type="file"],
 input[type="url"], textarea {
     background-color: white;
     border: 1px solid #CCCCCC;
@@ -145,9 +175,8 @@ input[type="url"], textarea {
     color: rgba(0, 0, 0, 0.75);
     display: block;
     font-family: inherit;
-    font-size: 14px;
-    height: 32px;
-    margin: 0 0 14px;
+    margin: 0;
+    margin-bottom: var(--box-margin);
     padding: 7px;
     width: 100%;
 }
@@ -156,8 +185,11 @@ input[type="range"] {
     margin-bottom: 5px;
     width: 100%;
 }
+input[type="radio"] {
+    margin-right: var(--text-margin);
+}
 input[type="checkbox"] {
-    margin: 0 5px;
+    margin: 0 var(--text-margin);
     vertical-align: middle;
     appearance: none;
 }
@@ -169,35 +201,12 @@ input[type="checkbox"]:after {
     border: 1px solid var(--color-lightGray);
     cursor: pointer;
     text-align: center;
-    font-size: 1.3rem;
-    line-height: 1rem;
+    font-size: 1rem;
+    line-height: 0.8rem;
 }
 input[type=checkbox]:checked:after {
     background-color: var(--color-lightCyan);
     content: '✓';
-}
-label input[type="radio"] {
-    appearance: none;
-    margin-right: 10px;
-}
-input[type="radio"]:after {
-    display: inline-block;
-    content: ' ';
-    width: 12px;
-    height: 12px;
-    border-radius: 50%;
-    border: 1px solid var(--color-lightGray);
-    cursor: pointer;
-    text-align: center;
-    font-size: 1.3rem;
-    line-height: 1rem;
-    vertical-align: bottom;
-}
-label input[type="radio"]:checked:after {
-    background-color: var(--color-lightCyan);
-    content: '•';
-    font-size: 3rem;
-    line-height: 1.1rem;
     color: var(--color-darkGray);
 }
 
@@ -217,6 +226,7 @@ select {
     height: 28px;
     line-height: 28px;
     margin-top: 5px;
+    margin-bottom: var(--box-margin);
 }
 .dark select {
     color: #efefef;
@@ -266,6 +276,11 @@ button.flat,
     min-height: inherit;
     width: initial;
     display: initial;
+    line-height: inherit;
+}
+button.flat:hover,
+[type="button"].flat:hover,
+.dark [type="button"].flat:hover {
     text-decoration: underline;
 }
 .help-text, .helptext {
@@ -286,7 +301,6 @@ input + .help-text {
 }
 .formbox {
     min-height: 36px;
-    line-height: 28px;
     margin-bottom: 14px;
 }
 .formbox.with-switch {
@@ -295,12 +309,19 @@ input + .help-text {
 .formbox select {
     width: calc(100% - 14px);
 }
+fieldset.formbox {
+    border: none;
+    border-top: 1px solid var(--color-lightGray);
+}
 label {
     display: block;
     font-size: 12px;
     line-height: 21px;
     width: 100%;
 }
+label + label {
+    margin-top: var(--box-margin);
+}
 .content label {
     font-weight: bold;
 }
@@ -361,7 +382,7 @@ details summary {
     border: 1px solid var(--color-darkGray);
 }
 fieldset legend {
-    font-size: 1.1rem;
+    font-size: .9rem;
     padding: 0 5px;
 }
 
@@ -384,6 +405,9 @@ fieldset legend {
     border-radius: 50%;
     content: attr(data-badge);
 }
+[hidden] {
+    display: none!important;
+}
 
 /* Switch */
 input.switch:empty {
@@ -470,10 +494,13 @@ input.switch:checked ~ label:after {
 .button-bar.half {
     grid-template-columns: 1fr 1fr;
 }
+.button-bar.by3,
+.button-bar.by5,
 .umap-multiplechoice.by3,
 .umap-multiplechoice.by5 {
     grid-template-columns: 1fr 1fr 1fr;
 }
+.button-bar.by4,
 .umap-multiplechoice.by4 {
     grid-template-columns: 1fr 1fr 1fr 1fr;
 }
@@ -757,148 +784,13 @@ input[type=hidden].blur + [type="button"] {
 
 
 /* *********** */
-/*   Alerts    */
-/* *********** */
-#umap-alert-container {
-    min-height: 46px;
-    line-height: 46px;
-    padding-left: 10px;
-    width: calc(100% - 500px);
-    position: absolute;
-    top: -46px;
-    left: 250px;  /* Keep save/cancel button accessible. */
-    right: 250px;
-    box-shadow: 0 1px 7px #999999;
-    visibility: hidden;
-    background: none repeat scroll 0 0 rgba(20, 22, 23, 0.8);
-    font-weight: bold;
-    color: #fff;
-    font-size: 0.8em;
-    z-index: 1012;
-    border-radius: 2px;
-}
-#umap-alert-container.error {
-    background-color: #c60f13;
-}
-.umap-alert #umap-alert-container {
-    visibility: visible;
-    top: 23px;
-}
-.umap-alert-container .umap-action {
-    margin-left: 10px;
-    background-color: #fff;
-    color: #000;
-    padding: 5px;
-    border-radius: 4px;
-}
-.umap-alert-container .umap-action:hover {
-    color: #000;
-}
-.umap-alert-container .error .umap-action {
-    background-color: #666;
-    color: #eee;
-}
-.umap-alert-container .error .umap-action:hover {
-    color: #fff;
-}
-.umap-alert-container input {
-    padding: 5px;
-    border-radius: 4px;
-    width: 100%;
-}
-
-/* *********** */
-/*   Tooltip   */
+/*   Various   */
 /* *********** */
-#umap-tooltip-container {
-    line-height: 20px;
-    padding: 5px 10px;
-    width: auto;
-    position: absolute;
-    box-shadow: 0 1px 7px #999999;
-    display: none;
-    background-color: rgba(40, 40, 40, 0.8);
-    color: #eeeeec;
-    font-size: 0.8em;
-    border-radius: 2px;
-    z-index: 1011;
-    font-weight: normal;
-    max-width: 300px;
-}
-.umap-tooltip #umap-tooltip-container {
-    display: block;
-}
-#umap-tooltip-container.tooltip-top:after {
-    top: 100%;
-    left: calc(50% - 11px);
-    border: solid transparent;
-    content: " ";
-    height: 0;
-    width: 0;
-    position: absolute;
-    pointer-events: none;
-    border-top-color: rgba(30, 30, 30, 0.8);
-    border-width: 11px;
-    margin-left: calc(-50% + 21px);
-}
-#umap-tooltip-container.tooltip-bottom:before {
-    top: -22px;
-    left: calc(50% - 11px);
-    border: solid transparent;
-    content: " ";
-    height: 0;
-    width: 0;
-    position: absolute;
-    pointer-events: none;
-    border-top-color: rgba(30, 30, 30, 0.7);
-    border-width: 11px;
-    transform: rotate(180deg);
-}
-#umap-tooltip-container.tooltip.tooltip-left:after {
-    left: 100%;
-    top: 50%;
-    border: solid transparent;
-    content: " ";
-    height: 0;
-    width: 0;
-    position: absolute;
-    pointer-events: none;
-    border-color: rgba(136, 183, 213, 0);
-    border-left-color: #333;
-    border-width: 11px;
-    margin-top: -10px;
-}
-
 
-
-/* *********** */
-/* Close link  */
-/* *********** */
-#umap-alert-container .umap-close-link {
-    color: #fff;
-    float: right;
-    padding-right: 10px;
-    width: 100px;
-    line-height: 1;
-    margin: .5rem;
-    background-color: #202425;
-    font-size: .7rem;
-}
-#umap-alert-container .umap-close-icon {
-    background-position: -74px -55px;
-}
-#umap-alert-container .umap-alert-actions {
-    display: flex;
-    margin: 1rem;
+.text {
+    word-break: break-word;
+    white-space: pre-line;
 }
-#umap-alert-container .umap-alert-actions .umap-action {
-    margin-bottom: 0;
-}
-
-
-/* *********** */
-/*   Various   */
-/* *********** */
 
 .umap-dragover:before {
     content:  ' ';
@@ -913,15 +805,3 @@ input[type=hidden].blur + [type="button"] {
     height: 100vh;
     opacity: 0.5;
 }
-
-
-/* *********** */
-/*    Mobile   */
-/* *********** */
-@media all and (orientation:portrait) {
-    #umap-alert-container {
-        width: 100%;
-        left: 0;
-        right: 0;
-    }
-}

umap/static/umap/content.css

@@ -248,7 +248,7 @@ input[type="submit"],
 ul.umap-autocomplete {
     position: absolute;
     background-color: white;
-    z-index: 1010;
+    z-index: 10100;
     box-shadow: 0 4px 9px #999999;
 }
 .umap-autocomplete li {
@@ -262,6 +262,7 @@ ul.umap-autocomplete {
 }
 .umap-singleresult {
     margin-bottom: 10px;
+    clear: both;
 }
 .umap-singleresult div,
 .umap-multiresult li {
@@ -300,7 +301,7 @@ ul.umap-autocomplete {
 }
 
 .messages .error {
-    background-color: #c60f13;
+    background-color: var(--color-red);
 }
 
 

umap/static/umap/css/dialog.css

@@ -0,0 +1,18 @@
+.umap-dialog {
+    z-index: 10001;
+    margin: auto;
+    margin-top: 100px;
+    width: 40vw;
+    max-width: 100vw;
+    max-height: 50vh;
+    padding: 20px;
+    border: 1px solid #222;
+    background-color: var(--background-color);
+    color: var(--text-color);
+    border-radius: 5px;
+    overflow-y: auto;
+}
+.umap-dialog .umap-close-link {
+    float: right;
+    width: 100px;
+}

umap/static/umap/css/icon.css

@@ -16,6 +16,14 @@
 .icon + span {
     margin-left: 10px;
 }
+.icon-block {
+    display: block;
+    float: left;
+    margin-right: 10px;
+}
+.icon-block + span {
+    margin-left: 0;
+}
 .dark .icon-16 {
     background-image: url('../img/16-white.svg');
 }

umap/static/umap/css/importers.css

@@ -0,0 +1,51 @@
+.importers h3 {
+  font-size: 1rem;
+}
+.importers h4 {
+  font-size: .9rem;
+}
+
+.importers ul [type=button] {
+    background: none;
+    font-size: 0.75rem;
+    border: none;
+    width: initial;
+    display: inline-block;
+}
+.importer h3:before {
+    background-image: url(../img/importers/random.svg);
+    background-repeat: no-repeat;
+    background-position: center;
+    content: '';
+    width: 36px;
+    height: 36px;
+    display: inline-block;
+    margin-right: 10px;
+    background-size: 100%;
+    vertical-align: -10px;
+}
+.importers ul [type=button]:before {
+    background-image: url(../img/importers/random.svg);
+    background-repeat: no-repeat;
+    background-position: center;
+    content: '';
+    width: 100%;
+    height: 50px;
+    display: block;
+}
+.importer.geodatamine h3:before,
+.importers ul .geodatamine:before {
+    background-image: url(../img/importers/geodatamine.svg);
+}
+.importer.communesfr h3:before,
+.importers ul .communesfr:before {
+    background-image: url(../img/importers/communesfr.svg);
+}
+.importer.overpass h3:before,
+.importers ul .overpass:before {
+    background-image: url(../img/importers/overpass.svg);
+}
+.importer.datasets h3:before,
+.importers ul .datasets:before {
+    background-image: url(../img/importers/datasets.svg);
+}

umap/static/umap/css/panel.css

@@ -7,14 +7,17 @@
     overflow-x: auto;
     z-index: 1010;
     background-color: var(--background-color);
+    color: var(--text-color);
     opacity: 0.98;
     cursor: initial;
     border-radius: 5px;
     border: 1px solid var(--color-lightGray);
+    bottom: calc(var(--current-footer-height) + var(--panel-bottom));
+    box-sizing: border-box;
+    counter-reset: step;
 }
 .panel.dark {
     border: 1px solid #222;
-    color: #efefef;
 }
 .panel.full {
     width: initial;
@@ -23,18 +26,11 @@
 }
 .panel.full.on {
     visibility: visible;
-    right: var(--panel-gutter);
+    right: calc(var(--panel-gutter) * 2 + var(--control-size));
     left: var(--panel-gutter);
-    top: var(--header-height);
     height: initial;
     max-height: initial;
 }
-.umap-caption-bar-enabled .panel {
-    bottom: calc(var(--footer-height) + var(--panel-bottom));
-}
-.panel {
-    box-sizing: border-box;
-}
 .panel .umap-popup-content img {
     /* See https://github.com/Leaflet/Leaflet/commit/61d746818b99d362108545c151a27f09d60960ee#commitcomment-6061847 */
     max-width: 99% !important;
@@ -46,53 +42,26 @@
     height: calc(100% - var(--panel-header-height)); /* Minus size of toolbox */
     padding: var(--panel-gutter);
 }
-.panel .toolbox {
-    padding: 5px 10px;
-    overflow: hidden;
-    display: flex;
-    flex-direction: row-reverse;
-    font-size: 10px;
-    justify-content: flex-start;
-    gap: 5px;
-    line-height: 2.2em;
-    background-color: #fff;
-    position: sticky;
-    top: 0;
-    height: var(--panel-header-height);
-}
-.panel.dark .toolbox {
-    background-color: var(--color-darkGray);
-}
-.panel .toolbox li {
-    cursor: pointer;
-    display: inline;
-    padding: 0 2px;
-    border: 1px solid #b6b6b3;
-    border-radius: 2px;
-}
-.panel.dark .toolbox
-.panel.dark .toolbox li {
-    color: #d3dfeb;
-    border: 1px solid #202425;
-}
-.panel .toolbox li:hover {
-    background-color: #d4d4d2;
+.panel h3 {
+    line-height: 120%;
 }
-.panel.dark .toolbox li:hover {
-    background-color: #353c3e;
+.panel .counter::before {
+    counter-increment: step;
+    content: counter(step) ". ";
 }
-.panel h3 {
-    line-height: 3;
+.panel .counter {
+    display: block;
+    margin-top: var(--panel-gutter);
 }
 @media all and (orientation:landscape) {
     .panel {
-        top: 0;
+        top: var(--current-header-height);
         margin-top: var(--panel-gutter);
         width: var(--panel-width);
         max-width: calc(100% - var(--panel-gutter) * 2 - var(--control-size))
     }
     .panel.condensed {
-        max-height: 500px;
+        max-height: calc(min(500px, 100% - var(--current-header-height) - var(--current-footer-height) - var(--panel-gutter) * 2));
         bottom: initial;
     }
     .panel.right {
@@ -109,16 +78,13 @@
         right: calc(var(--panel-gutter) * 2 + var(--control-size));
         visibility: visible;
     }
-    .umap-edit-enabled .panel {
-        top: var(--header-height);
-    }
 }
 @media all and (orientation:portrait) {
     .panel {
         height: 50%;
         max-height: 400px;
         width: 100%;
-        bottom: 0;
+        bottom: var(--current-footer-height);
         right: -100%;
     }
     .panel.left {
@@ -130,16 +96,11 @@
         visibility: visible;
     }
     .panel.expanded {
-        height: 100%;
-        max-height: 100%;
+        height: calc(100% - var(--current-footer-height));
+        max-height: calc(100% - var(--current-footer-height));
     }
     .umap-caption-bar-enabled .panel {
-        bottom: var(--footer-height);
         border-bottom-left-radius: 0;
         border-bottom-right-radius: 0;
     }
-    .umap-caption-bar-enabled .panel.expanded {
-        height: calc(100% - var(--footer-height));
-        max-height: calc(100% - var(--footer-height));
-    }
 }