umap-project 3.3.2__py3-none-any.whl → 3.4.0__py3-none-any.whl

umap/static/umap/map.css

@@ -24,6 +24,43 @@ html[dir="rtl"] .leaflet-tooltip-pane>* {
     margin-inline-start: 5px;
 }
 
+/* *********** */
+/*   Generic   */
+/* *********** */
+.with-transition {
+    transition: all var(--transition);
+}
+
+.draft {
+    background: repeating-linear-gradient(-45deg,
+            var(--color-darkGray),
+            var(--color-darkGray) 10px,
+            var(--color-darkerGray) 10px,
+            var(--color-darkerGray) 20px);
+}
+
+.show-on-draft {
+    display: none;
+}
+
+.draft .show-on-draft {
+    display: inline-block;
+}
+
+.aplat {
+    padding: var(--medium-box-padding);
+    margin-bottom: var(--box-margin);
+    background-color: var(--color-mediumGray);
+    border: 1px solid var(--color-accent);
+}
+
+.with-toolbox {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0;
+}
+
 /* *********** */
 /* Map details */
 /* *********** */
@@ -39,7 +76,7 @@ html[dir="rtl"] .leaflet-tooltip-pane>* {
     * Same as leaflet background, to work around screen blincking
     * between DOM is loaded and JS is read to render the map.
     */
-    background-color: var(--color-lightGray);
+    background-color: var(--color-veryLightGray);
 }
 
 .print-portrait,
@@ -233,7 +270,7 @@ html[dir="rtl"] .leaflet-tooltip-pane>* {
     width: 38px;
     height: 38px;
     box-shadow: none;
-    border: 1px solid var(--color-lightGray);
+    border: 1px solid var(--color-veryLightGray);
     border-radius: 4px;
 }
 
