umap-project 2.8.2__py3-none-any.whl → 2.9.0__py3-none-any.whl

umap/static/umap/map.css

@@ -102,12 +102,12 @@ html[dir="rtl"] .leaflet-tooltip-pane > * {
 .umap-control-more,
 .umap-control-less {
     background-image: url('./img/24-white.svg');
-    background-position: -72px -366px;
+    background-position: -72px -402px;
     text-indent: -9999px;
     margin-bottom: 0;
 }
 .umap-control-less {
-    background-position: -108px -366px;
+    background-position: -108px -402px;
 }
 .umap-more-controls .display-on-more,
 .umap-more-controls .umap-control-less {
@@ -134,12 +134,6 @@ html[dir="rtl"] .leaflet-tooltip-pane > * {
     background-position: -72px -144px;
     box-shadow: 0 0 4px 0 black inset;
 }
-.leaflet-control-star [type="button"] {
-    background-position: -144px -144px;
-}
-.leaflet-control-star.starred [type="button"] {
-    background-position: -108px -144px;
-}
 .leaflet-control-search [type="button"] {
     background-position: -36px -108px;
     display: block;
@@ -183,7 +177,6 @@ html[dir="rtl"] .leaflet-tooltip-pane > * {
     line-height: var(--control-size);
     display: block;
 }
-.leaflet-control-toolbar .leaflet-toolbar-icon.dark:hover,
 .edit-enable [type="button"]:hover {
     background-color: #4d5759;
 }
@@ -324,7 +317,6 @@ ul.photon-autocomplete {
 .leaflet-editable-drawing {
     cursor: crosshair;
 }
-.leaflet-control-toolbar > li > .leaflet-toolbar-icon,
 .umap-toolbar a,
 .umap-toolbar a:hover {
     height: var(--control-size);
@@ -338,9 +330,6 @@ ul.photon-autocomplete {
     background-image: url('./img/24.svg');
     background-size: auto auto;
 }
-.leaflet-control-toolbar li .leaflet-toolbar-icon.dark {
-    background-image: url('./img/24-white.svg');
-}
 .umap-toolbar {
     margin-top: 0;
 }
@@ -387,11 +376,13 @@ ul.photon-autocomplete {
 .umap-toolbar .umap-draw-polygon-multi {
     background-position: 0 -108px;
 }
-.umap-edit-enabled .leaflet-control-toolbar > li > .leaflet-toolbar-icon,
 .umap-edit-enabled .umap-toolbar a {
     display: block;
 }
-
+.leaflet-middle-icon,
+.leaflet-vertex-icon {
+    border-radius: 50%;
+}
 
 /* ********************************* */
 /*   Third party plugin override     */
@@ -429,10 +420,10 @@ ul.photon-autocomplete {
     width: 16px;
     height: 16px;
     margin-inline-start: 5px;
-    background-position: -4px -4px;
+    background-position: 2px -4px;
     background-repeat: no-repeat;
     background-image: url('./img/16.svg');
-    background-color: var(--color-darkGray) !important;
+    background-color: transparent !important;
     vertical-align: middle;
     text-indent: -9999px;
     min-height: inherit;
@@ -447,31 +438,8 @@ ul.photon-autocomplete {
     border-top: 1px solid #aaa;
     padding-top: 10px;
 }
-.umap-edit-actions {
-    padding-top: 5px;
-    clear: both;
-}
-.umap-edit-actions li {
-    height: var(--control-size);
-    line-height: var(--control-size);
-    cursor: pointer;
-    margin-bottom: 5px;
-    border-radius: 2px;
-    border: 1px solid #222;
-}
-.umap-edit-actions li i {
-    background-image: url('./img/24-white.svg');
-    background-repeat: no-repeat;
-    display: table-cell;
-    width: var(--control-size);
-    height: var(--control-size);
-}
-.umap-edit-actions li span {
-    display: table-cell;
-    vertical-align: middle;
-}
-.umap-edit-actions li:hover {
-    background-color: #353c3e;
+.umap-getstarted button {
+    width: 100%;
 }
 .umap-help {
     font-style: italic;
@@ -510,9 +478,6 @@ ul.photon-autocomplete {
 .layer-edit {
     background-position: -50px -49px;
 }
-.umap-toggle-edit {
-    background-position: -44px -48px;
-}
 .readonly .layer-edit,
 .off .layer-edit {
     background-position: -50px -73px;
@@ -521,28 +486,6 @@ ul.photon-autocomplete {
 .off .layer-delete {
     background-position: -122px -121px;
 }
-.umap-new-hole {
-    background-position: -71px -94px;
-}
-.umap-delete-one-of-multi {
-    background-position: -97px -70px;
-}
-.umap-delete-all,
-.umap-delete-one-of-one {
-    background-position: -119px -48px;
-}
-.umap-delete-vertex {
-    background-position: -119px -94px;
-}
-.umap-continue-line {
-    background-position: -96px 1px;
-}
-.umap-split-line {
-    background-position: -119px -22px;
-}
-.umap-extract-shape-from-multi{
-    background-position: -119px 2px;
-}
 .umap-browser .feature-title {
     width: inherit;
     cursor: inherit;
@@ -574,11 +517,11 @@ ul.photon-autocomplete {
 /* ********************************* */
 a.umap-control-browse,
 .umap-control-browse [type="button"] {
-    background-position: -36px -72px;
+    background-position: -144px -180px;
 }
 a.umap-control-caption,
 .umap-control-caption [type="button"] {
-    background-position: -72px -72px;
+    background-position: -144px -36px;
 }
 .leaflet-inplace-toolbar a {
     background-repeat: no-repeat;
@@ -694,8 +637,18 @@ a.umap-control-caption,
 .datalayer-name {
     cursor: pointer;
 }
-.umap-caption .umap-map-author {
-    padding-inline-start: 31px;
+.umap-caption .dates {
+    color: var(--color-mediumGray);
+}
+.umap-caption .header {
+    display: flex;
+}
+.umap-caption .header i.icon {
+    flex-shrink: 0;
+}
+.umap-caption hgroup p,
+.umap-caption hgroup button {
+    margin: 0;
 }
 .umap-browser .main-toolbox {
     padding-left: 4px; /* Align with toolbox below  */
@@ -713,7 +666,7 @@ a.umap-control-caption,
 /*      Tilelayer switcher           */
 /* ********************************* */
 
-.umap-tilelayer-switcher-container li {
+.umap-edit-tilelayers li {
     border: 1px solid rgb(116, 116, 116);
     border-radius: 4px 4px 4px 4px;
     margin-bottom: 14px;
@@ -725,7 +678,7 @@ a.umap-control-caption,
     margin-left: auto;
     margin-right: auto;
 }
-.umap-tilelayer-switcher-container li div {
+.umap-edit-tilelayers li div {
     background-color: rgb(116, 116, 116);
     bottom: 0;
     color: rgb(247, 246, 241);
@@ -737,8 +690,8 @@ a.umap-control-caption,
     width: 100%;
     text-align: center;
 }
-.umap-tilelayer-switcher-container li:hover div:before,
-.umap-tilelayer-switcher-container .selected div:before {
+.umap-edit-tilelayers li:hover div:before,
+.umap-edit-tilelayers .selected div:before {
     content: "✓";
     font-size: 1.3em;
     line-height: 56px;
@@ -746,7 +699,7 @@ a.umap-control-caption,
     position: absolute;
     inset-inline-start: 7px;
 }
-.umap-tilelayer-switcher-container li img {
+.umap-edit-tilelayers li img {
     display: block;
     max-width: 100%;
 }

umap/static/umap/nav.css

@@ -27,6 +27,10 @@ footer a.branding {
     font-weight: bold;
     padding-inline-start: 70px;
     display: inline-block;
+    text-decoration: none;
+}
+footer a.branding:hover {
+    text-decoration: underline;
 }
 html[dir="rtl"] footer a.branding {
   background-position: right center;
@@ -41,7 +45,7 @@ footer .i18n_switch {
     display: flex;
     flex-direction: column;
 }
-.umap-nav a {
+.umap-nav a:not(.button) {
     color: var(--color-darkBlue);
     padding: .4rem;
 }
@@ -51,7 +55,7 @@ footer .i18n_switch {
 .umap-nav h1 {
     margin-bottom: 0;
 }
-.umap-nav h1 a {
+.umap-nav h1 a:not(.button) {
     background-image: url("./img/logo.svg");
     background-position: left center;
     background-repeat: no-repeat;
@@ -74,7 +78,6 @@ html[dir="rtl"] .umap-nav h1 a {
 .umap-nav .button,
 .umap-nav .button:hover {
     text-decoration: none;
-    min-width: 150px;
     margin-inline-start: 1rem;
 }
 

umap/static/umap/unittests/utils.js

@@ -54,6 +54,13 @@ describe('Utils', () => {
       )
     })
 
+    it('should handle links with another url in path', () => {
+      assert.equal(
+        Utils.toHTML('A simple https://osm.org/https://anotherurl.com link'),
+        'A simple <a href="https://osm.org/https://anotherurl.com" target="_blank">https://osm.org/https://anotherurl.com</a> link'
+      )
+    })
+
     it('should handle simple link inside parenthesis', () => {
       assert.equal(
         Utils.toHTML('A simple link (http://osm.org)'),
@@ -172,6 +179,13 @@ describe('Utils', () => {
       )
     })
 
+    it('http link with http link as in path', () => {
+      assert.equal(
+        Utils.toHTML('A phrase with a [[https://iframeurl.com/https://another.com]].'),
+        'A phrase with a <a href="https://iframeurl.com/https://another.com" target="_blank">https://iframeurl.com/https://another.com</a>.'
+      )
+    })
+
     it('simple bullet points', () => {
       assert.equal(
         Utils.toHTML('* First point\n* Second point\n* Last point'),

umap/static/umap/vars.css

@@ -24,6 +24,8 @@
     --button-primary-color: var(--color-darkBlue);
     --button-neutral-background: var(--color-lightGray);
     --button-neutral-color: var(--color-darkGray);
+    --button-padding: 8px 16px;
+    --button-padding-small: 2px 8px;
 
     /* Sizes and spaces */
     --gutter: 8px;
@@ -38,6 +40,7 @@
     --control-size: 36px;
     --border-radius: 4px;
     --box-padding: 20px;
+    --small-box-padding: 4px;
     --box-margin: 14px;
     --text-margin: 7px;