.github/workflows/release-helm.yml

@@ -1,26 +0,0 @@
-name: Release Charts
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  release:
-    # depending on default permission settings for your org (contents being read-only or read-write for workloads), you will have to add permissions
-    # see: https://docs.github.com/en/actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token
-    permissions:
-      contents: write
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Publish Helm charts
-        uses: stefanprodan/helm-gh-pages@v1.7.0
-        with:
-          charts_dir: charts
-          linting: off
-          token: ${{ secrets.GITHUB_TOKEN }}

Makefile

@@ -65,7 +65,7 @@ publish: ## Publish the Python package to Pypi
 test: testpy testjs
 
 testpy:
-	pytest -vv umap/tests/ --dist=loadgroup --reruns 1 --maxfail 10
+	pytest -vv umap/tests/ --dist=loadgroup --reruns 1
 
 test-integration:
 	pytest -xv umap/tests/integration/ --dist=loadgroup

charts/umap/templates/deployment.yaml

@@ -66,11 +66,7 @@ spec:
           {{- end }}
           envFrom:
           - secretRef:
-              {{- if .Values.umap.envFromSecret }}
-              name: {{ .Values.umap.envFromSecret }}
-              {{- else }}
               name: {{ include "umap.fullname" . }}-env
-              {{- end }}
           volumeMounts:
             - name: config
               mountPath: /etc/umap/
@@ -84,11 +80,7 @@ spec:
       volumes:
         - name: config
           secret:
-            {{- if .Values.umap.configFromSecret }}
-            secretName: {{ .Values.umap.configFromSecret }}
-            {{- else }}
             secretName: {{ include "umap.fullname" . }}-config
-            {{- end }}
         - name: statics
           emptyDir: {}
       {{- if .Values.persistence.enabled }}

charts/umap/templates/secret-config.yaml