@@ -274,11 +311,11 @@ html[dir="rtl"] .leaflet-tooltip-pane>* {
     line-height: 100%;
     border-radius: var(--border-radius);
     margin-bottom: 0;
-    border: 1px solid var(--color-lightGray);
+    border: 1px solid var(--color-veryLightGray);
 }
 
 .leaflet-iconLayers-layerCell-plus:hover {
-    background-color: var(--color-lightGray);
+    background-color: var(--color-veryLightGray);
 }
 
 .leaflet-iconLayers:hover .leaflet-iconLayers-layerCell-plus {
@@ -320,7 +357,7 @@ ul.photon-autocomplete {
     overflow: hidden;
     white-space: nowrap;
     font-size: 1em;
-    border-inline-start: 4px solid var(--color-lightGray);
+    border-inline-start: 4px solid var(--color-veryLightGray);
 }
 
 .photon-autocomplete li strong {
@@ -332,7 +369,7 @@ ul.photon-autocomplete {
     margin: 0;
 }
 
-.photon-autocomplete button:hover {
+.photon-autocomplete button[type="button"]:hover {
     background-color: var(--color-darkCyan);
 }
 
@@ -368,8 +405,8 @@ ul.photon-autocomplete {
     display: none;
 }
 
-.search-result-tools button {
-    padding: 8px;
+.search-result-tools button[type="button"] {
+    padding: var(--text-margin);
     background-color: var(--background-color);
 }
 
@@ -420,60 +457,6 @@ ul.photon-autocomplete {
     margin-top: 0;
 }
 
-.update-map-extent,
-.leaflet-container .umap-toolbar .update-map-extent {
-    background-position: 0 -36px;
-}
-
-.umap-toolbar .update-map-tilelayers,
-.update-map-tilelayers {
-    background-position: -72px 0;
-}
-
-.manage-datalayers {
-    background-position: -36px -72px;
-}
-
-.umap-toolbar .update-map-permissions,
-.update-map-permissions {
-    background-position: -36px -36px;
-}
-
-.umap-toolbar .upload-data,
-.upload-data {
-    background-position: -144px 0;
-}
-
-.umap-toolbar .update-map-settings,
-.update-map-settings {
-    background-position: -108px 0;
-}
-
-.umap-draw-marker,
-.umap-toolbar .umap-draw-marker {
-    background-position: -144px -36px;
-}
-
-.umap-draw-polyline,
-.umap-toolbar .umap-draw-polyline {
-    background-position: -108px -36px;
-}
-
-.umap-draw-polyline-multi,
-.umap-toolbar .umap-draw-polyline-multi {
-    background-position: -36px -106px;
-}
-
-.umap-draw-polygon,
-.umap-toolbar .umap-draw-polygon {
-    background-position: -72px -36px;
-}
-
-.umap-draw-polygon-multi,
-.umap-toolbar .umap-draw-polygon-multi {
-    background-position: 0 -108px;
-}
-
 .umap-edit-enabled .umap-toolbar a {
     display: block;
 }
@@ -518,7 +501,7 @@ ul.photon-autocomplete {
 /* ********************************* */
 /*     Help Lightbox                 */
 /* ********************************* */
-.umap-help-button {
+.umap-help-button[type="button"] {
     display: inline-block;
     width: 16px;
     height: 16px;
@@ -589,17 +572,6 @@ ul.photon-autocomplete {
     background-position: -122px -121px;
 }
 
-.umap-browser .feature-title {
-    width: inherit;
-    cursor: inherit;
-    padding-inline-start: 6px;
-}
-
-.umap-browser .feature-title {
-    font-size: 12px;
-    cursor: pointer;
-}
-
 .show-on-edit {
     display: none !important;
 }
@@ -620,7 +592,6 @@ ul.photon-autocomplete {
     display: none !important;
 }
 
-
 /* ********************************* */
 /*   Browser panel          */
 /* ********************************* */
@@ -636,143 +607,6 @@ ul.photon-autocomplete {
     vertical-align: middle;
 }
 
-.umap-browser .datalayer i {
-    cursor: pointer;
-}
-
-.umap-browser .off .feature {
-    display: none;
-}
-
-.umap-browser .datalayer {
-    margin-bottom: 2px;
-    border-radius: 2px;
-}
-
-.umap-browser .datalayer ul {
-    border: 1px solid #d3d3d3;
-}
-
-.umap-browser.dark .datalayer ul {
-    border: 1px solid #232729;
-}
-
-.umap-browser .datalayer summary {
-    margin-bottom: 0;
-    overflow: hidden;
-    padding-inline-start: 5px;
-    height: 30px;
-    background-color: var(--color-lightGray);
-    font-weight: bold;
-}
-
-.umap-browser .off summary {
-    color: #b3b3b3;
-}
-
-.umap-browser li {
-    padding: 2px 0;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-.umap-browser .datalayer li:nth-child(even) {
-    background-color: #efefef;
-}
-
-.umap-browser.dark .datalayer li:nth-child(even) {
-    background-color: #2c3233;
-}
-
-.umap-browser .datalayer .feature-color {
-    box-shadow: 0 0 2px 0 black inset;
-    cursor: inherit;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    display: inline-block;
-    padding: 0;
-    width: 24px;
-    text-align: center;
-    margin-inline-start: 5px;
-}
-
-.umap-browser .marker .feature-color {
-    background: none;
-}
-
-.umap-browser.dark .datalayer .feature-color {
-    box-shadow: 0 0 2px 0 #999 inset;
-}
-
-.umap-browser .datalayer .feature-color img {
-    width: 24px;
-}
-
-.umap-browser .datalayer .feature-color span {
-    font-style: normal;
-    font-weight: bold;
-}
-
-.umap-browser .datalayer-toggle-list {
-    float: inline-end;
-    margin-inline-end: 5px;
-    background-position: -145px -70px;
-}
-
-.umap-browser .filters summary {
-    background: none;
-    border: 1px solid var(--color-lightGray);
-    width: fit-content;
-    padding: 0 10px;
-    margin-bottom: var(--block-margin);
-}
-
-.umap-browser .filters summary {
-    list-style: none;
-    display: inline-block;
-}
-
-.umap-browser details[open].filters summary {
-    margin-bottom: -1px;
-    border-bottom: 1px solid var(--background-color);
-}
-
-.datalayer-name {
-    cursor: pointer;
-}
-
-.umap-caption .dates {
-    color: var(--color-mediumGray);
-}
-
-.umap-caption .header {
-    display: flex;
-}
-
-.umap-caption .header i.icon {
-    flex-shrink: 0;
-}
-
-.umap-caption button {
-    background-color: var(--background-color);
-    color: var(--text-color);
-}
-
-.umap-browser .main-toolbox {
-    padding-left: 1.3rem;
-    /* Align with toolbox below  */
-    border-top: 1px solid var(--color-mediumGray);
-    margin-top: var(--box-margin);
-    padding-top: 3px;
-    padding-bottom: 3px;
-}
-
-.umap-browser .main-toolbox i {
-    cursor: pointer;
-}
-
 
 /* ********************************* */
 /*      Tilelayer switcher           */
@@ -833,10 +667,10 @@ ul.photon-autocomplete {
 }
 
 .caption-item {
-    color: #555;
-    padding: 6px 8px;
+    padding: var(--text-margin);
     box-shadow: 0 0 3px rgba(0, 0, 0, 0.2);
-    border-radius: 1px;
+    border-radius: var(--border-radius);
+    margin-bottom: var(--box-margin);
 }
 
 .caption-item ul {
@@ -998,6 +832,13 @@ ul.photon-autocomplete {
     box-shadow: black 0px 0px 1px;
     display: flex;
     align-content: center;
+    justify-content: center;
+}
+
+.umap-large-circle-icon span {
+    display: flex;
+    align-items: center;
+    text-align: center;
 }
 
 .umap-large-circle-icon.umap-icon-active {
@@ -1069,7 +910,7 @@ ul.photon-autocomplete {
     font-weight: bold;
 }
 
-.leaflet-overlay-pane > svg {
+.leaflet-overlay-pane>svg {
     z-index: var(--zindex-orphan-marker);
 }
 
@@ -1128,8 +969,13 @@ ul.photon-autocomplete {
     line-height: var(--control-size);
 }
 
+.leaflet-left .leaflet-control {
+    margin-left: var(--panel-gutter);
+    margin-top: var(--panel-gutter);
+}
+
 .leaflet-container .leaflet-control-zoom {
-    margin-inline-start: 10px;
+    margin-inline-start: var(--panel-gutter);
 }
 
 .leaflet-top,
@@ -1204,15 +1050,6 @@ ul.photon-autocomplete {
 }
 
 @media all and (max-width: 480px) {
-
-    .umap-main-edit-toolbox .share-status {
-        display: none;
-    }
-
-    .umap-main-edit-toolbox .map-name {
-        max-width: 100px;
-    }
-
     .leaflet-control-layers-expanded label {
         display: inline-block;
         margin-inline-end: 10px;

umap/static/umap/unittests/utils.js

@@ -838,6 +838,24 @@ describe('Utils', () => {
         '2024-03-03T00:00:00.000Z'
       )
     })
+    it('should parse a French date', () => {
+      assert.equal(
+        Utils.parseNaiveDate('14/09/2020').toISOString(),
+        '2020-09-14T00:00:00.000Z'
+      )
+    })
+    it('should parse a French date with ambiguous day number', () => {
+      assert.equal(
+        Utils.parseNaiveDate('08/09/2020').toISOString(),
+        '2020-09-08T00:00:00.000Z'
+      )
+    })
+    it('should parse a US date', () => {
+      assert.equal(
+        Utils.parseNaiveDate('1/14/2020').toISOString(),
+        '2020-01-14T00:00:00.000Z'
+      )
+    })
   })
 
   describe('#isObject', () => {

umap/static/umap/vars.css

@@ -2,7 +2,8 @@
     /* Colors. */
     --color-darkBlue: #263B58;
     --color-lighterGray: #f6f6f6;
-    --color-lightGray: #ddd;
+    --color-veryLightGray: #ddd;
+    --color-lightGray: #d3d3d3;
     --color-mediumGray: #3e4444;
     --color-darkGray: #323737;
     --color-darkerGray: #2a2e30;
@@ -16,7 +17,11 @@
     --color-darkCyan: #009099;
     --color-veryDarkCyan: #046460;
     --color-red: #c60f13;
+    --color-darkOrange: #b36200;
     --color-darkRed: #5b2a2a;
+    --color-lightViolet: #c043ff;
+    --color-veryDarkerViolet: #472e54;
+    --color-veryDarkViolet: #562f6b;
 
     --background-color: var(--color-light);
     --color-accent: var(--color-brightCyan);
@@ -26,7 +31,7 @@
     /* Buttons. */
     --button-primary-background: var(--color-limeGreen);
     --button-primary-color: var(--color-darkBlue);
-    --button-neutral-background: var(--color-lightGray);
+    --button-neutral-background: var(--color-veryLightGray);
     --button-neutral-color: var(--color-darkGray);
     --button-padding: 8px 16px;
     --button-padding-small: 2px 8px;
@@ -44,27 +49,30 @@
     --control-size: 36px;
     --border-radius: 4px;
     --box-padding: 20px;
-    --small-box-padding: 4px;
+    --medium-box-padding: calc(var(--box-padding) / 2);
+    --small-box-padding: calc(var(--box-padding) / 4);
     --box-margin: 14px;
     --text-margin: 7px;
     --dialog-width: 40vw;
     --map-fragment-height: 210px;
 
     /* z-indexes (leaflet CSS sets the map at 400 by default) */
+    --zindex-tooltip: 510;
     --zindex-alert: 500;
     --zindex-loader: 490;
     --zindex-toolbar: 480;
     --zindex-autocomplete: 470;
     --zindex-dialog: 460;
-    --zindex-contextmenu: 455;
-    --zindex-tooltip: 445;
+    --zindex-contextmenu: 450;
     --zindex-panels: 440;
     --zindex-controls: 430;
     --zindex-dragover: 410;
     --zindex-orphan-marker: 401;
 
     --block-shadow: 0 1px 7px var(--color-mediumGray);
+    --transition: 300ms;
 }
+
 .dark {
     --background-color: var(--color-darkGray);
     --text-color: #efefef;
@@ -77,3 +85,13 @@
         --box-margin: 7px;
     }
 }
+
+@media all and (max-width: 480px) {
+    :root {
+        --panel-gutter: 4px;
+    }
+
+    .umap-edit-enabled {
+        --header-height: 80px;
+    }
+}

umap/templates/umap/components/alerts/alert.html

@@ -28,36 +28,39 @@
       <h3 role="alert">
       </h3>
       {% url "login" as login_url %}
-      <p>
-        <em>{% blocktranslate %}Pro-tip: to easily find back your maps, <a href="{{ login_url }}" target="_blank">create an account</a> or <a href="{{ login_url }}" target="_blank">log in</a>.{% endblocktranslate %}</em>
+      <p class="aplat">
+        {% blocktranslate %}Oops, I didn't mean it, I want to <a href="{{ login_url }}" class="login">create an account</a> or <a href="{{ login_url }}" class="login">log in</a> (no worry, we'll attach the map to your account).{% endblocktranslate %}
       </p>
-      <div id="link-wrapper">
-        <form>
-          <label for="url">
-            {% translate "Here is your secret link to edit the map, please keep it safe:" %}
-          </label>
-          <fieldset role="group">
-            <input type="url" name="url" id="url">
-            <input type="button" value="{% translate "Copy link" %}">
-          </fieldset>
-        </form>
-      </div>
-      <div id="form-wrapper" hidden>
-        <form>
-          <label for="email">
-            {% translate "Enter your email address to receive the secret link:" %}
-          </label>
-          <fieldset role="group">
-            <input type="email"
-                   name="email"
-                   id="email"
-                   placeholder="{% translate "Email" %}"
-                   required>
-            <input type="submit"
-                   value="{% translate "Send me the link" %}"
-                   class="umap-action">
-          </fieldset>
-        </form>
+      <div class="anonymous soft-rounded aplat">
+        <h4><i class="icon icon-16 icon-anonymous"></i> {% trans "Yes, I want to continue editing anonymously, I will save the secret edit link to be able to edit this map later or on another device" %}</h4>
+        <div id="link-wrapper">
+          <form>
+            <label for="url">
+              {% translate "Here is your secret link to edit the map, please keep it safe:" %}
+            </label>
+            <fieldset role="group">
+              <input type="url" name="url" id="url">
+              <input type="button" value="{% translate "Copy link" %}">
+            </fieldset>
+          </form>
+        </div>
+        <div id="form-wrapper" hidden>
+          <form>
+            <label for="email">
+              {% translate "Enter your email address to receive the secret link:" %}
+            </label>
+            <fieldset role="group">
+              <input type="email"
+                     name="email"
+                     id="email"
+                     placeholder="{% translate "Email" %}"
+                     required>
+              <input type="submit"
+                     value="{% translate "Send me the link" %}"
+                     class="umap-action">
+            </fieldset>
+          </form>
+        </div>
       </div>
     </div>
     <ul class="buttons">

umap/templates/umap/css.html

@@ -18,10 +18,10 @@
       href="{% static 'umap/vendors/iconlayers/iconLayers.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/vars.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/font.css' %}" />
-<link rel="stylesheet" href="{% static 'umap/css/icon.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/base.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/css/popup.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/css/form.css' %}" />
+<link rel="stylesheet" href="{% static 'umap/css/icon.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/content.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/nav.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/map.css' %}" />
@@ -34,5 +34,6 @@
 <link rel="stylesheet" href="{% static 'umap/css/importers.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/css/tableeditor.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/css/bar.css' %}" />
+<link rel="stylesheet" href="{% static 'umap/css/browser.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/theme.css' %}" />
 {% endautoescape %}

umap/templates/umap/login_popup_end.html

@@ -5,19 +5,28 @@
 </h3>
 <script type="text/javascript">
   function proceed() {
-    if (window.opener?.onLogin) {
-      // We are in the normal process login
-      window.opener.onLogin()
-      window.close()
-    } else {
-      // we may be in login process that includes a magic link, so user
-      // has opened a new window from this link, and we cannot close it then.
-      window.location.href = '{% url "user_dashboard" %}'
+    if (window.BroadcastChannel) {
+      const bc = new BroadcastChannel('auth')
+      bc.onmessage = (event) => {
+        if (event.data === 'auth:close') {
+          window.close()
+        }
+      }
+      bc.postMessage('auth:ok')
     }
+    // In case the login was started in Javascript, the broadcasting would close this
+    // window, so we wait for the broadcasting to have a chance to finish the communication
+    // before trying to load the dashboard.
+    window.setTimeout(() => {
+      // We should arrive here in three situations:
+      // - the browser is older than 2022 and does not have BroadcastChannel API
+      // - the login process has opened another page/tab (like using a magic link)
+      // - the login was started from a content page (so not from the map page, and not in JS)
+      window.location.href = '{% url "user_dashboard" %}'
+    }, 1000)
   }
 
   proceed()
 // To handle errors, this template should be integrated into your authentication error message page
-// Note that you can call any window.opener function like window.opener.func
 
 </script>

umap/templates/umap/user_map_table.html

@@ -1,8 +1,8 @@
+{% load i18n %}
 <div class="wrapper">
   <div class="row">
     <div class="table-header">
       <form action="{{ request.get_full_path }}" method="get">
-        <span>
           <label class="sr-only" for="q">
             {{ label_title }}
           </label>
@@ -11,7 +11,12 @@
                  type="search"
                  placeholder="{{ label_title }}"
                  value="{{ request.GET.q|default:"" }}" />
-        </span>
+          <select name="tags">
+            <option value="">{% trans "Any category" %}</option>
+            {% for value, label in UMAP_TAGS %}
+            <option value="{{ value }}" {% if request.GET.tags == value %}selected{% endif %}>{{ label }}</option>
+            {% endfor %}
+          </select>
         <input type="submit" value="{{ submit_label }}" />
       </form>
       {% if maps.object_list|length > 1 %}

umap/tests/integration/conftest.py

@@ -24,12 +24,6 @@ def set_timeout(context):
     expect.set_options(timeout=timeout)
 
 
-@pytest.fixture(autouse=True)
-def mock_osm_tiles(page):
-    if not bool(os.environ.get("PWDEBUG", False)):
-        page.route(re.compile(r".*tile\..*"), mock_tiles)
-
-
 @pytest.fixture
 def new_page(context):
     def make_page(prefix="console"):
@@ -41,6 +35,8 @@ def new_page(context):
             else None,
         )
         page.on("pageerror", lambda exc: print(f"{prefix} uncaught exception: {exc}"))
+        if not bool(os.environ.get("PWDEBUG", os.environ.get("FORCE_TILES", False))):
+            page.route(re.compile(r".*tile\..*"), mock_tiles)
         return page
 
     yield make_page
@@ -51,6 +47,14 @@ def page(new_page):
     return new_page()
 
 
+@pytest.fixture
+def wait_for_loaded():
+    def _(page):
+        page.wait_for_function("() => U.MAP.dataloaded === true")
+
+    return _
+
+
 @pytest.fixture
 def login(new_page, settings, live_server):
     def do_login(user, **kwargs):