umap-project 3.2.0__py3-none-any.whl → 3.3.0__py3-none-any.whl

umap/static/umap/map.css

@@ -42,6 +42,31 @@ html[dir="rtl"] .leaflet-tooltip-pane>* {
     background-color: var(--color-lightGray);
 }
 
+.print-portrait,
+.print-landscape {
+    left: initial !important;
+    right: initial !important;
+    top: initial !important;
+    bottom: initial !important;
+    height: initial !important;
+}
+
+.print-a4.print-landscape {
+    aspect-ratio: 297/210;
+}
+
+.print-a4.print-portrait {
+    aspect-ratio: 210/297;
+}
+
+.print-usletter.print-landscape {
+    aspect-ratio: 11/8.5;
+}
+
+.print-usletter.print-portrait {
+    aspect-ratio: 8.5/11;
+}
+
 /* *********** */
 /* Structure   */
 /* *********** */
@@ -96,17 +121,21 @@ html[dir="rtl"] .leaflet-tooltip-pane>* {
 .leaflet-control-locate a,
 .umap-control a,
 .umap-control [type="button"] {
-    background-position: 50% 50%;
-    background-repeat: no-repeat;
     display: block;
     height: var(--control-size);
     width: var(--control-size);
     line-height: var(--control-size);
-    background-image: url('./img/24.svg');
-    text-indent: -9999px;
     margin-bottom: 0;
     background-color: white;
     min-height: initial;
+    padding: 0;
+}
+
+.leaflet-measure-control a,
+.leaflet-control-locate a {
+    background-position: 50% 50%;
+    background-repeat: no-repeat;
+    background-image: url('./img/24.svg');
 }
 
 .leaflet-control.display-on-more {
@@ -595,15 +624,6 @@ ul.photon-autocomplete {
 /* ********************************* */
 /*   Browser panel          */
 /* ********************************* */
-a.umap-control-browse,
-.umap-control-browse [type="button"] {
-    background-position: -144px -180px;
-}
-
-a.umap-control-caption,
-.umap-control-caption [type="button"] {
-    background-position: -144px -36px;
-}
 
 .leaflet-inplace-toolbar a {
     background-repeat: no-repeat;
@@ -844,15 +864,21 @@ a.umap-control-caption,
 .rules-caption .color-box {
     width: 24px;
     height: 24px;
+    line-height: 24px;
     display: inline-block;
     margin-right: var(--text-margin);
     vertical-align: middle;
+    text-align: center;
+}
+
+.rules-caption .color-box img {
+    vertical-align: middle;
 }
 
 /* ************* */
 /* Marker's Icon */
 /* ************* */
-.umap-div-icon .icon_container {
+.umap-div-icon .icon-container {
     background-color: white;
     border-radius: 4px 4px 4px 4px;
     height: 32px;
@@ -864,7 +890,7 @@ a.umap-control-caption,
     line-height: 32px;
 }
 
-.umap-div-icon.umap-icon-active .icon_container {
+.umap-div-icon.umap-icon-active .icon-container {
     border-radius: 5px;
     box-shadow: 7px 10px 10px -1px black;
     height: 36px;
@@ -875,14 +901,14 @@ a.umap-control-caption,
     width: 36px;
 }
 
-.umap-div-icon .icon_container img {
+.umap-div-icon .icon-container img {
     vertical-align: middle;
     max-width: 24px !important;
     /* leaflet.css has !important, so... */
     max-height: 24px !important;
 }
 
-.umap-div-icon .icon_arrow {
+.umap-div-icon .icon-arrow {
     border-left: 8px solid transparent;
     border-right: 8px solid transparent;
     border-top: 8px solid #2270b5;
@@ -893,11 +919,11 @@ a.umap-control-caption,
     opacity: 0.9;
 }
 
-.umap-div-icon.umap-icon-active .icon_arrow {
+.umap-div-icon.umap-icon-active .icon-arrow {
     opacity: 1.0 !important;
 }
 
-.umap-drop-icon .icon_arrow {
+.umap-drop-icon .icon-arrow {
     border-left: 10px solid transparent;
     border-right: 10px solid transparent;
     border-top: 16px solid #2270B5;
@@ -908,7 +934,7 @@ a.umap-control-caption,
     width: 0;
 }
 
-.umap-drop-icon.umap-icon-active .icon_arrow {
+.umap-drop-icon.umap-icon-active .icon-arrow {
     border-left-width: 12px;
     border-right-width: 12px;
     border-top-width: 18px;
@@ -916,7 +942,7 @@ a.umap-control-caption,
     opacity: 1.0 !important;
 }
 
-.umap-drop-icon .icon_container {
+.umap-drop-icon .icon-container {
     background-color: #2470B5;
     border-radius: 16px 16px 16px 16px;
     box-shadow: 6px 13px 8px -4px black;
@@ -927,7 +953,7 @@ a.umap-control-caption,
     width: 32px;
 }
 
-.umap-drop-icon.umap-icon-active .icon_container {
+.umap-drop-icon.umap-icon-active .icon-container {
     box-shadow: 4px 11px 10px -2px black;
     border-radius: 18px 18px 18px 18px;
     height: 36px;
@@ -938,36 +964,48 @@ a.umap-control-caption,
     width: 36px;
 }
 
-.umap-drop-icon .icon_container img {
+.umap-drop-icon .icon-container img {
     vertical-align: middle;
     max-width: 24px !important;
     max-height: 24px !important;
 }
 
-.umap-div-icon .icon_container span,
-.umap-drop-icon .icon_container span {
+.umap-div-icon .icon-container span,
+.umap-drop-icon .icon-container span {
     vertical-align: middle;
     font-weight: bold;
 }
 
 .umap-circle-icon {
-    border: 1px solid white;
-    border-radius: 10px 10px 10px 10px;
-    margin-inline-start: -6px;
-    margin-top: -6px;
+    border: 2px solid white;
+    border-radius: 50%;
     height: 12px;
     width: 12px;
 }
 
 .umap-circle-icon.umap-icon-active {
-    height: 16px;
-    margin-inline-start: -8px;
-    margin-top: -8px;
     opacity: 1.0 !important;
+    height: 16px;
     width: 16px;
 }
 
-.umap-ball-icon .icon_container {
+.umap-large-circle-icon {
+    border: 2px solid white;
+    background-color: white;
+    border-radius: 50%;
+    height: 36px;
+    width: 36px;
+    box-shadow: black 0px 0px 1px;
+    display: flex;
+    align-content: center;
+}
+
+.umap-large-circle-icon.umap-icon-active {
+    opacity: 1.0 !important;
+    box-shadow: var(--block-shadow);
+}
+
+.umap-ball-icon .icon-container {
     background-color: darkblue;
     background: radial-gradient(circle at 6px 38%, white -4px, darkblue 8px) repeat scroll 0 0 transparent;
     border-radius: 8px 8px 8px 8px;
@@ -978,7 +1016,7 @@ a.umap-control-caption,
     width: 16px;
 }
 
-.umap-ball-icon.umap-icon-active .icon_container {
+.umap-ball-icon.umap-icon-active .icon-container {
     border-radius: 10px 10px 10px 10px;
     box-shadow: 1px 23px 7px -1px black;
     margin-inline-start: -2px;
@@ -988,7 +1026,7 @@ a.umap-control-caption,
     width: 20px;
 }
 
-.umap-ball-icon .icon_arrow {
+.umap-ball-icon .icon-arrow {
     background-color: black;
     height: 16px;
     inset-inline-start: 7px;
@@ -1006,24 +1044,35 @@ a.umap-control-caption,
     cursor: not-allowed;
 }
 
-.leaflet-container .umap-raw-icon img {
-    max-height: 48px !important;
-    max-width: 48px !important;
-}
-
 .umap-raw-icon {
     display: flex;
     flex-direction: column;
     justify-content: center;
-    align-items: center;
     align-content: center;
     overflow: hidden;
 }
 
+.umap-raw-icon img {
+    object-fit: contain;
+}
+
 .umap-raw-icon.umap-icon-active {
     box-shadow: var(--block-shadow);
 }
 
+.umap-cluster-icon {
+    border-radius: 50%;
+    border: 4px solid white;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-weight: bold;
+}
+
+.leaflet-overlay-pane > svg {
+    z-index: var(--zindex-orphan-marker);
+}
+
 /* ********************************* */
 /*         Ajax loader               */
 /* ********************************* */

umap/static/umap/vars.css

@@ -61,6 +61,7 @@
     --zindex-panels: 440;
     --zindex-controls: 430;
     --zindex-dragover: 410;
+    --zindex-orphan-marker: 401;
 
     --block-shadow: 0 1px 7px var(--color-mediumGray);
 }

umap/static/umap/vendors/editable/Leaflet.Editable.js

@@ -814,6 +814,8 @@
   // 🍂namespace Editable; 🍂class BaseEditor; 🍂aka L.Editable.BaseEditor
   // When editing a feature (Marker, Polyline…), an editor is attached to it. This
   // editor basically knows how to handle the edition.
+  // 🍂option draggable: boolean = false
+  // Disable dragging of the feature while in edit mode
   L.Editable.BaseEditor = L.Handler.extend({
     initialize: function (map, feature, options) {
       L.setOptions(this, options)
@@ -854,7 +856,7 @@
 
     onFeatureAdd: function () {
       this.tools.editLayer.addLayer(this.editLayer)
-      if (this.feature.dragging) this.feature.dragging.enable()
+      if (this.feature.dragging && this.options.draggable != false) this.feature.dragging.enable()
     },
 
     hasMiddleMarkers: function () {