@@ -1,4 +1,3 @@
-{{ if not .Values.umap.configFromSecret }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -7,5 +6,4 @@ metadata:
     {{- include "umap.labels" . | nindent 4 }}
 type: Opaque
 data:
-  umap.conf: {{ .Values.umap.config | b64enc }}
+  umap.conf: {{ .Values.umap.config | b64enc }}
-{{- end }}

charts/umap/templates/secret-env.yaml

@@ -1,4 +1,3 @@
-{{ if not .Values.umap.envFromSecret }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -9,5 +8,4 @@ type: Opaque
 data:
 {{- range $key, $value := .Values.umap.environment }}
   {{ $key }}: "{{ $value | b64enc }}"
-{{- end }}
+{{- end }}
-{{- end }}

charts/umap/values.yaml

@@ -77,18 +77,11 @@ umap:
     SECRET_KEY: CHANGE_ME
     STATIC_ROOT: /srv/umap/static
     MEDIA_ROOT: /srv/umap/uploads
-  # Configure environment variables using an existing secret in the same namespace.
-  # In this case the values above are not used
-  envFromSecret: null
-
   # You can also provide umap.conf content here:
   config: |
     from umap.settings.base import *
 
     # See: https://github.com/umap-project/umap/blob/master/umap/settings/local.py.sample
-  # Configure config file using an existing secret in the same namespace.
-  # In this case the values above are not used
-  configFromSecret: null
 
 persistence:
   enabled: true

docs-users/requirements.txt

@@ -1,5 +1,5 @@
 # Force rtfd to use a recent version of mkdocs
 mkdocs==1.6.1
 pymdown-extensions==10.14.3
-mkdocs-material==9.6.12
+mkdocs-material==9.6.10
 mkdocs-static-i18n==1.3.0

docs/changelog.md

@@ -1,31 +1,5 @@
 # Changelog
 
-## 3.0.5 - 2025-04-25
-
-* allow to save a remote data with unloaded data by @yohanboniface in #2657
-* allow to save/undo/sync drag'n'drop of datalayers by @yohanboniface in #2677
-* setting center and zoom manually should set dirty status by @yohanboniface in #2676
-* fix error when saving and deleting heatmap layer by @yohanboniface in #2681
-* make rules reordering syncable, savable and undoable by @yohanboniface in #2672
-* loading remote data should not make the map dirty  by @yohanboniface in #2679
-* implement a design system for UI consistency by @davidbgk in #2654
-* pass CSRF_TRUSTED_ORIGINS env to settings by @lippoliv in #2656
-* do not display "saved" message if some request failed by @yohanboniface in #2669
-* show an error message if saving layer failed by @yohanboniface in #2670
-* naive support for GeometryCollection as Feature geometry by @yohanboniface in #2658
-* add a back button in rules form by @yohanboniface in #2673
-
-## New Contributors
-* @lippoliv made their first contribution in #2656
-
-## 3.0.4 - 2025-04-14
-
-* do not show "back to home" button in iframes by @yohanboniface in #2644
-* remove "hide home button" shown twice in map settings by @yohanboniface in #2645
-* adapt Helm chart to match La Suite's expectations by @ohemelaar in #2646
-* update colors by @yohanboniface in #2647
-
-
 ## 3.0.3 - 2025-04-11
 
 * do not try to remove a feature not yet added by @yohanboniface in #2637

docs/requirements.txt

@@ -1,5 +1,5 @@
 # Force rtfd to use a recent version of mkdocs
 mkdocs==1.6.1
 pymdown-extensions==10.14.3
-mkdocs-material==9.6.12
+mkdocs-material==9.6.10
 mkdocs-static-i18n==1.3.0

package.json

@@ -38,7 +38,7 @@
   "dependencies": {
     "@dwayneparton/geojson-to-gpx": "^0.2.0",
     "@placemarkio/tokml": "0.3.4",
-    "@tmcw/togeojson": "^7.1.0",
+    "@tmcw/togeojson": "^5.8.0",
     "colorbrewer": "1.5.7",
     "csv2geojson": "github:umap-project/csv2geojson#patched",
     "dompurify": "3.2.4",

pyproject.toml

@@ -32,7 +32,7 @@ dependencies = [
   "django-agnocomplete==2.2.0",
   "django-environ==0.12.0",
   "django-probes==1.7.0",
-  "Pillow==11.2.1",
+  "Pillow==11.1.0",
   "psycopg==3.2.6",
   "requests==2.32.3",
   "rcssmin==1.2.1",
@@ -44,10 +44,10 @@ dependencies = [
 [project.optional-dependencies]
 dev = [
   "hatch==1.14.1",
-  "ruff==0.11.6",
+  "ruff==0.11.4",
   "djlint==1.36.4",
   "mkdocs==1.6.1",
-  "mkdocs-material==9.6.12",
+  "mkdocs-material==9.6.10",
   "mkdocs-static-i18n==1.3.0",
   "vermin==1.6.0",
   "pymdown-extensions==10.14.3",
@@ -58,20 +58,20 @@ test = [
   "factory-boy==3.3.3",
   "playwright>=1.39",
   "pytest==8.3.5",
-  "pytest-django==4.11.1",
+  "pytest-django==4.10.0",
   "pytest-playwright==0.7.0",
   "pytest-rerunfailures==15.0",
   "pytest-xdist>=3.5.0,<4",
-  "moto[s3]==5.1.4"
+  "moto[s3]==5.1.3"
 ]
 docker = [
-  "uvicorn==0.34.2",
+  "uvicorn==0.34.0",
 ]
 s3 = [
   "django-storages[s3]==1.14.6",
 ]
 sync = [
-  "pydantic==2.11.3",
+  "pydantic==2.11.2",
   "redis==5.2.1",
   "websockets==15.0.1",
 ]

umap/__init__.py

@@ -1 +1 @@
-VERSION = "3.0.5"
+VERSION = "3.0.3"

umap/locale/el/LC_MESSAGES/django.po

@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uMap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-11 15:30+0000\n"
+"POT-Creation-Date: 2025-03-03 17:36+0000\n"
 "PO-Revision-Date: 2013-11-22 14:00+0000\n"
 "Last-Translator: prendi <prendi@openmailbox.org>, 2017\n"
 "Language-Team: Greek (http://app.transifex.com/openstreetmap/umap/language/el/)\n"
@@ -40,205 +40,137 @@ msgstr "Λόγω συντήρησης, ο ιστότοπος είναι μόνο
 msgid ""
 "Using “%(name)s” to authenticate is deprecated and will be removed soon. "
 "Please configure another provider below before losing access to your account"
-" and maps. Then, please logout and login again with the new provider."
+" and maps."
-msgstr "Η χρήση του «%(name)s» για τον έλεγχο ταυτότητας έχει ξεπεραστεί και θα καταργηθεί σύντομα. Παρακαλούμε ρυθμίστε έναν άλλο πάροχο παρακάτω πριν χάσετε την πρόσβαση στο λογαριασμό και τους χάρτες σας. Στη συνέχεια, παρακαλούμε αποσυνδεθείτε και συνδεθείτε ξανά με τον νέο πάροχο."
+msgstr ""
 
-#: models.py:61 models.py:80
+#: models.py:60 models.py:79
 msgid "name"
 msgstr "όνομα"
 
-#: models.py:63 models.py:493
+#: models.py:62 models.py:485
 msgid "description"
 msgstr "περιγραφή"
 
-#: models.py:111
+#: models.py:110
 msgid "details"
 msgstr "λεπτομέρειες"
 
-#: models.py:112
+#: models.py:111
 msgid "Link to a page where the licence is detailed."
 msgstr "Σύνδεσμος σελίδας αναλυτικής Άδειας Χρήσης."
 
-#: models.py:122
+#: models.py:121
 msgid "URL template using OSM tile format"
 msgstr "Πρότυπο URL που χρησιμοποιεί μορφοποίηση πλακιδίων OSM"
 
-#: models.py:128
+#: models.py:127
 msgid "Order of the tilelayers in the edit box"
 msgstr "Σειρά των υπόβαθρων στο πλαίσιο επεξεργασίας"
 
-#: models.py:176 models.py:487
+#: models.py:175 models.py:479
 msgid "Only editable with secret edit link"
 msgstr "Επεξεργάσιμο μόνο με μυστικό σύνδεσμο"
 
-#: models.py:177 models.py:488
+#: models.py:176 models.py:480
 msgid "Everyone can edit"
 msgstr "Όλοι μπορούν να επεξεργαστούν"
 
-#: models.py:180 models.py:481
+#: models.py:179 models.py:473
 msgid "Everyone"
 msgstr "Οποιοσδήποτε"
 
-#: models.py:181 models.py:190 models.py:482
+#: models.py:180 models.py:189 models.py:474
 msgid "Editors and team only"
 msgstr "Μόνο συντάκτες και ομάδα"
 
-#: models.py:182 models.py:483
+#: models.py:181 models.py:475
 msgid "Owner only"
 msgstr "Μόνο ο κάτοχος"
 
-#: models.py:185
+#: models.py:184
 msgid "Draft (private)"
 msgstr "Πρόχειρο (ιδιωτικό)"
 
-#: models.py:186
+#: models.py:185
 msgid "Everyone (public)"
 msgstr "Όλοι (δημόσιος)"
 
-#: models.py:189
+#: models.py:188
 msgid "Anyone with link"
 msgstr "Οποιοδήποτε με τον σύνδεσμο"
 
-#: models.py:191
+#: models.py:190
 msgid "Blocked"
 msgstr "Αποκλεισμένος"
 
-#: models.py:192 models.py:477
+#: models.py:191 models.py:469
 msgid "Deleted"
 msgstr "Διαγράφηκε"
 
-#: models.py:195
+#: models.py:194
 msgid "center"
 msgstr "κέντρο"
 
-#: models.py:196
+#: models.py:195
 msgid "zoom"
 msgstr "εστίαση"
 
-#: models.py:198
+#: models.py:197
 msgid "locate"
 msgstr "εντοπισμός θέσης"
 
-#: models.py:198
+#: models.py:197
 msgid "Locate user on load?"
 msgstr "Εντοπισμός θέσης χρήστη κατά την φόρτωση;"
 
-#: models.py:202
+#: models.py:201
 msgid "Choose the map licence."
 msgstr "Επιλογή άδειας χρήσης του χάρτη."
 
-#: models.py:203
+#: models.py:202
 msgid "licence"
 msgstr "άδεια"
 
-#: models.py:214
+#: models.py:213
 msgid "owner"
 msgstr "ιδιοκτήτης"
 
-#: models.py:218
+#: models.py:217
 msgid "editors"
 msgstr "συντάκτες"
 
-#: models.py:224
+#: models.py:223
 msgid "team"
 msgstr "ομάδα"
 
-#: models.py:230 models.py:509
+#: models.py:229 models.py:501
 msgid "edit status"
 msgstr "κατάσταση επεξεργασίας"
 
-#: models.py:235 models.py:514
+#: models.py:234 models.py:506
 msgid "share status"
 msgstr "κατάσταση διαμοιρασμού"
 
-#: models.py:238 models.py:504
+#: models.py:237 models.py:496
 msgid "settings"
 msgstr "ρυθμίσεις"
 
-#: models.py:410
+#: models.py:407
 msgid "Clone of"
 msgstr "Κλώνος του"
 
-#: models.py:476 models.py:480 models.py:486
+#: models.py:468 models.py:472 models.py:478
 msgid "Inherit"
 msgstr "Κληρονόμοι"
 
-#: models.py:499
+#: models.py:491
 msgid "display on load"
 msgstr "εμφάνιση κατά τη φόρτωση"
 
-#: models.py:500
+#: models.py:492
 msgid "Display this layer on load."
 msgstr "Εμφάνιση αυτού του επιπέδου κατά την φόρτωση."
 
-#: settings/base.py:295
-msgid "Art and Culture"
-msgstr "Τέχνες και Πολιτισμός"
-
-#: settings/base.py:296
-msgid "Cycling"
-msgstr "Ποδηλασία"
-
-#: settings/base.py:297
-msgid "Business"
-msgstr "Επιχειρήσεις"
-
-#: settings/base.py:298
-msgid "Environment"
-msgstr "Περιβάλλον"
-
-#: settings/base.py:299
-msgid "Education"
-msgstr "Εκπαίδευση"
-
-#: settings/base.py:300
-msgid "Food and Agriculture"
-msgstr "Διατροφή και Γεωργία"
-
-#: settings/base.py:301
-msgid "Geopolitics"
-msgstr "Γεωπολιτική"
-
-#: settings/base.py:302
-msgid "Health"
-msgstr "Υγεία"
-
-#: settings/base.py:303
-msgid "Hiking"
-msgstr "Πεζοπορία-Ορειβασία"
-
-#: settings/base.py:304
-msgid "History"
-msgstr "Ιστορία"
-
-#: settings/base.py:305
-msgid "Public sector"
-msgstr "Δημόσιος τομέας"
-
-#: settings/base.py:306
-msgid "Science"
-msgstr "Επιστήμες"
-
-#: settings/base.py:307
-msgid "Shopping"
-msgstr "Ψώνια"
-
-#: settings/base.py:308
-msgid "Sport and Leisure"
-msgstr "Αθλητισμός και ελεύθερος χρόνος"
-
-#: settings/base.py:309
-msgid "Travel"
-msgstr "Ταξίδια"
-
-#: settings/base.py:310
-msgid "Transports"
-msgstr "Μεταφορές"
-
-#: settings/base.py:311
-msgid "Tourism"
-msgstr "Τουρισμός"
-
 #: templates/403.html:8
 msgid ""
 "<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" "
@@ -491,7 +423,7 @@ msgstr "Οι ομάδες μου"
 msgid "Map of the uMaps"
 msgstr "Χάρτης των uMaps"
 
-#: templates/umap/home.html:25
+#: templates/umap/home.html:24
 msgid "Get inspired, browse maps"
 msgstr "Περιηγήσου και αναζήτησε την έμπνευση στους χάρτες!"
 
@@ -499,15 +431,11 @@ msgstr "Περιηγήσου και αναζήτησε την έμπνευση
 msgid "You are logged in. Continuing..."
 msgstr "Είστε συνδεδεμένοι. Συνέχεια..."
 
-#: templates/umap/map_list.html:18 views.py:444
+#: templates/umap/map_list.html:11 views.py:437
 msgid "by"
 msgstr "από"
 
-#: templates/umap/map_list.html:22
+#: templates/umap/map_list.html:20
-msgid "See the map"
-msgstr "Δες τον χάρτη"
-
-#: templates/umap/map_list.html:28
 msgid "More"
 msgstr "Περισσότερα"
 
@@ -666,15 +594,11 @@ msgid_plural "%(count)s maps found:"
 msgstr[0] "%(count)s χάρτης βρέθηκε:"
 msgstr[1] "%(count)s χάρτες βρέθηκαν:"
 
-#: templates/umap/search.html:30
+#: templates/umap/search.html:28
 msgid "No map found."
 msgstr "Δεν βρέθηκε κανένας χάρτης."
 
-#: templates/umap/search.html:36
+#: templates/umap/search.html:33
-msgid "Latest created maps in category"
-msgstr "Τελευταία δημιουργημένοι χάρτες στην κατηγορία"
-
-#: templates/umap/search.html:43
 msgid "Latest created maps"
 msgstr "Χάρτες που δημιουργήθηκαν τελευταίοι"
 
@@ -682,11 +606,7 @@ msgstr "Χάρτες που δημιουργήθηκαν τελευταίοι"
 msgid "Search maps"
 msgstr "Αναζήτηση χαρτών"
 
-#: templates/umap/search_bar.html:14
+#: templates/umap/search_bar.html:16
-msgid "Any category"
-msgstr "Οποιαδήποτε κατηγορία"
-
-#: templates/umap/search_bar.html:19
 msgid "Search"
 msgstr "Αναζήτηση"
 
@@ -750,70 +670,70 @@ msgstr "Χρήστες"
 msgid "New team"
 msgstr "Νέα ομάδα"
 
-#: views.py:235
+#: views.py:234
 msgid "Cannot delete a team with more than one member"
 msgstr "Δεν είναι δυνατή η διαγραφή μιας ομάδας που έχει περισσότερα από ένα μέλη"
 
-#: views.py:239
+#: views.py:238
 #, python-format
 msgid "Team “%(name)s” has been deleted"
 msgstr "Η ομάδα «%(name)s» έχει διαγραφεί."
 
-#: views.py:449
+#: views.py:442
 msgid "View the map"
 msgstr "Προβολή του χάρτη"
 
-#: views.py:845
+#: views.py:838
 msgid "See full screen"
 msgstr "Προβολή πλήρους οθόνης"
 
-#: views.py:988
+#: views.py:981
 msgid "Map editors updated with success!"
 msgstr "Η ενημέρωση των συντακτών χάρτη ήταν επιτυχής!"
 
-#: views.py:1024
+#: views.py:1017
 #, python-format
 msgid "The uMap edit link for your map: %(map_name)s"
 msgstr "Ο uMap σύνδεσμος επεξεργασίας του χάρτη σας: %(map_name)s"
 
-#: views.py:1027
+#: views.py:1020
 #, python-format
 msgid "Here is your secret edit link: %(link)s"
 msgstr "Εδώ είναι ο μυστικός σύνδεσμος επεξεργασίας: %(link)s"
 
-#: views.py:1034
+#: views.py:1027
 #, python-format
 msgid "Can't send email to %(email)s"
 msgstr "Αδυναμία αποστολής email στο %(email)s"
 
-#: views.py:1037
+#: views.py:1030
 #, python-format
 msgid "Email sent to %(email)s"
 msgstr "Μήνυμα email στάλθηκε στο %(email)s"
 
-#: views.py:1048
+#: views.py:1041
 msgid "Only its owner can delete the map."
 msgstr "Μονό ο ιδιοκτήτης μπορεί να διαγράψει αυτό τον χάρτη."
 
-#: views.py:1054
+#: views.py:1044
 msgid "Map successfully deleted."
 msgstr "Ο χάρτης διαγράφηκε με επιτυχία."
 
-#: views.py:1080
+#: views.py:1070
 #, 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 "Ο χάρτης κλωνοποιήθηκε! Αν θέλετε να τον επεξεργαστείτε από κάποιον άλλο υπολογιστή, παρακαλώ χρησιμοποιήστε αυτόν τον σύνδεσμο: %(anonymous_url)s"
 
-#: views.py:1085
+#: views.py:1075
 msgid "Congratulations, your map has been cloned!"
 msgstr "Συγχαρητήρια ο χάρτης σας κλωνοποιήθηκε!"
 
-#: views.py:1339
+#: views.py:1329
 msgid "Layer successfully deleted."
 msgstr "Το επίπεδο διαγράφηκε με επιτυχία."
 
-#: views.py:1361
+#: views.py:1351
 msgid "Permissions updated with success!"
 msgstr "Τα δικαιώματα ενημερώθηκαν με επιτυχία!"

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: 2025-04-25 15:38+0000\n"
+"POT-Creation-Date: 2025-04-11 15:30+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"
@@ -165,71 +165,71 @@ msgstr ""
 msgid "Display this layer on load."
 msgstr ""
 
-#: settings/base.py:296
+#: settings/base.py:295
 msgid "Art and Culture"
 msgstr ""
 
-#: settings/base.py:297
+#: settings/base.py:296
 msgid "Cycling"
 msgstr ""
 
-#: settings/base.py:298
+#: settings/base.py:297
 msgid "Business"
 msgstr ""
 
-#: settings/base.py:299
+#: settings/base.py:298
 msgid "Environment"
 msgstr ""
 
-#: settings/base.py:300
+#: settings/base.py:299
 msgid "Education"
 msgstr ""
 
-#: settings/base.py:301
+#: settings/base.py:300
 msgid "Food and Agriculture"
 msgstr ""
 
-#: settings/base.py:302
+#: settings/base.py:301
 msgid "Geopolitics"
 msgstr ""
 
-#: settings/base.py:303
+#: settings/base.py:302
 msgid "Health"
 msgstr ""
 
-#: settings/base.py:304
+#: settings/base.py:303
 msgid "Hiking"
 msgstr ""
 
-#: settings/base.py:305
+#: settings/base.py:304
 msgid "History"
 msgstr ""
 
-#: settings/base.py:306
+#: settings/base.py:305
 msgid "Public sector"
 msgstr ""
 
-#: settings/base.py:307
+#: settings/base.py:306
 msgid "Science"
 msgstr ""
 
-#: settings/base.py:308
+#: settings/base.py:307
 msgid "Shopping"
 msgstr ""
 
-#: settings/base.py:309
+#: settings/base.py:308
 msgid "Sport and Leisure"
 msgstr ""
 
-#: settings/base.py:310
+#: settings/base.py:309
 msgid "Travel"
 msgstr ""
 
-#: settings/base.py:311
+#: settings/base.py:310
 msgid "Transports"
 msgstr ""
 
-#: settings/base.py:312
+#: settings/base.py:311
 msgid "Tourism"
 msgstr ""
 

umap/locale/es/LC_MESSAGES/django.po

@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uMap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-11 15:30+0000\n"
+"POT-Creation-Date: 2025-03-03 17:36+0000\n"
 "PO-Revision-Date: 2013-11-22 14:00+0000\n"
 "Last-Translator: Ignacio L'Episcopo, 2024-2025\n"
 "Language-Team: Spanish (http://app.transifex.com/openstreetmap/umap/language/es/)\n"
@@ -44,205 +44,137 @@ msgstr "Sitio en modo solo lectura por mantenimiento"
 msgid ""
 "Using “%(name)s” to authenticate is deprecated and will be removed soon. "
 "Please configure another provider below before losing access to your account"
-" and maps. Then, please logout and login again with the new provider."
+" and maps."
-msgstr "El uso de “%(name)s” para autenticar está obsoleto y se eliminará pronto. Por favor, configura otro proveedor a continuación antes de perder acceso a tu cuenta y mapas. Luego, cierra sesión e inicia sesión nuevamente con el nuevo proveedor."
+msgstr ""
 
-#: models.py:61 models.py:80
+#: models.py:60 models.py:79
 msgid "name"
 msgstr "nombre"
 
-#: models.py:63 models.py:493
+#: models.py:62 models.py:485
 msgid "description"
 msgstr "descripción"
 
-#: models.py:111
+#: models.py:110
 msgid "details"
 msgstr "detalles"
 
-#: models.py:112
+#: models.py:111
 msgid "Link to a page where the licence is detailed."
 msgstr "Enlace a una página donde se detalla la licencia."
 
-#: models.py:122
+#: models.py:121
 msgid "URL template using OSM tile format"
 msgstr "Plantilla de URL usando el formato de teselas OSM"
 
-#: models.py:128
+#: models.py:127
 msgid "Order of the tilelayers in the edit box"
 msgstr "Orden de las capas de teselas en el cuadro de edición"
 
-#: models.py:176 models.py:487
+#: models.py:175 models.py:479
 msgid "Only editable with secret edit link"
 msgstr "Solo editable con enlace secreto de edición"
 
-#: models.py:177 models.py:488
+#: models.py:176 models.py:480
 msgid "Everyone can edit"
 msgstr "Todos pueden editar"
 
-#: models.py:180 models.py:481
+#: models.py:179 models.py:473
 msgid "Everyone"
 msgstr "Todos"
 
-#: models.py:181 models.py:190 models.py:482
+#: models.py:180 models.py:189 models.py:474
 msgid "Editors and team only"
 msgstr "Solo editores y equipo"
 
-#: models.py:182 models.py:483
+#: models.py:181 models.py:475
 msgid "Owner only"
 msgstr "Solo el propietario"
 
-#: models.py:185
+#: models.py:184
 msgid "Draft (private)"
 msgstr "Borrador (privado)"
 
-#: models.py:186
+#: models.py:185
 msgid "Everyone (public)"
 msgstr "Todos (público)"
 
-#: models.py:189
+#: models.py:188
 msgid "Anyone with link"
 msgstr "Cualquiera con el enlace"
 
-#: models.py:191
+#: models.py:190
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: models.py:192 models.py:477
+#: models.py:191 models.py:469
 msgid "Deleted"
 msgstr "Eliminado"
 
-#: models.py:195
+#: models.py:194
 msgid "center"
 msgstr "centro"
 
-#: models.py:196
+#: models.py:195
 msgid "zoom"
 msgstr "zoom"
 
-#: models.py:198
+#: models.py:197
 msgid "locate"
 msgstr "localizar"
 
-#: models.py:198
+#: models.py:197
 msgid "Locate user on load?"
 msgstr "¿Localizar al usuario al cargar?"
 
-#: models.py:202
+#: models.py:201
 msgid "Choose the map licence."
 msgstr "Elige la licencia del mapa."
 
-#: models.py:203
+#: models.py:202
 msgid "licence"
 msgstr "licencia"
 
-#: models.py:214
+#: models.py:213
 msgid "owner"
 msgstr "propietario"
 
-#: models.py:218
+#: models.py:217
 msgid "editors"
 msgstr "editores"
 
-#: models.py:224
+#: models.py:223
 msgid "team"
 msgstr "equipo"
 
-#: models.py:230 models.py:509
+#: models.py:229 models.py:501
 msgid "edit status"
 msgstr "estado de edición"
 
-#: models.py:235 models.py:514
+#: models.py:234 models.py:506
 msgid "share status"
 msgstr "estado de compartir"
 
-#: models.py:238 models.py:504
+#: models.py:237 models.py:496
 msgid "settings"
 msgstr "ajustes"
 
-#: models.py:410
+#: models.py:407
 msgid "Clone of"
 msgstr "Clon de"
 
-#: models.py:476 models.py:480 models.py:486
+#: models.py:468 models.py:472 models.py:478
 msgid "Inherit"
 msgstr "Heredar"
 
-#: models.py:499
+#: models.py:491
 msgid "display on load"
 msgstr "mostrar al cargar"
 
-#: models.py:500
+#: models.py:492
 msgid "Display this layer on load."
 msgstr "Mostrar esta capa al cargar."
 
-#: settings/base.py:295
-msgid "Art and Culture"
-msgstr "Arte y cultura"
-
-#: settings/base.py:296
-msgid "Cycling"
-msgstr "Ciclismo"
-
-#: settings/base.py:297
-msgid "Business"
-msgstr "Negocios"
-
-#: settings/base.py:298
-msgid "Environment"
-msgstr "Medio ambiente"
-
-#: settings/base.py:299
-msgid "Education"
-msgstr "Educación"
-
-#: settings/base.py:300
-msgid "Food and Agriculture"
-msgstr "Alimentos y agricultura"
-
-#: settings/base.py:301
-msgid "Geopolitics"
-msgstr "Geopolítica"
-
-#: settings/base.py:302
-msgid "Health"
-msgstr "Salud"
-
-#: settings/base.py:303
-msgid "Hiking"
-msgstr "Senderismo"
-
-#: settings/base.py:304
-msgid "History"
-msgstr "Historia"
-
-#: settings/base.py:305
-msgid "Public sector"
-msgstr "Sector público"
-
-#: settings/base.py:306
-msgid "Science"
-msgstr "Ciencia"
-
-#: settings/base.py:307
-msgid "Shopping"
-msgstr "Compras"
-
-#: settings/base.py:308
-msgid "Sport and Leisure"
-msgstr "Deporte y ocio"
-
-#: settings/base.py:309
-msgid "Travel"
-msgstr "Viajes"
-
-#: settings/base.py:310
-msgid "Transports"
-msgstr "Transporte"
-
-#: settings/base.py:311
-msgid "Tourism"
-msgstr "Turismo"
-
 #: templates/403.html:8
 msgid ""
 "<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" "
@@ -495,7 +427,7 @@ msgstr "Mis equipos"
 msgid "Map of the uMaps"
 msgstr "Mapa de los uMaps"
 
-#: templates/umap/home.html:25
+#: templates/umap/home.html:24
 msgid "Get inspired, browse maps"
 msgstr "Inspírate, navega por los mapas"
 
@@ -503,15 +435,11 @@ msgstr "Inspírate, navega por los mapas"
 msgid "You are logged in. Continuing..."
 msgstr "Has iniciado sesión. Continuando..."
 
-#: templates/umap/map_list.html:18 views.py:444
+#: templates/umap/map_list.html:11 views.py:437
 msgid "by"
 msgstr "por"
 
-#: templates/umap/map_list.html:22
+#: templates/umap/map_list.html:20
-msgid "See the map"
-msgstr "Ver el mapa"
-
-#: templates/umap/map_list.html:28
 msgid "More"
 msgstr "Más"
 
@@ -671,15 +599,11 @@ msgstr[0] "%(count)s mapa encontrado:"
 msgstr[1] "%(count)s mapas encontrados:"
 msgstr[2] "%(count)s mapas encontrados:"
 
-#: templates/umap/search.html:30
+#: templates/umap/search.html:28
 msgid "No map found."
 msgstr "No se ha encontrado ningún mapa."
 
-#: templates/umap/search.html:36
+#: templates/umap/search.html:33
-msgid "Latest created maps in category"
-msgstr "Últimos mapas creados en la categoría"
-
-#: templates/umap/search.html:43
 msgid "Latest created maps"
 msgstr "Últimos mapas creados"
 
@@ -687,11 +611,7 @@ msgstr "Últimos mapas creados"
 msgid "Search maps"
 msgstr "Buscar mapas"
 
-#: templates/umap/search_bar.html:14
+#: templates/umap/search_bar.html:16
-msgid "Any category"
-msgstr "Cualquier categoría"
-
-#: templates/umap/search_bar.html:19
 msgid "Search"
 msgstr "Buscar"
 
@@ -755,70 +675,70 @@ msgstr "Usuarios"
 msgid "New team"
 msgstr "Nuevo equipo"
 
-#: views.py:235
+#: views.py:234
 msgid "Cannot delete a team with more than one member"
 msgstr "No se puede eliminar un equipo con más de un miembro"
 
-#: views.py:239
+#: views.py:238
 #, python-format
 msgid "Team “%(name)s” has been deleted"
 msgstr "El equipo “%(name)s” ha sido eliminado"
 
-#: views.py:449
+#: views.py:442
 msgid "View the map"
 msgstr "Ver el mapa"
 
-#: views.py:845
+#: views.py:838
 msgid "See full screen"
 msgstr "Ver en pantalla completa"
 
-#: views.py:988
+#: views.py:981
 msgid "Map editors updated with success!"
 msgstr "¡Los editores del mapas han sido actualizados con éxito!"
 
-#: views.py:1024
+#: views.py:1017
 #, python-format
 msgid "The uMap edit link for your map: %(map_name)s"
 msgstr "El enlace de edición de uMap para tu mapa: %(map_name)s"
 
-#: views.py:1027
+#: views.py:1020
 #, python-format
 msgid "Here is your secret edit link: %(link)s"
 msgstr "Aquí está tu enlace secreto de edición: %(link)s"
 
-#: views.py:1034
+#: views.py:1027
 #, python-format
 msgid "Can't send email to %(email)s"
 msgstr "No se puede enviar correo electrónico a %(email)s"
 
-#: views.py:1037
+#: views.py:1030
 #, python-format
 msgid "Email sent to %(email)s"
 msgstr "Correo electrónico enviado a %(email)s"
 
-#: views.py:1048
+#: views.py:1041
 msgid "Only its owner can delete the map."
 msgstr "Sólo el propietario puede borrar el mapa."
 
-#: views.py:1054
+#: views.py:1044
 msgid "Map successfully deleted."
 msgstr "Mapa eliminado correctamente."
 
-#: views.py:1080
+#: views.py:1070
 #, 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 "¡Tu mapa ha sido clonado! Si quieres editar este mapa desde otro ordenador, usa este enlace: %(anonymous_url)s"
 
-#: views.py:1085
+#: views.py:1075
 msgid "Congratulations, your map has been cloned!"
 msgstr "¡Enhorabuena! ¡Tu mapa ha sido clonado!"
 
-#: views.py:1339
+#: views.py:1329
 msgid "Layer successfully deleted."
 msgstr "Se eliminó la capa con éxito."
 
-#: views.py:1361
+#: views.py:1351
 msgid "Permissions updated with success!"
 msgstr "¡Permisos actualizados con éxito!"

umap/locale/nl/LC_MESSAGES/django.po

@@ -670,7 +670,7 @@ msgstr "Geen kaart gevonden."
 
 #: templates/umap/search.html:36
 msgid "Latest created maps in category"
-msgstr "Laatst gemaakte kaarten in categorie"
+msgstr ""
 
 #: templates/umap/search.html:43
 msgid "Latest created maps"

umap/models.py

@@ -551,7 +551,6 @@ class DataLayer(NamedModel):
         if self.old_id:
             metadata["old_id"] = self.old_id
         metadata["id"] = self.pk
-        metadata["rank"] = self.rank
         metadata["permissions"] = {"edit_status": self.edit_status}
         metadata["editMode"] = "advanced" if self.can_edit(request) else "disabled"
         metadata["_referenceVersion"] = self.reference_version

umap/settings/base.py

@@ -19,7 +19,6 @@ env = environ.Env()
 
 INTERNAL_IPS = env.list("INTERNAL_IPS", default=["127.0.0.1"])
 ALLOWED_HOSTS = env.list("ALLOWED_HOSTS", default=["*"])
-CSRF_TRUSTED_ORIGINS = env.list("CSRF_TRUSTED_ORIGINS", default=[])
 ADMINS = tuple(parseaddr(email) for email in env.list("ADMINS", default=[]))
 ASGI_APPLICATION = "umap.asgi.application"
 

umap/static/umap/css/bar.css

@@ -1,6 +1,6 @@
 .umap-main-edit-toolbox [type=button] {
     color: #fff;
-    font-size: 0.8rem;
+    font-size: 1em;
     background-color: var(--color-darkGray);
     width: auto;
     margin-bottom: 0;

umap/static/umap/css/form.css

@@ -6,7 +6,7 @@ input[type="text"], input[type="password"], input[type="date"],
 input[type="datetime-local"], input[type="email"], input[type="number"],
 input[type="search"], input[type="tel"], input[type="time"], input[type="file"],
 input[type="url"], textarea {
-    background-color: var(--color-light);
+    background-color: white;
     border: 2px solid var(--color-darkBlue);
     color: var(--text-color);
     display: block;
@@ -47,7 +47,7 @@ input[type=checkbox]:checked:after {
 }
 input[data-modified=true] {
     background-color: var(--color-lightCyan);
-    border: 1px solid var(--color-veryDarkGray);
+    border: 1px solid var(--color-darkGray);
 }
 input + select,
 select + input,
@@ -71,7 +71,7 @@ select {
 .dark select {
     color: var(--text-color);
     background-color: var(--color-darkGray);
-    border-color: var(--color-veryDarkGray);
+    border-color: var(--color-dark);
     border-width: 1px;
 }
 select[multiple="multiple"] {
@@ -89,7 +89,7 @@ input[type="submit"] {
     text-decoration: none;
     justify-content: center;
     background-color: var(--color-darkBlue);
-    color: var(--color-light);
+    color: white;
     font-weight: normal;
     min-height: 40px;
 }
@@ -97,21 +97,21 @@ input[type="submit"] {
 .dark [type="button"] {
     background-color: var(--color-darkerGray);
     color: var(--text-color);
-    border: 1px solid var(--color-veryDarkGray);
+    border: 1px solid #1b1f20;
 }
 .button.primary {
     font-weight: bold;
 }
 .dark .button.primary:not([disabled]),
 .dark [type="button"].primary:not([disabled]) {
-    background-color: var(--color-verySoftCyan);
+    background-color: var(--color-brightCyan);
     color: var(--color-dark);
-    border: 1px solid var(--color-veryDarkGray);
+    border: 1px solid #1b1f20;
 }
 .dark .button:hover,
 .dark [type="button"]:hover,
 .dark input[type="submit"]:hover {
-    background-color: var(--color-darkerGray);
+    background-color: #2e3436;
 }
 .dark a {
     color: var(--text-color);
@@ -151,14 +151,14 @@ button.round.small {
     display: block;
     padding: 7px 7px;
     margin-bottom: 14px;
-    background: var(--color-mediumGray);
+    background: #393F3F;
     color: var(--color-lightGray);
     font-size: 10px;
     border-radius: 0 2px;
 }
 .content .helptext {
-    background-color: var(--color-lightGray);
+    background-color: #eee;
-    color: var(--color-dark);
+    color: #000;
 }
 input + .help-text {
     margin-top: -14px;
@@ -205,8 +205,8 @@ input + .error {
     margin-top: -14px;
     margin-bottom: 14px;
     background: var(--color-lightGray);
-    color: var(--color-light);
+    color: #fff;
-    background-color: var(--color-red);
+    background-color: #cc0000;
     font-size: 11px;
     border-radius: 0 2px;
 }
@@ -214,14 +214,14 @@ input[type="file"] + .error {
     margin-top: 0;
 }
 input[value]:invalid {
-    border-color: var(--color-red);
+    border-color: red;
-    background-color: var(--color-darkRed);
+    background-color: darkred;
 }
 .dark input, .dark textarea {
     background-color: var(--color-darkerGray);
-    border-color: var(--color-veryDarkGray);
+    border-color: var(--color-dark);
     border-width: 1px;
-    color: var(--color-lightGray);
+    color: #efefef;
 }
 details {
     margin-bottom: 5px;
@@ -229,7 +229,7 @@ details {
     border-start-end-radius: 4px;
 }
 .dark details {
-    border: 1px solid var(--color-veryDarkGray);
+    border: 1px solid #222;
 }
 details fieldset {
     overflow: hidden;
@@ -245,8 +245,8 @@ details summary {
     padding: 0 5px;
 }
 .dark details summary {
-    background-color: var(--color-darkerGray);
+    background-color: #232729;
-    color: var(--color-light);
+    color: #fff;
 }
 .dark details fieldset {
     border: 1px solid var(--color-darkGray);
@@ -311,34 +311,33 @@ input.switch:empty ~ label:after {
     width: 6em;
     -webkit-transition: all 100ms ease-in;
     transition: all 100ms ease-in;
-    color: var(--color-mediumGray);
+    color: #c9c9c7;
     font-weight: bold;
-    background-color: var(--color-lighterGray);
+    background-color: #ededed;
 }
 .dark input.switch:empty ~ label:before,
 .dark input.switch:empty ~ label:after {
-    background-color: var(--color-darkerGray);
+    background-color: #272c2e;
 }
 input.switch:empty ~ label:after {
     width: 3em;
     margin-inline-start: 0.1em;
-    background-color: var(--color-lightGray);
+    background-color: #ededed;
     content: "OFF";
     text-indent: 3.5em;
-    border: 1px solid var(--color-darkerGray);
+    border: 1px solid #374E75;
     font-weight: bold;
 }
 .dark input.switch:empty ~ label:after {
-    border: 1px solid var(--color-veryDarkGray);
+    border: 1px solid #202425;
-    background-color: var(--color-darkerGray);
+    background-color: #2c3233;
-    color: var(--color-lightGray);
 }
 input.switch:checked:empty ~ label:after {
     content: ' ';
 }
 .dark input.switch:checked ~ label:before,
 input.switch:checked ~ label:before {
-    background-color: var(--color-verySoftCyan);
+    background-color: var(--color-lightCyan);
     border: 1px solid var(--color-lightGray);
     color: var(--color-darkGray);
     content: "ON";
@@ -348,7 +347,7 @@ input.switch:checked ~ label:before {
 }
 .dark input.switch:checked ~ label:before {
     border: none;
-    background-color: var(--color-verySoftCyan);
+    background-color: var(--color-accent);
 }
 input.switch:checked ~ label:after {
     margin-inline-start: 3em;
@@ -388,9 +387,9 @@ input.switch:checked ~ label:after {
     display: none;
 }
 .umap-multiplechoice label {
-    border: 1px solid var(--color-veryDarkGray);
+    border: 1px solid #374E75;
     cursor: pointer;
-    background-color: var(--color-lightGray);
+    background-color: #c9c9c7;
     min-height: 30px;
     line-height: 30px;
     text-align: center;
@@ -398,11 +397,12 @@ input.switch:checked ~ label:after {
     display: inline-block;
 }
 .dark .umap-multiplechoice label {
-    border: 1px solid var(--color-veryDarkGray);
+    border: 1px solid black;
-    background-color: var(--color-darkGray);
+    background-color: #2c3233;
 }
 .umap-multiplechoice input[type='radio']:checked + label {
-    background-color: var(--color-verySoftCyan);
+    background-color: var(--color-accent);
+    box-shadow: inset 0 0 6px 0px #2c3233;
     color: var(--color-darkGray);
 }
 .inheritable .header .buttons {
@@ -420,7 +420,7 @@ input.switch:checked ~ label:after {
     width: initial;
 }
 .inheritable + .inheritable {
-    border-top: 1px solid var(--color-darkerGray);
+    border-top: 1px solid #222;
     padding-top: 5px;
     margin-top: 5px;
 }
@@ -504,7 +504,7 @@ i.info {
     justify-content: space-around;
     font-size: 1.2em;
     margin-bottom: 20px;
-    border-bottom: 1px solid var(--color-lighterGray);
+    border-bottom: 1px solid #bebebe;
 }
 .flat-tabs button {
     padding: 10px;
@@ -515,14 +515,14 @@ i.info {
 .flat-tabs button:hover,
 .flat-tabs .on {
     font-weight: bold;
-    border-bottom: 1px solid var(--color-mediumGray);
+    border-bottom: 1px solid #444;
 }
 .dark .flat-tabs button {
-    color: var(--color-light);
+    color: #fff;
 }
 .dark .flat-tabs button:hover,
 .dark .flat-tabs .on {
-    border-bottom: 1px solid var(--color-light);
+    border-bottom: 1px solid #fff;
 }
 .umap-pictogram-category h6 {
     font-size: 1.3em;
@@ -538,11 +538,11 @@ i.info {
     height: 30px;
     line-height: 30px;
     cursor: pointer;
-    background-color: var(--color-lightGray);
+    background-color: #999;
     text-align: center;
     margin-bottom: 5px;
     display: inline-block;
-    color: var(--color-dark);
+    color: black;
     font-weight: bold;
     overflow: hidden;
 }
@@ -552,10 +552,10 @@ i.info {
 }
 .umap-pictogram-choice:hover,
 .umap-color-picker span:hover {
-    background-color: var(--color-lighterGray);
+    background-color: #bebebe;
 }
 .umap-pictogram-choice.selected {
-    box-shadow: inset 0 0 0 1px var(--color-lighterGray);
+    box-shadow: inset 0 0 0 1px #e9e9e9;
 }
 
 .umap-pictogram-choice .leaflet-marker-icon {

umap/static/umap/css/tooltip.css

@@ -59,16 +59,3 @@
 .tooltip-accent li:last-of-type {
     margin-bottom: 0;
 }
-
-.umap-tooltip-container.tooltip-right:before {
-    right: 100%;
-    top: calc(50% - var(--arrow-size));
-    border: solid transparent;
-    content: " ";
-    height: 0;
-    width: 0;
-    position: absolute;
-    pointer-events: none;
-    border-right-color: var(--tooltip-color);
-    border-width: var(--arrow-size);
-}

umap/static/umap/js/modules/autocomplete.js

@@ -7,7 +7,6 @@ import {
 import { translate } from './i18n.js'
 import { Request, ServerRequest } from './request.js'
 import { escapeHTML, generateId } from './utils.js'
-import * as Utils from './utils.js'
 
 export class BaseAutocomplete {
   constructor(parent, options) {
@@ -292,9 +291,10 @@ class BaseServerAjax extends BaseAjax {
 export const SingleMixin = (Base) =>
   class extends Base {
     initSelectedContainer() {
-      const el = Utils.loadTemplate('<div class="umap-singleresult"></div>')
+      return DomUtil.after(
-      this.input.parentNode.insertBefore(el, this.input.nextSibling)
+        this.input,
-      return el
+        DomUtil.element({ tagName: 'div', className: 'umap-singleresult' })
+      )
     }
 
     displaySelected(result) {
@@ -322,9 +322,10 @@ export const SingleMixin = (Base) =>
 export const MultipleMixin = (Base) =>
   class extends Base {
     initSelectedContainer() {
-      const el = Utils.loadTemplate('<ul class="umap-multiresult"></ul>')
+      return DomUtil.after(
-      this.input.parentNode.insertBefore(el, this.input.nextSibling)
+        this.input,
-      return el
+        DomUtil.element({ tagName: 'ul', className: 'umap-multiresult' })
+      )
     }
 
     displaySelected(result) {

umap/static/umap/js/modules/browser.js

@@ -5,7 +5,6 @@ import { translate } from './i18n.js'
 import * as Icon from './rendering/icon.js'
 import ContextMenu from './ui/contextmenu.js'
 import * as Utils from './utils.js'
-import { SCHEMA } from './schema.js'
 
 export default class Browser {
   constructor(umap, leafletMap) {
@@ -22,24 +21,35 @@ export default class Browser {
   addFeature(feature, parent) {
     if (feature.isFiltered()) return
     if (this.options.inBbox && !feature.isOnScreen(this.bounds)) return
-    const template = `
+    const row = DomUtil.create('li', `${feature.getClassName()} feature`)
-      <li class="feature ${feature.getClassName()}">
+    const zoom_to = DomUtil.createButtonIcon(
-        <button class="icon icon-16 icon-zoom" title="${translate('Bring feature to center')}" data-ref=zoom></button>
+      row,
-        <button class="icon icon-16 show-on-edit icon-edit" title="${translate('Edit this feature')}" data-ref=edit></button>
+      'icon-zoom',
-        <button class="icon icon-16 show-on-edit icon-delete" title="${translate('Delete this feature')}" data-ref=remove></button>
+      translate('Bring feature to center')
-        <i class="icon icon-16 icon-${feature.getClassName()} feature-color" data-ref=colorBox></i>
+    )
-        <span class="feature-title" data-ref=label></span>
+    const edit = DomUtil.createButtonIcon(
-      </li>
+      row,
-    `
+      'show-on-edit icon-edit',
-    const [row, { zoom, edit, remove, colorBox, label }] =
+      translate('Edit this feature')
-      Utils.loadTemplateWithRefs(template)
+    )
-    label.textContent = label.title = feature.getDisplayName() || '—'
+    const del = DomUtil.createButtonIcon(
+      row,
+      'show-on-edit icon-delete',
+      translate('Delete this feature')
+    )
+    const colorBox = DomUtil.create(
+      'i',
+      `icon icon-16 icon-${feature.getClassName()} feature-color`,
+      row
+    )
+    const title = DomUtil.create('span', 'feature-title', row)
     const symbol = feature._getIconUrl
       ? Icon.formatUrl(feature._getIconUrl(), feature)
       : null
+    title.textContent = title.title = feature.getDisplayName() || '—'
     const bgcolor = feature.getPreviewColor()
     colorBox.style.backgroundColor = bgcolor
-    if (symbol && symbol !== SCHEMA.iconUrl.default) {
+    if (symbol && symbol !== U.SCHEMA.iconUrl.default) {
       const icon = Icon.makeElement(symbol, colorBox)
       Icon.setContrast(icon, colorBox, symbol, bgcolor)
     } else if (DomUtil.contrastedColor(colorBox, bgcolor)) {
@@ -48,10 +58,10 @@ export default class Browser {
     const viewFeature = (e) => {
       feature.zoomTo({ ...e, callback: () => feature.view() })
     }
-    zoom.addEventListener('click', viewFeature)
+    DomEvent.on(zoom_to, 'click', viewFeature)
-    label.addEventListener('click', viewFeature)
+    DomEvent.on(title, 'click', viewFeature)
-    edit.addEventListener('click', () => feature.edit())
+    DomEvent.on(edit, 'click', feature.edit, feature)
-    remove.addEventListener('click', () => feature.del())
+    DomEvent.on(del, 'click', feature.del, feature)
     // HOTFIX. Remove when this is released:
     // https://github.com/Leaflet/Leaflet/pull/9052
     DomEvent.disableClickPropagation(row)
@@ -63,51 +73,51 @@ export default class Browser {
   }
 
   addDataLayer(datalayer, parent) {
-    const open = this.mode !== 'layers' ? ' open' : ''
+    let className = `datalayer ${datalayer.getHidableClass()}`
-    const [container, { headline, toolbox, label }] = Utils.loadTemplateWithRefs(`
+    if (this.mode !== 'layers') className += ' show-list'
-      <details class="datalayer ${datalayer.getHidableClass()}" id="${this.datalayerId(datalayer)}"${open}>
+    const container = DomUtil.create('div', className, parent)
-        <summary data-ref=headline>
+    const headline = DomUtil.create('h5', '', container)
-          <span data-ref=toolbox></span>
+    container.id = this.datalayerId(datalayer)
-          <span class="datalayer-name" data-id="${datalayer.id}" data-ref=label></span>
+    const ul = DomUtil.create('ul', '', container)
-          <span class="datalayer-counter"></span>
-        </summary>
-        <ul></ul>
-      </details>
-    `)
-    datalayer.renderToolbox(toolbox)
-    parent.appendChild(container)
     this.updateDatalayer(datalayer)
   }
 
   updateDatalayer(datalayer) {
     // Compute once, but use it for each feature later.
     this.bounds = this._leafletMap.getBounds()
-    const id = this.datalayerId(datalayer)
+    const parent = DomUtil.get(this.datalayerId(datalayer))
-    const parent = document.getElementById(id)
     // Panel is not open
     if (!parent) return
     parent.classList.toggle('off', !datalayer.isVisible())
-    const label = parent.querySelector('.datalayer-name')
     const container = parent.querySelector('ul')
+    const headline = parent.querySelector('h5')
+    const toggleList = () => parent.classList.toggle('show-list')
+    headline.innerHTML = ''
+    const toggle = DomUtil.create('i', 'icon icon-16 datalayer-toggle-list', headline)
+    DomEvent.on(toggle, 'click', toggleList)
+    datalayer.renderToolbox(headline)
+    const name = DomUtil.create('span', 'datalayer-name', headline)
+    name.textContent = name.title = datalayer.options.name
+    DomEvent.on(name, 'click', toggleList)
     container.innerHTML = ''
     datalayer.eachFeature((feature) => this.addFeature(feature, container))
-    datalayer.propagate(['properties.name'])
+
     const total = datalayer.count()
     if (!total) return
     const current = container.querySelectorAll('li').length
     const count = total === current ? total : `${current}/${total}`
-    const counter = parent.querySelector('.datalayer-counter')
+    const counter = DomUtil.create('span', 'datalayer-counter', headline)
     counter.textContent = `(${count})`
     counter.title = translate(`Features in this layer: ${count}`)
   }
 
   toggleBadge() {
-    Utils.toggleBadge(this.filtersTitle, this.hasFilters())
+    U.Utils.toggleBadge(this.filtersTitle, this.hasFilters())
-    Utils.toggleBadge('.umap-control-browse', this.hasFilters())
+    U.Utils.toggleBadge('.umap-control-browse', this.hasFilters())
   }
 
   onFormChange() {
-    this._umap.datalayers.browsable().map((datalayer) => {
+    this._umap.eachBrowsableDataLayer((datalayer) => {
       datalayer.resetLayer(true)
       this.updateDatalayer(datalayer)
       if (this._umap.fullPanel?.isOpen()) datalayer.tableEdit()
@@ -130,7 +140,7 @@ export default class Browser {
   onMoveEnd() {
     if (!this.isOpen()) return
     const isListDynamic = this.options.inBbox
-    this._umap.datalayers.browsable().map((datalayer) => {
+    this._umap.eachBrowsableDataLayer((datalayer) => {
       if (!isListDynamic && !datalayer.hasDynamicData()) return
       this.updateDatalayer(datalayer)
     })
@@ -139,7 +149,7 @@ export default class Browser {
   update() {
     if (!this.isOpen()) return
     this.dataContainer.innerHTML = ''
-    this._umap.datalayers.browsable().map((datalayer) => {
+    this._umap.eachBrowsableDataLayer((datalayer) => {
       this.addDataLayer(datalayer, this.dataContainer)
     })
   }
@@ -147,51 +157,21 @@ export default class Browser {
   open(mode) {
     // Force only if mode is known, otherwise keep current mode.
     if (mode) this.mode = mode
-    const template = `
+    const container = DomUtil.create('div')
-      <div>
-        <h3><i class="icon icon-16 icon-layers"></i>${translate('Data browser')}</h3>
-        <details class="filters" data-ref="details">
-          <summary data-ref=filtersTitle><i class="icon icon-16 icon-filters"></i>${translate('Filters')}</summary>
-          <fieldset>
-            <div data-ref=formContainer>
-            </div>
-            <button class="flat" type="button" data-ref=reset><i class="icon icon-16 icon-restore" title=""></i>${translate('Reset all')}</button>
-          </fieldset>
-        </details>
-        <div class="main-toolbox">
-          <i class="icon icon-16 icon-eye" title="${translate('show/hide all layers')}" data-ref="toggle"></i>
-          <i class="icon icon-16 icon-zoom" title="${translate('zoom to data extent')}" data-ref="fitBounds"></i>
-          <i class="icon icon-16 icon-download" title="${translate('download visible data')}" data-ref="download"></i>
-        </div>
-        <div data-ref=dataContainer></div>
-      </div>
-    `
-    const [
-      container,
-      {
-        details,
-        filtersTitle,
-        toggle,
-        fitBounds,
-        download,
-        dataContainer,
-        formContainer,
-        reset,
-      },
-    ] = Utils.loadTemplateWithRefs(template)
     // HOTFIX. Remove when this is released:
     // https://github.com/Leaflet/Leaflet/pull/9052
     DomEvent.disableClickPropagation(container)
-    details.open = this.mode === 'filters'
-    toggle.addEventListener('click', () => this.toggleLayers())
-    fitBounds.addEventListener('click', () => this._umap.fitDataBounds())
-    download.addEventListener('click', () => this.downloadVisible(download))
-    download.hidden = this._umap.getProperty('embedControl') === false
 
-    this.filtersTitle = filtersTitle
+    DomUtil.createTitle(container, translate('Data browser'), 'icon-layers')
-    this.dataContainer = dataContainer
+    this.formContainer = DomUtil.createFieldset(container, L._('Filters'), {
-    this.formContainer = formContainer
+      on: this.mode === 'filters',
+      className: 'filters',
+      icon: 'icon-filters',
+    })
+    this.filtersTitle = container.querySelector('summary')
     this.toggleBadge()
+    this.addMainToolbox(container)
+    this.dataContainer = DomUtil.create('div', '', container)
 
     let fields = [
       [
@@ -204,19 +184,27 @@ export default class Browser {
     builder.on('set', () => this.onFormChange())
     let filtersBuilder
     this.formContainer.appendChild(builder.build())
-    builder.form.addEventListener('reset', () => {
+    DomEvent.on(builder.form, 'reset', () => {
       window.setTimeout(builder.syncAll.bind(builder))
     })
     if (this._umap.properties.facetKey) {
       fields = this._umap.facets.build()
       filtersBuilder = new Form(this._umap.facets, fields)
       filtersBuilder.on('set', () => this.onFormChange())
-      filtersBuilder.form.addEventListener('reset', () => {
+      DomEvent.on(filtersBuilder.form, 'reset', () => {
         window.setTimeout(filtersBuilder.syncAll.bind(filtersBuilder))
       })
       this.formContainer.appendChild(filtersBuilder.build())
     }
-    reset.addEventListener('click', () => this.resetFilters())
+    const reset = DomUtil.createButton('flat', this.formContainer, '', () =>
+      this.resetFilters()
+    )
+    DomUtil.createIcon(reset, 'icon-restore')
+    DomUtil.element({
+      tagName: 'span',
+      parent: reset,
+      textContent: translate('Reset all'),
+    })
 
     this._umap.panel.open({
       content: container,
@@ -232,6 +220,21 @@ export default class Browser {
     }
   }
 
+  addMainToolbox(container) {
+    const [toolbox, { toggle, fitBounds, download }] = Utils.loadTemplateWithRefs(`
+      <div class="main-toolbox">
+        <i class="icon icon-16 icon-eye" title="${translate('show/hide all layers')}" data-ref="toggle"></i>
+        <i class="icon icon-16 icon-zoom" title="${translate('zoom to data extent')}" data-ref="fitBounds"></i>
+        <i class="icon icon-16 icon-download" title="${translate('download visible data')}" data-ref="download"></i>
+      </div>
+    `)
+    container.appendChild(toolbox)
+    toggle.addEventListener('click', () => this.toggleLayers())
+    fitBounds.addEventListener('click', () => this._umap.fitDataBounds())
+    download.addEventListener('click', () => this.downloadVisible(download))
+    download.hidden = this._umap.getProperty('embedControl') === false
+  }
+
   downloadVisible(element) {
     const menu = new ContextMenu({ fixed: true })
     const items = []
@@ -248,10 +251,10 @@ export default class Browser {
     // If at least one layer is shown, hide it
     // otherwise show all
     let allHidden = true
-    this._umap.datalayers.browsable().map((datalayer) => {
+    this._umap.eachBrowsableDataLayer((datalayer) => {
       if (datalayer.isVisible()) allHidden = false
     })
-    this._umap.datalayers.browsable().map((datalayer) => {
+    this._umap.eachBrowsableDataLayer((datalayer) => {
       datalayer._forcedVisibility = true
       if (allHidden) {
         datalayer.show()
@@ -262,13 +265,15 @@ export default class Browser {
   }
 
   static backButton(umap) {
-    const button = Utils.loadTemplate(
+    const button = DomUtil.createButtonIcon(
-      `<button class="icon icon-16 icon-back" title="${translate('Back to browser')}"></button>`
+      DomUtil.create('li', '', undefined),
+      'icon-back',
+      translate('Back to browser')
     )
     // Fixme: remove me when this is merged and released
     // https://github.com/Leaflet/Leaflet/pull/9052
     DomEvent.disableClickPropagation(button)
-    button.addEventListener('click', () => umap.openBrowser())
+    DomEvent.on(button, 'click', () => umap.openBrowser())
     return button
   }
 }

umap/static/umap/js/modules/caption.js

@@ -68,11 +68,9 @@ export default class Caption extends Utils.WithTemplate {
       this.elements.description.hidden = true
     }
     this.elements.datalayersContainer.innerHTML = ''
-    this._umap.datalayers
+    this._umap.eachDataLayerReverse((datalayer) =>
-      .reverse()
+      this.addDataLayer(datalayer, this.elements.datalayersContainer)
-      .map((datalayer) =>
+    )
-        this.addDataLayer(datalayer, this.elements.datalayersContainer)
-      )
     this.addCredits()
     if (this._umap.properties.created_at) {
       const created_at = translate('created at {date}', {
@@ -87,7 +85,7 @@ export default class Caption extends Utils.WithTemplate {
     }
     this._umap.panel.open({ content: this.element }).then(() => {
       // Create the legend when the panel is actually on the DOM
-      this._umap.datalayers.reverse().map((datalayer) => datalayer.renderLegend())
+      this._umap.eachDataLayerReverse((datalayer) => datalayer.renderLegend())
       this._umap.propagate()
     })
   }

umap/static/umap/js/modules/data/features.js

@@ -22,6 +22,7 @@ class Feature {
   constructor(umap, datalayer, geojson = {}, id = null) {
     this._umap = umap
     this.sync = umap.syncEngine.proxy(this)
+    this._isDirty = false
     this._ui = null
 
     // DataLayer the feature belongs to
@@ -53,6 +54,17 @@ class Feature {
     }
   }
 
+  set isDirty(status) {
+    this._isDirty = status
+    if (this.datalayer) {
+      this.datalayer.isDirty = status
+    }
+  }
+
+  get isDirty() {
+    return this._isDirty
+  }
+
   get ui() {
     if (!this._ui) this.makeUI()
     return this._ui
@@ -355,6 +367,7 @@ class Feature {
   }
 
   del(sync) {
+    this.isDirty = true
     this._umap._leafletMap.closePopup()
     if (this.datalayer) {
       this.datalayer.removeFeature(this, sync)
@@ -399,11 +412,13 @@ class Feature {
 
   changeDataLayer(datalayer) {
     if (this.datalayer) {
+      this.datalayer.isDirty = true
       this.datalayer.removeFeature(this)
     }
 
     datalayer.addFeature(this)
     this.sync.upsert(this.toGeoJSON())
+    datalayer.isDirty = true
     this.redraw()
   }
 
@@ -470,6 +485,7 @@ class Feature {
 
   deleteProperty(property) {
     delete this.properties[property]
+    this.isDirty = true
   }
 
   renameProperty(from, to) {
@@ -562,6 +578,7 @@ class Feature {
     delete geojson.id
     delete geojson.properties.id
     const feature = this.datalayer.makeFeature(geojson)
+    feature.isDirty = true
     feature.edit()
     return feature
   }
@@ -597,7 +614,7 @@ class Feature {
         this.datalayer.hideFeature(this)
         this.makeUI()
         this.datalayer.showFeature(this)
-      } else if (this.datalayer?.isBrowsable()) {
+      } else {
         this.ui._redraw()
       }
     }
@@ -1036,6 +1053,7 @@ export class LineString extends Path {
     this.pullGeometry()
     if (!this.ui.editEnabled()) this.edit()
     this.ui.editor.reset()
+    this.isDirty = true
   }
 
   isMulti() {

umap/static/umap/js/modules/data/layer.js

@@ -64,9 +64,6 @@ export class DataLayer {
 
     this.setOptions(data)
     this.pane.dataset.id = this.id
-    if (this.options.rank === undefined) {
-      this.options.rank = this._umap.datalayers.count()
-    }
 
     if (!Utils.isObject(this.options.remoteData)) {
       this.options.remoteData = {}
@@ -125,20 +122,6 @@ export class DataLayer {
     return `datalayer-${stamp(this)}`
   }
 
-  get rank() {
-    // Make sure we always have a valid rank. Undefined rank may happen
-    // after importing an old umap backup, and not touching the layers
-    // after that.
-    if (this.options.rank === undefined) {
-      this.options.rank = this.getDOMOrder()
-    }
-    return this.options.rank
-  }
-
-  set rank(value) {
-    this.options.rank = value
-  }
-
   getSyncMetadata() {
     return {
       subject: 'datalayer',
@@ -147,10 +130,6 @@ export class DataLayer {
   }
 
   render(fields, builder) {
-    // Propagate will remove the fields it has already
-    // processed
-    fields = this.propagate(fields)
-
     const impacts = Utils.getImpactsFromSchema(fields)
 
     for (const impact of impacts) {
@@ -170,36 +149,10 @@ export class DataLayer {
         case 'remote-data':
           this.fetchRemoteData()
           break
-        case 'datalayer-rank':
-          this._umap.reorderDataLayers()
-          break
       }
     }
   }
 
-  // This method does a targeted update of the UI,
-  // it whould be merged with `render`` method and the
-  // SCHEMA at some point
-  propagate(fields = []) {
-    const impacts = {
-      'properties.name': () => {
-        Utils.eachElement('.datalayer-name', (el) => {
-          if (el.dataset.id === this.id) {
-            el.textContent = this.getName()
-            el.title = this.getName()
-          }
-        })
-      },
-    }
-    for (const [field, impact] of Object.entries(impacts)) {
-      if (!fields.length || fields.includes(field)) {
-        impact()
-        fields = fields.filter((item) => item !== field)
-      }
-    }
-    return fields
-  }
-
   showAtLoad() {
     return this.autoLoaded() && this.showAtZoom()
   }
@@ -269,9 +222,16 @@ export class DataLayer {
     if (!error) {
       this._umap.modifiedAt = response.headers.get('last-modified')
       this.setReferenceVersion({ response, sync: false })
-      delete geojson._umap_options
+      // FIXME: for now the _umap_options property is set dynamically from backend
+      // And thus it's not in the geojson file in the server
+      // So do not let all options to be reset
+      // Fix is a proper migration so all datalayers settings are
+      // in DB, and we remove it from geojson flat files.
+      if (geojson._umap_options) {
+        geojson._umap_options.editMode = this.options.editMode
+      }
       // In case of maps pre 1.0 still around
-      delete geojson._storage
+      if (geojson._storage) geojson._storage.editMode = this.options.editMode
       await this.fromUmapGeoJSON(geojson)
       this.backupOptions()
       this._loading = false
@@ -300,6 +260,7 @@ export class DataLayer {
 
   async fromUmapGeoJSON(geojson) {
     if (geojson._storage) geojson._umap_options = geojson._storage // Retrocompat
+    geojson._umap_options.id = this.id
     if (geojson._umap_options) this.setOptions(geojson._umap_options)
     if (this.isRemoteLayer()) {
       await this.fetchRemoteData()
@@ -308,6 +269,15 @@ export class DataLayer {
     }
   }
 
+  clear() {
+    this.sync.startBatch()
+    for (const feature of Object.values(this._features)) {
+      feature.del()
+    }
+    this.sync.commitBatch()
+    this.dataChanged()
+  }
+
   backupData() {
     if (this._geojson) {
       this._geojson_bk = Utils.CopyJSON(this._geojson)
@@ -358,7 +328,7 @@ export class DataLayer {
       url = this._umap.proxyUrl(url, this.options.remoteData.ttl)
     }
     return await this.getUrl(url, remoteUrl).then((raw) => {
-      this.clear(false)
+      this.clear()
       return this._umap.formatter
         .parse(raw, this.options.remoteData.format)
         .then((geojson) => this.fromGeoJSON(geojson, false))
@@ -398,7 +368,12 @@ export class DataLayer {
   }
 
   connectToMap() {
-    this._umap.datalayers.add(this)
+    if (!this._umap.datalayers[this.id]) {
+      this._umap.datalayers[this.id] = this
+    }
+    if (!this._umap.datalayersIndex.includes(this)) {
+      this._umap.datalayersIndex.push(this)
+    }
     this._umap.onDataLayersChanged()
   }
 
@@ -517,19 +492,8 @@ export class DataLayer {
     const features = []
     this.sortFeatures(collection)
     for (const featureJson of collection) {
-      if (featureJson.geometry?.type === 'GeometryCollection') {
+      const feature = this.makeFeature(featureJson, sync)
-        for (const geometry of featureJson.geometry.geometries) {
+      if (feature) features.push(feature)
-          const feature = this.makeFeature({
-            type: 'Feature',
-            geometry,
-            properties: featureJson.properties,
-          })
-          if (feature) features.push(feature)
-        }
-      } else {
-        const feature = this.makeFeature(featureJson, sync)
-        if (feature) features.push(feature)
-      }
     }
     return features
   }
@@ -642,33 +606,16 @@ export class DataLayer {
 
   del(sync = true) {
     const oldValue = Utils.CopyJSON(this.umapGeoJSON())
-    // TODO merge datalayer del and features del in same
+    this.erase()
-    // batch
-    this.clear()
     if (sync) {
       this.isDeleted = true
       this.sync.delete(oldValue)
     }
-    this.hide()
-    this.parentPane.removeChild(this.pane)
-    this._umap.onDataLayersChanged()
-    this.layer.onDelete(this._leafletMap)
-    this.propagateDelete()
-    this._leaflet_events_bk = this._leaflet_events
   }
 
   empty() {
     if (this.isRemoteLayer()) return
-    this.sync.startBatch()
     this.clear()
-    this.sync.commitBatch()
-  }
-
-  clear(sync = true) {
-    for (const feature of Object.values(this._features)) {
-      feature.del(sync)
-    }
-    this.dataChanged()
   }
 
   clone() {
@@ -681,13 +628,24 @@ export class DataLayer {
     return datalayer
   }
 
+  erase() {
+    this.hide()
+    this._umap.datalayersIndex.splice(this.getRank(), 1)
+    this.parentPane.removeChild(this.pane)
+    this._umap.onDataLayersChanged()
+    this.layer.onDelete(this._leafletMap)
+    this.propagateDelete()
+    this._leaflet_events_bk = this._leaflet_events
+    this.clear()
+  }
+
   redraw() {
     if (!this.isVisible()) return
     this.eachFeature((feature) => feature.redraw())
   }
 
   edit() {
-    if (!this._umap.editEnabled) {
+    if (!this._umap.editEnabled || !this.isLoaded()) {
       return
     }
     const container = DomUtil.create('div', 'umap-layer-properties-container')
@@ -1095,11 +1053,23 @@ export class DataLayer {
   }
 
   getPreviousBrowsable() {
-    return this._umap.datalayers.prev(this)
+    let id = this.getRank()
+    let next
+    const index = this._umap.datalayersIndex
+    while (((id = index[++id] ? id : 0), (next = index[id]))) {
+      if (next === this || next.canBrowse()) break
+    }
+    return next
   }
 
   getNextBrowsable() {
-    return this._umap.datalayers.next(this)
+    let id = this.getRank()
+    let prev
+    const index = this._umap.datalayersIndex
+    while (((id = index[--id] ? id : index.length - 1), (prev = index[id]))) {
+      if (prev === this || prev.canBrowse()) break
+    }
+    return prev
   }
 
   umapGeoJSON() {
@@ -1110,8 +1080,8 @@ export class DataLayer {
     }
   }
 
-  getDOMOrder() {
+  getRank() {
-    return Array.from(this.parentPane.children).indexOf(this.pane)
+    return this._umap.datalayersIndex.indexOf(this)
   }
 
   isReadOnly() {
@@ -1133,21 +1103,15 @@ export class DataLayer {
     }
   }
 
-  prepareOptions() {
-    const options = Utils.CopyJSON(this.options)
-    delete options.permissions
-    return JSON.stringify(options)
-  }
-
   async save() {
     if (this.isDeleted) return await this.saveDelete()
-    if (!this.isRemoteLayer() && !this.isLoaded()) return
+    if (!this.isLoaded()) return
     const geojson = this.umapGeoJSON()
     const formData = new FormData()
     formData.append('name', this.options.name)
     formData.append('display_on_load', !!this.options.displayOnLoad)
-    formData.append('rank', this.rank)
+    formData.append('rank', this.getRank())
-    formData.append('settings', this.prepareOptions())
+    formData.append('settings', JSON.stringify(this.options))
     // Filename support is shaky, don't do it for now.
     const blob = new Blob([JSON.stringify(geojson)], { type: 'application/json' })
     formData.append('geojson', blob)
@@ -1182,15 +1146,12 @@ export class DataLayer {
             await this._umap.saveAll()
           }
         )
-      } else {
-        console.debug(error)
-        Alert.error(translate('Cannot save layer, please try again in a few minutes.'))
       }
     } else {
       // Response contains geojson only if save has conflicted and conflicts have
       // been resolved. So we need to reload to get extra data (added by someone else)
       if (data.geojson) {
-        this.clear(false)
+        this.clear()
         this.fromGeoJSON(data.geojson)
         delete data.geojson
       }

umap/static/umap/js/modules/facets.js

@@ -24,7 +24,7 @@ export default class Facets {
       this.selected[name] = selected
     }
 
-    this._umap.datalayers.browsable().map((datalayer) => {
+    this._umap.eachBrowsableDataLayer((datalayer) => {
       datalayer.eachFeature((feature) => {
         for (const name of names) {
           let value = feature.properties[name]

umap/static/umap/js/modules/form/fields.js

@@ -560,7 +560,7 @@ Fields.SlideshowDelay = class extends Fields.IntSelect {
 Fields.DataLayerSwitcher = class extends Fields.Select {
   getOptions() {
     const options = []
-    this.builder._umap.datalayers.reverse().map((datalayer) => {
+    this.builder._umap.eachDataLayerReverse((datalayer) => {
       if (
         datalayer.isLoaded() &&
         !datalayer.isDataReadOnly() &&

umap/static/umap/js/modules/importer.js

@@ -243,7 +243,7 @@ export default class Importer extends Utils.WithTemplate {
     this.raw = null
     const layerSelect = this.qs('[name="layer-id"]')
     layerSelect.innerHTML = ''
-    this._umap.datalayers.reverse().map((datalayer) => {
+    this._umap.eachDataLayerReverse((datalayer) => {
       if (datalayer.isLoaded() && !datalayer.isRemoteLayer()) {
         DomUtil.element({
           tagName: 'option',

umap/static/umap/js/modules/managers.js

@@ -1,46 +0,0 @@
-export class DataLayerManager extends Object {
-  add(datalayer) {
-    this[datalayer.id] = datalayer
-  }
-  active() {
-    return Object.values(this)
-      .filter((datalayer) => !datalayer.isDeleted)
-      .sort((a, b) => a.rank > b.rank)
-  }
-  reverse() {
-    return this.active().reverse()
-  }
-  count() {
-    return this.active().length
-  }
-  find(func) {
-    for (const datalayer of this.reverse()) {
-      if (func.call(datalayer, datalayer)) {
-        return datalayer
-      }
-    }
-  }
-  filter(func) {
-    return this.active().filter(func)
-  }
-  visible() {
-    return this.filter((datalayer) => datalayer.isVisible())
-  }
-  browsable() {
-    return this.reverse().filter((datalayer) => datalayer.allowBrowse())
-  }
-  prev(datalayer) {
-    const browsable = this.browsable()
-    const current = browsable.indexOf(datalayer)
-    const prev = browsable[current - 1] || browsable[browsable.length - 1]
-    if (!prev.canBrowse()) return this.prev(prev)
-    return prev
-  }
-  next(datalayer) {
-    const browsable = this.browsable()
-    const current = browsable.indexOf(datalayer)
-    const next = browsable[current + 1] || browsable[0]
-    if (!next.canBrowse()) return this.next(next)
-    return next
-  }
-}

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

@@ -159,7 +159,7 @@ export class MapPermissions {
         `<fieldset class="separator"><legend>${translate('Datalayers')}</legend></fieldset>`
       )
       container.appendChild(fieldset)
-      this._umap.datalayers.active().map((datalayer) => {
+      this._umap.eachDataLayer((datalayer) => {
         datalayer.permissions.edit(fieldset)
       })
     }

umap/static/umap/js/modules/rendering/controls.js

@@ -1,251 +0,0 @@
-import { Control } from '../../../vendors/leaflet/leaflet-src.esm.js'
-import * as Utils from '../utils.js'
-import { translate } from '../i18n.js'
-
-export const HomeControl = Control.extend({
-  options: {
-    position: 'topleft',
-  },
-
-  onAdd: (map) => {
-    const path = map._umap.getStaticPathFor('home.svg')
-    const container = Utils.loadTemplate(
-      `<a href="/" class="home-button" title="${translate('Back to home')}"><img src="${path}" alt="${translate('Home logo')}" width="38px" height="38px" /></a>`
-    )
-    return container
-  },
-})
-
-export const EditControl = Control.extend({
-  options: {
-    position: 'topright',
-  },
-
-  onAdd: (map) => {
-    const template = `
-      <div class="edit-enable">
-        <button type="button" data-ref="button">${translate('Edit')}</button>
-      </div>
-    `
-    const [container, { button }] = Utils.loadTemplateWithRefs(template)
-    button.addEventListener('click', () => map._umap.enableEdit())
-    button.addEventListener('mouseover', () => {
-      map._umap.tooltip.open({
-        content: map._umap.help.displayLabel('TOGGLE_EDIT'),
-        anchor: button,
-        position: 'bottom',
-        delay: 750,
-        duration: 5000,
-      })
-    })
-    return container
-  },
-})
-
-export const MoreControl = Control.extend({
-  options: {
-    position: 'topleft',
-  },
-
-  onAdd: function (map) {
-    const pos = this.getPosition()
-    const corner = map._controlCorners[pos]
-    const className = 'umap-more-controls'
-    const template = `
-      <div class="umap-control-text">
-        <button class="umap-control-more" type="button" data-ref="button"></button>
-      </div>
-    `
-    const [container, { button }] = Utils.loadTemplateWithRefs(template)
-    button.addEventListener('click', () => corner.classList.toggle(className))
-    button.addEventListener('mouseover', () => {
-      const extended = corner.classList.contains(className)
-      map._umap.tooltip.open({
-        content: extended ? translate('Hide controls') : translate('More controls'),
-        anchor: button,
-        position: 'right',
-        delay: 750,
-      })
-    })
-    return container
-  },
-})
-
-export const PermanentCreditsControl = Control.extend({
-  options: {
-    position: 'bottomleft',
-  },
-
-  onAdd: (map) => {
-    const container = Utils.loadTemplate(
-      `<div class="umap-permanent-credits-container text">${Utils.toHTML(map.options.permanentCredit)}</div>`
-    )
-    const background = map.options.permanentCreditBackground ? '#FFFFFFB0' : ''
-    container.style.backgroundColor = background
-    return container
-  },
-})
-
-const BaseButton = Control.extend({
-  initialize: function (umap, options) {
-    this._umap = umap
-    Control.prototype.initialize.call(this, options)
-  },
-
-  onAdd: function (map) {
-    const template = `
-      <div class="${this.options.className} umap-control">
-        <button type="button" title="${this.options.title}" data-ref="button"></button>
-      </div>
-    `
-    const [container, { button }] = Utils.loadTemplateWithRefs(template)
-    button.addEventListener('click', (event) => {
-      event.stopPropagation()
-      this.onClick()
-    })
-    button.addEventListener('dblclick', (event) => {
-      event.stopPropagation()
-    })
-    this.afterAdd(container)
-    return container
-  },
-
-  afterAdd: (container) => {},
-})
-
-export const DataLayersControl = BaseButton.extend({
-  options: {
-    position: 'topleft',
-    className: 'umap-control-browse',
-    title: translate('Open browser'),
-  },
-
-  afterAdd: function (container) {
-    Utils.toggleBadge(container, this._umap.browser?.hasFilters())
-  },
-
-  onClick: function () {
-    this._umap.openBrowser()
-  },
-})
-
-export const CaptionControl = BaseButton.extend({
-  options: {
-    position: 'topleft',
-    className: 'umap-control-caption',
-    title: translate('About'),
-  },
-
-  onClick: function () {
-    this._umap.openCaption()
-  },
-})
-
-export const EmbedControl = BaseButton.extend({
-  options: {
-    position: 'topleft',
-    title: translate('Share and download'),
-    className: 'leaflet-control-embed',
-  },
-
-  onClick: function () {
-    this._umap.share.open()
-  },
-})
-
-export const AttributionControl = Control.Attribution.extend({
-  options: {
-    prefix: '',
-  },
-
-  _update: function () {
-    // Layer is no more on the map
-    if (!this._map) return
-    Control.Attribution.prototype._update.call(this)
-    const shortCredit = this._map._umap.getProperty('shortCredit')
-    const captionMenus = this._map._umap.getProperty('captionMenus')
-    // Use our own container, so we can hide/show on small screens
-    const originalCredits = this._container.innerHTML
-    this._container.innerHTML = ''
-    const template = `
-      <div class="attribution-container">
-        ${originalCredits}
-        <span data-ref="short"> — ${Utils.toHTML(shortCredit)}</span>
-        <a  href="#" data-ref="caption"> — ${translate('Open caption')}</a>
-        <a href="/" data-ref="home"> — ${translate('Home')}</a>
-        <a href="https://umap-project.org/" data-ref="site"> — ${translate('Powered by uMap')}</a>
-        <a href="#" class="attribution-toggle"></a>
-      </div>
-    `
-    const [container, { short, caption, home, site }] =
-      Utils.loadTemplateWithRefs(template)
-    caption.addEventListener('click', () => this._map._umap.openCaption())
-    this._container.appendChild(container)
-    short.hidden = !shortCredit
-    caption.hidden = !captionMenus
-    site.hidden = !captionMenus
-    home.hidden = this._map._umap.isEmbed || !captionMenus
-  },
-})
-
-/* Used in edit mode to define the default tilelayer */
-export const TileLayerChooser = BaseButton.extend({
-  options: {
-    position: 'topleft',
-  },
-
-  onClick: function () {
-    this.openSwitcher({ edit: true })
-  },
-
-  openSwitcher: function (options = {}) {
-    const template = `
-      <div class="umap-edit-tilelayers">
-        <h3><i class="icon icon-16 icon-tilelayer" title=""></i><span class="">${translate('Change tilelayers')}</span></h3>
-        <ul data-ref="tileContainer"></ul>
-      </div>
-    `
-    const [container, { tileContainer }] = Utils.loadTemplateWithRefs(template)
-    this.buildList(tileContainer, options)
-    const panel = options.edit ? this._umap.editPanel : this._umap.panel
-    panel.open({ content: container, highlight: 'tilelayers' })
-  },
-
-  buildList: function (container, options) {
-    this._umap._leafletMap.eachTileLayer((tilelayer) => {
-      const browserIsHttps = window.location.protocol === 'https:'
-      const tileLayerIsHttp = tilelayer.options.url_template.indexOf('http:') === 0
-      if (browserIsHttps && tileLayerIsHttp) return
-      container.appendChild(this.addTileLayerElement(tilelayer, options))
-    })
-  },
-
-  addTileLayerElement: function (tilelayer, options) {
-    const selectedClass = this._umap._leafletMap.hasLayer(tilelayer) ? 'selected' : ''
-    const src = Utils.template(
-      tilelayer.options.url_template,
-      this._umap._leafletMap.options.demoTileInfos
-    )
-    const template = `
-      <li>
-        <img src="${src}" loading="lazy" />
-        <div>${tilelayer.options.name}</div>
-      </li>
-    `
-    const li = Utils.loadTemplate(template)
-    li.addEventListener('click', () => {
-      const oldTileLayer = this._umap.properties.tilelayer
-      this._umap._leafletMap.selectTileLayer(tilelayer)
-      this._umap._leafletMap._controls.tilelayers.setLayers()
-      if (options?.edit) {
-        this._umap.properties.tilelayer = tilelayer.toJSON()
-        this._umap.sync.update(
-          'properties.tilelayer',
-          this._umap.properties.tilelayer,
-          oldTileLayer
-        )
-      }
-    })
-    return li
-  },
-})

umap/static/umap/js/modules/rendering/layers/heat.js

@@ -41,11 +41,6 @@ export const Heat = L.HeatLayer.extend({
     }
   },
 
-  removeLayer: (layer) => {
-    // No op, there is no "removeLatLng" in Leaflet.heat
-    // but this method is expected by DataLayer
-  },
-
   onAdd: function (map) {
     LayerMixin.onAdd.call(this, map)
     return L.HeatLayer.prototype.onAdd.call(this, map)

umap/static/umap/js/modules/rendering/map.js

@@ -11,17 +11,6 @@ import {
 import { uMapAlert as Alert } from '../../components/alerts/alert.js'
 import DropControl from '../drop.js'
 import { translate } from '../i18n.js'
-import {
-  AttributionControl,
-  CaptionControl,
-  DataLayersControl,
-  EmbedControl,
-  EditControl,
-  HomeControl,
-  MoreControl,
-  PermanentCreditsControl,
-  TileLayerChooser,
-} from './controls.js'
 import * as Utils from '../utils.js'
 import * as Icon from './icon.js'
 
@@ -51,15 +40,15 @@ const ControlsMixin = {
     this._controls = {}
 
     if (this._umap.hasEditMode() && !this.options.noControl) {
-      new EditControl(this).addTo(this)
+      new U.EditControl(this).addTo(this)
     }
-    this._controls.home = new HomeControl(this._umap)
+    this._controls.home = new U.HomeControl(this._umap)
     this._controls.zoom = new Control.Zoom({
       zoomInTitle: translate('Zoom in'),
       zoomOutTitle: translate('Zoom out'),
     })
-    this._controls.datalayers = new DataLayersControl(this._umap)
+    this._controls.datalayers = new U.DataLayersControl(this._umap)
-    this._controls.caption = new CaptionControl(this._umap)
+    this._controls.caption = new U.CaptionControl(this._umap)
     this._controls.locate = new U.Locate(this, {
       strings: {
         title: translate('Center map on your location'),
@@ -80,8 +69,8 @@ const ControlsMixin = {
       },
     })
     this._controls.search = new U.SearchControl()
-    this._controls.embed = new EmbedControl(this._umap)
+    this._controls.embed = new Control.Embed(this._umap)
-    this._controls.tilelayersChooser = new TileLayerChooser(this._umap)
+    this._controls.tilelayersChooser = new U.TileLayerChooser(this)
     this._controls.editinosm = new Control.EditInOSM({
       position: 'topleft',
       widgetOptions: {
@@ -91,9 +80,9 @@ const ControlsMixin = {
       },
     })
     this._controls.measure = new L.MeasureControl().initHandler(this)
-    this._controls.more = new MoreControl()
+    this._controls.more = new U.MoreControls()
     this._controls.scale = L.control.scale()
-    this._controls.permanentCredit = new PermanentCreditsControl(this)
+    this._controls.permanentCredit = new U.PermanentCreditsControl(this)
     this._umap.drop = new DropControl(this._umap, this, this._container)
     this._controls.tilelayers = new U.TileLayerControl(this)
   },
@@ -104,7 +93,7 @@ const ControlsMixin = {
     }
     if (this.options.noControl) return
 
-    this._controls.attribution = new AttributionControl().addTo(this)
+    this._controls.attribution = new U.AttributionControl().addTo(this)
     if (this.options.miniMap) {
       this.whenReady(function () {
         if (this.selectedTilelayer) {
@@ -327,7 +316,7 @@ export const LeafletMap = BaseMap.extend({
     } else if (this.options.defaultView === 'latest') {
       this._umap.onceDataLoaded(() => {
         if (!this._umap.hasData()) return
-        const datalayer = this._umap.datalayers.visible()[0]
+        const datalayer = this._umap.firstVisibleDatalayer()
         let feature
         if (datalayer) {
           const feature = datalayer.getFeatureByIndex(-1)

umap/static/umap/js/modules/rendering/ui.js

@@ -109,6 +109,7 @@ const PointMixin = {
   addInteractions() {
     FeatureMixin.addInteractions.call(this)
     this.on('dragend', (event) => {
+      this.isDirty = true
       this.feature.edit(event)
     })
     if (!this.feature.isReadOnly()) this.on('mouseover', this._enableDragging)

umap/static/umap/js/modules/rules.js

@@ -1,4 +1,4 @@
-import { stamp } from '../../vendors/leaflet/leaflet-src.esm.js'
+import { DomEvent, DomUtil, stamp } from '../../vendors/leaflet/leaflet-src.esm.js'
 import { AutocompleteDatalist } from './autocomplete.js'
 import { MutatingForm } from './form/builder.js'
 import { translate } from './i18n.js'
@@ -119,9 +119,10 @@ class Rule {
       'options.smoothFactor',
       'options.dashArray',
     ]
+    const container = DomUtil.create('div')
     const builder = new MutatingForm(this, options)
-    const container = document.createElement('div')
+    const defaultShapeProperties = DomUtil.add('div', '', container)
-    container.appendChild(builder.build())
+    defaultShapeProperties.appendChild(builder.build())
     const autocomplete = new AutocompleteDatalist(builder.helpers.condition.input)
     const properties = this._umap.allProperties()
     autocomplete.suggestions = properties
@@ -136,45 +137,43 @@ class Rule {
           .map((str) => `${value}${str || ''}`)
       }
     })
-    const backButton = Utils.loadTemplate(`
+    this._umap.editPanel.open({ content: container, highlight: 'settings' })
-      <button class="flat" type="button" data-ref="add">
-        <i class="icon icon-16 icon-back" title="${translate('Back to list')}"></i>
-      </button>`)
-    backButton.addEventListener('click', () =>
-      this._umap.edit().then(() => {
-        this._umap.editPanel.container.querySelector('details#rules').open = true
-      })
-    )
-
-    this._umap.editPanel.open({
-      content: container,
-      highlight: 'settings',
-      actions: [backButton],
-    })
   }
 
-  renderToolbox(ul) {
+  renderToolbox(row) {
-    const template = `
+    row.classList.toggle('off', !this.active)
-      <li data-id="${stamp(this)}" class="orderable">
+    const toggle = DomUtil.createButtonIcon(
-        <button class="icon icon-16 icon-eye" title="${translate('Toggle rule')}" data-ref=toggle></button>
+      row,
-        <button class="icon icon-16 icon-edit show-on-edit" title="${translate('Edit')}" data-ref=edit></button>
+      'icon-eye',
-        <button class="icon icon-16 icon-delete show-on-edit" title="${translate('Delete rule')}" data-ref=remove></button>
+      translate('Show/hide layer')
-        <span>${this.condition || translate('empty rule')}</span>
+    )
-        <i class="icon icon-16 icon-drag" title="${translate('Drag to reorder')}"></i>
+    const edit = DomUtil.createButtonIcon(
-      </li>
+      row,
-    `
+      'icon-edit show-on-edit',
-    const [li, { toggle, edit, remove }] = Utils.loadTemplateWithRefs(template)
+      translate('Edit')
-    ul.appendChild(li)
+    )
-    li.classList.toggle('off', !this.active)
+    const remove = DomUtil.createButtonIcon(
-    edit.addEventListener('click', () => this.edit())
+      row,
-    remove.addEventListener('click', () => {
+      'icon-delete show-on-edit',
-      if (!confirm(translate('Are you sure you want to delete this rule?'))) return
+      translate('Delete layer')
-      this._delete()
+    )
-      this._umap.editPanel.close()
+    DomEvent.on(edit, 'click', this.edit, this)
-    })
+    DomEvent.on(
-    toggle.addEventListener('click', () => {
+      remove,
+      'click',
+      function () {
+        if (!confirm(translate('Are you sure you want to delete this rule?'))) return
+        this._delete()
+        this._umap.editPanel.close()
+      },
+      this
+    )
+    DomUtil.add('span', '', row, this.condition || translate('empty rule'))
+    DomUtil.createIcon(row, 'icon-drag', translate('Drag to reorder'))
+    row.dataset.id = stamp(this)
+    DomEvent.on(toggle, 'click', () => {
       this.active = !this.active
-      li.classList.toggle('off', !this.active)
+      row.classList.toggle('off', !this.active)
       this._umap.render(['rules'])
     })
   }
@@ -208,9 +207,8 @@ export default class Rules {
   }
 
   onReorder(src, dst, initialIndex, finalIndex) {
-    const oldRules = Utils.CopyJSON(this._umap.properties.rules || {})
+    const moved = this.rules.find((rule) => stamp(rule) === src.dataset.id)
-    const moved = this.rules.find((rule) => stamp(rule) === +src.dataset.id)
+    const reference = this.rules.find((rule) => stamp(rule) === dst.dataset.id)
-    const reference = this.rules.find((rule) => stamp(rule) === +dst.dataset.id)
     const movedIdx = this.rules.indexOf(moved)
     let referenceIdx = this.rules.indexOf(reference)
     const minIndex = Math.min(movedIdx, referenceIdx)
@@ -224,28 +222,20 @@ export default class Rules {
     this.rules.splice(newIdx, 0, moved)
     this._umap.render(['rules'])
     this.commit()
-    this._umap.sync.update('properties.rules', this._umap.properties.rules, oldRules)
   }
 
   edit(container) {
-    const template = `
+    const body = DomUtil.createFieldset(container, translate('Conditional style rules'))
-      <details id="rules">
-        <summary>${translate('Conditional style rules')}</summary>
-        <fieldset>
-          <ul data-ref=ul></ul>
-          <button class="umap-add" type="button" data-ref=add>${translate('Add rule')}</button>
-        </fieldset>
-      </details>
-    `
-    const [body, { ul, add }] = Utils.loadTemplateWithRefs(template)
     if (this.rules.length) {
+      const ul = DomUtil.create('ul', '', body)
       for (const rule of this.rules) {
-        rule.renderToolbox(ul)
+        rule.renderToolbox(DomUtil.create('li', 'orderable', ul))
       }
+
       const orderable = new Orderable(ul, this.onReorder.bind(this))
     }
-    add.addEventListener('click', () => this.addRule())
+
-    container.appendChild(body)
+    DomUtil.createButton('umap-add', body, translate('Add rule'), this.addRule, this)
   }
 
   addRule() {

umap/static/umap/js/modules/schema.js

@@ -10,7 +10,7 @@ import { translate } from './i18n.js'
  * - `type`:        The type of the data
  * - `impacts`:     A list of impacts than happen when this property is updated, among
  *                  'ui', 'data', 'limit-bounds', 'datalayer-index', 'remote-data',
- *                  'background', 'sync', 'datalayer-rank'.
+ *                  'background' 'sync'.
  *
  * - Extra keys are being passed to the FormBuilder automatically.
  */
@@ -436,10 +436,6 @@ export const SCHEMA = {
     ],
     default: 'Default',
   },
-  rank: {
-    type: Number,
-    impacts: ['datalayer-rank'],
-  },
   remoteData: {
     type: Object,
     impacts: ['remote-data'],

umap/static/umap/js/modules/share.js

@@ -204,8 +204,8 @@ class IframeExporter {
       delete this.queryString.feature
     }
     if (this.options.keepCurrentDatalayers) {
-      this._umap.datalayers.visible().map((datalayer) => {
+      this._umap.eachDataLayer((datalayer) => {
-        if (datalayer.createdOnServer) {
+        if (datalayer.isVisible() && datalayer.createdOnServer) {
           datalayers.push(datalayer.id)
         }
       })

umap/static/umap/js/modules/slideshow.js

@@ -66,7 +66,7 @@ export default class Slideshow extends WithTemplate {
   }
 
   defaultDatalayer() {
-    return this._umap.datalayers.find((d) => d.canBrowse())
+    return this._umap.findDataLayer((d) => d.canBrowse())
   }
 
   startSpinner() {

umap/static/umap/js/modules/sync/engine.js

@@ -207,45 +207,31 @@ export class SyncEngine {
     this._send(operation)
   }
 
-  _getDirtyObjects() {
+  async save() {
-    const dirty = new Map()
+    const needSave = new Map()
     if (!this._umap.id) {
       // There is no operation for first map save
-      dirty.set(this._umap, [])
+      needSave.set(this._umap, [])
-    }
-    const addDirtyObject = (operation) => {
-      const updater = this._getUpdater(operation.subject)
-      const obj = updater.getStoredObject(operation.metadata)
-      if (!dirty.has(obj)) {
-        dirty.set(obj, [])
-      }
-      dirty.get(obj).push(operation)
     }
     for (const operation of this._operations.sorted()) {
       if (operation.dirty) {
-        addDirtyObject(operation)
+        const updater = this._getUpdater(operation.subject)
-        if (operation.verb === 'batch') {
+        const obj = updater.getStoredObject(operation.metadata)
-          for (const op of operation.operations) {
+        if (!needSave.has(obj)) {
-            addDirtyObject(op)
+          needSave.set(obj, [])
-          }
         }
+        needSave.get(obj).push(operation)
       }
     }
-    return dirty
-  }
-
-  async save() {
-    const needSave = this._getDirtyObjects()
     for (const [obj, operations] of needSave.entries()) {
       const ok = await obj.save()
-      if (!ok) return false
+      if (!ok) break
       for (const operation of operations) {
         operation.dirty = false
       }
     }
     this.saved()
     this._undoManager.toggleState()
-    return true
   }
 
   saved() {

umap/static/umap/js/modules/ui/bar.js

@@ -207,7 +207,7 @@ export class BottomBar extends WithTemplate {
       const select = this.elements.layers
       const selected = select.options[select.selectedIndex].value
       if (!selected) return
-      this._umap.datalayers.active().map((datalayer) => {
+      this._umap.eachDataLayer((datalayer) => {
         datalayer.toggle(datalayer.id === selected)
       })
     })
@@ -228,7 +228,7 @@ export class BottomBar extends WithTemplate {
 
   buildDataLayerSwitcher() {
     this.elements.layers.innerHTML = ''
-    const datalayers = this._umap.datalayers.filter((d) => d.options.inCaption)
+    const datalayers = this._umap.datalayersIndex.filter((d) => d.options.inCaption)
     if (datalayers.length < 2) {
       this.elements.layers.hidden = true
     } else {

umap/static/umap/js/modules/ui/base.js

@@ -4,8 +4,6 @@ export class Positioned {
       this.anchorTop(anchor)
     } else if (anchor && position === 'bottom') {
       this.anchorBottom(anchor)
-    } else if (anchor && position === 'right') {
-      this.anchorRight(anchor)
     } else {
       this.anchorAbsolute()
     }
@@ -14,7 +12,6 @@ export class Positioned {
   toggleClassPosition(position) {
     this.container.classList.toggle('tooltip-bottom', position === 'bottom')
     this.container.classList.toggle('tooltip-top', position === 'top')
-    this.container.classList.toggle('tooltip-right', position === 'right')
   }
 
   anchorTop(el) {
@@ -36,16 +33,6 @@ export class Positioned {
     })
   }
 
-  anchorRight(el) {
-    this.toggleClassPosition('right')
-    const coords = this.getPosition(el)
-    console.log(coords)
-    this.setPosition({
-      left: coords.right + 11,
-      top: coords.top,
-    })
-  }
-
   anchorAbsolute() {
     const left =
       this.parent.offsetLeft +

umap/static/umap/js/modules/umap.js

@@ -33,7 +33,6 @@ import { EditPanel, FullPanel, Panel } from './ui/panel.js'
 import Tooltip from './ui/tooltip.js'
 import URLs from './urls.js'
 import * as Utils from './utils.js'
-import { DataLayerManager } from './managers.js'
 
 export default class Umap {
   constructor(element, geojson) {
@@ -108,8 +107,8 @@ export default class Umap {
     if (geojson.properties.schema) this.overrideSchema(geojson.properties.schema)
 
     // Do not display in an iframe.
-    if (this.isEmbed) {
+    if (window.self !== window.top) {
-      this.properties.homeControl = false
+      geojson.properties.homeControl = false
     }
 
     this._leafletMap.setup()
@@ -167,7 +166,8 @@ export default class Umap {
     }
 
     // Global storage for retrieving datalayers and features.
-    this.datalayers = new DataLayerManager()
+    this.datalayers = {} // All datalayers, including deleted.
+    this.datalayersIndex = [] // Datalayers actually on the map and ordered.
     this.featuresIndex = {}
 
     this.formatter = new Formatter(this)
@@ -217,6 +217,7 @@ export default class Umap {
     }
 
     window.onbeforeunload = () => (this.editEnabled && this.isDirty) || null
+    this.backup()
   }
 
   get isDirty() {
@@ -257,10 +258,6 @@ export default class Umap {
     }
   }
 
-  get isEmbed() {
-    return window.self !== window.top
-  }
-
   setPropertiesFromQueryString() {
     const asBoolean = (key) => {
       const value = this.searchParams.get(key)
@@ -615,7 +612,7 @@ export default class Umap {
     this.datalayersLoaded = true
     this.fire('datalayersloaded')
     const toLoad = []
-    for (const datalayer of this.datalayers.active()) {
+    for (const datalayer of this.datalayersIndex) {
       if (datalayer.showAtLoad()) toLoad.push(() => datalayer.show())
     }
     while (toLoad.length) {
@@ -629,7 +626,7 @@ export default class Umap {
 
   createDataLayer(options = {}, sync = true) {
     options.name =
-      options.name || `${translate('Layer')} ${this.datalayers.count() + 1}`
+      options.name || `${translate('Layer')} ${this.datalayersIndex.length + 1}`
     const datalayer = new DataLayer(this, this._leafletMap, options)
 
     if (sync !== false) {
@@ -640,6 +637,7 @@ export default class Umap {
 
   createDirtyDataLayer(options) {
     const datalayer = this.createDataLayer(options, true)
+    datalayer.isDirty = true
     return datalayer
   }
 
@@ -649,19 +647,19 @@ export default class Umap {
   }
 
   reindexDataLayers() {
-    this.datalayers.active().map((datalayer) => datalayer.reindex())
+    this.eachDataLayer((datalayer) => datalayer.reindex())
     this.onDataLayersChanged()
   }
 
-  reorderDataLayers() {
+  indexDatalayers() {
-    const parent = this._leafletMap.getPane('overlayPane')
+    const panes = this._leafletMap.getPane('overlayPane')
-    const datalayers = Object.values(this.datalayers)
+
-      .filter((datalayer) => !datalayer._isDeleted)
+    this.datalayersIndex = []
-      .sort((datalayer1, datalayer2) => datalayer1.rank > datalayer2.rank)
+    for (const pane of panes.children) {
-    for (const datalayer of datalayers) {
+      if (!pane.dataset || !pane.dataset.id) continue
-      const child = parent.querySelector(`[data-id="${datalayer.id}"]`)
+      this.datalayersIndex.push(this.datalayers[pane.dataset.id])
-      parent.appendChild(child)
     }
+    this.onDataLayersChanged()
   }
 
   onceDatalayersLoaded(callback, context) {
@@ -692,8 +690,8 @@ export default class Umap {
   async saveAll() {
     if (!this.isDirty) return
     if (this._defaultExtent) this._setCenterAndZoom()
-    const status = await this.sync.save()
+    this.backup()
-    if (!status) return
+    await this.sync.save()
     // Do a blind render for now, as we are not sure what could
     // have changed, we'll be more subtil when we'll remove the
     // save action
@@ -711,6 +709,24 @@ export default class Umap {
     return this.properties.name || translate('Untitled map')
   }
 
+  backup() {
+    this.backupProperties()
+    this._datalayersIndex_bk = [].concat(this.datalayersIndex)
+  }
+
+  backupProperties() {
+    this._backupProperties = Object.assign({}, this.properties)
+    this._backupProperties.tilelayer = Object.assign({}, this.properties.tilelayer)
+    this._backupProperties.limitBounds = Object.assign({}, this.properties.limitBounds)
+    this._backupProperties.permissions = Object.assign({}, this.permissions.properties)
+  }
+
+  resetProperties() {
+    this.properties = Object.assign({}, this._backupProperties)
+    this.properties.tilelayer = Object.assign({}, this._backupProperties.tilelayer)
+    this.permissions.properties = Object.assign({}, this._backupProperties.permissions)
+  }
+
   setProperties(newProperties) {
     for (const key of Object.keys(SCHEMA)) {
       if (newProperties[key] !== undefined) {
@@ -723,24 +739,24 @@ export default class Umap {
   }
 
   hasData() {
-    for (const datalayer of this.datalayers.active()) {
+    for (const datalayer of this.datalayersIndex) {
       if (datalayer.hasData()) return true
     }
   }
 
   hasLayers() {
-    return Boolean(this.datalayers.count())
+    return Boolean(this.datalayersIndex.length)
   }
 
   allProperties() {
-    return [].concat(...this.datalayers.active().map((dl) => dl.allProperties()))
+    return [].concat(...this.datalayersIndex.map((dl) => dl.allProperties()))
   }
 
   sortedValues(property) {
     return []
-      .concat(...this.datalayers.active().map((dl) => dl.sortedValues(property)))
+      .concat(...this.datalayersIndex.map((dl) => dl.sortedValues(property)))
       .filter((val, idx, arr) => arr.indexOf(val) === idx)
-      .sort(Utils.naturalSort)
+      .sort(U.Utils.naturalSort)
   }
 
   editCaption() {
@@ -803,7 +819,7 @@ export default class Umap {
       `<button type="button">${translate('Use current center and zoom')}</button>`
     )
     button.addEventListener('click', () => {
-      this.setCenterAndZoom()
+      this._setCenterAndZoom()
       builder.fetchAll()
     })
     container.appendChild(form)
@@ -817,6 +833,7 @@ export default class Umap {
       UIFields.push(`properties.${name}Control`)
     }
     UIFields = UIFields.concat([
+      'properties.homeControl',
       'properties.moreControl',
       'properties.scrollWheelZoom',
       'properties.miniMap',
@@ -1161,7 +1178,7 @@ export default class Umap {
     }
     this._advancedActions(container)
 
-    return this.editPanel.open({
+    this.editPanel.open({
       content: container,
       className: 'dark',
       highlight: 'settings',
@@ -1215,8 +1232,12 @@ export default class Umap {
         })
       }
     } else {
-      this.permissions.setProperties(data.permissions)
+      if (!this.permissions.isDirty) {
-      this.permissions.commit()
+        // Do not override local changes to permissions,
+        // but update in case some other editors changed them in the meantime.
+        this.permissions.setProperties(data.permissions)
+        this.permissions.commit()
+      }
       this._leafletMap.once('saved', () => {
         Alert.success(data.info || translate('Map has been saved!'))
       })
@@ -1253,7 +1274,7 @@ export default class Umap {
 
   toGeoJSON() {
     let features = []
-    this.datalayers.active().map((datalayer) => {
+    this.eachDataLayer((datalayer) => {
       if (datalayer.isVisible()) {
         features = features.concat(datalayer.featuresToGeoJSON())
       }
@@ -1329,20 +1350,13 @@ export default class Umap {
           if (fields.includes('properties.rules')) {
             this.rules.load()
           }
-          this.datalayers.visible().map((datalayer) => {
+          this.eachVisibleDataLayer((datalayer) => {
             datalayer.redraw()
           })
           break
         case 'datalayer-index':
           this.reindexDataLayers()
           break
-        case 'datalayer-rank':
-          // When drag'n'dropping datalayers,
-          // this get called once per datalayers.
-          // (and same for undo/redo of the action)
-          // TODO: call only once
-          this.reorderDataLayers()
-          break
         case 'background':
           this._leafletMap.initTileLayers()
           break
@@ -1431,7 +1445,7 @@ export default class Umap {
     ) {
       return datalayer
     }
-    datalayer = this.datalayers.find((datalayer) => {
+    datalayer = this.findDataLayer((datalayer) => {
       if (!datalayer.isDataReadOnly() && datalayer.isBrowsable()) {
         fallback = datalayer
         if (datalayer.isVisible()) return true
@@ -1446,37 +1460,61 @@ export default class Umap {
     return this.createDirtyDataLayer()
   }
 
-  eachFeature(callback) {
+  findDataLayer(method, context) {
-    this.datalayers.browsable().map((datalayer) => {
+    for (let i = this.datalayersIndex.length - 1; i >= 0; i--) {
-      if (datalayer.isVisible()) datalayer.eachFeature(callback)
+      if (method.call(context, this.datalayersIndex[i])) {
+        return this.datalayersIndex[i]
+      }
+    }
+  }
+
+  eachDataLayer(method, context) {
+    for (let i = 0; i < this.datalayersIndex.length; i++) {
+      method.call(context, this.datalayersIndex[i])
+    }
+  }
+
+  eachDataLayerReverse(method, context, filter) {
+    for (let i = this.datalayersIndex.length - 1; i >= 0; i--) {
+      if (filter && !filter.call(context, this.datalayersIndex[i])) continue
+      method.call(context, this.datalayersIndex[i])
+    }
+  }
+
+  eachBrowsableDataLayer(method, context) {
+    this.eachDataLayerReverse(method, context, (d) => d.allowBrowse())
+  }
+
+  eachVisibleDataLayer(method, context) {
+    this.eachDataLayerReverse(method, context, (d) => d.isVisible())
+  }
+
+  eachFeature(callback, context) {
+    this.eachBrowsableDataLayer((datalayer) => {
+      if (datalayer.isVisible()) datalayer.eachFeature(callback, context)
     })
   }
 
   removeDataLayers() {
-    this.datalayers.active().map((datalayer) => {
+    this.eachDataLayerReverse((datalayer) => {
       datalayer.del()
     })
   }
 
   emptyDataLayers() {
-    this.datalayers.active().map((datalayer) => {
+    this.eachDataLayerReverse((datalayer) => {
       datalayer.empty()
     })
   }
 
   editDatalayers() {
     if (!this.editEnabled) return
-    const template = `
+    const container = DomUtil.create('div')
-      <div>
+    DomUtil.createTitle(container, translate('Manage layers'), 'icon-layers')
-        <h3><i class="icon icon-16 icon-layers"></i>${translate('Manage layers')}</h3>
+    const ul = DomUtil.create('ul', '', container)
-        <ul data-ref=ul></ul>
+    this.eachDataLayerReverse((datalayer) => {
-      </div>
+      const row = DomUtil.create('li', 'orderable', ul)
-    `
+      DomUtil.createIcon(row, 'icon-drag', translate('Drag to reorder'))
-    const [container, { ul }] = Utils.loadTemplateWithRefs(template)
-    this.datalayers.reverse().map((datalayer) => {
-      const row = Utils.loadTemplate(
-        `<li class="orderable"><i class="icon icon-16 icon-drag" title="${translate('Drag to reorder')}"></i></li>`
-      )
       datalayer.renderToolbox(row)
       const builder = new MutatingForm(
         datalayer,
@@ -1487,27 +1525,20 @@ export default class Umap {
       row.appendChild(form)
       row.classList.toggle('off', !datalayer.isVisible())
       row.dataset.id = datalayer.id
-      ul.appendChild(row)
     })
     const onReorder = (src, dst, initialIndex, finalIndex) => {
       const movedLayer = this.datalayers[src.dataset.id]
       const targetLayer = this.datalayers[dst.dataset.id]
-      const minIndex = Math.min(movedLayer.getDOMOrder(), targetLayer.getDOMOrder())
+      const minIndex = Math.min(movedLayer.getRank(), targetLayer.getRank())
-      const maxIndex = Math.max(movedLayer.getDOMOrder(), targetLayer.getDOMOrder())
+      const maxIndex = Math.max(movedLayer.getRank(), targetLayer.getRank())
       if (finalIndex === 0) movedLayer.bringToTop()
       else if (finalIndex > initialIndex) movedLayer.insertBefore(targetLayer)
       else movedLayer.insertAfter(targetLayer)
-      this.sync.startBatch()
+      this.eachDataLayerReverse((datalayer) => {
-      this.datalayers.reverse().map((datalayer) => {
+        if (datalayer.getRank() >= minIndex && datalayer.getRank() <= maxIndex)
-        const rank = datalayer.getDOMOrder()
+          datalayer.isDirty = true
-        if (rank >= minIndex && rank <= maxIndex) {
-          const oldRank = datalayer.rank
-          datalayer.rank = rank
-          datalayer.sync.update('options.rank', rank, oldRank)
-        }
       })
-      this.sync.commitBatch()
+      this.indexDatalayers()
-      this.onDataLayersChanged()
     }
     const orderable = new Orderable(ul, onReorder)
 
@@ -1529,6 +1560,18 @@ export default class Umap {
     return datalayer
   }
 
+  firstVisibleDatalayer() {
+    return this.findDataLayer((datalayer) => {
+      if (datalayer.isVisible()) return true
+    })
+  }
+
+  ensurePanesOrder() {
+    this.eachDataLayer((datalayer) => {
+      datalayer.bringToTop()
+    })
+  }
+
   openBrowser(mode) {
     this.onceDatalayersLoaded(() => this.browser.open(mode))
   }
@@ -1679,7 +1722,7 @@ export default class Umap {
 
   getLayersBounds() {
     const bounds = new latLngBounds()
-    this.datalayers.browsable().map((d) => {
+    this.eachBrowsableDataLayer((d) => {
       if (d.isVisible()) bounds.extend(d.layer.getBounds())
     })
     return bounds

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

@@ -1,3 +1,183 @@
+U.HomeControl = L.Control.extend({
+  options: {
+    position: 'topleft',
+  },
+
+  onAdd: (map) => {
+    const path = map._umap.getStaticPathFor('home.svg')
+    const container = U.Utils.loadTemplate(
+      `<a href="/" class="home-button" title="${L._('Back to home')}"><img src="${path}" alt="${L._('Home logo')}" width="38px" height="38px" /></a>`
+    )
+    return container
+  },
+})
+
+U.EditControl = L.Control.extend({
+  options: {
+    position: 'topright',
+  },
+
+  onAdd: function (map) {
+    const container = L.DomUtil.create('div', 'edit-enable')
+    const enableEditing = L.DomUtil.createButton(
+      '',
+      container,
+      L._('Edit'),
+      map._umap.enableEdit,
+      map._umap
+    )
+    L.DomEvent.on(
+      enableEditing,
+      'mouseover',
+      () => {
+        map._umap.tooltip.open({
+          content: map._umap.help.displayLabel('TOGGLE_EDIT'),
+          anchor: enableEditing,
+          position: 'bottom',
+          delay: 750,
+          duration: 5000,
+        })
+      },
+      this
+    )
+
+    return container
+  },
+})
+
+U.MoreControls = L.Control.extend({
+  options: {
+    position: 'topleft',
+  },
+
+  onAdd: function () {
+    const container = L.DomUtil.create('div', 'umap-control-text')
+    const moreButton = L.DomUtil.createButton(
+      'umap-control-more',
+      container,
+      L._('More controls'),
+      this.toggle,
+      this
+    )
+    const lessButton = L.DomUtil.createButton(
+      'umap-control-less',
+      container,
+      L._('Hide controls'),
+      this.toggle,
+      this
+    )
+    return container
+  },
+
+  toggle: function () {
+    const pos = this.getPosition()
+    const corner = this._map._controlCorners[pos]
+    const className = 'umap-more-controls'
+    if (L.DomUtil.hasClass(corner, className)) L.DomUtil.removeClass(corner, className)
+    else L.DomUtil.addClass(corner, className)
+  },
+})
+
+U.PermanentCreditsControl = L.Control.extend({
+  options: {
+    position: 'bottomleft',
+  },
+
+  initialize: function (map, options) {
+    this.map = map
+    L.Control.prototype.initialize.call(this, options)
+  },
+
+  onAdd: function () {
+    this.paragraphContainer = L.DomUtil.create(
+      'div',
+      'umap-permanent-credits-container text'
+    )
+    this.setCredits()
+    this.setBackground()
+    return this.paragraphContainer
+  },
+
+  setCredits: function () {
+    this.paragraphContainer.innerHTML = U.Utils.toHTML(this.map.options.permanentCredit)
+  },
+
+  setBackground: function () {
+    if (this.map.options.permanentCreditBackground) {
+      this.paragraphContainer.style.backgroundColor = '#FFFFFFB0'
+    } else {
+      this.paragraphContainer.style.backgroundColor = ''
+    }
+  },
+})
+
+L.Control.Button = L.Control.extend({
+  initialize: function (umap, options) {
+    this._umap = umap
+    L.Control.prototype.initialize.call(this, options)
+  },
+
+  getClassName: function () {
+    return this.options.className
+  },
+
+  onAdd: function (map) {
+    const container = L.DomUtil.create('div', `${this.getClassName()} umap-control`)
+    const button = L.DomUtil.createButton(
+      '',
+      container,
+      this.options.title,
+      this.onClick,
+      this
+    )
+    L.DomEvent.on(button, 'dblclick', L.DomEvent.stopPropagation)
+    this.afterAdd(container)
+    return container
+  },
+
+  afterAdd: (container) => {},
+})
+
+U.DataLayersControl = L.Control.Button.extend({
+  options: {
+    position: 'topleft',
+    className: 'umap-control-browse',
+    title: L._('Open browser'),
+  },
+
+  afterAdd: function (container) {
+    U.Utils.toggleBadge(container, this._umap.browser?.hasFilters())
+  },
+
+  onClick: function () {
+    this._umap.openBrowser()
+  },
+})
+
+U.CaptionControl = L.Control.Button.extend({
+  options: {
+    position: 'topleft',
+    className: 'umap-control-caption',
+    title: L._('About'),
+  },
+
+  onClick: function () {
+    this._umap.openCaption()
+  },
+})
+
+L.Control.Embed = L.Control.Button.extend({
+  options: {
+    position: 'topleft',
+    title: L._('Share and download'),
+    className: 'leaflet-control-embed umap-control',
+  },
+
+  onClick: function () {
+    this._umap.share.open()
+  },
+})
+
 /* Used in view mode to define the current tilelayer */
 U.TileLayerControl = L.Control.IconLayers.extend({
   initialize: function (map, options) {
@@ -58,6 +238,128 @@ U.TileLayerControl = L.Control.IconLayers.extend({
   },
 })
 
+/* Used in edit mode to define the default tilelayer */
+U.TileLayerChooser = L.Control.extend({
+  options: {
+    position: 'topleft',
+  },
+
+  initialize: function (map, options = {}) {
+    this.map = map
+    L.Control.prototype.initialize.call(this, options)
+  },
+
+  onAdd: function () {
+    const container = L.DomUtil.create('div', 'leaflet-control-tilelayers umap-control')
+    const changeMapBackgroundButton = L.DomUtil.createButton(
+      '',
+      container,
+      L._('Change map background'),
+      this.openSwitcher,
+      this
+    )
+    L.DomEvent.on(changeMapBackgroundButton, 'dblclick', L.DomEvent.stopPropagation)
+    return container
+  },
+
+  openSwitcher: function (options = {}) {
+    const container = L.DomUtil.create('div', 'umap-edit-tilelayers')
+    L.DomUtil.createTitle(container, L._('Change tilelayers'), 'icon-tilelayer')
+    this._tilelayers_container = L.DomUtil.create('ul', '', container)
+    this.buildList(options)
+    const panel = options.edit ? this.map._umap.editPanel : this.map._umap.panel
+    panel.open({ content: container, highlight: 'tilelayers' })
+  },
+
+  buildList: function (options) {
+    this.map.eachTileLayer(function (tilelayer) {
+      if (
+        window.location.protocol === 'https:' &&
+        tilelayer.options.url_template.indexOf('http:') === 0
+      )
+        return
+      this.addTileLayerElement(tilelayer, options)
+    }, this)
+  },
+
+  addTileLayerElement: function (tilelayer, options) {
+    const selectedClass = this.map.hasLayer(tilelayer) ? 'selected' : ''
+    const el = L.DomUtil.create('li', selectedClass, this._tilelayers_container)
+    const img = L.DomUtil.create('img', '', el)
+    const name = L.DomUtil.create('div', '', el)
+    img.src = U.Utils.template(
+      tilelayer.options.url_template,
+      this.map.options.demoTileInfos
+    )
+    img.loading = 'lazy'
+    name.textContent = tilelayer.options.name
+    L.DomEvent.on(
+      el,
+      'click',
+      () => {
+        const oldTileLayer = this.map._umap.properties.tilelayer
+        this.map.selectTileLayer(tilelayer)
+        this.map._controls.tilelayers.setLayers()
+        if (options?.edit) {
+          this.map._umap.properties.tilelayer = tilelayer.toJSON()
+          this.map._umap.isDirty = true
+          this.map._umap.sync.update(
+            'properties.tilelayer',
+            this.map._umap.properties.tilelayer,
+            oldTileLayer
+          )
+        }
+      },
+      this
+    )
+  },
+})
+
+U.AttributionControl = L.Control.Attribution.extend({
+  options: {
+    prefix: '',
+  },
+
+  _update: function () {
+    // Layer is no more on the map
+    if (!this._map) return
+    L.Control.Attribution.prototype._update.call(this)
+    // Use our own container, so we can hide/show on small screens
+    const credits = this._container.innerHTML
+    this._container.innerHTML = ''
+    const container = L.DomUtil.create('div', 'attribution-container', this._container)
+    container.innerHTML = credits
+    const shortCredit = this._map._umap.getProperty('shortCredit')
+    const captionMenus = this._map._umap.getProperty('captionMenus')
+    if (shortCredit) {
+      L.DomUtil.element({
+        tagName: 'span',
+        parent: container,
+        safeHTML: ` — ${U.Utils.toHTML(shortCredit)}`,
+      })
+    }
+    if (captionMenus) {
+      const link = L.DomUtil.add('a', '', container, ` — ${L._('Open caption')}`)
+      L.DomEvent.on(link, 'click', L.DomEvent.stop)
+        .on(link, 'click', () => this._map._umap.openCaption())
+        .on(link, 'dblclick', L.DomEvent.stop)
+    }
+    if (window.top === window.self && captionMenus) {
+      // We are not in iframe mode
+      L.DomUtil.createLink('', container, ` — ${L._('Home')}`, '/')
+    }
+    if (captionMenus) {
+      L.DomUtil.createLink(
+        '',
+        container,
+        ` — ${L._('Powered by uMap')}`,
+        'https://umap-project.org/'
+      )
+    }
+    L.DomUtil.createLink('attribution-toggle', this._container, '')
+  },
+})
+
 /*
  * Take control over L.Control.Locate to be able to
  * call start() before adding the control (and thus the button) to the map.
@@ -159,6 +461,7 @@ U.Search = L.PhotonSearch.extend({
       event.stopPropagation()
       const datalayer = this.map._umap.defaultEditDataLayer()
       const marker = datalayer.makeFeature(feature)
+      marker.isDirty = true
       marker.edit()
     })
     geom.addEventListener('mousedown', async (event) => {
@@ -299,8 +602,14 @@ U.Editable = L.Editable.extend({
       if (event.layer instanceof U.LeafletMarker) event.layer.feature.del()
     })
     this.on('editable:drawing:commit', function (event) {
+      event.layer.feature.isDirty = true
       if (this._umap.editedFeature !== event.layer) event.layer.feature.edit(event)
     })
+    this.on('editable:editing', (event) => {
+      const feature = event.layer.feature
+      feature.isDirty = true
+      // feature.pullGeometry(false)
+    })
     this.on('editable:vertex:ctrlclick', (event) => {
       const index = event.vertex.getIndex()
       if (
@@ -354,6 +663,7 @@ U.Editable = L.Editable.extend({
     // Overrided from Leaflet.Editable
     const datalayer = this._umap.defaultEditDataLayer()
     datalayer.addFeature(layer.feature)
+    layer.isDirty = true
     return layer
   },
 

umap/static/umap/js/umap.core.js

@@ -65,6 +65,18 @@ L.DomUtil.createButton = (className, container, content, callback, context) => {
   return el
 }
 
+L.DomUtil.createLink = (className, container, content, url, target, title) => {
+  const el = L.DomUtil.add('a', className, container, content)
+  el.href = url
+  if (target) {
+    el.target = target
+  }
+  if (title) {
+    el.title = title
+  }
+  return el
+}
+
 L.DomUtil.createIcon = (parent, className, title, size = 16) => {
   return L.DomUtil.element({
     tagName: 'i',
@@ -128,6 +140,16 @@ L.DomUtil.element = ({ tagName, parent, ...attrs }) => {
   return el
 }
 
+L.DomUtil.before = (target, el) => {
+  target.parentNode.insertBefore(el, target)
+  return el
+}
+
+L.DomUtil.after = (target, el) => {
+  target.parentNode.insertBefore(el, target.nextSibling)
+  return el
+}
+
 // From https://gist.github.com/Accudio/b9cb16e0e3df858cef0d31e38f1fe46f
 // convert colour in range 0-255 to the modifier used within luminance calculation
 L.DomUtil.colourMod = (colour) => {
@@ -192,6 +214,24 @@ L.DomUtil.contrastedColor = (el, bgcolor) => {
   if (bgcolor) _CACHE_CONSTRAST[bgcolor] = out
   return out
 }
+L.DomEvent.once = (el, types, fn, context) => {
+  // cf https://github.com/Leaflet/Leaflet/pull/3528#issuecomment-134551575
+
+  if (typeof types === 'object') {
+    for (const type in types) {
+      L.DomEvent.once(el, type, types[type], fn)
+    }
+    return L.DomEvent
+  }
+
+  const handler = L.bind(() => {
+    L.DomEvent.off(el, types, fn, context).off(el, types, handler, context)
+  }, L.DomEvent)
+
+  // add a listener that's executed once and removed after that
+  return L.DomEvent.on(el, types, fn, context).on(el, types, handler, context)
+}
+
 L.LatLng.prototype.isValid = function () {
   return (
     Number.isFinite(this.lat) &&

umap/static/umap/locale/am_ET.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "Cache proxied request",
     "Caption": "ካፕሽን",
     "Center map on your location": "መገኛዎን የሚያሳየውን ካርታ ወደ መሀል ያድርጉ",
+    "Change map background": "የካርታውን የጀርባ ገፅታ ይቀይሩ",
     "Change tilelayers": "የታይልሌየሩን",
     "Change": "Change",
     "Choose the data format": "የረጃውን ፎርማት ቀይር",
@@ -456,6 +457,7 @@ const locale = {
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,14 +538,7 @@ const locale = {
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("am_ET", locale)
 L.setLocale("am_ET")

umap/static/umap/locale/am_ET.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "Cache proxied request",
     "Caption": "ካፕሽን",
     "Center map on your location": "መገኛዎን የሚያሳየውን ካርታ ወደ መሀል ያድርጉ",
+    "Change map background": "የካርታውን የጀርባ ገፅታ ይቀይሩ",
     "Change tilelayers": "የታይልሌየሩን",
     "Change": "Change",
     "Choose the data format": "የረጃውን ፎርማት ቀይር",
@@ -456,6 +457,7 @@
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,12 +538,5 @@
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/ar.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "Cache proxied request",
     "Caption": "شرح",
     "Center map on your location": "Center map on your location",
+    "Change map background": "Change map background",
     "Change tilelayers": "Change tilelayers",
     "Change": "Change",
     "Choose the data format": "اختر تنسيق البيانات",
@@ -456,6 +457,7 @@ const locale = {
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,14 +538,7 @@ const locale = {
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("ar", locale)
 L.setLocale("ar")

umap/static/umap/locale/ar.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "Cache proxied request",
     "Caption": "شرح",
     "Center map on your location": "Center map on your location",
+    "Change map background": "Change map background",
     "Change tilelayers": "Change tilelayers",
     "Change": "Change",
     "Choose the data format": "اختر تنسيق البيانات",
@@ -456,6 +457,7 @@
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,12 +538,5 @@
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/ast.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "Cache proxied request",
     "Caption": "Caption",
     "Center map on your location": "Center map on your location",
+    "Change map background": "Change map background",
     "Change tilelayers": "Change tilelayers",
     "Change": "Change",
     "Choose the data format": "Choose the data format",
@@ -456,6 +457,7 @@ const locale = {
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,14 +538,7 @@ const locale = {
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("ast", locale)
 L.setLocale("ast")

umap/static/umap/locale/ast.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "Cache proxied request",
     "Caption": "Caption",
     "Center map on your location": "Center map on your location",
+    "Change map background": "Change map background",
     "Change tilelayers": "Change tilelayers",
     "Change": "Change",
     "Choose the data format": "Choose the data format",
@@ -456,6 +457,7 @@
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,12 +538,5 @@
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/bg.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "Cache proxied request",
     "Caption": "Надпис",
     "Center map on your location": "Center map on your location",
+    "Change map background": "Промяна фона на картата",
     "Change tilelayers": "Променете слоевете",
     "Change": "Change",
     "Choose the data format": "Изберете формата на данните",
@@ -456,6 +457,7 @@ const locale = {
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,14 +538,7 @@ const locale = {
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("bg", locale)
 L.setLocale("bg")

umap/static/umap/locale/bg.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "Cache proxied request",
     "Caption": "Надпис",
     "Center map on your location": "Center map on your location",
+    "Change map background": "Промяна фона на картата",
     "Change tilelayers": "Променете слоевете",
     "Change": "Change",
     "Choose the data format": "Изберете формата на данните",
@@ -456,6 +457,7 @@
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,12 +538,5 @@
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/br.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "Cache proxied request",
     "Caption": "Alc'hwez",
     "Center map on your location": "Kreizañ ar gartenn war al lec'h m'emaoc'h",
+    "Change map background": "Cheñch foñs ar gartenn",
     "Change tilelayers": "Cheñch foñs ar gartenn",
     "Change": "Kemmañ",
     "Choose the data format": "Diuzañ furmad ar roadennoù",
@@ -456,6 +457,7 @@ const locale = {
     "Choose this dataset": "Dibab an hollad cheñchamantoù-mañ",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Dibab un tem",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Dibab ar roadennoù-mañ",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,14 +538,7 @@ const locale = {
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("br", locale)
 L.setLocale("br")

umap/static/umap/locale/br.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "Cache proxied request",
     "Caption": "Alc'hwez",
     "Center map on your location": "Kreizañ ar gartenn war al lec'h m'emaoc'h",
+    "Change map background": "Cheñch foñs ar gartenn",
     "Change tilelayers": "Cheñch foñs ar gartenn",
     "Change": "Kemmañ",
     "Choose the data format": "Diuzañ furmad ar roadennoù",
@@ -456,6 +457,7 @@
     "Choose this dataset": "Dibab an hollad cheñchamantoù-mañ",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Dibab un tem",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Dibab ar roadennoù-mañ",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,12 +538,5 @@
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/ca.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "Petició proxy en memòria cau",
     "Caption": "Llegenda",
     "Center map on your location": "Centra el mapa a la vostra ubicació",
+    "Change map background": "Canvia el fons del mapa",
     "Change tilelayers": "Canvia les capes de tessel·les",
     "Change": "Change",
     "Choose the data format": "Trieu el format de dades",
@@ -84,7 +85,7 @@ const locale = {
     "Custom background": "Fons personalitzat",
     "Custom overlay": "Superposició personalitzada",
     "dash array": "matriu de guions",
-    "Data is browsable": "Les dades es poden navegar",
+    "Data is browsable": "Data is browsable",
     "Datalayers": "Capes de dades",
     "Default interaction options": "Opcions d'interacció predeterminades",
     "Default properties": "Propietats predeterminades",
@@ -176,12 +177,12 @@ const locale = {
     "Icon shape": "forma de la icona",
     "Icon symbol": "Imatge de la icona",
     "If false, the polygon or line will act as a part of the underlying map.": "If false, the polygon or line will act as a part of the underlying map.",
-    "Iframe with custom height (in px): {{{https://iframe.url.com|height}}}": "Iframe amb alçada personalitzada (height en px): {{{https://iframe.url.com|height}}}",
+    "Iframe with custom height (in px): {{{https://iframe.url.com|height}}}": "Iframe with custom height (in px): {{{https://iframe.url.com|height}}}",
-    "Iframe with custom height and width (in px): {{{https://iframe.url.com|height*width}}}": "Iframe amb alçada i amplada personalitzada (height i width en px): {{{https://iframe.url.com|height*width}}}",
+    "Iframe with custom height and width (in px): {{{https://iframe.url.com|height*width}}}": "Iframe with custom height and width (in px): {{{https://iframe.url.com|height*width}}}",
     "iframe": "iframe",
     "Iframe: {{{https://iframe.url.com}}}": "Iframe: {{{https://iframe.url.com}}}",
-    "Image with custom width (in px): {{https://image.url.com|width}}": "Imatge amb amplada personalitzada (width en px): {{https://image.url.com|width}}",
+    "Image with custom width (in px): {{https://image.url.com|width}}": "Image with custom width (in px): {{https://image.url.com|width}}",
-    "Image: {{https://image.url.com}}": "Imatge: {{https://image.url.com}}",
+    "Image: {{https://image.url.com}}": "Image: {{https://image.url.com}}",
     "Import data": "Importa dades",
     "Import in a new layer": "Import in a new layer",
     "Imports all umap data, including layers and settings.": "Imports all umap data, including layers and settings.",
@@ -202,14 +203,14 @@ const locale = {
     "Labels are clickable": "Les etiquetes es poden fer clic",
     "Latest feature": "Darrera característica",
     "Latitude": "Latitud",
-    "Layer properties": "Propietats de la capa",
+    "Layer properties": "Layer properties",
     "Layer": "Capa",
     "Licence": "Llicència",
     "licence": "llicència",
     "Limit bounds": "Límits",
     "Link to view the map": "Enllaç per veure el mapa",
     "Link to…": "Link to…",
-    "Link with text: [[https://example.com|text of the link]]": "Enllaç amb text:  [[https://example.com|text de l'enllaç]]",
+    "Link with text: [[https://example.com|text of the link]]": "Link with text: [[https://example.com|text of the link]]",
     "Long credits": "Crèdits llargs",
     "Longitude": "Longitud",
     "Make main shape": "Make main shape",
@@ -301,17 +302,17 @@ const locale = {
     "Secret edit link:": "Secret edit link:",
     "See full screen": "Mostra-ho a pantalla completa",
     "See on OpenStreetMap": "See on OpenStreetMap",
-    "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Estableix-lo com a fals per ocultar aquesta capa de la presentació de diapositives, el navegador de dades, la navegació emergent...",
+    "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…",
     "settings": "settings",
-    "Shape properties": "Propietats de la forma",
+    "Shape properties": "Shape properties",
     "Share and download": "Comparteix i baixa",
     "Share this link to open a customized map view": "Comparteix aquest enllaç per obrir una vista de mapa personalitzada",
     "Short credits": "Crèdits curts",
     "Short link": "Enllaç curt",
-    "Show this layer in the caption": "Mostra aquesta capa a la llegenda",
+    "Show this layer in the caption": "Show this layer in the caption",
     "Show/hide layer": "Mostra/amaga la capa",
     "Side panel": "panell lateral",
-    "Simple link: [[https://example.com]]": "Enllaç senzill: [[https://example.com]]",
+    "Simple link: [[https://example.com]]": "Simple link: [[https://example.com]]",
     "Simplify": "Simplificar",
     "Skipping unknown geometry.type: {type}": "S'està ometent el tipus de geometria desconegut: {type}",
     "Slideshow": "Presentació",
@@ -323,7 +324,7 @@ const locale = {
     "Stop editing": "Atura l'edició",
     "Stop slideshow": "Atura la presentació",
     "Street": "Street",
-    "stroke": "línia",
+    "stroke": "stroke",
     "Supported scheme": "Esquema suportat",
     "Supported variables that will be dynamically replaced": "Supported variables that will be dynamically replaced",
     "Symbol": "Symbol",
@@ -364,7 +365,7 @@ const locale = {
     "Visibility: {status}": "Visibilitat: {status}",
     "weight": "pes",
     "Where do we go from here?": "On anem des d'aquí?",
-    "Whether to display or not polygons paths.": "Si es mostren o no els camins de polígons.",
+    "Whether to display or not polygons paths.": "Whether to display or not polygons paths.",
     "Whether to fill polygons with color.": "emplenar polígons amb color..",
     "Who can edit \"{layer}\"": "Qui pot editar \"{layer}\"",
     "Who can edit": "Qui pot editar",
@@ -456,6 +457,7 @@ const locale = {
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -502,7 +504,7 @@ const locale = {
     "Type editor's username": "Escriviu el nom d'usuari de l'editor",
     "Map": "Mapa",
     "Manage collaborators": "Gestiona els col·laboradors",
-    "show/hide all layers": "mostrar/ocultar totes les capes",
+    "show/hide all layers": "show/hide all layers",
     "zoom to data extent": "zoom to data extent",
     "download visible data": "download visible data",
     "Import helpers": "Import helpers",
@@ -520,10 +522,10 @@ const locale = {
     "Anonymous": "Anonymous",
     "created at {date}": "created at {date}",
     "modified at {date}": "modified at {date}",
-    "Default zoom": "Zoom predeterminat",
+    "Default zoom": "Default zoom",
-    "Default latitude": "Latitud predeterminada",
+    "Default latitude": "Default latitude",
-    "Default longitude": "Longitud predeterminada",
+    "Default longitude": "Default longitude",
-    "Edit map default view": "Edita la visualització predeterminada del mapa",
+    "Edit map default view": "Edit map default view",
     "Use current center and zoom": "Use current center and zoom",
     "Layer permalink": "Layer permalink",
     "Back to home": "Back to home",
@@ -533,17 +535,10 @@ const locale = {
     "Cancel last edit": "Cancel last edit",
     "Redo last edit": "Redo last edit",
     "Links": "Links",
-    "Images": "Imatges",
+    "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("ca", locale)
 L.setLocale("ca")

umap/static/umap/locale/ca.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "Petició proxy en memòria cau",
     "Caption": "Llegenda",
     "Center map on your location": "Centra el mapa a la vostra ubicació",
+    "Change map background": "Canvia el fons del mapa",
     "Change tilelayers": "Canvia les capes de tessel·les",
     "Change": "Change",
     "Choose the data format": "Trieu el format de dades",
@@ -84,7 +85,7 @@
     "Custom background": "Fons personalitzat",
     "Custom overlay": "Superposició personalitzada",
     "dash array": "matriu de guions",
-    "Data is browsable": "Les dades es poden navegar",
+    "Data is browsable": "Data is browsable",
     "Datalayers": "Capes de dades",
     "Default interaction options": "Opcions d'interacció predeterminades",
     "Default properties": "Propietats predeterminades",
@@ -176,12 +177,12 @@
     "Icon shape": "forma de la icona",
     "Icon symbol": "Imatge de la icona",
     "If false, the polygon or line will act as a part of the underlying map.": "If false, the polygon or line will act as a part of the underlying map.",
-    "Iframe with custom height (in px): {{{https://iframe.url.com|height}}}": "Iframe amb alçada personalitzada (height en px): {{{https://iframe.url.com|height}}}",
+    "Iframe with custom height (in px): {{{https://iframe.url.com|height}}}": "Iframe with custom height (in px): {{{https://iframe.url.com|height}}}",
-    "Iframe with custom height and width (in px): {{{https://iframe.url.com|height*width}}}": "Iframe amb alçada i amplada personalitzada (height i width en px): {{{https://iframe.url.com|height*width}}}",
+    "Iframe with custom height and width (in px): {{{https://iframe.url.com|height*width}}}": "Iframe with custom height and width (in px): {{{https://iframe.url.com|height*width}}}",
     "iframe": "iframe",
     "Iframe: {{{https://iframe.url.com}}}": "Iframe: {{{https://iframe.url.com}}}",
-    "Image with custom width (in px): {{https://image.url.com|width}}": "Imatge amb amplada personalitzada (width en px): {{https://image.url.com|width}}",
+    "Image with custom width (in px): {{https://image.url.com|width}}": "Image with custom width (in px): {{https://image.url.com|width}}",
-    "Image: {{https://image.url.com}}": "Imatge: {{https://image.url.com}}",
+    "Image: {{https://image.url.com}}": "Image: {{https://image.url.com}}",
     "Import data": "Importa dades",
     "Import in a new layer": "Import in a new layer",
     "Imports all umap data, including layers and settings.": "Imports all umap data, including layers and settings.",
@@ -202,14 +203,14 @@
     "Labels are clickable": "Les etiquetes es poden fer clic",
     "Latest feature": "Darrera característica",
     "Latitude": "Latitud",
-    "Layer properties": "Propietats de la capa",
+    "Layer properties": "Layer properties",
     "Layer": "Capa",
     "Licence": "Llicència",
     "licence": "llicència",
     "Limit bounds": "Límits",
     "Link to view the map": "Enllaç per veure el mapa",
     "Link to…": "Link to…",
-    "Link with text: [[https://example.com|text of the link]]": "Enllaç amb text:  [[https://example.com|text de l'enllaç]]",
+    "Link with text: [[https://example.com|text of the link]]": "Link with text: [[https://example.com|text of the link]]",
     "Long credits": "Crèdits llargs",
     "Longitude": "Longitud",
     "Make main shape": "Make main shape",
@@ -301,17 +302,17 @@
     "Secret edit link:": "Secret edit link:",
     "See full screen": "Mostra-ho a pantalla completa",
     "See on OpenStreetMap": "See on OpenStreetMap",
-    "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Estableix-lo com a fals per ocultar aquesta capa de la presentació de diapositives, el navegador de dades, la navegació emergent...",
+    "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…",
     "settings": "settings",
-    "Shape properties": "Propietats de la forma",
+    "Shape properties": "Shape properties",
     "Share and download": "Comparteix i baixa",
     "Share this link to open a customized map view": "Comparteix aquest enllaç per obrir una vista de mapa personalitzada",
     "Short credits": "Crèdits curts",
     "Short link": "Enllaç curt",
-    "Show this layer in the caption": "Mostra aquesta capa a la llegenda",
+    "Show this layer in the caption": "Show this layer in the caption",
     "Show/hide layer": "Mostra/amaga la capa",
     "Side panel": "panell lateral",
-    "Simple link: [[https://example.com]]": "Enllaç senzill: [[https://example.com]]",
+    "Simple link: [[https://example.com]]": "Simple link: [[https://example.com]]",
     "Simplify": "Simplificar",
     "Skipping unknown geometry.type: {type}": "S'està ometent el tipus de geometria desconegut: {type}",
     "Slideshow": "Presentació",
@@ -323,7 +324,7 @@
     "Stop editing": "Atura l'edició",
     "Stop slideshow": "Atura la presentació",
     "Street": "Street",
-    "stroke": "línia",
+    "stroke": "stroke",
     "Supported scheme": "Esquema suportat",
     "Supported variables that will be dynamically replaced": "Supported variables that will be dynamically replaced",
     "Symbol": "Symbol",
@@ -364,7 +365,7 @@
     "Visibility: {status}": "Visibilitat: {status}",
     "weight": "pes",
     "Where do we go from here?": "On anem des d'aquí?",
-    "Whether to display or not polygons paths.": "Si es mostren o no els camins de polígons.",
+    "Whether to display or not polygons paths.": "Whether to display or not polygons paths.",
     "Whether to fill polygons with color.": "emplenar polígons amb color..",
     "Who can edit \"{layer}\"": "Qui pot editar \"{layer}\"",
     "Who can edit": "Qui pot editar",
@@ -456,6 +457,7 @@
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -502,7 +504,7 @@
     "Type editor's username": "Escriviu el nom d'usuari de l'editor",
     "Map": "Mapa",
     "Manage collaborators": "Gestiona els col·laboradors",
-    "show/hide all layers": "mostrar/ocultar totes les capes",
+    "show/hide all layers": "show/hide all layers",
     "zoom to data extent": "zoom to data extent",
     "download visible data": "download visible data",
     "Import helpers": "Import helpers",
@@ -520,10 +522,10 @@
     "Anonymous": "Anonymous",
     "created at {date}": "created at {date}",
     "modified at {date}": "modified at {date}",
-    "Default zoom": "Zoom predeterminat",
+    "Default zoom": "Default zoom",
-    "Default latitude": "Latitud predeterminada",
+    "Default latitude": "Default latitude",
-    "Default longitude": "Longitud predeterminada",
+    "Default longitude": "Default longitude",
-    "Edit map default view": "Edita la visualització predeterminada del mapa",
+    "Edit map default view": "Edit map default view",
     "Use current center and zoom": "Use current center and zoom",
     "Layer permalink": "Layer permalink",
     "Back to home": "Back to home",
@@ -533,15 +535,8 @@
     "Cancel last edit": "Cancel last edit",
     "Redo last edit": "Redo last edit",
     "Links": "Links",
-    "Images": "Imatges",
+    "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/cs_CZ.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "Požadavek na zástupnou mezipaměť",
     "Caption": "Popisek",
     "Center map on your location": "Přemístit se na mapě na vaši polohu",
+    "Change map background": "Změnit pozadí mapy",
     "Change tilelayers": "Změnit pozadí mapy",
     "Change": "Změnit",
     "Choose the data format": "Vyberte formát dat",
@@ -539,11 +540,7 @@ const locale = {
     "Geocode": "Geocode",
     "Display the back to home icon": "Display the back to home icon",
     "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
+    "Simplify all geometries to points": "Simplify all geometries to points"
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("cs_CZ", locale)
 L.setLocale("cs_CZ")

umap/static/umap/locale/cs_CZ.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "Požadavek na zástupnou mezipaměť",
     "Caption": "Popisek",
     "Center map on your location": "Přemístit se na mapě na vaši polohu",
+    "Change map background": "Změnit pozadí mapy",
     "Change tilelayers": "Změnit pozadí mapy",
     "Change": "Změnit",
     "Choose the data format": "Vyberte formát dat",
@@ -539,9 +540,5 @@
     "Geocode": "Geocode",
     "Display the back to home icon": "Display the back to home icon",
     "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
+    "Simplify all geometries to points": "Simplify all geometries to points"
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/da.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "Forespørgsel i proxycache",
     "Caption": "Billedtekst",
     "Center map on your location": "Centrer kort på din placering",
+    "Change map background": "Skift kortbaggrund",
     "Change tilelayers": "Skift kortlag",
     "Change": "Change",
     "Choose the data format": "Vælg dataformat",
@@ -456,6 +457,7 @@ const locale = {
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,14 +538,7 @@ const locale = {
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("da", locale)
 L.setLocale("da")

umap/static/umap/locale/da.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "Forespørgsel i proxycache",
     "Caption": "Billedtekst",
     "Center map on your location": "Centrer kort på din placering",
+    "Change map background": "Skift kortbaggrund",
     "Change tilelayers": "Skift kortlag",
     "Change": "Change",
     "Choose the data format": "Vælg dataformat",
@@ -456,6 +457,7 @@
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,12 +538,5 @@
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/de.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "Proxycache-Anfrage",
     "Caption": "Überschrift",
     "Center map on your location": "Die Karte auf deinen Standort ausrichten",
+    "Change map background": "Hintergrundkarte ändern",
     "Change tilelayers": "Kachelebenen ändern",
     "Change": "Ändern",
     "Choose the data format": "Wähle das Datenformat",
@@ -539,11 +540,7 @@ const locale = {
     "Geocode": "Geocode",
     "Display the back to home icon": "Display the back to home icon",
     "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
+    "Simplify all geometries to points": "Simplify all geometries to points"
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("de", locale)
 L.setLocale("de")

umap/static/umap/locale/de.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "Proxycache-Anfrage",
     "Caption": "Überschrift",
     "Center map on your location": "Die Karte auf deinen Standort ausrichten",
+    "Change map background": "Hintergrundkarte ändern",
     "Change tilelayers": "Kachelebenen ändern",
     "Change": "Ändern",
     "Choose the data format": "Wähle das Datenformat",
@@ -539,9 +540,5 @@
     "Geocode": "Geocode",
     "Display the back to home icon": "Display the back to home icon",
     "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
+    "Simplify all geometries to points": "Simplify all geometries to points"
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/el.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "Αίτημα μεσολάβησης προσωρινής μνήμης",
     "Caption": "Λεζάντα",
     "Center map on your location": "Κεντράρισμα του χάρτη στην τοποθεσία σας",
+    "Change map background": "Αλλαγή υποβάθρου του χάρτη",
     "Change tilelayers": "Αλλαγή χαρτογραφικού υπόβαθρου",
     "Change": "Αλλαγή",
     "Choose the data format": "Επιλογή μορφοποίησης δεδομένων",
@@ -433,117 +434,111 @@ const locale = {
     "key~value (eg. name~Grisy)": "κλειδί~τιμή (π.χ. όνομα~Grisy)",
     "key=\"value|value2\" (eg. name=\"Paris|Berlin\")": "κλειδί=\"value|value2\" (eg. όνομα=\"Παρίσι|Βερολίνο\")",
     "More info about Overpass syntax": "Περισσότερες πληροφορίες σχετικά με τη σύνταξη της Υπέρβασης",
-    "For more complex needs, see": "Για πιο σύνθετες ανάγκες, βλ.",
+    "For more complex needs, see": "For more complex needs, see",
-    "Choose data": "Επιλογή δεδομένων",
+    "Choose data": "Choose data",
-    "Choose the format": "Επιλογή μορφοποίησης",
+    "Choose the format": "Choose the format",
-    "Choose the layer": "Επιλογή επιπέδου",
+    "Choose the layer": "Choose the layer",
-    "Layer name": "Όνομα επιπέδου",
+    "Layer name": "Layer name",
-    "Choose import mode": "Επιλογή τρόπου εισαγωγής",
+    "Choose import mode": "Choose import mode",
-    "Copy into the layer": "Αντιγραφή στο επίπεδο",
+    "Copy into the layer": "Copy into the layer",
-    "Link to the layer as remote data": "Σύνδεση με το επίπεδο ως απομακρυσμένα δεδομένα",
+    "Link to the layer as remote data": "Link to the layer as remote data",
     "Condition": "Συνθήκη",
     "key=value or key!=value": "key=value ή key!=value",
     "Are you sure you want to delete this rule?": "Θέλετε σίγουρα να διαγραφεί αυτός ο κανόνας;",
     "empty rule": "κενός κανόνας",
     "Conditional style rules": "Κανόνες μορφοποίησης υπό όρους",
     "Add rule": "Προσθήκη κανόνα",
-    "Browser: data": "Περιηγητής: δεδομένα",
+    "Browser: data": "Browser: data",
-    "Browser: layers": "Περιηγητής: επίπεδα",
+    "Browser: layers": "Browser: layers",
-    "Browser: filters": "Περιηγητής: φίλτρα",
+    "Browser: filters": "Browser: filters",
-    "Enable real-time collaboration": "Ενεργοποίηση συνεργασίας σε πραγματικό χρόνο",
+    "Enable real-time collaboration": "Enable real-time collaboration",
     "✅ Copied!": "✅ Αντιγράφηκε!",
-    "Choose a dataset": "Επιλογή συνόλου δεδομένων",
+    "Choose a dataset": "Choose a dataset",
-    "Choose this dataset": "Επιλογή αυτού του συνόλου δεδομένων",
+    "Choose this dataset": "Choose this dataset",
-    "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: θεματικά δεδομένα από το OpenStreetMap",
+    "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
-    "Choose a theme": "Επιλογή θέματος",
+    "Choose a theme": "Choose a theme",
-    "Choose this data": "Επιλογή αυτών των δεδομένων",
+    "Symplify all geometries to points": "Symplify all geometries to points",
+    "Choose this data": "Choose this data",
     "Search admin boundary": "Αναζήτηση διοικητικού ορίου",
-    "Please choose a theme and a boundary first.": "Επιλέξτε πρώτα ένα θέμα και ένα όριο.",
+    "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
     "Expression": "Έκφραση",
     "Geometry mode": "Λειτουργία γεωμετρίας",
-    "Only geometry centers": "Μόνο γεωμετρικά κέντρα",
+    "Only geometry centers": "Only geometry centers",
-    "Search area": "Περιοχή αναζήτησης",
+    "Search area": "Search area",
-    "Type area name, or let empty to load data in current map view": "Πληκτρολογήστε το όνομα της περιοχής ή αφήστε το κενό, για να φορτώσετε δεδομένα στην τρέχουσα προβολή χάρτη.",
+    "Type area name, or let empty to load data in current map view": "Type area name, or let empty to load data in current map view",
-    "Data successfully imported!": "Τα δεδομένα εισήχθησαν επιτυχώς!",
+    "Data successfully imported!": "Data successfully imported!",
-    "Clear data": "Εκκαθάριση δεδομένων",
+    "Clear data": "Clear data",
-    "Remove layers": "Αφαίρεση επιπέδων",
+    "Remove layers": "Remove layers",
-    "Categorized": "Κατηγοριοποιημένο",
+    "Categorized": "Categorized",
-    "Alphabetical": "Αλφαβητικά",
+    "Alphabetical": "Alphabetical",
-    "Category property": "Ιδιότητα κατηγορίας",
+    "Category property": "Category property",
     "Color palette": "Παλέτα χρωμάτων",
     "Categories": "Κατηγορίες",
     "Comma separated list of categories.": "Λίστα κατηγοριών χωρισμένες με κόμμα.",
     "Categories mode": "Λειτουργία κατηγοριών",
-    "Remove filter for this column": "Αφαίρεση φίλτρου από αυτή τη στήλη",
+    "Remove filter for this column": "Remove filter for this column",
-    "Add filter for this column": "Προσθήκη φίλτρου από αυτή τη στήλη",
+    "Add filter for this column": "Add filter for this column",
-    "Rename this column": "Μετονομασία αυτής της στήλης",
+    "Rename this column": "Rename this column",
-    "Delete this column": "Διαγραφή αυτής της στήλης",
+    "Delete this column": "Delete this column",
-    "Name “{name}” should not contain a dot.": "Το όνομα \"{name}\" δεν πρέπει να περιέχει τελεία.",
+    "Name “{name}” should not contain a dot.": "Name “{name}” should not contain a dot.",
-    "This name already exists: “{name}”": "Αυτό το όνομα υπάρχει ήδη: \"{name}\"",
+    "This name already exists: “{name}”": "This name already exists: “{name}”",
-    "Delete selected rows": "Διαγραφή επιλεγμένων γραμμών",
+    "Delete selected rows": "Delete selected rows",
-    "Found {count} rows. Are you sure you want to delete all?": "Βρέθηκαν {count} σειρές. Είστε σίγουροι ότι θέλετε να τις διαγράψετε όλες;",
+    "Found {count} rows. Are you sure you want to delete all?": "Found {count} rows. Are you sure you want to delete all?",
     "Expression is empty": "Η έκφραση είναι κενή",
     "OK": "OK",
     "Cancel": "Άκυρο",
-    "Attach map to a team": "Σύνδεση χάρτη με μια ομάδα",
+    "Attach map to a team": "Attach map to a team",
-    "Display the polygon inverted": "Εμφανίζει το πολύγωνο ανεστραμμένο",
+    "Display the polygon inverted": "Display the polygon inverted",
-    "Proportional circles": "Αναλογικοί κύκλοι",
+    "Proportional circles": "Proportional circles",
-    "Property name to compute circles": "Όνομα ιδιότητας για τον υπολογισμό κύκλων",
+    "Property name to compute circles": "Property name to compute circles",
-    "Min circle radius": "Ελάχιστη ακτίνα κύκλου",
+    "Min circle radius": "Min circle radius",
-    "Max circle radius": "Μέγιστη ακτίνα κύκλου",
+    "Max circle radius": "Max circle radius",
-    "Display the open browser control": "Εμφάνιση του χειριστηρίου ανοικτού προγράμματος περιήγησης",
+    "Display the open browser control": "Display the open browser control",
-    "Copy as GeoJSON": "Αντιγραφή ως GeoJSON",
+    "Copy as GeoJSON": "Copy as GeoJSON",
-    "Please zoom in to edit the geometry": "Παρακαλώ εστιάστε για να επεξεργαστείτε τη γεωμετρία",
+    "Please zoom in to edit the geometry": "Please zoom in to edit the geometry",
-    "New map": "Νέος χάρτης",
+    "New map": "New map",
-    "My maps": "Οι χάρτες μου",
+    "My maps": "My maps",
-    "My teams": "Οι ομάδες μου",
+    "My teams": "My teams",
-    "My profile": "Το προφίλ μου",
+    "My profile": "My profile",
-    "Type new owner's username": "Πληκτρολογήστε το όνομα χρήστη του νέου ιδιοκτήτη",
+    "Type new owner's username": "Type new owner's username",
-    "Type editor's username": "Πληκτρολογήστε το όνομα χρήστη του συντάκτη",
+    "Type editor's username": "Type editor's username",
-    "Map": "Χάρτης",
+    "Map": "Map",
-    "Manage collaborators": "Διαχείριση συνεργατών",
+    "Manage collaborators": "Manage collaborators",
-    "show/hide all layers": "εμφάνιση/απόκρυψη όλων των επιπέδων",
+    "show/hide all layers": "show/hide all layers",
-    "zoom to data extent": "εστίαση στην έκταση των δεδομένων",
+    "zoom to data extent": "zoom to data extent",
-    "download visible data": "λήψη ορατών δεδομένων",
+    "download visible data": "download visible data",
-    "Import helpers": "Βοηθοί εισαγωγής",
+    "Import helpers": "Import helpers",
-    "Import helpers will fill the URL field for you.": "Οι βοηθοί εισαγωγής θα συμπληρώσουν το πεδίο URL για εσάς.",
+    "Import helpers will fill the URL field for you.": "Import helpers will fill the URL field for you.",
     "Wikipedia": "Wikipedia",
-    "Save draft": "Αποθήκευση προσχεδίου",
+    "Save draft": "Save draft",
-    "No data has been found for import": "Δεν βρέθηκαν δεδομένα για την εισαγωγή",
+    "No data has been found for import": "No data has been found for import",
-    "Successfully imported {count} feature(s)": "Εισήχθησαν επιτυχώς {count} χαρακτηριστικό(ά)",
+    "Successfully imported {count} feature(s)": "Successfully imported {count} feature(s)",
-    "Disconnected": "Αποσυνδεδεμένο",
+    "Disconnected": "Disconnected",
-    "You must be logged in": "Πρέπει να συνδεθείτε",
+    "You must be logged in": "You must be logged in",
-    "on hover": "στην αιώρηση",
+    "on hover": "on hover",
-    "Cannot load remote data for layer \"{layer}\" with url \"{url}\"": "Δεν είναι δυνατή η φόρτωση απομακρυσμένων δεδομένων για το επίπεδο \"{layer}\" με url \"{url}\"",
+    "Cannot load remote data for layer \"{layer}\" with url \"{url}\"": "Cannot load remote data for layer \"{layer}\" with url \"{url}\"",
-    "Cannot parse remote data for layer \"{layer}\" with url \"{url}\"": "Δεν είναι δυνατή η ανάλυση απομακρυσμένων δεδομένων για το επίπεδο \"{layer}\" με url \"{url}\"",
+    "Cannot parse remote data for layer \"{layer}\" with url \"{url}\"": "Cannot parse remote data for layer \"{layer}\" with url \"{url}\"",
-    "Import failed: invalid data": "Η εισαγωγή απέτυχε: μη έγκυρα δεδομένα",
+    "Import failed: invalid data": "Import failed: invalid data",
-    "Anonymous": "Ανώνυμος",
+    "Anonymous": "Anonymous",
-    "created at {date}": "δημιουργήθηκε {ημερομηνία}",
+    "created at {date}": "created at {date}",
-    "modified at {date}": "τροποποιήθηκε {ημερομηνία}",
+    "modified at {date}": "modified at {date}",
-    "Default zoom": "Προκαθορισμένη εστίαση",
+    "Default zoom": "Default zoom",
-    "Default latitude": "Προκαθορισμένο γεωγραφικό πλάτος",
+    "Default latitude": "Default latitude",
-    "Default longitude": "Προκαθορισμένο γεωγραφικό μήκος",
+    "Default longitude": "Default longitude",
-    "Edit map default view": "Επεξεργασία προεπιλεγμένης προβολής χάρτη",
+    "Edit map default view": "Edit map default view",
-    "Use current center and zoom": "Χρήση τρέχοντος κέντρου και εστίασης",
+    "Use current center and zoom": "Use current center and zoom",
-    "Layer permalink": "Mόνιμο url του επιπέδου",
+    "Layer permalink": "Layer permalink",
-    "Back to home": "Επιστροφή στην αρχική σελίδα",
+    "Back to home": "Back to home",
-    "Home logo": "Λογότυπο αρχικής σελίδας",
+    "Home logo": "Home logo",
-    "Add this geometry to my map": "Προσθήκη αυτής της γεωμετρίας στο χάρτη μου",
+    "Add this geometry to my map": "Add this geometry to my map",
-    "Add this place to my map": "Προσθήκη αυτής της τοποθεσίας στον χάρτη μου",
+    "Add this place to my map": "Add this place to my map",
-    "Cancel last edit": "Ακύρωση τελευταίας επεξεργασίας",
+    "Cancel last edit": "Cancel last edit",
-    "Redo last edit": "Αναίρεση ακύρωσης τελευταίας επεξεργασίας",
+    "Redo last edit": "Redo last edit",
-    "Links": "Σύνδεσμοι",
+    "Links": "Links",
-    "Images": "Εικόνες",
+    "Images": "Images",
     "Iframes": "Iframes",
-    "Tags": "Ετικέτες",
+    "Tags": "Tags",
-    "Geocode": "Γεωκωδικοποίηση",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Εμφάνιση του εικονιδίου επιστροφής στην αρχική σελίδα",
-    "Do you want to display layer switcher in caption bar?": "Θέλετε να εμφανίσετε τον διακόπτη επιπέδων στη γραμμή λεζάντας;",
-    "Simplify all geometries to points": "Απλοποίηση όλων των γεωμετριών σε σημεία",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("el", locale)
 L.setLocale("el")

umap/static/umap/locale/el.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "Αίτημα μεσολάβησης προσωρινής μνήμης",
     "Caption": "Λεζάντα",
     "Center map on your location": "Κεντράρισμα του χάρτη στην τοποθεσία σας",
+    "Change map background": "Αλλαγή υποβάθρου του χάρτη",
     "Change tilelayers": "Αλλαγή χαρτογραφικού υπόβαθρου",
     "Change": "Αλλαγή",
     "Choose the data format": "Επιλογή μορφοποίησης δεδομένων",
@@ -433,115 +434,109 @@
     "key~value (eg. name~Grisy)": "κλειδί~τιμή (π.χ. όνομα~Grisy)",
     "key=\"value|value2\" (eg. name=\"Paris|Berlin\")": "κλειδί=\"value|value2\" (eg. όνομα=\"Παρίσι|Βερολίνο\")",
     "More info about Overpass syntax": "Περισσότερες πληροφορίες σχετικά με τη σύνταξη της Υπέρβασης",
-    "For more complex needs, see": "Για πιο σύνθετες ανάγκες, βλ.",
+    "For more complex needs, see": "For more complex needs, see",
-    "Choose data": "Επιλογή δεδομένων",
+    "Choose data": "Choose data",
-    "Choose the format": "Επιλογή μορφοποίησης",
+    "Choose the format": "Choose the format",
-    "Choose the layer": "Επιλογή επιπέδου",
+    "Choose the layer": "Choose the layer",
-    "Layer name": "Όνομα επιπέδου",
+    "Layer name": "Layer name",
-    "Choose import mode": "Επιλογή τρόπου εισαγωγής",
+    "Choose import mode": "Choose import mode",
-    "Copy into the layer": "Αντιγραφή στο επίπεδο",
+    "Copy into the layer": "Copy into the layer",
-    "Link to the layer as remote data": "Σύνδεση με το επίπεδο ως απομακρυσμένα δεδομένα",
+    "Link to the layer as remote data": "Link to the layer as remote data",
     "Condition": "Συνθήκη",
     "key=value or key!=value": "key=value ή key!=value",
     "Are you sure you want to delete this rule?": "Θέλετε σίγουρα να διαγραφεί αυτός ο κανόνας;",
     "empty rule": "κενός κανόνας",
     "Conditional style rules": "Κανόνες μορφοποίησης υπό όρους",
     "Add rule": "Προσθήκη κανόνα",
-    "Browser: data": "Περιηγητής: δεδομένα",
+    "Browser: data": "Browser: data",
-    "Browser: layers": "Περιηγητής: επίπεδα",
+    "Browser: layers": "Browser: layers",
-    "Browser: filters": "Περιηγητής: φίλτρα",
+    "Browser: filters": "Browser: filters",
-    "Enable real-time collaboration": "Ενεργοποίηση συνεργασίας σε πραγματικό χρόνο",
+    "Enable real-time collaboration": "Enable real-time collaboration",
     "✅ Copied!": "✅ Αντιγράφηκε!",
-    "Choose a dataset": "Επιλογή συνόλου δεδομένων",
+    "Choose a dataset": "Choose a dataset",
-    "Choose this dataset": "Επιλογή αυτού του συνόλου δεδομένων",
+    "Choose this dataset": "Choose this dataset",
-    "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: θεματικά δεδομένα από το OpenStreetMap",
+    "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
-    "Choose a theme": "Επιλογή θέματος",
+    "Choose a theme": "Choose a theme",
-    "Choose this data": "Επιλογή αυτών των δεδομένων",
+    "Symplify all geometries to points": "Symplify all geometries to points",
+    "Choose this data": "Choose this data",
     "Search admin boundary": "Αναζήτηση διοικητικού ορίου",
-    "Please choose a theme and a boundary first.": "Επιλέξτε πρώτα ένα θέμα και ένα όριο.",
+    "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
     "Expression": "Έκφραση",
     "Geometry mode": "Λειτουργία γεωμετρίας",
-    "Only geometry centers": "Μόνο γεωμετρικά κέντρα",
+    "Only geometry centers": "Only geometry centers",
-    "Search area": "Περιοχή αναζήτησης",
+    "Search area": "Search area",
-    "Type area name, or let empty to load data in current map view": "Πληκτρολογήστε το όνομα της περιοχής ή αφήστε το κενό, για να φορτώσετε δεδομένα στην τρέχουσα προβολή χάρτη.",
+    "Type area name, or let empty to load data in current map view": "Type area name, or let empty to load data in current map view",
-    "Data successfully imported!": "Τα δεδομένα εισήχθησαν επιτυχώς!",
+    "Data successfully imported!": "Data successfully imported!",
-    "Clear data": "Εκκαθάριση δεδομένων",
+    "Clear data": "Clear data",
-    "Remove layers": "Αφαίρεση επιπέδων",
+    "Remove layers": "Remove layers",
-    "Categorized": "Κατηγοριοποιημένο",
+    "Categorized": "Categorized",
-    "Alphabetical": "Αλφαβητικά",
+    "Alphabetical": "Alphabetical",
-    "Category property": "Ιδιότητα κατηγορίας",
+    "Category property": "Category property",
     "Color palette": "Παλέτα χρωμάτων",
     "Categories": "Κατηγορίες",
     "Comma separated list of categories.": "Λίστα κατηγοριών χωρισμένες με κόμμα.",
     "Categories mode": "Λειτουργία κατηγοριών",
-    "Remove filter for this column": "Αφαίρεση φίλτρου από αυτή τη στήλη",
+    "Remove filter for this column": "Remove filter for this column",
-    "Add filter for this column": "Προσθήκη φίλτρου από αυτή τη στήλη",
+    "Add filter for this column": "Add filter for this column",
-    "Rename this column": "Μετονομασία αυτής της στήλης",
+    "Rename this column": "Rename this column",
-    "Delete this column": "Διαγραφή αυτής της στήλης",
+    "Delete this column": "Delete this column",
-    "Name “{name}” should not contain a dot.": "Το όνομα \"{name}\" δεν πρέπει να περιέχει τελεία.",
+    "Name “{name}” should not contain a dot.": "Name “{name}” should not contain a dot.",
-    "This name already exists: “{name}”": "Αυτό το όνομα υπάρχει ήδη: \"{name}\"",
+    "This name already exists: “{name}”": "This name already exists: “{name}”",
-    "Delete selected rows": "Διαγραφή επιλεγμένων γραμμών",
+    "Delete selected rows": "Delete selected rows",
-    "Found {count} rows. Are you sure you want to delete all?": "Βρέθηκαν {count} σειρές. Είστε σίγουροι ότι θέλετε να τις διαγράψετε όλες;",
+    "Found {count} rows. Are you sure you want to delete all?": "Found {count} rows. Are you sure you want to delete all?",
     "Expression is empty": "Η έκφραση είναι κενή",
     "OK": "OK",
     "Cancel": "Άκυρο",
-    "Attach map to a team": "Σύνδεση χάρτη με μια ομάδα",
+    "Attach map to a team": "Attach map to a team",
-    "Display the polygon inverted": "Εμφανίζει το πολύγωνο ανεστραμμένο",
+    "Display the polygon inverted": "Display the polygon inverted",
-    "Proportional circles": "Αναλογικοί κύκλοι",
+    "Proportional circles": "Proportional circles",
-    "Property name to compute circles": "Όνομα ιδιότητας για τον υπολογισμό κύκλων",
+    "Property name to compute circles": "Property name to compute circles",
-    "Min circle radius": "Ελάχιστη ακτίνα κύκλου",
+    "Min circle radius": "Min circle radius",
-    "Max circle radius": "Μέγιστη ακτίνα κύκλου",
+    "Max circle radius": "Max circle radius",
-    "Display the open browser control": "Εμφάνιση του χειριστηρίου ανοικτού προγράμματος περιήγησης",
+    "Display the open browser control": "Display the open browser control",
-    "Copy as GeoJSON": "Αντιγραφή ως GeoJSON",
+    "Copy as GeoJSON": "Copy as GeoJSON",
-    "Please zoom in to edit the geometry": "Παρακαλώ εστιάστε για να επεξεργαστείτε τη γεωμετρία",
+    "Please zoom in to edit the geometry": "Please zoom in to edit the geometry",
-    "New map": "Νέος χάρτης",
+    "New map": "New map",
-    "My maps": "Οι χάρτες μου",
+    "My maps": "My maps",
-    "My teams": "Οι ομάδες μου",
+    "My teams": "My teams",
-    "My profile": "Το προφίλ μου",
+    "My profile": "My profile",
-    "Type new owner's username": "Πληκτρολογήστε το όνομα χρήστη του νέου ιδιοκτήτη",
+    "Type new owner's username": "Type new owner's username",
-    "Type editor's username": "Πληκτρολογήστε το όνομα χρήστη του συντάκτη",
+    "Type editor's username": "Type editor's username",
-    "Map": "Χάρτης",
+    "Map": "Map",
-    "Manage collaborators": "Διαχείριση συνεργατών",
+    "Manage collaborators": "Manage collaborators",
-    "show/hide all layers": "εμφάνιση/απόκρυψη όλων των επιπέδων",
+    "show/hide all layers": "show/hide all layers",
-    "zoom to data extent": "εστίαση στην έκταση των δεδομένων",
+    "zoom to data extent": "zoom to data extent",
-    "download visible data": "λήψη ορατών δεδομένων",
+    "download visible data": "download visible data",
-    "Import helpers": "Βοηθοί εισαγωγής",
+    "Import helpers": "Import helpers",
-    "Import helpers will fill the URL field for you.": "Οι βοηθοί εισαγωγής θα συμπληρώσουν το πεδίο URL για εσάς.",
+    "Import helpers will fill the URL field for you.": "Import helpers will fill the URL field for you.",
     "Wikipedia": "Wikipedia",
-    "Save draft": "Αποθήκευση προσχεδίου",
+    "Save draft": "Save draft",
-    "No data has been found for import": "Δεν βρέθηκαν δεδομένα για την εισαγωγή",
+    "No data has been found for import": "No data has been found for import",
-    "Successfully imported {count} feature(s)": "Εισήχθησαν επιτυχώς {count} χαρακτηριστικό(ά)",
+    "Successfully imported {count} feature(s)": "Successfully imported {count} feature(s)",
-    "Disconnected": "Αποσυνδεδεμένο",
+    "Disconnected": "Disconnected",
-    "You must be logged in": "Πρέπει να συνδεθείτε",
+    "You must be logged in": "You must be logged in",
-    "on hover": "στην αιώρηση",
+    "on hover": "on hover",
-    "Cannot load remote data for layer \"{layer}\" with url \"{url}\"": "Δεν είναι δυνατή η φόρτωση απομακρυσμένων δεδομένων για το επίπεδο \"{layer}\" με url \"{url}\"",
+    "Cannot load remote data for layer \"{layer}\" with url \"{url}\"": "Cannot load remote data for layer \"{layer}\" with url \"{url}\"",
-    "Cannot parse remote data for layer \"{layer}\" with url \"{url}\"": "Δεν είναι δυνατή η ανάλυση απομακρυσμένων δεδομένων για το επίπεδο \"{layer}\" με url \"{url}\"",
+    "Cannot parse remote data for layer \"{layer}\" with url \"{url}\"": "Cannot parse remote data for layer \"{layer}\" with url \"{url}\"",
-    "Import failed: invalid data": "Η εισαγωγή απέτυχε: μη έγκυρα δεδομένα",
+    "Import failed: invalid data": "Import failed: invalid data",
-    "Anonymous": "Ανώνυμος",
+    "Anonymous": "Anonymous",
-    "created at {date}": "δημιουργήθηκε {ημερομηνία}",
+    "created at {date}": "created at {date}",
-    "modified at {date}": "τροποποιήθηκε {ημερομηνία}",
+    "modified at {date}": "modified at {date}",
-    "Default zoom": "Προκαθορισμένη εστίαση",
+    "Default zoom": "Default zoom",
-    "Default latitude": "Προκαθορισμένο γεωγραφικό πλάτος",
+    "Default latitude": "Default latitude",
-    "Default longitude": "Προκαθορισμένο γεωγραφικό μήκος",
+    "Default longitude": "Default longitude",
-    "Edit map default view": "Επεξεργασία προεπιλεγμένης προβολής χάρτη",
+    "Edit map default view": "Edit map default view",
-    "Use current center and zoom": "Χρήση τρέχοντος κέντρου και εστίασης",
+    "Use current center and zoom": "Use current center and zoom",
-    "Layer permalink": "Mόνιμο url του επιπέδου",
+    "Layer permalink": "Layer permalink",
-    "Back to home": "Επιστροφή στην αρχική σελίδα",
+    "Back to home": "Back to home",
-    "Home logo": "Λογότυπο αρχικής σελίδας",
+    "Home logo": "Home logo",
-    "Add this geometry to my map": "Προσθήκη αυτής της γεωμετρίας στο χάρτη μου",
+    "Add this geometry to my map": "Add this geometry to my map",
-    "Add this place to my map": "Προσθήκη αυτής της τοποθεσίας στον χάρτη μου",
+    "Add this place to my map": "Add this place to my map",
-    "Cancel last edit": "Ακύρωση τελευταίας επεξεργασίας",
+    "Cancel last edit": "Cancel last edit",
-    "Redo last edit": "Αναίρεση ακύρωσης τελευταίας επεξεργασίας",
+    "Redo last edit": "Redo last edit",
-    "Links": "Σύνδεσμοι",
+    "Links": "Links",
-    "Images": "Εικόνες",
+    "Images": "Images",
     "Iframes": "Iframes",
-    "Tags": "Ετικέτες",
+    "Tags": "Tags",
-    "Geocode": "Γεωκωδικοποίηση",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Εμφάνιση του εικονιδίου επιστροφής στην αρχική σελίδα",
-    "Do you want to display layer switcher in caption bar?": "Θέλετε να εμφανίσετε τον διακόπτη επιπέδων στη γραμμή λεζάντας;",
-    "Simplify all geometries to points": "Απλοποίηση όλων των γεωμετριών σε σημεία",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/en.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "Cache proxied request",
     "Caption": "Caption",
     "Center map on your location": "Center map on your location",
+    "Change map background": "Change map background",
     "Change tilelayers": "Change tilelayers",
     "Change": "Change",
     "Choose the data format": "Choose the data format",
@@ -539,11 +540,7 @@ const locale = {
     "Geocode": "Geocode",
     "Display the back to home icon": "Display the back to home icon",
     "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
+    "Simplify all geometries to points": "Simplify all geometries to points"
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("en", locale)
 L.setLocale("en")

umap/static/umap/locale/en.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "Cache proxied request",
     "Caption": "Caption",
     "Center map on your location": "Center map on your location",
+    "Change map background": "Change map background",
     "Change tilelayers": "Change tilelayers",
     "Change": "Change",
     "Choose the data format": "Choose the data format",
@@ -539,9 +540,5 @@
     "Geocode": "Geocode",
     "Display the back to home icon": "Display the back to home icon",
     "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
+    "Simplify all geometries to points": "Simplify all geometries to points"
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/en_US.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "Cache proxied request",
     "Caption": "Caption",
     "Center map on your location": "Center map on your location",
+    "Change map background": "Change basemap",
     "Change tilelayers": "Set map background",
     "Change": "Change",
     "Choose the data format": "Choose...",
@@ -456,6 +457,7 @@
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,12 +538,5 @@
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/es.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "Almacenar en caché la solicitud de proxy",
     "Caption": "Leyenda",
     "Center map on your location": "Centrar el mapa en tu ubicación",
+    "Change map background": "Cambiar el fondo del mapa",
     "Change tilelayers": "Cambiar capas de teselas",
     "Change": "Cambiar",
     "Choose the data format": "Elegir el formato de datos",
@@ -525,25 +526,21 @@ const locale = {
     "Default longitude": "Longitud predeterminada",
     "Edit map default view": "Editar vista predeterminada del mapa",
     "Use current center and zoom": "Usar el centro y zoom actuales",
-    "Layer permalink": "Enlace permanente de la capa",
+    "Layer permalink": "Layer permalink",
-    "Back to home": "Volver al inicio",
+    "Back to home": "Back to home",
-    "Home logo": "Logo de inicio",
+    "Home logo": "Home logo",
-    "Add this geometry to my map": "Agregar esta geometría a mi mapa",
+    "Add this geometry to my map": "Add this geometry to my map",
-    "Add this place to my map": "Agregar este lugar a mi mapa",
+    "Add this place to my map": "Add this place to my map",
-    "Cancel last edit": "Cancelar la última edición",
+    "Cancel last edit": "Cancel last edit",
-    "Redo last edit": "Rehacer la última edición",
+    "Redo last edit": "Redo last edit",
-    "Links": "Enlaces",
+    "Links": "Links",
-    "Images": "Imágenes",
+    "Images": "Images",
     "Iframes": "Iframes",
-    "Tags": "Etiquetas",
+    "Tags": "Tags",
-    "Geocode": "Geocodificar",
+    "Geocode": "Geocode",
-    "Display the back to home icon": "Mostrar el ícono de volver al inicio",
+    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "¿Quieres mostrar el selector de capas en la barra de título?",
+    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplificar todas las geometrías a puntos",
+    "Simplify all geometries to points": "Simplify all geometries to points"
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("es", locale)
 L.setLocale("es")

umap/static/umap/locale/es.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "Almacenar en caché la solicitud de proxy",
     "Caption": "Leyenda",
     "Center map on your location": "Centrar el mapa en tu ubicación",
+    "Change map background": "Cambiar el fondo del mapa",
     "Change tilelayers": "Cambiar capas de teselas",
     "Change": "Cambiar",
     "Choose the data format": "Elegir el formato de datos",
@@ -525,23 +526,19 @@
     "Default longitude": "Longitud predeterminada",
     "Edit map default view": "Editar vista predeterminada del mapa",
     "Use current center and zoom": "Usar el centro y zoom actuales",
-    "Layer permalink": "Enlace permanente de la capa",
+    "Layer permalink": "Layer permalink",
-    "Back to home": "Volver al inicio",
+    "Back to home": "Back to home",
-    "Home logo": "Logo de inicio",
+    "Home logo": "Home logo",
-    "Add this geometry to my map": "Agregar esta geometría a mi mapa",
+    "Add this geometry to my map": "Add this geometry to my map",
-    "Add this place to my map": "Agregar este lugar a mi mapa",
+    "Add this place to my map": "Add this place to my map",
-    "Cancel last edit": "Cancelar la última edición",
+    "Cancel last edit": "Cancel last edit",
-    "Redo last edit": "Rehacer la última edición",
+    "Redo last edit": "Redo last edit",
-    "Links": "Enlaces",
+    "Links": "Links",
-    "Images": "Imágenes",
+    "Images": "Images",
     "Iframes": "Iframes",
-    "Tags": "Etiquetas",
+    "Tags": "Tags",
-    "Geocode": "Geocodificar",
+    "Geocode": "Geocode",
-    "Display the back to home icon": "Mostrar el ícono de volver al inicio",
+    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "¿Quieres mostrar el selector de capas en la barra de título?",
+    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplificar todas las geometrías a puntos",
+    "Simplify all geometries to points": "Simplify all geometries to points"
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/et.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "Cache proxied request",
     "Caption": "Legend",
     "Center map on your location": "Sea oma asukoht keskpunktiks",
+    "Change map background": "Vaheta kaardi taust",
     "Change tilelayers": "Vaheta kaardi taust",
     "Change": "Change",
     "Choose the data format": "Vali andmevorming",
@@ -456,6 +457,7 @@ const locale = {
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,14 +538,7 @@ const locale = {
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("et", locale)
 L.setLocale("et")

umap/static/umap/locale/et.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "Cache proxied request",
     "Caption": "Legend",
     "Center map on your location": "Sea oma asukoht keskpunktiks",
+    "Change map background": "Vaheta kaardi taust",
     "Change tilelayers": "Vaheta kaardi taust",
     "Change": "Change",
     "Choose the data format": "Vali andmevorming",
@@ -456,6 +457,7 @@
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,12 +538,5 @@
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/eu.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "Cache proxy eskaera",
     "Caption": "Testua",
     "Center map on your location": "Zentratu mapa zure kokapenean",
+    "Change map background": "Aldatu maparen atzeko planoa",
     "Change tilelayers": "Aldatu lauzen geruza",
     "Change": "Aldatu",
     "Choose the data format": "Aukeratu data-formatua",
@@ -539,11 +540,7 @@ const locale = {
     "Geocode": "Geocode",
     "Display the back to home icon": "Display the back to home icon",
     "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
+    "Simplify all geometries to points": "Simplify all geometries to points"
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("eu", locale)
 L.setLocale("eu")

umap/static/umap/locale/eu.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "Cache proxy eskaera",
     "Caption": "Testua",
     "Center map on your location": "Zentratu mapa zure kokapenean",
+    "Change map background": "Aldatu maparen atzeko planoa",
     "Change tilelayers": "Aldatu lauzen geruza",
     "Change": "Aldatu",
     "Choose the data format": "Aukeratu data-formatua",
@@ -539,9 +540,5 @@
     "Geocode": "Geocode",
     "Display the back to home icon": "Display the back to home icon",
     "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
+    "Simplify all geometries to points": "Simplify all geometries to points"
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/fa_IR.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "حفظ موقت درخواست پراکسی‌شده",
     "Caption": "درباره",
     "Center map on your location": "تنظیم مرکز نقشه روی موقعیت شما",
+    "Change map background": "تغییر پس‌زمینهٔ نقشه",
     "Change tilelayers": "لایهٔ کاشی را تغییر دهید",
     "Change": "تغییر",
     "Choose the data format": "قالب داده را انتخاب کنید",
@@ -539,11 +540,7 @@ const locale = {
     "Geocode": "Geocode",
     "Display the back to home icon": "Display the back to home icon",
     "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
+    "Simplify all geometries to points": "Simplify all geometries to points"
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("fa_IR", locale)
 L.setLocale("fa_IR")

umap/static/umap/locale/fa_IR.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "حفظ موقت درخواست پراکسی‌شده",
     "Caption": "درباره",
     "Center map on your location": "تنظیم مرکز نقشه روی موقعیت شما",
+    "Change map background": "تغییر پس‌زمینهٔ نقشه",
     "Change tilelayers": "لایهٔ کاشی را تغییر دهید",
     "Change": "تغییر",
     "Choose the data format": "قالب داده را انتخاب کنید",
@@ -539,9 +540,5 @@
     "Geocode": "Geocode",
     "Display the back to home icon": "Display the back to home icon",
     "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
+    "Simplify all geometries to points": "Simplify all geometries to points"
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/fi.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "Cache proxied request",
     "Caption": "Kuvateksti",
     "Center map on your location": "Keskitä kartta sijaintiisi",
+    "Change map background": "Vaihda taustakarttaa",
     "Change tilelayers": "Muuta karttavaihtoehtoja",
     "Change": "Change",
     "Choose the data format": "Valitse päivämäärän muoto",
@@ -456,6 +457,7 @@ const locale = {
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,14 +538,7 @@ const locale = {
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("fi", locale)
 L.setLocale("fi")

umap/static/umap/locale/fi.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "Cache proxied request",
     "Caption": "Kuvateksti",
     "Center map on your location": "Keskitä kartta sijaintiisi",
+    "Change map background": "Vaihda taustakarttaa",
     "Change tilelayers": "Muuta karttavaihtoehtoja",
     "Change": "Change",
     "Choose the data format": "Valitse päivämäärän muoto",
@@ -456,6 +457,7 @@
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,12 +538,5 @@
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/fr.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "Cacher la requête avec proxy",
     "Caption": "Légende",
     "Center map on your location": "Centrer la carte sur votre position",
+    "Change map background": "Changer le fond de carte",
     "Change tilelayers": "Changer le fond de carte",
     "Change": "Modifier",
     "Choose the data format": "Choisir le format des données",
@@ -539,11 +540,7 @@ const locale = {
     "Geocode": "Géocoder",
     "Display the back to home icon": "Afficher le bouton de retour à l'accueil",
     "Do you want to display layer switcher in caption bar?": "Afficher un sélecteur de calques dans la barre de légende ?",
-    "Simplify all geometries to points": "Simplifier les géométries en points",
+    "Simplify all geometries to points": "Simplifier les géométries en points"
-    "Back to list": "Retour à la liste",
-    "Toggle rule": "Permuter la règle",
-    "Delete rule": "Supprimer la règle",
-    "Cannot save layer, please try again in a few minutes.": "Impossible d'enregistrer le calque, veuillez réessayer dans quelques minutes."
 }
 L.registerLocale("fr", locale)
 L.setLocale("fr")

umap/static/umap/locale/fr.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "Cacher la requête avec proxy",
     "Caption": "Légende",
     "Center map on your location": "Centrer la carte sur votre position",
+    "Change map background": "Changer le fond de carte",
     "Change tilelayers": "Changer le fond de carte",
     "Change": "Modifier",
     "Choose the data format": "Choisir le format des données",
@@ -539,9 +540,5 @@
     "Geocode": "Géocoder",
     "Display the back to home icon": "Afficher le bouton de retour à l'accueil",
     "Do you want to display layer switcher in caption bar?": "Afficher un sélecteur de calques dans la barre de légende ?",
-    "Simplify all geometries to points": "Simplifier les géométries en points",
+    "Simplify all geometries to points": "Simplifier les géométries en points"
-    "Back to list": "Retour à la liste",
-    "Toggle rule": "Permuter la règle",
-    "Delete rule": "Supprimer la règle",
-    "Cannot save layer, please try again in a few minutes.": "Impossible d'enregistrer le calque, veuillez réessayer dans quelques minutes."
 }

umap/static/umap/locale/gl.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "Solicitude de proxy da memoria tobo",
     "Caption": "Lenda",
     "Center map on your location": "Centrar o mapa na túa posición",
+    "Change map background": "Cambiar o mapa do fondo",
     "Change tilelayers": "Cambiar as capas de teselas",
     "Change": "Cambiar",
     "Choose the data format": "Escoller o formato de datos",
@@ -539,11 +540,7 @@ const locale = {
     "Geocode": "Geocode",
     "Display the back to home icon": "Display the back to home icon",
     "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
+    "Simplify all geometries to points": "Simplify all geometries to points"
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("gl", locale)
 L.setLocale("gl")

umap/static/umap/locale/gl.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "Solicitude de proxy da memoria tobo",
     "Caption": "Lenda",
     "Center map on your location": "Centrar o mapa na túa posición",
+    "Change map background": "Cambiar o mapa do fondo",
     "Change tilelayers": "Cambiar as capas de teselas",
     "Change": "Cambiar",
     "Choose the data format": "Escoller o formato de datos",
@@ -539,9 +540,5 @@
     "Geocode": "Geocode",
     "Display the back to home icon": "Display the back to home icon",
     "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
+    "Simplify all geometries to points": "Simplify all geometries to points"
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/he.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "שמירת בקשות שעברו דרך המתווך במטמון",
     "Caption": "כותרת",
     "Center map on your location": "מרכוז המפה על המיקום שלך",
+    "Change map background": "החלפת רקע המפה",
     "Change tilelayers": "החלפת שכבות אריחים",
     "Change": "Change",
     "Choose the data format": "נא לבחור את מבנה הנתונים",
@@ -456,6 +457,7 @@ const locale = {
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,14 +538,7 @@ const locale = {
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("he", locale)
 L.setLocale("he")

umap/static/umap/locale/he.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "שמירת בקשות שעברו דרך המתווך במטמון",
     "Caption": "כותרת",
     "Center map on your location": "מרכוז המפה על המיקום שלך",
+    "Change map background": "החלפת רקע המפה",
     "Change tilelayers": "החלפת שכבות אריחים",
     "Change": "Change",
     "Choose the data format": "נא לבחור את מבנה הנתונים",
@@ -456,6 +457,7 @@
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,12 +538,5 @@
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/hr.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "Cache proxied request",
     "Caption": "Napomena",
     "Center map on your location": "Center map on your location",
+    "Change map background": "Promjeni pozadinu karte",
     "Change tilelayers": "Promeni naslov layera",
     "Change": "Change",
     "Choose the data format": "Odaberi format datuma",
@@ -456,6 +457,7 @@ const locale = {
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,14 +538,7 @@ const locale = {
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("hr", locale)
 L.setLocale("hr")

umap/static/umap/locale/hr.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "Cache proxied request",
     "Caption": "Napomena",
     "Center map on your location": "Center map on your location",
+    "Change map background": "Promjeni pozadinu karte",
     "Change tilelayers": "Promeni naslov layera",
     "Change": "Change",
     "Choose the data format": "Odaberi format datuma",
@@ -456,6 +457,7 @@
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,12 +538,5 @@
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/hu.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "Proxy keresztül továbbított gyorsítótárkérés",
     "Caption": "Leírás",
     "Center map on your location": "A térkép közepének igazítása a saját pozícióhoz",
+    "Change map background": "Térkép hátterének módosítása",
     "Change tilelayers": "Mozaikrétegek módosítása",
     "Change": "Módosítás",
     "Choose the data format": "Adatformátum kiválasztása",
@@ -539,11 +540,7 @@ const locale = {
     "Geocode": "Geocode",
     "Display the back to home icon": "Display the back to home icon",
     "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
+    "Simplify all geometries to points": "Simplify all geometries to points"
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("hu", locale)
 L.setLocale("hu")

umap/static/umap/locale/hu.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "Proxy keresztül továbbított gyorsítótárkérés",
     "Caption": "Leírás",
     "Center map on your location": "A térkép közepének igazítása a saját pozícióhoz",
+    "Change map background": "Térkép hátterének módosítása",
     "Change tilelayers": "Mozaikrétegek módosítása",
     "Change": "Módosítás",
     "Choose the data format": "Adatformátum kiválasztása",
@@ -539,9 +540,5 @@
     "Geocode": "Geocode",
     "Display the back to home icon": "Display the back to home icon",
     "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
+    "Simplify all geometries to points": "Simplify all geometries to points"
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/id.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "Cache proxied request",
     "Caption": "Caption",
     "Center map on your location": "Center map on your location",
+    "Change map background": "Change map background",
     "Change tilelayers": "Change tilelayers",
     "Change": "Change",
     "Choose the data format": "Choose the data format",
@@ -456,6 +457,7 @@ const locale = {
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,14 +538,7 @@ const locale = {
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("id", locale)
 L.setLocale("id")

umap/static/umap/locale/id.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "Cache proxied request",
     "Caption": "Caption",
     "Center map on your location": "Center map on your location",
+    "Change map background": "Change map background",
     "Change tilelayers": "Change tilelayers",
     "Change": "Change",
     "Choose the data format": "Choose the data format",
@@ -456,6 +457,7 @@
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,12 +538,5 @@
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/is.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "Setja milliþjónabeiðnir í skyndiminni",
     "Caption": "Skýringatexti",
     "Center map on your location": "Miðjusetja kortið á staðsetningu þína",
+    "Change map background": "Breyta bakgrunni landakorts",
     "Change tilelayers": "Skipta um kortatíglaþekjur",
     "Change": "Breyta",
     "Choose the data format": "Veldu gagnasnið",
@@ -456,6 +457,7 @@ const locale = {
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,14 +538,7 @@ const locale = {
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("is", locale)
 L.setLocale("is")

umap/static/umap/locale/is.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "Setja milliþjónabeiðnir í skyndiminni",
     "Caption": "Skýringatexti",
     "Center map on your location": "Miðjusetja kortið á staðsetningu þína",
+    "Change map background": "Breyta bakgrunni landakorts",
     "Change tilelayers": "Skipta um kortatíglaþekjur",
     "Change": "Breyta",
     "Choose the data format": "Veldu gagnasnið",
@@ -456,6 +457,7 @@
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,12 +538,5 @@
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/it.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "Usa la cache per le richieste proxy",
     "Caption": "Didascalia",
     "Center map on your location": "Centra la mappa sulla tua posizione",
+    "Change map background": "Cambia la mappa di sfondo",
     "Change tilelayers": "Cambia i livelli di sfondo",
     "Change": "Cambia",
     "Choose the data format": "Scegli il formato dati",
@@ -539,11 +540,7 @@ const locale = {
     "Geocode": "Geocode",
     "Display the back to home icon": "Display the back to home icon",
     "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
+    "Simplify all geometries to points": "Simplify all geometries to points"
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("it", locale)
 L.setLocale("it")

umap/static/umap/locale/it.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "Usa la cache per le richieste proxy",
     "Caption": "Didascalia",
     "Center map on your location": "Centra la mappa sulla tua posizione",
+    "Change map background": "Cambia la mappa di sfondo",
     "Change tilelayers": "Cambia i livelli di sfondo",
     "Change": "Cambia",
     "Choose the data format": "Scegli il formato dati",
@@ -539,9 +540,5 @@
     "Geocode": "Geocode",
     "Display the back to home icon": "Display the back to home icon",
     "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
+    "Simplify all geometries to points": "Simplify all geometries to points"
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/ja.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "Cache proxied request",
     "Caption": "表題",
     "Center map on your location": "閲覧者の位置をマップの中心に設定",
+    "Change map background": "背景地図を変更",
     "Change tilelayers": "タイルレイヤの変更",
     "Change": "Change",
     "Choose the data format": "データ形式選択",
@@ -456,6 +457,7 @@ const locale = {
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,14 +538,7 @@ const locale = {
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("ja", locale)
 L.setLocale("ja")

umap/static/umap/locale/ja.json

@@ -45,6 +45,7 @@
     "Cache proxied request": "Cache proxied request",
     "Caption": "表題",
     "Center map on your location": "閲覧者の位置をマップの中心に設定",
+    "Change map background": "背景地図を変更",
     "Change tilelayers": "タイルレイヤの変更",
     "Change": "Change",
     "Choose the data format": "データ形式選択",
@@ -456,6 +457,7 @@
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,12 +538,5 @@
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }

umap/static/umap/locale/ko.js

@@ -45,6 +45,7 @@ const locale = {
     "Cache proxied request": "Cache proxied request",
     "Caption": "캡션",
     "Center map on your location": "지도에서 나의 위치를 가운데로 놓기",
+    "Change map background": "배경 지도 변경",
     "Change tilelayers": "타일 레이어 변경",
     "Change": "Change",
     "Choose the data format": "데이터 포맷 선택",
@@ -456,6 +457,7 @@ const locale = {
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
+    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -536,14 +538,7 @@ const locale = {
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode",
+    "Geocode": "Geocode"
-    "Display the back to home icon": "Display the back to home icon",
-    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
-    "Simplify all geometries to points": "Simplify all geometries to points",
-    "Back to list": "Back to list",
-    "Toggle rule": "Toggle rule",
-    "Delete rule": "Delete rule",
-    "Cannot save layer, please try again in a few minutes.": "Cannot save layer, please try again in a few minutes."
 }
 L.registerLocale("ko", locale)
 L.setLocale("ko")