umap-project 2.4.0__tar.gz → 2.4.0b1__tar.gz

{umap_project-2.4.0 → umap_project-2.4.0b1}/.gitignore

@@ -22,6 +22,3 @@ dist/
 *.egg-info/
 playwright/.auth/
 test-results/
-
-### Transifex ###
-tx

{umap_project-2.4.0 → umap_project-2.4.0b1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.1
 Name: umap-project
-Version: 2.4.0
+Version: 2.4.0b1
 Summary: Create maps with OpenStreetMap layers in a minute and embed them in your site.
 Author-email: Yohan Boniface <yb@enix.org>
 Maintainer-email: David Larlet <david@larlet.fr>
@@ -22,7 +22,7 @@ Requires-Dist: django-probes==1.7.0
 Requires-Dist: django==5.0.6
 Requires-Dist: pillow==10.3.0
 Requires-Dist: psycopg==3.1.19
-Requires-Dist: pydantic==2.7.4
+Requires-Dist: pydantic==2.7.3
 Requires-Dist: rcssmin==1.1.2
 Requires-Dist: requests==2.32.3
 Requires-Dist: rjsmin==1.2.2
@@ -33,11 +33,11 @@ Provides-Extra: dev
 Requires-Dist: djlint==1.34.1; extra == 'dev'
 Requires-Dist: hatch==1.12.0; extra == 'dev'
 Requires-Dist: isort==5.13.2; extra == 'dev'
-Requires-Dist: mkdocs-material==9.5.27; extra == 'dev'
+Requires-Dist: mkdocs-material==9.5.26; extra == 'dev'
 Requires-Dist: mkdocs-static-i18n==1.2.3; extra == 'dev'
 Requires-Dist: mkdocs==1.6.0; extra == 'dev'
 Requires-Dist: pymdown-extensions==10.8.1; extra == 'dev'
-Requires-Dist: ruff==0.4.9; extra == 'dev'
+Requires-Dist: ruff==0.4.8; extra == 'dev'
 Requires-Dist: vermin==1.6.0; extra == 'dev'
 Provides-Extra: docker
 Requires-Dist: uwsgi==2.0.26; extra == 'docker'

{umap_project-2.4.0 → umap_project-2.4.0b1}/pyproject.toml

@@ -34,7 +34,7 @@ dependencies = [
   "django-probes==1.7.0",
   "Pillow==10.3.0",
   "psycopg==3.1.19",
-  "pydantic==2.7.4",
+  "pydantic==2.7.3",
   "requests==2.32.3",
   "rcssmin==1.1.2",
   "rjsmin==1.2.2",
@@ -46,10 +46,10 @@ dependencies = [
 [project.optional-dependencies]
 dev = [
   "hatch==1.12.0",
-  "ruff==0.4.9",
+  "ruff==0.4.8",
   "djlint==1.34.1",
   "mkdocs==1.6.0",
-  "mkdocs-material==9.5.27",
+  "mkdocs-material==9.5.26",
   "mkdocs-static-i18n==1.2.3",
   "vermin==1.6.0",
   "pymdown-extensions==10.8.1",

umap_project-2.4.0b1/umap/__init__.py

@@ -0,0 +1 @@
+VERSION = "2.4.0b1"

{umap_project-2.4.0 → umap_project-2.4.0b1}/umap/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-21 19:58+0000\n"
+"POT-Creation-Date: 2024-06-14 17:49+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -553,49 +553,49 @@ msgstr ""
 msgid "Map editors updated with success!"
 msgstr ""
 
-#: views.py:882
+#: views.py:883
 #, python-format
 msgid "The uMap edit link for your map: %(map_name)s"
 msgstr ""
 
-#: views.py:885
+#: views.py:886
 #, python-format
 msgid "Here is your secret edit link: %(link)s"
 msgstr ""
 
-#: views.py:892
+#: views.py:893
 #, python-format
 msgid "Can't send email to %(email)s"
 msgstr ""
 
-#: views.py:895
+#: views.py:896
 #, python-format
 msgid "Email sent to %(email)s"
 msgstr ""
 
-#: views.py:906
+#: views.py:907
 msgid "Only its owner can delete the map."
 msgstr ""
 
-#: views.py:909
+#: views.py:910
 msgid "Map successfully deleted."
 msgstr ""
 
-#: views.py:935
+#: views.py:936
 #, python-format
 msgid ""
 "Your map has been cloned! If you want to edit this map from another "
 "computer, please use this link: %(anonymous_url)s"
 msgstr ""
 
-#: views.py:940
+#: views.py:941
 msgid "Congratulations, your map has been cloned!"
 msgstr ""
 
-#: views.py:1175
+#: views.py:1176
 msgid "Layer successfully deleted."
 msgstr ""
 
-#: views.py:1197
+#: views.py:1198
 msgid "Permissions updated with success!"
 msgstr ""

{umap_project-2.4.0 → umap_project-2.4.0b1}/umap/locale/fr/LC_MESSAGES/django.po

@@ -8,7 +8,6 @@
 # Buggi, 2013
 # Buggi, 2013
 # Buggi, 2013
-# Larlet David <david@larlet.fr>, 2024
 # Philippe Verdy, 2017
 # severin.menard <severin.menard@protonmail.com>, 2014
 # severin.menard <severin.menard@protonmail.com>, 2014
@@ -26,7 +25,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-06-14 17:49+0000\n"
 "PO-Revision-Date: 2013-11-22 14:00+0000\n"
-"Last-Translator: Larlet David <david@larlet.fr>, 2024\n"
+"Last-Translator: yohanboniface <yohanboniface@free.fr>, 2013-2014,2018-2019,2023-2024\n"
 "Language-Team: French (http://app.transifex.com/openstreetmap/umap/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -268,7 +267,7 @@ msgstr "Exporter et partager votre carte"
 #: templates/umap/about_summary.html:37
 #, python-format
 msgid "And it's <a href=\"%(repo_url)s\">open source</a>!"
-msgstr "Et c'est <a href=\"%(repo_url)s\">open source</a> !"
+msgstr "Et c'est <a href=\"%(repo_url)s\">open source</a>!"
 
 #: templates/umap/about_summary.html:48 templates/umap/navigation.html:38
 #: templates/umap/user_dashboard.html:42
@@ -291,11 +290,11 @@ msgid ""
 "Pro-tip: to easily find back your maps, <a href=\"%(login_url)s\" "
 "target=\"_blank\">create an account</a> or <a href=\"%(login_url)s\" "
 "target=\"_blank\">log in</a>."
-msgstr "Astuce : pour retrouver facilement vos cartes, <a href=\"%(login_url)s\" target=\"_blank\">créez un compte</a> ou <a href=\"%(login_url)s\" target=\"_blank\">identifiez-vous</a>."
+msgstr "Astuce: pour retrouver facilement vos cartes, <a href=\"%(login_url)s\" target=\"_blank\">créez un compte</a> ou <a href=\"%(login_url)s\" target=\"_blank\">identifiez-vous</a>."
 
 #: templates/umap/components/alerts/alert.html:30
 msgid "Here is your secret link to edit the map, please keep it safe:"
-msgstr "Ceci est le lien d'édition secret, gardez-le en lieu sûr :"
+msgstr "Ceci est le lien d'édition secret, gardez-le en lieu sûr:"
 
 #: templates/umap/components/alerts/alert.html:33
 msgid "Copy link"
@@ -303,7 +302,7 @@ msgstr "Copier le lien"
 
 #: templates/umap/components/alerts/alert.html:39
 msgid "Enter your email address to receive the secret link:"
-msgstr "Entrez votre courriel pour recevoir le lien secret :"
+msgstr "Entrer une adresse mail pour recevoir le lien secret:"
 
 #: templates/umap/components/alerts/alert.html:41
 msgid "Email"
@@ -311,7 +310,7 @@ msgstr "Courriel"
 
 #: templates/umap/components/alerts/alert.html:42
 msgid "Send me the link"
-msgstr "Envoyer le lien"
+msgstr "Recevoir le lien"
 
 #: templates/umap/components/alerts/alert.html:63
 msgid "See their edits in another tab"
@@ -338,7 +337,7 @@ msgid ""
 "need a stable instance, please use <a "
 "href=\"%(stable_url)s\">%(stable_url)s</a>. You can also host your own "
 "instance, it's <a href=\"%(repo_url)s\">open source</a>!"
-msgstr "Il s'agit d'un site de démonstration, utilisé pour les tests et validation avant diffusion. Si vous avez besoin d'une version stable, utilisez plutôt <a href=\"%(stable_url)s\">%(stable_url)s</a>. Vous pouvez aussi mettre en place votre propre version, c'est <a href=\"%(repo_url)s\">open source</a> !"
+msgstr "Il s'agit d'un site de démonstration, utilisé pour les tests et validation avant diffusion. Si vous avez besoin d'une version stable, utilisez plutôt <a href=\"%(stable_url)s\">%(stable_url)s</a>. Vous pouvez aussi mettre en place votre propre version, c'est <a href=\"%(repo_url)s\">open source</a>!"
 
 #: templates/umap/home.html:11
 msgid "Map of the uMaps"
@@ -436,7 +435,7 @@ msgstr "fin"
 #: templates/umap/map_table.html:116
 #, python-format
 msgid "Lines per page: %(per_page)s"
-msgstr "Lignes par page : %(per_page)s"
+msgstr "Lignes par page: %(per_page)s"
 
 #: templates/umap/map_table.html:121
 #, python-format
@@ -515,7 +514,7 @@ msgid "%(count)s map found:"
 msgid_plural "%(count)s maps found:"
 msgstr[0] "%(count)s carte trouvée:"
 msgstr[1] "%(count)s cartes trouvées:"
-msgstr[2] "%(count)s cartes trouvées :"
+msgstr[2] "%(count)s cartes trouvées:"
 
 #: templates/umap/search.html:21
 msgid "No map found."
@@ -574,12 +573,12 @@ msgstr "Éditeurs de la carte mis à jour !"
 #: views.py:883
 #, python-format
 msgid "The uMap edit link for your map: %(map_name)s"
-msgstr "La lien d'édition uMap pour votre carte : %(map_name)s"
+msgstr "La lien d'édition uMap pour votre carte %(map_name)s"
 
 #: views.py:886
 #, python-format
 msgid "Here is your secret edit link: %(link)s"
-msgstr "Voici votre lien d'édition secret : %(link)s"
+msgstr "Voici votre lien d'édition secret: %(link)s"
 
 #: views.py:893
 #, python-format

{umap_project-2.4.0 → umap_project-2.4.0b1}/umap/static/umap/base.css

@@ -61,22 +61,16 @@ kbd {
   white-space: nowrap;
 }
 h3 {
-    font-size: 1rem;
+    font-size: 1.2rem;
 }
 h4 {
-    font-size: 0.9rem;
-}
-h5 {
-    font-size: 0.8rem;
-}
-h6 {
-    font-size: 0.7rem;
+    font-size: 1.1rem;
 }
 hgroup > * {
     margin-bottom: 0;
 }
 hgroup {
-    margin-bottom: var(--box-margin);
+    margin-bottom: var(--box-space);
 }
 hgroup > :not(:first-child):last-child {
     font-weight: normal;
@@ -185,11 +179,8 @@ input[type="range"] {
     margin-bottom: 5px;
     width: 100%;
 }
-input[type="radio"] {
-    margin-right: var(--text-margin);
-}
 input[type="checkbox"] {
-    margin: 0 var(--text-margin);
+    margin: 0 5px;
     vertical-align: middle;
     appearance: none;
 }
@@ -209,6 +200,28 @@ input[type=checkbox]:checked:after {
     content: '✓';
     color: var(--color-darkGray);
 }
+label input[type="radio"] {
+    appearance: none;
+    margin-right: 10px;
+    background: var(--color-darkGray);
+}
+input[type="radio"]:after {
+    display: inline-block;
+    content: '⦾';
+    width: 16px;
+    height: 16px;
+    border-radius: 50%;
+    cursor: pointer;
+    text-align: center;
+    vertical-align: bottom;
+    font-size: 1.2rem;
+    line-height: 0.7;
+}
+label input[type="radio"]:checked:after {
+    background-color: var(--color-lightCyan);
+    color: var(--color-darkGray);
+    content: '⦿';
+}
 
 input[data-modified=true] {
     background-color: var(--color-lightCyan);
@@ -320,7 +333,7 @@ label {
     width: 100%;
 }
 label + label {
-    margin-top: var(--box-margin);
+    margin-top: var(--box-space);
 }
 .content label {
     font-weight: bold;
@@ -382,7 +395,7 @@ details summary {
     border: 1px solid var(--color-darkGray);
 }
 fieldset legend {
-    font-size: .9rem;
+    font-size: 1rem;
     padding: 0 5px;
 }
 
@@ -787,11 +800,6 @@ input[type=hidden].blur + [type="button"] {
 /*   Various   */
 /* *********** */
 
-.text {
-    word-break: break-word;
-    white-space: pre-line;
-}
-
 .umap-dragover:before {
     content:  ' ';
     background-image: url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" width="200" height="200" viewBox="0 0 24 24" fill="none" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="arcs">%3Cpath d="M3 15v4c0 1.1.9 2 2 2h14a2 2 0 0 0 2-2v-4M17 9l-5 5-5-5M12 12.8V2.5"/>%3C/svg>');

{umap_project-2.4.0 → umap_project-2.4.0b1}/umap/static/umap/css/importers.css

@@ -1,13 +1,6 @@
-.importers h3 {
-  font-size: 1rem;
-}
-.importers h4 {
-  font-size: .9rem;
-}
-
 .importers ul [type=button] {
     background: none;
-    font-size: 0.75rem;
+    font-size: 1rem;
     border: none;
     width: initial;
     display: inline-block;

{umap_project-2.4.0 → umap_project-2.4.0b1}/umap/static/umap/css/panel.css

@@ -52,6 +52,7 @@
 .panel .counter {
     display: block;
     margin-top: var(--panel-gutter);
+    font-weight: bold;
 }
 @media all and (orientation:landscape) {
     .panel {

{umap_project-2.4.0 → umap_project-2.4.0b1}/umap/static/umap/img/16-white.svg

@@ -22,7 +22,6 @@
   </rdf:RDF>
  </metadata>
  <g id="layer1" transform="translate(0 -812.36)">
-  <path id="path6" transform="translate(0 812.36)" d="m106.59 43.849c-3.1009-0.58252-5.5294-2.8635-6.3194-5.9353-0.23482-0.91317-0.29424-2.2415-0.14177-3.1695 0.51108-3.1108 2.8336-5.668 5.8628-6.455 3.7298-0.96909 7.5978 0.86166 9.2444 4.3755 0.52616 1.1228 0.76105 2.332 0.7086 3.6477-0.0496 1.2454-0.28677 2.1826-0.82249 3.2508-1.0498 2.0933-2.8894 3.5595-5.2481 4.1831-0.49134 0.1299-0.73215 0.15444-1.689 0.17211-0.81094 0.01498-1.2469-4e-3 -1.5952-0.06942zm2.4397-5.8477v-3.0462h-2.0509v6.0923h2.0509zm-0.53434-4.5639c0.33094-0.09915 0.70763-0.44461 0.87372-0.80128 0.4662-1.0012-0.2615-2.1447-1.3648-2.1447-0.44164 0-0.73107 0.12392-1.0653 0.45609-0.42453 0.42196-0.54914 0.93769-0.37666 1.5589 0.0814 0.29328 0.60383 0.8291 0.89905 0.92215 0.28553 0.09 0.74987 0.09398 1.034 0.0089z" fill="#f2f2f2" stroke="#999" stroke-width=".25" style="paint-order:fill markers stroke"/>
   <text id="text4457" x="5.7867966" y="897.80786" fill="#000000" font-family="sans-serif" letter-spacing="0px" word-spacing="0px" style="line-height:0%" xml:space="preserve"><tspan id="tspan4459" x="5.7867966" y="897.80786" font-family="sans-serif" font-size="40px" style="line-height:1.25"> </tspan></text>
   <g id="g3001" transform="translate(-23.256 -119.39)">
    <path id="path3014" d="m35.256 935.75c-4.4124 0-8.0001 3.5878-8.0001 8.0001 0 4.4124 3.5878 8.0001 8.0001 8.0001s8.0001-3.5878 8.0001-8.0001c0-4.4124-3.5878-8.0001-8.0001-8.0001zm0 1.0003c3.8719 0 6.9999 3.1279 6.9999 6.9999 0 3.8719-3.1279 6.9999-6.9999 6.9999s-6.9999-3.128-6.9999-6.9999c0-3.8719 3.1279-6.9999 6.9999-6.9999z" 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"/>
@@ -45,6 +44,8 @@
   </g>
   <path id="path3684-2" d="m63.714 890.36-1.1428 1.1428 2.2857 2.2858 1.1428-1.1429zm-1.7143 1.7143-6.2857 6.2857 2.2857 2.2857 6.2857-6.2857zm-6.2857 6.2857-1.7143 4 4-1.7143z" fill="#b3b3b3"/>
   <path id="table-5-8-8-6-1" d="m54 914.36v1h1v-1zm2 0v1h10v-1zm-2 2v1h1v-1zm2 0v1h10v-1zm-2 2v1h1v-1zm2 0v1h10v-1zm-2 2v1h1v-1zm2 0v1h10v-1zm-2 2v1h1v-1zm2 0v1h10v-1zm-2 2v1h1v-1zm2 0v1h10v-1z" fill="#f2f2f2"/>
+  <circle id="path3764" cx="108" cy="844.36" r="1.5" fill="#f2f2f2" stroke="#999" stroke-width=".25"/>
+  <path id="rect4274" d="m107 847.36h2v6h-2z" fill="#f2f2f2" stroke="#999" stroke-width=".25"/>
   <g id="g4717" transform="translate(-54.789 -114.48)">
    <path id="path3862" transform="translate(-1.2108 854.84)" d="m141.27 173.42-6.7559 2.6797 0.95313 6.3457 5.8711 3.127 4.1484-7.873zm-1.4473 2.4883 2.9902 1.6016-0.5918 2.4316-3.3574 1.5039-1.7383-3.8106z" fill="#f2f2f2" fill-rule="evenodd" stroke="#999" stroke-width=".25"/>
   </g>
@@ -116,6 +117,7 @@
     <path id="path4353-1-6-1-3-3-9-6" 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="path3014-4" d="m108 840.36c-4.4124 0-8.0001 3.5878-8.0001 8.0001 0 4.4124 3.5878 8.0001 8.0001 8.0001s8.0001-3.5878 8.0001-8.0001c0-4.4124-3.5878-8.0001-8.0001-8.0001zm0 1.0003c3.8719 0 6.9999 3.1279 6.9999 6.9999 0 3.8719-3.1279 6.9999-6.9999 6.9999s-6.9999-3.128-6.9999-6.9999c0-3.8719 3.1279-6.9999 6.9999-6.9999z" 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"/>
   <rect id="rect4237" x="77" y="889.36" width="2" height="2" fill="#f2f2f2"/>
   <rect id="rect4239" x="81" y="889.36" width="2" height="2" fill="#f2f2f2"/>
   <rect id="rect4241" x="85" y="889.36" width="2" height="2" fill="#f2f2f2"/>

{umap_project-2.4.0 → umap_project-2.4.0b1}/umap/static/umap/img/source/16-white.svg

@@ -16,7 +16,7 @@
       <path d="M 16.0401,2.3158 H 2.005 v 14.0351 h 14.0351 z" fill="#ffffff" id="path1259" />
     </mask>
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="10.391897" inkscape:cx="112.73207" inkscape:cy="34.401804" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" inkscape:window-width="1920" inkscape:window-height="1011" 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="25.599967" inkscape:cx="37.558642" inkscape:cy="19.121119" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" inkscape:window-width="1920" inkscape:window-height="1011" 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" spacingy="1" spacingx="1" units="px" />
     <sodipodi:guide orientation="-1,0" position="24,168" 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)" />
@@ -40,7 +40,6 @@
     </rdf:RDF>
   </metadata>
   <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(0,-812.36218)">
-    <path style="fill:#f2f2f2;fill-opacity:1;stroke-width:0.25;paint-order:fill markers stroke;stroke:#999999;stroke-opacity:1" d="m 106.58891,43.849359 c -3.10089,-0.58252 -5.52944,-2.863466 -6.31937,-5.935298 -0.23482,-0.913171 -0.294235,-2.2415 -0.14177,-3.169542 0.51108,-3.110805 2.83364,-5.667956 5.86284,-6.455008 3.72982,-0.969088 7.59776,0.861664 9.2444,4.375508 0.52616,1.122793 0.76105,2.331963 0.7086,3.647677 -0.0496,1.245447 -0.28677,2.18265 -0.82249,3.250829 -1.04984,2.093266 -2.88939,3.559535 -5.24807,4.183141 -0.49134,0.129903 -0.73215,0.154443 -1.68896,0.172114 -0.81094,0.01498 -1.24691,-0.004 -1.59518,-0.06942 z m 2.43966,-5.8477 v -3.046165 h -1.02544 -1.02544 v 3.046165 3.046164 h 1.02544 1.02544 z m -0.53434,-4.563852 c 0.33094,-0.09915 0.70763,-0.444612 0.87372,-0.801282 0.4662,-1.001185 -0.2615,-2.144718 -1.36482,-2.144718 -0.44164,0 -0.73107,0.12392 -1.06527,0.456086 -0.42453,0.421956 -0.54914,0.937689 -0.37666,1.558908 0.0814,0.293275 0.60383,0.829099 0.89905,0.922151 0.28553,0.09 0.74987,0.09398 1.03398,0.0089 z" id="path6" transform="translate(0,812.36218)" />
     <text xml:space="preserve" style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" x="5.7867966" y="897.80786" id="text4457"><tspan y="897.80786" x="5.7867966" sodipodi:role="line" id="tspan4459" style="font-size:40px;line-height:1.25;font-family:sans-serif"> </tspan></text>
     <g id="g3001" transform="translate(-23.255701,-119.38651)">
       <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 35.255701,935.74851 c -4.412356,0 -8.00014,3.58778 -8.00014,8.00014 0,4.41235 3.587784,8.00014 8.00014,8.00014 4.412356,0 8.00014,-3.58779 8.00014,-8.00014 0,-4.41236 -3.587784,-8.00014 -8.00014,-8.00014 z m 0,1.00028 c 3.871916,0 6.99986,3.12794 6.99986,6.99986 0,3.87191 -3.127944,6.99986 -6.99986,6.99986 -3.871916,0 -6.999861,-3.12795 -6.999861,-6.99986 0,-3.87192 3.127945,-6.99986 6.999861,-6.99986 z" id="path3014" inkscape:connector-curvature="0" />
@@ -64,6 +63,8 @@
     </g>
     <path style="fill:#b3b3b3;fill-opacity:1;stroke:none" d="m 63.71429,890.36216 -1.14285,1.1428 2.28571,2.2858 L 66,892.64786 Z M 62,892.07646 55.714286,898.36218 58,900.64788 l 6.28572,-6.2857 z m -6.285714,6.28572 -1.714286,4 4,-1.7143 z" id="path3684-2" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccc" />
     <path inkscape:connector-curvature="0" id="table-5-8-8-6-1" style="fill:#f2f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 54,914.3622 v 1 h 1 v -1 z m 2,0 v 1 h 10 v -1 z m -2,2 v 1 h 1 v -1 z m 2,0 v 1 h 10 v -1 z m -2,2 v 1 h 1 v -1 z m 2,0 v 1 h 10 v -1 z m -2,2 v 1 h 1 v -1 z m 2,0 v 1 h 10 v -1 z m -2,2 v 1 h 1 v -1 z m 2,0 v 1 h 10 v -1 z m -2,2 v 1 h 1 v -1 z m 2,0 v 1 h 10 v -1 z" />
+    <circle style="fill:#f2f2f2;fill-opacity:1;stroke:#999999;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path3764" cx="108" cy="844.36218" r="1.5" />
+    <path style="fill:#f2f2f2;fill-opacity:1;stroke:#999999;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 107,847.36218 h 2 v 6 h -2 z" id="rect4274" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" />
     <g id="g4717" transform="translate(-54.789185,-114.477)">
       <path style="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-opacity:1" d="m 141.26953,173.42383 -6.75586,2.67969 0.95313,6.3457 5.87109,3.12695 4.14844,-7.87305 z m -1.44726,2.48828 2.99023,1.60156 -0.5918,2.43164 -3.35742,1.50391 -1.73828,-3.81055 z" transform="translate(-1.210815,854.83918)" id="path3862" inkscape:connector-curvature="0" />
     </g>
@@ -138,6 +139,7 @@
         <path inkscape:connector-curvature="0" id="path4353-1-6-1-3-3-9-6" 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: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 108,840.36204 c -4.41236,0 -8.00014,3.58778 -8.00014,8.00014 0,4.41235 3.58778,8.00014 8.00014,8.00014 4.41236,0 8.00014,-3.58779 8.00014,-8.00014 0,-4.41236 -3.58778,-8.00014 -8.00014,-8.00014 z m 0,1.00028 c 3.87192,0 6.99986,3.12794 6.99986,6.99986 0,3.87191 -3.12794,6.99986 -6.99986,6.99986 -3.87192,0 -6.99986,-3.12795 -6.99986,-6.99986 0,-3.87192 3.12794,-6.99986 6.99986,-6.99986 z" id="path3014-4" inkscape:connector-curvature="0" />
     <rect style="fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4237" width="2" height="2" x="77" y="889.36218" />
     <rect style="fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4239" width="2" height="2" x="81" y="889.36218" />
     <rect style="fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4241" width="2" height="2" x="85" y="889.36218" />

{umap_project-2.4.0 → umap_project-2.4.0b1}/umap/static/umap/js/modules/browser.js

@@ -143,6 +143,8 @@ export default class Browser {
   open(mode) {
     // Force only if mode is known, otherwise keep current mode.
     if (mode) this.mode = mode
+    // Get once but use it for each feature later
+    this.filterKeys = this.map.getFilterKeys()
     const container = DomUtil.create('div')
     // HOTFIX. Remove when this is released:
     // https://github.com/Leaflet/Leaflet/pull/9052
@@ -203,11 +205,9 @@ export default class Browser {
   }
 
   static backButton(map) {
-    const button = DomUtil.createButtonIcon(
-      DomUtil.create('li', '', undefined),
-      'icon-back',
-      translate('Back to browser')
-    )
+    const button = DomUtil.create('li', '')
+    DomUtil.create('i', 'icon icon-16 icon-back', button)
+    button.title = translate('Back to browser')
     // Fixme: remove me when this is merged and released
     // https://github.com/Leaflet/Leaflet/pull/9052
     DomEvent.disableClickPropagation(button)

{umap_project-2.4.0 → umap_project-2.4.0b1}/umap/static/umap/js/modules/caption.js

@@ -24,7 +24,7 @@ export default class Caption {
     if (this.map.options.description) {
       const description = DomUtil.element({
         tagName: 'div',
-        className: 'umap-map-description text',
+        className: 'umap-map-description',
         safeHTML: Utils.toHTML(this.map.options.description),
         parent: container,
       })

{umap_project-2.4.0 → umap_project-2.4.0b1}/umap/static/umap/js/modules/importer.js

@@ -230,21 +230,13 @@ export default class Importer {
 
   openFiles() {
     this.open()
-    this.qs('[type=file]').showPicker()
+    this.fileInput.showPicker()
   }
 
   submit() {
-    let hasErrors = false
-    if (this.format === 'umap') {
-      hasErrors = !this.full()
-    } else if (!this.url) {
-      hasErrors = !this.copy()
-    } else if (this.action) {
-      hasErrors = !this[this.action]()
-    }
-    if (!hasErrors) {
-      Alert.info(translate('Data successfully imported!'))
-    }
+    if (this.format === 'umap') this.full()
+    else if (!this.url) this.copy()
+    else if (this.action) this[this.action]()
   }
 
   full() {
@@ -262,19 +254,16 @@ export default class Importer {
     } catch (e) {
       Alert.error(translate('Invalid umap data'))
       console.error(e)
-      return false
     }
   }
 
   link() {
-    if (!this.url) {
-      return false
-    }
+    if (!this.url) return
     if (!this.format) {
       Alert.error(translate('Please choose a format'))
-      return false
+      return
     }
-    const layer = this.layer
+    let layer = this.layer
     layer.options.remoteData = {
       url: this.url,
       format: this.format,
@@ -291,9 +280,9 @@ export default class Importer {
     // Usefull in case of multiple files with different formats.
     if (!this.format && !this.files.length) {
       Alert.error(translate('Please choose a format'))
-      return false
+      return
     }
-    const layer = this.layer
+    let layer = this.layer
     if (this.clear) layer.empty()
     if (this.files.length) {
       for (const file of this.files) {

{umap_project-2.4.0 → umap_project-2.4.0b1}/umap/static/umap/js/modules/importers/datasets.js

@@ -28,7 +28,6 @@ export class Importer {
       if (select.value) {
         importer.url = select.value
         importer.format = select.options[select.selectedIndex].dataset.format
-        importer.layerName = select.options[select.selectedIndex].textContent
       }
       importer.dialog.close()
     }

{umap_project-2.4.0 → umap_project-2.4.0b1}/umap/static/umap/js/modules/utils.js

@@ -124,9 +124,9 @@ export function toHTML(r, options) {
   }
 
   // headings and hr
-  r = r.replace(/^### (.*)(\r\n|\r|\n)?/gm, '<h6>$1</h6>')
-  r = r.replace(/^## (.*)(\r\n|\r|\n)?/gm, '<h5>$1</h5>')
-  r = r.replace(/^# (.*)(\r\n|\r|\n)?/gm, '<h4>$1</h4>')
+  r = r.replace(/^### (.*)(\r\n|\r|\n)?/gm, '<h5>$1</h5>')
+  r = r.replace(/^## (.*)(\r\n|\r|\n)?/gm, '<h4>$1</h4>')
+  r = r.replace(/^# (.*)(\r\n|\r|\n)?/gm, '<h3>$1</h3>')
   r = r.replace(/^---/gm, '<hr>')
 
   // bold, italics

{umap_project-2.4.0 → umap_project-2.4.0b1}/umap/static/umap/js/umap.features.js

@@ -144,11 +144,7 @@ U.FeatureMixin = {
   edit: function (e) {
     if (!this.map.editEnabled || this.isReadOnly()) return
     const container = L.DomUtil.create('div', 'umap-feature-container')
-    L.DomUtil.createTitle(
-      container,
-      L._('Feature properties'),
-      `icon-${this.getClassName()}`
-    )
+    L.DomUtil.createTitle(container, L._('Feature properties'), `icon-${this.getClassName()}`)
 
     let builder = new U.FormBuilder(
       this,
@@ -532,7 +528,7 @@ U.FeatureMixin = {
   },
 
   isFiltered: function () {
-    const filterKeys = this.datalayer.getFilterKeys()
+    const filterKeys = this.map.getFilterKeys()
     const filter = this.map.browser.options.filter
     if (filter && !this.matchFilter(filter, filterKeys)) return true
     if (!this.matchFacets()) return true
@@ -541,10 +537,6 @@ U.FeatureMixin = {
 
   matchFilter: function (filter, keys) {
     filter = filter.toLowerCase()
-    if (U.Utils.hasVar(keys)) {
-      return this.getDisplayName().toLowerCase().indexOf(filter) !== -1
-    }
-    keys = keys.split(',')
     for (let i = 0, value; i < keys.length; i++) {
       value = (this.properties[keys[i]] || '') + ''
       if (value.toLowerCase().indexOf(filter) !== -1) return true
@@ -606,7 +598,7 @@ U.FeatureMixin = {
     if (locale) properties.locale = locale
     if (L.lang) properties.lang = L.lang
     properties.rank = this.getRank() + 1
-    if (this._map && this.hasGeom()) {
+    if (this.hasGeom()) {
       center = this.getCenter()
       properties.lat = center.lat
       properties.lon = center.lng