umap-project 1.3.7__py3-none-any.whl → 1.4.1__py3-none-any.whl

umap/models.py

@@ -131,15 +131,15 @@ class Map(NamedModel):
     PRIVATE = 3
     BLOCKED = 9
     EDIT_STATUS = (
-        (ANONYMOUS, _("Everyone can edit")),
-        (EDITORS, _("Only editors can edit")),
-        (OWNER, _("Only owner can edit")),
+        (ANONYMOUS, _("Everyone")),
+        (EDITORS, _("Editors only")),
+        (OWNER, _("Owner only")),
     )
     SHARE_STATUS = (
-        (PUBLIC, _("everyone (public)")),
-        (OPEN, _("anyone with link")),
-        (PRIVATE, _("editors only")),
-        (BLOCKED, _("blocked")),
+        (PUBLIC, _("Everyone (public)")),
+        (OPEN, _("Anyone with link")),
+        (PRIVATE, _("Editors only")),
+        (BLOCKED, _("Blocked")),
     )
     slug = models.SlugField(db_index=True)
     description = models.TextField(blank=True, null=True, verbose_name=_("description"))

umap/settings/base.py

@@ -59,6 +59,7 @@ LANGUAGES = (
     ('ar', 'Arabic'),
     ('ast', 'Asturian'),
     ('bg', 'Bulgarian'),
+    ('br', 'Breton'),
     ('ca', 'Catalan'),
     ('cs-cz', 'Czech'),
     ('da', 'Danish'),
@@ -67,6 +68,7 @@ LANGUAGES = (
     ('en', 'English'),
     ('es', 'Spanish'),
     ('et', 'Estonian'),
+    ('eu', 'Basque'),
     ('fa-ir', 'Persian (Iran)'),
     ('fi', 'Finnish'),
     ('fr', 'French'),
@@ -89,7 +91,7 @@ LANGUAGES = (
     ('pt-pt', 'Portuguese (Portugal)'),
     ('ro', 'Romanian'),
     ('ru', 'Russian'),
-    ('si-lk', 'Sinhala (Sri Lanka)'),
+    ('si', 'Sinhala'),
     ('sk-sk', 'Slovak'),
     ('sl', 'Slovenian'),
     ('sr', 'Serbian'),

umap/static/umap/content.css

@@ -282,6 +282,29 @@ ul.umap-autocomplete {
 }
 
 
+/* **************************** */
+/*           Dashboard          */
+/* **************************** */
+table.maps {
+    width: 100%;
+}
+table.maps .map_fragment {
+    height: 100px;
+    width: 100%;
+    min-width: 200px;
+}
+table.maps tbody tr:nth-child(odd) {
+    background-color: #f4f4f4;
+}
+table.maps td {
+    text-align: center;
+}
+table.maps thead tr {
+    line-height: 2em;
+}
+
+
+
 /* **************************** */
 /*   Override Leaflet.Storage   */
 /* **************************** */

umap/static/umap/img/16-white.svg

@@ -64,17 +64,19 @@
     <path id="path4353-1-6-1-3-3-9" transform="matrix(1.9 0 0 1.9 -245.02 606.04)" d="m222.11 179.64-1.0488 1.0488 1.582 1.5801-1.582 1.582 1.0488 1.0469 1.582-1.5801 1.5801 1.5801 1.0488-1.0469-1.582-1.582 1.582-1.5801-1.0488-1.0488-1.5801 1.5801z" color="#000000" color-rendering="auto" fill="#f2f2f2" fill-rule="evenodd" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke="none" style="isolation:auto;mix-blend-mode:normal;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-transform:none;white-space:normal"/>
    </g>
   </g>
-  <path id="path4873" d="m110.42 815.62v4h4v-4zm0.5371 4.5488-1.293 2.418 1.2109 0.64649 1.291-2.4199zm-1.9394 3.6289-0.28711 0.53906h-2.5176v2.3457l-4.2461 4.248 1.4141 1.4141 4.0078-4.0078h2.8242v-3.8633l0.0156-0.0293-0.0156-8e-3v-0.0996h-0.18554l-1.0098-0.53906z" color="#000000" color-rendering="auto" fill="#f2f2f2" fill-rule="evenodd" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke="#999" stroke-width=".25" style="isolation:auto;mix-blend-mode:normal;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-transform:none;white-space:normal"/>
+  <path id="path4873" d="m108.15 816.36v3.8267h3.8544v-3.8267zm0.51755 4.3517-1.2459 2.3132 1.1669 0.61848 1.244-2.3151zm-1.8689 3.4717-0.27666 0.51571h-2.426v2.2441l-4.0916 4.064 1.3626 1.3528 3.862-3.8342h2.7214v-3.6959l0.015-0.028-0.015-8e-3v-0.0953h-0.17879l-0.97303-0.51571z" color="#000000" color-rendering="auto" fill="#f2f2f2" fill-rule="evenodd" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke="#999" stroke-width=".25" style="isolation:auto;mix-blend-mode:normal;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-transform:none;white-space:normal"/>
   <g id="g4244" transform="matrix(.51357 -.54309 .54309 .51357 -518.02 506.23)">
    <path id="path4240" transform="matrix(.91922 .97205 -.97205 .91922 152.14 647.93)" d="m220.49 133.52c-0.33017 0.01-0.66239 0.0456-0.99414 0.10742-2.2249 0.41425-4.0267 1.9575-4.832 4.0098l-0.87696-1.8164a0.50005 0.50005 0 0 0-0.83398-0.11328 0.50005 0.50005 0 0 0-0.0664 0.54883l1.459 3.0195a0.50005 0.50005 0 0 0 0.60742 0.25586l2.8438-0.94532a0.50028 0.50028 0 1 0-0.31641-0.94922l-2.002 0.66797c0.61312-1.8902 2.2073-3.3241 4.2012-3.6953 2.2474-0.41845 4.5146 0.59912 5.6953 2.5566 1.1807 1.9575 1.022 4.4377-0.39648 6.2305-1.4185 1.7928-3.7961 2.5154-5.9727 1.8164a0.50005 0.50005 0 1 0-0.30469 0.95117c2.5704 0.82539 5.3874-0.0294 7.0625-2.1465 0.4188-0.52924 0.74532-1.1114 0.97657-1.7207 0.69373-1.828 0.53599-3.9147-0.50977-5.6484-1.22-2.0227-3.4291-3.1977-5.7402-3.1289z" color="#000000" color-rendering="auto" fill="#f2f2f2" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke="#999" stroke-linecap="round" stroke-linejoin="round" stroke-width=".25" style="isolation:auto;mix-blend-mode:normal;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-transform:none;white-space:normal"/>
   </g>
-  <g id="g4140" transform="translate(-88,-64)">
+  <g id="delete-vertex" transform="translate(-90,-64)">
    <path id="path4349-2-2-9-3-8-3-5" transform="translate(0 852.36)" d="m227.55 53.105-6.0547 3.0273h-3.4414v3.5176l-2.9512 5.9023 1.7891 0.89453 3.1562-6.3145h2.0059v-2.043l6.3906-3.1953z" color="#000000" color-rendering="auto" fill="#f2f2f2" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke="#999" stroke-width=".25" style="isolation:auto;mix-blend-mode:normal;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-transform:none;white-space:normal"/>
    <path id="path4353-1-6-1-3-5-1-9" d="m217 907.36 6 6" fill="none" stroke="#fff" stroke-width="2.482"/>
    <path id="path4353-1-6-1-3-5-1" d="m217 907.36 6 6" fill="none" stroke="#4d4d4d" stroke-width="1.4822"/>
   </g>
-  <path id="path4349-2-2-9-3-8-9" d="m135.12 817.45-1.4688 13.336 1.9883 0.21875 1.4668-13.336z" color="#000000" color-rendering="auto" fill="#f2f2f2" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke="#999" stroke-width=".25" style="isolation:auto;mix-blend-mode:normal;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-transform:none;white-space:normal"/>
-  <path id="path4349-2-2-3-3-3" d="m129.66 830.95-2.4614-13.189" fill="none" stroke="#808080" stroke-width="2"/>
+  <g id="split-line">
+   <path id="path4349-2-2-9-3-8-9" d="m135.12 817.45-1.4688 13.336 1.9883 0.21875 1.4668-13.336z" color="#000000" color-rendering="auto" fill="#f2f2f2" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke="#999" stroke-width=".25" style="isolation:auto;mix-blend-mode:normal;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-transform:none;white-space:normal"/>
+   <path id="path4349-2-2-3-3-3" d="m129.66 830.95-2.4614-13.189" fill="none" stroke="#808080" stroke-width="2"/>
+  </g>
   <g id="g4621-0-6-2" transform="translate(-73.385 -72.287)" fill="#4d4d4d">
    <g id="g4400-8-39-2-3-1-1-8-9" transform="matrix(.57449 0 0 .57449 77.91 445.57)" fill-rule="evenodd" stroke="#4d4d4d" stroke-width="4.2244">
     <path id="path4353-1-6-1-3-6-5-5-7" d="m175.81 948.25 8.3885 8.3497"/>

umap/static/umap/img/16.svg

@@ -127,15 +127,17 @@
    <path id="path4873-4" d="m107.03 825.28-6.3585 6.3585" fill="none" stroke="#464646" stroke-width="2"/>
    <rect id="continue-line" x="104.21" y="824.34" width="4" height="4" fill="#464646"/>
   </g>
-  <g id="g4140" transform="translate(-86,-66)">
+  <g id="delete-vertex" transform="translate(-90,-64)">
    <path id="path4349-2-2-9-3-8-3-5" d="m216 918.36 4-8" fill="none" stroke="#808080" stroke-width="2"/>
    <path id="path4349-2-2-9-3-8-3-8" d="m220 910.36 8-4" fill="none" stroke="#808080" stroke-width="2"/>
    <rect id="rect4918-1" x="218.06" y="908.49" width="4" height="4" fill="#808080"/>
    <path id="path4353-1-6-1-3-5-1-9" d="m217 907.36 6 6" fill="none" stroke="#fff" stroke-width="2.482"/>
    <path id="path4353-1-6-1-3-5-1" d="m217 907.36 6 6" fill="none" stroke="#4d4d4d" stroke-width="1.4822"/>
   </g>
-  <path id="path4349-2-2-9-3-8-9" d="m136.64 830.89 1.4677-13.336" fill="none" stroke="#464646" stroke-width="2"/>
-  <path id="path4349-2-2-3-3-3" d="m131.66 830.95-2.4614-13.189" fill="none" stroke="#808080" stroke-width="2"/>
+  <g id="split-line" fill="none" stroke-width="2">
+   <path id="path4349-2-2-9-3-8-9" d="m134.64 830.89 1.4677-13.336" stroke="#464646"/>
+   <path id="path4349-2-2-3-3-3" d="m129.66 830.95-2.4614-13.189" stroke="#808080"/>
+  </g>
   <path id="delete-disabled" d="m131 937.36v1c-1.4286 0-3.2857 0.5999-4 2v1h10v-1c-0.71429-1.4001-2.5714-2-4-2v-1zm-4 5 2 9h6l2-9z" fill="#b3b3b3"/>
  </g>
 </svg>

umap/static/umap/img/source/16-white.svg

@@ -3,7 +3,7 @@
 
 <svg width="144" height="144" id="svg2" version="1.1" inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" sodipodi:docname="16-white.svg" inkscape:export-filename="16-white.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs id="defs4" />
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="3.9131365" inkscape:cx="46.382231" inkscape:cy="119.72493" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" inkscape:window-width="1920" inkscape:window-height="1019" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" showguides="true" inkscape:guide-bbox="true" inkscape:snap-grids="true" inkscape:snap-to-guides="true" inkscape:showpageshadow="2" inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="3.9131365" inkscape:cx="47.659978" inkscape:cy="71.17053" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" inkscape:window-width="1920" inkscape:window-height="1019" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" showguides="true" inkscape:guide-bbox="true" inkscape:snap-grids="true" inkscape:snap-to-guides="true" inkscape:showpageshadow="2" inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1">
     <inkscape:grid type="xygrid" id="grid3004" empspacing="4" visible="true" enabled="true" snapvisiblegridlinesonly="true" originx="0" originy="0" />
     <sodipodi:guide orientation="-1,0" position="24,144" id="guide3084" inkscape:locked="false" inkscape:label="" inkscape:color="rgb(0,134,229)" />
     <sodipodi:guide orientation="0,1" position="0,72" id="guide3086" inkscape:locked="false" inkscape:label="" inkscape:color="rgb(0,134,229)" />
@@ -85,17 +85,19 @@
         <path inkscape:connector-curvature="0" id="path4353-1-6-1-3-3-9" transform="matrix(1.9000195,0,0,1.9000195,-245.02393,606.04174)" d="m 222.11328,179.64258 -1.04883,1.04883 1.58203,1.58007 -1.58203,1.58204 1.04883,1.04687 1.58203,-1.58008 1.58008,1.58008 1.04883,-1.04687 -1.58203,-1.58204 1.58203,-1.58007 -1.04883,-1.04883 -1.58008,1.58008 z" style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f2f2f2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.81628;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       </g>
     </g>
-    <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f2f2f2;fill-opacity:1;fill-rule:evenodd;stroke:#999999;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 110.41602,815.62195 v 4 h 4 v -4 z m 0.5371,4.54882 -1.29296,2.41797 1.21093,0.64649 1.29102,-2.41992 z m -1.93945,3.62891 -0.28711,0.53906 h -2.51758 v 2.34571 l -4.24609,4.24804 1.41406,1.41407 4.00782,-4.00782 h 2.82421 v -3.86328 l 0.0156,-0.0293 -0.0156,-0.008 v -0.0996 h -0.18554 l -1.00977,-0.53906 z" id="path4873" inkscape:connector-curvature="0" />
+    <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f2f2f2;fill-opacity:1;fill-rule:evenodd;stroke:#999999;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 108.14555,816.36218 v 3.8267 h 3.85445 v -3.8267 z m 0.51755,4.35174 -1.24591,2.31321 1.16687,0.61848 1.24404,-2.31507 z m -1.86888,3.47168 -0.27666,0.51571 h -2.42597 v 2.24408 l -4.09159,4.06399 1.36261,1.3528 3.86198,-3.83417 h 2.72145 v -3.6959 l 0.015,-0.028 -0.015,-0.008 v -0.0953 h -0.17879 l -0.97303,-0.51571 z" id="path4873" inkscape:connector-curvature="0" />
     <g id="g4244" transform="matrix(0.51357238,-0.54309229,0.54309229,0.51357238,-518.0199,506.22551)">
       <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f2f2f2;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 220.49219,133.52344 c -0.33017,0.01 -0.66239,0.0456 -0.99414,0.10742 -2.22487,0.41425 -4.02666,1.95747 -4.83203,4.00976 l -0.87696,-1.8164 a 0.50004998,0.50004998 0 0 0 -0.83398,-0.11328 0.50004998,0.50004998 0 0 0 -0.0664,0.54883 l 1.45899,3.01953 a 0.50004998,0.50004998 0 0 0 0.60742,0.25586 l 2.84375,-0.94532 a 0.50028339,0.50028339 0 1 0 -0.31641,-0.94922 l -2.00195,0.66797 c 0.61312,-1.89015 2.20733,-3.32407 4.20117,-3.69531 2.24744,-0.41845 4.51458,0.59912 5.69531,2.55664 1.18073,1.95754 1.02202,4.43774 -0.39648,6.23047 -1.41851,1.79275 -3.79606,2.51535 -5.97266,1.81641 a 0.50004998,0.50004998 0 1 0 -0.30469,0.95117 c 2.57038,0.82539 5.38736,-0.0294 7.0625,-2.14649 0.4188,-0.52924 0.74532,-1.11137 0.97657,-1.7207 0.69373,-1.828 0.53599,-3.91467 -0.50977,-5.64844 -1.22005,-2.02271 -3.42908,-3.19767 -5.74023,-3.1289 z" transform="matrix(0.91921787,0.9720541,-0.9720541,0.91921787,152.1356,647.93271)" id="path4240" inkscape:connector-curvature="0" />
     </g>
-    <g id="g4140" transform="translate(-88,-64)">
+    <g id="delete-vertex" transform="translate(-90,-64)">
       <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f2f2f2;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 227.55273,53.105469 -6.05468,3.027343 h -3.44141 v 3.517579 l -2.95117,5.902343 1.78906,0.894532 3.15625,-6.314454 h 2.00586 v -2.042968 l 6.39063,-3.195313 z" transform="translate(0,852.36218)" id="path4349-2-2-9-3-8-3-5" inkscape:connector-curvature="0" />
       <path sodipodi:nodetypes="cc" style="fill:none;stroke:#ffffff;stroke-width:2.482;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 217,907.36218 6,6" id="path4353-1-6-1-3-5-1-9" inkscape:connector-curvature="0" />
       <path sodipodi:nodetypes="cc" style="fill:none;stroke:#4d4d4d;stroke-width:1.48224;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 217,907.36218 6,6" id="path4353-1-6-1-3-5-1" inkscape:connector-curvature="0" />
     </g>
-    <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f2f2f2;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 135.11523,817.44531 -1.46875,13.33594 1.98829,0.21875 1.46679,-13.33594 z" id="path4349-2-2-9-3-8-9" inkscape:connector-curvature="0" />
-    <path style="fill:none;stroke:#808080;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 129.65868,830.95182 -2.4614,-13.1887" id="path4349-2-2-3-3-3" inkscape:connector-curvature="0" />
+    <g id="split-line">
+      <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f2f2f2;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 135.11523,817.44531 -1.46875,13.33594 1.98829,0.21875 1.46679,-13.33594 z" id="path4349-2-2-9-3-8-9" inkscape:connector-curvature="0" />
+      <path style="fill:none;stroke:#808080;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 129.65868,830.95182 -2.4614,-13.1887" id="path4349-2-2-3-3-3" inkscape:connector-curvature="0" />
+    </g>
     <g id="g4621-0-6-2" transform="translate(-73.384659,-72.287334)" style="fill:#4d4d4d;fill-opacity:1">
       <g style="fill:#4d4d4d;fill-opacity:1;stroke:#ffffff;stroke-width:4.22442;stroke-miterlimit:4;stroke-dasharray:none" transform="matrix(0.57449139,0,0,0.57449139,77.909804,445.56677)" id="g4400-8-39-2-3-1-1-8-9">
         <path sodipodi:nodetypes="cc" style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:4.22442;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 175.80573,948.24562 8.38854,8.34969" id="path4353-1-6-1-3-6-5-5-7" inkscape:connector-curvature="0" />

umap/static/umap/img/source/16.svg

@@ -3,7 +3,7 @@
 
 <svg width="144" height="144" id="svg2" version="1.1" inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" sodipodi:docname="16.svg" inkscape:export-filename="/home/ybon/Code/js/Leaflet.Storage/src/img/16.png" inkscape:export-xdpi="89.996864" inkscape:export-ydpi="89.996864" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs id="defs4" />
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="6.4903658" inkscape:cx="86.743955" inkscape:cy="60.320175" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" inkscape:window-width="1920" inkscape:window-height="1019" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" showguides="true" inkscape:guide-bbox="true" inkscape:snap-grids="true" inkscape:snap-to-guides="true" inkscape:showpageshadow="2" inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="6.4903658" inkscape:cx="86.975067" inkscape:cy="60.628324" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" inkscape:window-width="1920" inkscape:window-height="1019" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" showguides="true" inkscape:guide-bbox="true" inkscape:snap-grids="true" inkscape:snap-to-guides="true" inkscape:showpageshadow="2" inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1">
     <inkscape:grid type="xygrid" id="grid3004" empspacing="4" visible="true" enabled="true" snapvisiblegridlinesonly="true" originx="0" originy="0" />
     <sodipodi:guide orientation="-1,0" position="24,144" id="guide3084" inkscape:locked="false" inkscape:label="" inkscape:color="rgb(0,134,229)" />
     <sodipodi:guide orientation="0,1" position="0,96" id="guide3086" inkscape:locked="false" inkscape:label="" inkscape:color="rgb(0,134,229)" />
@@ -145,15 +145,17 @@
       <path style="fill:none;fill-rule:evenodd;stroke:#464646;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" d="m 107.02836,825.2798 -6.35851,6.35851" id="path4873-4" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" />
       <rect style="fill:#464646;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1" id="continue-line" width="4" height="4" x="104.20859" y="824.3382" />
     </g>
-    <g id="g4140" transform="translate(-86,-66)">
+    <g id="delete-vertex" transform="translate(-90,-64)">
       <path sodipodi:nodetypes="cc" style="fill:none;stroke:#808080;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 216,918.36218 4,-8" id="path4349-2-2-9-3-8-3-5" inkscape:connector-curvature="0" />
       <path sodipodi:nodetypes="cc" style="fill:none;stroke:#808080;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 220,910.36218 8,-4" id="path4349-2-2-9-3-8-3-8" inkscape:connector-curvature="0" />
       <rect style="fill:#808080;fill-opacity:1;stroke:none" id="rect4918-1" width="4" height="4" x="218.05635" y="908.49438" />
       <path sodipodi:nodetypes="cc" style="fill:none;stroke:#ffffff;stroke-width:2.482;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 217,907.36218 6,6" id="path4353-1-6-1-3-5-1-9" inkscape:connector-curvature="0" />
       <path sodipodi:nodetypes="cc" style="fill:none;stroke:#4d4d4d;stroke-width:1.48224;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 217,907.36218 6,6" id="path4353-1-6-1-3-5-1" inkscape:connector-curvature="0" />
     </g>
-    <path style="fill:none;stroke:#464646;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 136.64055,830.8915 1.46774,-13.3359" id="path4349-2-2-9-3-8-9" inkscape:connector-curvature="0" />
-    <path style="fill:none;stroke:#808080;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 131.65868,830.95182 -2.4614,-13.1887" id="path4349-2-2-3-3-3" inkscape:connector-curvature="0" />
+    <g id="split-line">
+      <path style="fill:none;stroke:#464646;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 134.64055,830.8915 1.46774,-13.3359" id="path4349-2-2-9-3-8-9" inkscape:connector-curvature="0" />
+      <path style="fill:none;stroke:#808080;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 129.65868,830.95182 -2.4614,-13.1887" id="path4349-2-2-3-3-3" inkscape:connector-curvature="0" />
+    </g>
     <path style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 131,937.36218 v 1 c -1.42857,0 -3.28571,0.5999 -4,2 v 1 h 10 v -1 c -0.71429,-1.4001 -2.57143,-2 -4,-2 v -1 z m -4,5 2,9 h 6 l 2,-9 z" id="delete-disabled" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccc" inkscape:label="" />
   </g>
 </svg>

umap/static/umap/js/umap.controls.js

@@ -472,7 +472,7 @@ L.U.DataLayersControl = L.Control.extend({
 
     if (L.Browser.pointer) {
       L.DomEvent.disableClickPropagation(container)
-      L.DomEvent.on(container, 'mousewheel', L.DomEvent.stopPropagation)
+      L.DomEvent.on(container, 'wheel', L.DomEvent.stopPropagation)
       L.DomEvent.on(container, 'MozMousePixelScroll', L.DomEvent.stopPropagation)
     }
     if (!L.Browser.touch) {
@@ -1019,6 +1019,39 @@ L.U.Map.include({
     this.ui.openPanel({ data: { html: container }, actions: actions })
   },
 
+  EXPORT_TYPES: {
+    geojson: {
+      formatter: function (map) {
+        return JSON.stringify(map.toGeoJSON(), null, 2)
+      },
+      ext: '.geojson',
+      filetype: 'application/json',
+    },
+    gpx: {
+      formatter: function (map) {
+        return togpx(map.toGeoJSON())
+      },
+      ext: '.gpx',
+      filetype: 'application/xml',
+    },
+    kml: {
+      formatter: function (map) {
+        return tokml(map.toGeoJSON())
+      },
+      ext: '.kml',
+      filetype: 'application/vnd.google-earth.kml+xml',
+    },
+    umap: {
+      name: L._('Full map data'),
+      formatter: function (map) {
+        return map.serialize()
+      },
+      ext: '.umap',
+      filetype: 'application/json',
+      selected: true,
+    },
+  },
+
   renderShareBox: function () {
     const container = L.DomUtil.create('div', 'umap-share')
     const embedTitle = L.DomUtil.add('h4', '', container, L._('Embed the map'))
@@ -1091,66 +1124,36 @@ L.U.Map.include({
       else exportCaveat.style.display = 'inherit'
     }
     L.DomEvent.on(typeInput, 'change', toggleCaveat)
-    const types = {
-      geojson: {
-        formatter: function (map) {
-          return JSON.stringify(map.toGeoJSON(), null, 2)
-        },
-        ext: '.geojson',
-        filetype: 'application/json',
-      },
-      gpx: {
-        formatter: function (map) {
-          return togpx(map.toGeoJSON())
-        },
-        ext: '.gpx',
-        filetype: 'application/xml',
-      },
-      kml: {
-        formatter: function (map) {
-          return tokml(map.toGeoJSON())
-        },
-        ext: '.kml',
-        filetype: 'application/vnd.google-earth.kml+xml',
-      },
-      umap: {
-        name: L._('Full map data'),
-        formatter: function (map) {
-          return map.serialize()
-        },
-        ext: '.umap',
-        filetype: 'application/json',
-        selected: true,
-      },
-    }
-    for (const key in types) {
-      if (types.hasOwnProperty(key)) {
+    for (const key in this.EXPORT_TYPES) {
+      if (this.EXPORT_TYPES.hasOwnProperty(key)) {
         option = L.DomUtil.create('option', '', typeInput)
         option.value = key
-        option.textContent = types[key].name || key
-        if (types[key].selected) option.selected = true
+        option.textContent = this.EXPORT_TYPES[key].name || key
+        if (this.EXPORT_TYPES[key].selected) option.selected = true
       }
     }
     toggleCaveat()
     const download = L.DomUtil.create('a', 'button', container)
     download.textContent = L._('Download data')
-    L.DomEvent.on(
-      download,
-      'click',
-      () => {
-        const type = types[typeInput.value]
-        const content = type.formatter(this)
-        let name = this.options.name || 'data'
-        name = name.replace(/[^a-z0-9]/gi, '_').toLowerCase()
-        download.download = name + type.ext
-        window.URL = window.URL || window.webkitURL
-        const blob = new Blob([content], { type: type.filetype })
-        download.href = window.URL.createObjectURL(blob)
-      },
-      this
-    )
+    L.DomEvent.on(download, 'click', () => this.download(typeInput.value), this)
     this.ui.openPanel({ data: { html: container } })
   },
+
+  download: function (mode) {
+    const type = this.EXPORT_TYPES[mode || 'umap']
+    const content = type.formatter(this)
+    let name = this.options.name || 'data'
+    name = name.replace(/[^a-z0-9]/gi, '_').toLowerCase()
+    window.URL = window.URL || window.webkitURL
+    const blob = new Blob([content], { type: type.filetype })
+    const el = document.createElement('a')
+    el.download = name + type.ext
+    el.href = window.URL.createObjectURL(blob)
+    el.style.display = 'none'
+    document.body.appendChild(el)
+    el.click()
+    document.body.removeChild(el)
+  },
 })
 
 L.U.TileLayerControl = L.Control.extend({

umap/static/umap/js/umap.features.js

@@ -580,6 +580,20 @@ L.U.Marker = L.Marker.extend({
     this.resetTooltip()
   },
 
+  _getTooltipAnchor: function () {
+    const anchor = this.options.icon.options.tooltipAnchor,
+      direction = this.getOption('labelDirection')
+    if (direction === 'left') {
+      anchor.x *= -1
+    } else if (direction === 'bottom') {
+      anchor.x = 0
+      anchor.y = 0
+    } else if (direction === 'top') {
+      anchor.x = 0
+    }
+    return anchor
+  },
+
   disconnectFromDataLayer: function (datalayer) {
     this.options.icon.datalayer = null
     L.U.FeatureMixin.disconnectFromDataLayer.call(this, datalayer)

umap/static/umap/js/umap.js

@@ -91,12 +91,8 @@ L.U.Map.include({
 
     this.ui = new L.U.UI(this._container)
     this.xhr = new L.U.Xhr(this.ui)
-    this.xhr.on('dataloding', function (e) {
-      this.fire('dataloding', e)
-    })
-    this.xhr.on('datalaod', function (e) {
-      this.fire('datalaod', e)
-    })
+    this.xhr.on('dataloading',  (e) => this.fire('dataloading', e))
+    this.xhr.on('dataload', (e) => this.fire('dataload', e))
 
     this.initLoader()
     this.name = this.options.name
@@ -255,13 +251,16 @@ L.U.Map.include({
     }
     this.initShortcuts()
     this.onceDatalayersLoaded(function () {
-      if (this.options.onLoadPanel === 'databrowser') this.openBrowser()
+      if (L.Util.queryString('share')) this.renderShareBox()
+      else if (this.options.onLoadPanel === 'databrowser') this.openBrowser()
       else if (this.options.onLoadPanel === 'caption') this.displayCaption()
       else if (this.options.onLoadPanel === 'datafilters') this.openFilter()
     })
     this.onceDataLoaded(function () {
       const slug = L.Util.queryString('feature')
       if (slug && this.features_index[slug]) this.features_index[slug].view()
+      if (L.Util.queryString('edit')) this.enableEdit()
+      if (L.Util.queryString('download')) this.download()
     })
 
     window.onbeforeunload = (e) => {

umap/static/umap/js/umap.layer.js

@@ -976,7 +976,7 @@ L.U.DataLayer = L.Evented.extend({
   buildVersionsFieldset: function (container) {
     const appendVersion = function (data) {
       const date = new Date(parseInt(data.at, 10))
-      const content = `${date.toLocaleDateString(L.locale)} (${
+      const content = `${date.toLocaleString(L.lang)} (${
         parseInt(data.size) / 1000
       }Kb)`
       const el = L.DomUtil.create('div', 'umap-datalayer-version', versionsContainer)
@@ -1060,7 +1060,7 @@ L.U.DataLayer = L.Evented.extend({
   },
 
   isVisible: function () {
-    return this.map.hasLayer(this.layer)
+    return this.layer && this.map.hasLayer(this.layer)
   },
 
   canBrowse: function () {

umap/static/umap/js/umap.permissions.js

@@ -35,13 +35,13 @@ L.U.MapPermissions = L.Class.extend({
   isOwner: function () {
     return (
       this.map.options.user &&
-      this.map.options.permissions.owner &&
-      this.map.options.user.id == this.map.options.permissions.owner.id
+      this.map.permissions.options.owner &&
+      this.map.options.user.id == this.map.permissions.options.owner.id
     )
   },
 
   isAnonymousMap: function () {
-    return !this.map.options.permissions.owner
+    return !this.map.permissions.options.owner
   },
 
   getMap: function () {

umap/static/umap/js/umap.ui.js

@@ -11,7 +11,7 @@ L.U.UI = L.Evented.extend({
     this.container = L.DomUtil.create('div', 'leaflet-ui-container', this.parent)
     L.DomEvent.disableClickPropagation(this.container)
     L.DomEvent.on(this.container, 'contextmenu', L.DomEvent.stopPropagation) // Do not activate our custom context menu.
-    L.DomEvent.on(this.container, 'mousewheel', L.DomEvent.stopPropagation)
+    L.DomEvent.on(this.container, 'wheel', L.DomEvent.stopPropagation)
     L.DomEvent.on(this.container, 'MozMousePixelScroll', L.DomEvent.stopPropagation)
     this._panel = L.DomUtil.create('div', '', this.container)
     this._panel.id = 'umap-ui-container'