diff --git a/docs/administration.md b/docs/administration.md index 51502752..84488613 100644 --- a/docs/administration.md +++ b/docs/administration.md @@ -10,11 +10,17 @@ Icons (aka pictograms in uMap sources) can be used in your map markers. Icons are not embedded in uMap sources, you will have to add them manually. So you can choose which icons you want to use. +You can use either PNG, JPG or SVG files. SVG files are recommended. + +When using SVG, it's recommended to use icons without color. uMap will switch to white colors +automatically according to the marker background color. + Example of icons libraries you may want to use: - [Maki Icons](https://labs.mapbox.com/maki-icons/) (icon set made for map designers) - [Osmic Icons](https://gitlab.com/gmgeo/osmic) - [SJJB Icons](http://www.sjjb.co.uk/mapicons/contactsheet) +- [Remix](https://remixicon.com/) ### Import icons manually @@ -22,32 +28,15 @@ You can import icons manually by going to your uMap admin page: `https://your.se ### Import icons automatically -To import icons on your uMap server, you will need to use command `umap import_pictograms` +To import icons on your uMap server, you will need to use the command `umap import_pictograms`. -Note, you can get help with `umap import_pictograms -h` +Note: you can get help with `umap import_pictograms -h` -In this example, we will import Maki icons. +Basic usage: -First, we download icons from main site. Inside the downloaded archive, we keep only the icons folder that contains svg files. Place this folder on your server. + umap import_pictograms --attribution "Maki Icons by Mapbox" path/to/icons/directory/ -Go inside icons folder and remove tiny icons: `rm *-11.svg` +### Categories -Now, we will use imagemagick to convert svg to png. - -`for file in *.svg; do convert -background none $file ${file%15.svg}24.png; done` - -To have white icons use: -`for file in *.svg; do convert -background none -fuzz 100% -fill white -opaque black $file ${file%15.svg}24.png; done` - - -Notes: -- you may also want to resize image with option `-resize 24x` -- this solution is not optimal, generated png are blurry. - -This will convert the svg to png and rename them from `*-15.svg` to `*-24.png` - -Now we will import icons. Note: icons names must end with `-24.png` - -`umap import_pictograms --attribution "Maki Icons by Mapbox" icons` - -Done. Icons are imported. +uMap can render icons grouped into categories. When using the import script, any +subfolder will be used as category. diff --git a/docs/changelog.md b/docs/changelog.md index 671c9c5f..c998a37e 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,5 +1,48 @@ # Changelog +## 1.10.1 - 2023-10-27 + +* Add minimal CSV export by @yohanboniface in https://github.com/umap-project/umap/pull/1376 +* A11Y: switch from links to buttons when pertinent by @davidbgk in https://github.com/umap-project/umap/pull/1290 +* Fix map not loading when defaultView=latest and datalayer has no data by @yohanboniface in https://github.com/umap-project/umap/pull/1375 +* Fix displayOnLoad not honoured at import by @yohanboniface in https://github.com/umap-project/umap/pull/1384 +* Fix filter data crashing when data contains non string values by @yohanboniface in https://github.com/umap-project/umap/pull/1378 +* Increase maxZoomLimit to 24 by @yohanboniface in https://github.com/umap-project/umap/pull/1381 +* Round range step to 1 digit by @yohanboniface in https://github.com/umap-project/umap/pull/1380 +* Keep only non graphic props in default properties, to prevent useless redraw by @yohanboniface in https://github.com/umap-project/umap/pull/1379 +* Split defaultDatalayer in defaultView/EditDatalayer by @yohanboniface in https://github.com/umap-project/umap/pull/1383 +* Fix variable declared globally by mistake by @yohanboniface in https://github.com/umap-project/umap/pull/1382 +* Cancel tooltip on mouseout by @yohanboniface in https://github.com/umap-project/umap/pull/1385 +* Update eye icon by @yohanboniface in https://github.com/umap-project/umap/pull/1386 + + +## 1.9.3 - 2023-10-18 + +* Add experimental drag and drop of file on the map container by @yohanboniface in https://github.com/umap-project/umap/pull/1370 +* Hide the next icon in buttons’ sprites by @davidbgk in https://github.com/umap-project/umap/pull/1371 + + +## 1.9.2 - 2023-10-12 + +* Fix `map` reference in DataLayersControl by @yohanboniface in https://github.com/umap-project/umap/pull/1368 +* Add back `HeatLayer._map` reference check by @yohanboniface in https://github.com/umap-project/umap/pull/1369 + + +## 1.9.1 - 2023-10-12 + +* Fix import of .umap file containing a choropleth layer by @yohanboniface in https://github.com/umap-project/umap/pull/1367 + +## 1.9.0 - 2023-10-12 + +* Add experimental choropleth datalayer type by @yohanboniface in https://github.com/umap-project/umap/pull/1136 +* Finally add Map.create_at field by @yohanboniface in https://github.com/umap-project/umap/pull/1350 +* Update uwsgi.ini to prevent buffers errors with NGINX reverse proxies by @sircharlo in https://github.com/umap-project/umap/pull/1354 +* switch to grid layout for multiple choice buttons by @jschleic in https://github.com/umap-project/umap/pull/1356 +* Allow to hide a datalayer from the caption list by @yohanboniface in https://github.com/umap-project/umap/pull/1362 +* Hide attribution on small screen and add a small ? to display it by @yohanboniface in https://github.com/umap-project/umap/pull/1349 +* Heatmap improvements by @yohanboniface in https://github.com/umap-project/umap/pull/1358 + + ## 1.8.2 - 2023-09-27 * Allow to restrict data browser items to current map view by @yohanboniface in https://github.com/umap-project/umap/pull/1339 diff --git a/docs/install.md b/docs/install.md index 87e573ee..853583b1 100644 --- a/docs/install.md +++ b/docs/install.md @@ -1,31 +1,31 @@ # Installation -*Note: for Ubuntu follow procedure [Ubuntu from scratch](ubuntu.md)* +*Note: for Ubuntu, follow procedure [Ubuntu from scratch](ubuntu.md)* -*Note: for a Windows installation follow procedure [Installing on Windows](install_windows.md)* +*Note: for Windows, follow procedure [Installing on Windows](install_windows.md)* Create a geo aware database. See [Geodjango doc](https://docs.djangoproject.com/en/dev/ref/contrib/gis/install/) for backend installation. Create a virtual environment - virtualenv umap - source umap/bin/activate + python -m venv venv + source venv/bin/activate Install dependencies and project pip install umap-project -Create a default local settings file +Create a default `local_settings` file - wget https://raw.githubusercontent.com/umap-project/umap/master/umap/settings/local.py.sample -O local.py + wget https://raw.githubusercontent.com/umap-project/umap/master/umap/settings/local.py.sample -O local_settings.py Reference it as env var: - export UMAP_SETTINGS=`pwd`/local.py + export UMAP_SETTINGS=`pwd`/local_settings.py -Add database connection information in `local.py`, for example +Add database connection information in `local_settings.py`, for example DATABASES = { 'default': { @@ -34,10 +34,27 @@ Add database connection information in `local.py`, for example } } -Add a `SECRET_KEY` in `local.py` with a long random secret key +Depending on your installation, you might need to change the USER that connects the database. + +It should look like this: + +```python +DATABASES = { + "default": { + "ENGINE": "django.contrib.gis.db.backends.postgis", + "NAME": "umap", + "USER": "postgres", + } +} + +Add a `SECRET_KEY` in `local_settings.py` with a long random secret key SECRET_KEY = "a long and random secret key that must not be shared" +You can easily generate one with openssl: + + openssl rand -base64 32 + uMap uses [python-social-auth](http://python-social-auth.readthedocs.org/) for user authentication. So you will need to configure it according to your needs. For example diff --git a/package.json b/package.json index b2995e06..33d3835c 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "homepage": "http://wiki.openstreetmap.org/wiki/UMap", "dependencies": { "@tmcw/togeojson": "^5.8.0", + "colorbrewer": "^1.5.6", "csv2geojson": "5.1.1", "dompurify": "^3.0.3", "georsstogeojson": "^0.1.0", @@ -55,6 +56,7 @@ "leaflet.path.drag": "0.0.6", "leaflet.photon": "0.8.0", "osmtogeojson": "^3.0.0-beta.3", + "simple-statistics": "^7.8.3", "togpx": "^0.5.4", "tokml": "0.4.0" } diff --git a/pyproject.toml b/pyproject.toml index a0869ca9..7831d31a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,7 +37,7 @@ dependencies = [ "django-compressor==4.3.1", "django-environ==0.10.0", "django-probes==1.7.0", - "Pillow==9.5.0", + "Pillow==10.0.1", "psycopg2==2.9.6", "requests==2.31.0", "social-auth-core==4.4.2", diff --git a/scripts/vendorsjs.sh b/scripts/vendorsjs.sh index 751132fc..793fbeb5 100755 --- a/scripts/vendorsjs.sh +++ b/scripts/vendorsjs.sh @@ -26,5 +26,7 @@ mkdir -p umap/static/umap/vendors/tokml && cp -r node_modules/tokml/tokml.js uma mkdir -p umap/static/umap/vendors/locatecontrol/ && cp -r node_modules/leaflet.locatecontrol/dist/L.Control.Locate.css umap/static/umap/vendors/locatecontrol/ mkdir -p umap/static/umap/vendors/locatecontrol/ && cp -r node_modules/leaflet.locatecontrol/src/L.Control.Locate.js umap/static/umap/vendors/locatecontrol/ mkdir -p umap/static/umap/vendors/dompurify/ && cp -r node_modules/dompurify/dist/purify.js umap/static/umap/vendors/dompurify/ +mkdir -p umap/static/umap/vendors/colorbrewer/ && cp node_modules/colorbrewer/index.js umap/static/umap/vendors/colorbrewer/colorbrewer.js +mkdir -p umap/static/umap/vendors/simple-statistics/ && cp node_modules/simple-statistics/dist/simple-statistics.min.js umap/static/umap/vendors/simple-statistics/ echo 'Done!' diff --git a/umap/__init__.py b/umap/__init__.py index 1c5c7553..1acb578e 100644 --- a/umap/__init__.py +++ b/umap/__init__.py @@ -1 +1 @@ -VERSION = "1.8.2" +VERSION = "1.10.0" diff --git a/umap/locale/br/LC_MESSAGES/django.mo b/umap/locale/br/LC_MESSAGES/django.mo index da91ba93..425b4317 100644 Binary files a/umap/locale/br/LC_MESSAGES/django.mo and b/umap/locale/br/LC_MESSAGES/django.mo differ diff --git a/umap/locale/br/LC_MESSAGES/django.po b/umap/locale/br/LC_MESSAGES/django.po index 90020cf3..ae889830 100644 --- a/umap/locale/br/LC_MESSAGES/django.po +++ b/umap/locale/br/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2023-10-12 06:55+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Dren ar Frankig , 2023\n" "Language-Team: Breton (http://app.transifex.com/openstreetmap/umap/language/br/)\n" @@ -28,9 +28,9 @@ msgstr "N'haller he c'hemmañ nemet gant ul liamm aozañ kuzh" msgid "Everyone can edit" msgstr "An holl a c'hall kemmañ" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:318 msgid "Inherit" -msgstr "" +msgstr "Dre ziouer" #: middleware.py:14 msgid "Site is readonly for maintenance" @@ -56,15 +56,15 @@ msgstr "Patrom URL a implij furmad teol OSM" msgid "Order of the tilelayers in the edit box" msgstr "" -#: models.py:142 models.py:318 +#: models.py:142 models.py:319 msgid "Everyone" msgstr "An holl" -#: models.py:143 models.py:149 models.py:319 +#: models.py:143 models.py:149 models.py:320 msgid "Editors only" msgstr "Aozerien nemetken" -#: models.py:144 models.py:320 +#: models.py:144 models.py:321 msgid "Owner only" msgstr "Ar perc'henner hepken" @@ -80,7 +80,7 @@ msgstr "Piv bennak en deus ul liamm" msgid "Blocked" msgstr "Stanket" -#: models.py:153 models.py:324 +#: models.py:153 models.py:325 msgid "description" msgstr "deskrivadur" @@ -108,35 +108,35 @@ msgstr "Dibabit aotre-implijout ar gartenn." msgid "licence" msgstr "aotre" -#: models.py:172 +#: models.py:173 msgid "owner" msgstr "perc'henner" -#: models.py:176 +#: models.py:177 msgid "editors" msgstr "aozerien" -#: models.py:181 models.py:338 +#: models.py:182 models.py:339 msgid "edit status" msgstr "statud aozañ" -#: models.py:186 +#: models.py:187 msgid "share status" msgstr "digor da biv?" -#: models.py:189 models.py:333 +#: models.py:190 models.py:334 msgid "settings" msgstr "arventennoù" -#: models.py:268 +#: models.py:269 msgid "Clone of" msgstr "Eilenn eus" -#: models.py:328 +#: models.py:329 msgid "display on load" msgstr "diskwel pa vez karget" -#: models.py:329 +#: models.py:330 msgid "Display this layer on load." msgstr "Diskwel ar gwiskad-mañ pa vez karget" @@ -157,23 +157,23 @@ msgstr "%(current_user)s n'en/he deus kartenn ebet." #: templates/auth/user_form.html:6 templates/umap/navigation.html:12 #: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 msgid "My Dashboard" -msgstr "" +msgstr "Ma zaolenn-vourzh" #: templates/auth/user_form.html:6 msgid "My Profile" -msgstr "" +msgstr "Ma frofil" #: templates/auth/user_form.html:19 msgid "Save" -msgstr "" +msgstr "Enrollañ" #: templates/auth/user_form.html:24 msgid "Your current providers" -msgstr "" +msgstr "Ho pourchaserien a-vremañ" #: templates/auth/user_form.html:30 msgid "Connect to another provider" -msgstr "" +msgstr "Kennaskañ ouzh ur pourchaser all" #: templates/auth/user_form.html:32 msgid "" @@ -246,7 +246,7 @@ msgstr "Enporzhiañ roadennoù geografek a-vern (geojson, gpx, kml, osm...)" #: templates/umap/about_summary.html:26 msgid "Choose the license for your data" -msgstr "Diuzañ aotre-implijout ho roadennoù" +msgstr "Dibab aotre-implijout ho roadennoù" #: templates/umap/about_summary.html:27 msgid "Embed and share your map" @@ -427,11 +427,11 @@ msgstr "Klask" #: templates/umap/user_dashboard.html:7 msgid "Search my maps" -msgstr "Klask em c'hartennoù" +msgstr "Klask e-touez ma c'hartennoù" #: templates/umap/user_dashboard.html:10 msgid "My profile" -msgstr "" +msgstr "Ma frofil" #: templates/umap/user_dashboard.html:20 msgid "You have no map yet." @@ -441,48 +441,48 @@ msgstr "N'ho peus kartenn ebet c'hoazh." msgid "View the map" msgstr "Diskouez ar gartenn" -#: views.py:658 +#: views.py:659 msgid "Map has been updated!" msgstr "Hizivaet eo bet ar gartenn!" -#: views.py:683 +#: views.py:684 msgid "Map editors updated with success!" msgstr "Aozerien ar gartenn bet hizivaet gant berzh!" -#: views.py:721 +#: views.py:722 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "Al liamm uMap evit aozañ ho kartenn: %(map_name)s" -#: views.py:724 +#: views.py:725 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "Setu ho liamm aozañ kuzh: %(link)s" -#: views.py:730 +#: views.py:731 #, python-format msgid "Email sent to %(email)s" msgstr "Postel kaset da %(email)s" -#: views.py:741 +#: views.py:742 msgid "Only its owner can delete the map." msgstr "N'eus nemet perc'henner ar gartenn a c'hall he dilemel." -#: views.py:764 +#: views.py:765 #, 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 "Eilet eo bet ho kartenn! M'ho peus c'hoant d'he c'hemmañ diwar un urzhiataer all, implijit al liamm-mañ: %(anonymous_url)s" -#: views.py:769 +#: views.py:770 msgid "Congratulations, your map has been cloned!" msgstr "Eilet eo bet ho kartenn gant berzh!" -#: views.py:958 +#: views.py:959 msgid "Layer successfully deleted." msgstr "Gwiskad dilamet gant berzh." -#: views.py:980 +#: views.py:981 msgid "Permissions updated with success!" -msgstr "" +msgstr "Aotreoù hizivaet gant berzh!" diff --git a/umap/locale/cs_CZ/LC_MESSAGES/django.mo b/umap/locale/cs_CZ/LC_MESSAGES/django.mo index 4116e30c..6cd350d8 100644 Binary files a/umap/locale/cs_CZ/LC_MESSAGES/django.mo and b/umap/locale/cs_CZ/LC_MESSAGES/django.mo differ diff --git a/umap/locale/cs_CZ/LC_MESSAGES/django.po b/umap/locale/cs_CZ/LC_MESSAGES/django.po index e6c78c90..5d09f2ce 100644 --- a/umap/locale/cs_CZ/LC_MESSAGES/django.po +++ b/umap/locale/cs_CZ/LC_MESSAGES/django.po @@ -7,6 +7,7 @@ # Jakub A. Tesinsky, 2014 # Jakub A. Tesinsky, 2014 # Jiří Podhorecký, 2018-2019 +# Jiří Podhorecký, 2023 # Jiří Podhorecký, 2019 # Jiří Podhorecký, 2018 # Jiří Podhorecký, 2018 @@ -15,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2023-10-12 06:55+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" -"Last-Translator: Aleš Fiala , 2023\n" +"Last-Translator: Jiří Podhorecký, 2023\n" "Language-Team: Czech (Czech Republic) (http://app.transifex.com/openstreetmap/umap/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,9 +34,9 @@ msgstr "Lze upravovat jen pomocí tajného odkazu" msgid "Everyone can edit" msgstr "Kdokoli může editovat" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:318 msgid "Inherit" -msgstr "" +msgstr "Zdědit" #: middleware.py:14 msgid "Site is readonly for maintenance" @@ -61,15 +62,15 @@ msgstr "Vzor URL ve formátu pro dlaždice OSM " msgid "Order of the tilelayers in the edit box" msgstr "Pořadí vrstev při editaci" -#: models.py:142 models.py:318 +#: models.py:142 models.py:319 msgid "Everyone" msgstr "Kdokoli" -#: models.py:143 models.py:149 models.py:319 +#: models.py:143 models.py:149 models.py:320 msgid "Editors only" msgstr "Jen přispěvatelé" -#: models.py:144 models.py:320 +#: models.py:144 models.py:321 msgid "Owner only" msgstr "Jen vlastník" @@ -85,7 +86,7 @@ msgstr "Kdokoli kdo má odkaz" msgid "Blocked" msgstr "Blokováno" -#: models.py:153 models.py:324 +#: models.py:153 models.py:325 msgid "description" msgstr "popis" @@ -113,35 +114,35 @@ msgstr "Vyberte si licenci mapy." msgid "licence" msgstr "licence" -#: models.py:172 +#: models.py:173 msgid "owner" msgstr "vlastník" -#: models.py:176 +#: models.py:177 msgid "editors" msgstr "přispěvovatelé" -#: models.py:181 models.py:338 +#: models.py:182 models.py:339 msgid "edit status" msgstr "kdo může provádět úpravy" -#: models.py:186 +#: models.py:187 msgid "share status" msgstr "nastavení sdílení" -#: models.py:189 models.py:333 +#: models.py:190 models.py:334 msgid "settings" msgstr "nastavení" -#: models.py:268 +#: models.py:269 msgid "Clone of" msgstr "Kopie" -#: models.py:328 +#: models.py:329 msgid "display on load" msgstr "zobrazit při startu" -#: models.py:329 +#: models.py:330 msgid "Display this layer on load." msgstr "Zobrazit tuto vrstvu na startu." @@ -162,29 +163,29 @@ msgstr "%(current_user)s nemá mapy." #: templates/auth/user_form.html:6 templates/umap/navigation.html:12 #: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10 msgid "My Dashboard" -msgstr "" +msgstr "Můj ovládací panel" #: templates/auth/user_form.html:6 msgid "My Profile" -msgstr "" +msgstr "Můj profil" #: templates/auth/user_form.html:19 msgid "Save" -msgstr "" +msgstr "Uložit" #: templates/auth/user_form.html:24 msgid "Your current providers" -msgstr "" +msgstr "Vaši současní poskytovatelé" #: templates/auth/user_form.html:30 msgid "Connect to another provider" -msgstr "" +msgstr "Připojit se k jinému poskytovateli" #: templates/auth/user_form.html:32 msgid "" "It's a good habit to connect your account to more than one provider, in case" " one provider becomes unavailable, temporarily or even permanently." -msgstr "" +msgstr "Je dobrým zvykem připojit svůj účet k více poskytovatelům pro případ, že by jeden z nich byl dočasně nebo dokonce trvale nedostupný." #: templates/auth/user_stars.html:5 #, python-format @@ -435,7 +436,7 @@ msgstr "Prohledávat moje mapy" #: templates/umap/user_dashboard.html:10 msgid "My profile" -msgstr "" +msgstr "Můj profil" #: templates/umap/user_dashboard.html:20 msgid "You have no map yet." @@ -445,48 +446,48 @@ msgstr "Zatím nemáte žádnou mapu." msgid "View the map" msgstr "Prohlídnout si tuto mapu" -#: views.py:658 +#: views.py:659 msgid "Map has been updated!" msgstr "Mapa byla aktualizována!" -#: views.py:683 +#: views.py:684 msgid "Map editors updated with success!" msgstr "Seznam přispěvovatelů byl úspěšně upraven!" -#: views.py:721 +#: views.py:722 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "Odkaz na úpravu uMap pro vaši mapu: %(map_name)s" -#: views.py:724 +#: views.py:725 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "Zde je váš tajný odkaz na úpravu: %(link)s" -#: views.py:730 +#: views.py:731 #, python-format msgid "Email sent to %(email)s" msgstr "E-mail odeslán na %(email)s" -#: views.py:741 +#: views.py:742 msgid "Only its owner can delete the map." msgstr "Jen vlastník může vymzat tuto mapu." -#: views.py:764 +#: views.py:765 #, 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 "Byla vytvořena kopie mapy! Pokud chcete upravovat tuto mapu z jiného počítače, použijte tento odkaz: %(anonymous_url)s" -#: views.py:769 +#: views.py:770 msgid "Congratulations, your map has been cloned!" msgstr "Gratulujeme, byla vytvořena kopie mapy!" -#: views.py:958 +#: views.py:959 msgid "Layer successfully deleted." msgstr "Vrstva úspěšně vymazána." -#: views.py:980 +#: views.py:981 msgid "Permissions updated with success!" -msgstr "" +msgstr "Oprávnění úspěšně aktualizována!" diff --git a/umap/locale/en/LC_MESSAGES/django.po b/umap/locale/en/LC_MESSAGES/django.po index 47624e7a..d93ef7c6 100644 --- a/umap/locale/en/LC_MESSAGES/django.po +++ b/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: 2023-09-27 04:36+0000\n" +"POT-Creation-Date: 2023-10-12 06:55+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,7 +25,7 @@ msgstr "" msgid "Everyone can edit" msgstr "" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:318 msgid "Inherit" msgstr "" @@ -53,15 +53,15 @@ msgstr "" msgid "Order of the tilelayers in the edit box" msgstr "" -#: models.py:142 models.py:318 +#: models.py:142 models.py:319 msgid "Everyone" msgstr "" -#: models.py:143 models.py:149 models.py:319 +#: models.py:143 models.py:149 models.py:320 msgid "Editors only" msgstr "" -#: models.py:144 models.py:320 +#: models.py:144 models.py:321 msgid "Owner only" msgstr "" @@ -77,7 +77,7 @@ msgstr "" msgid "Blocked" msgstr "" -#: models.py:153 models.py:324 +#: models.py:153 models.py:325 msgid "description" msgstr "" @@ -105,35 +105,35 @@ msgstr "" msgid "licence" msgstr "" -#: models.py:172 +#: models.py:173 msgid "owner" msgstr "" -#: models.py:176 +#: models.py:177 msgid "editors" msgstr "" -#: models.py:181 models.py:338 +#: models.py:182 models.py:339 msgid "edit status" msgstr "" -#: models.py:186 +#: models.py:187 msgid "share status" msgstr "" -#: models.py:189 models.py:333 +#: models.py:190 models.py:334 msgid "settings" msgstr "" -#: models.py:268 +#: models.py:269 msgid "Clone of" msgstr "" -#: models.py:328 +#: models.py:329 msgid "display on load" msgstr "" -#: models.py:329 +#: models.py:330 msgid "Display this layer on load." msgstr "" diff --git a/umap/locale/es/LC_MESSAGES/django.mo b/umap/locale/es/LC_MESSAGES/django.mo index e4899331..d29b45c8 100644 Binary files a/umap/locale/es/LC_MESSAGES/django.mo and b/umap/locale/es/LC_MESSAGES/django.mo differ diff --git a/umap/locale/es/LC_MESSAGES/django.po b/umap/locale/es/LC_MESSAGES/django.po index 4de5aaef..b563ef60 100644 --- a/umap/locale/es/LC_MESSAGES/django.po +++ b/umap/locale/es/LC_MESSAGES/django.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2023-10-12 06:55+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" "Last-Translator: Eric Armijo, 2023\n" "Language-Team: Spanish (http://app.transifex.com/openstreetmap/umap/language/es/)\n" @@ -32,7 +32,7 @@ msgstr "Sólo puede editarse con el enlace secreto de edición" msgid "Everyone can edit" msgstr "Todos pueden editar" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:318 msgid "Inherit" msgstr "Heredar" @@ -60,15 +60,15 @@ msgstr "Plantilla URL usando el formato de teselas OSM" msgid "Order of the tilelayers in the edit box" msgstr "Orden de las capas de teselas en la caja de edición" -#: models.py:142 models.py:318 +#: models.py:142 models.py:319 msgid "Everyone" msgstr "Todos" -#: models.py:143 models.py:149 models.py:319 +#: models.py:143 models.py:149 models.py:320 msgid "Editors only" msgstr "Sólo editores" -#: models.py:144 models.py:320 +#: models.py:144 models.py:321 msgid "Owner only" msgstr "Sólo propietario" @@ -84,7 +84,7 @@ msgstr "Cualquiera con enlace" msgid "Blocked" msgstr "Bloqueado" -#: models.py:153 models.py:324 +#: models.py:153 models.py:325 msgid "description" msgstr "descripción" @@ -112,35 +112,35 @@ msgstr "Elija la licencia del mapa." msgid "licence" msgstr "licencia" -#: models.py:172 +#: models.py:173 msgid "owner" msgstr "propietario" -#: models.py:176 +#: models.py:177 msgid "editors" msgstr "editores" -#: models.py:181 models.py:338 +#: models.py:182 models.py:339 msgid "edit status" msgstr "estado de la edición" -#: models.py:186 +#: models.py:187 msgid "share status" msgstr "compartir estado" -#: models.py:189 models.py:333 +#: models.py:190 models.py:334 msgid "settings" msgstr "ajustes" -#: models.py:268 +#: models.py:269 msgid "Clone of" msgstr "Clon de" -#: models.py:328 +#: models.py:329 msgid "display on load" msgstr "mostrar al cargar" -#: models.py:329 +#: models.py:330 msgid "Display this layer on load." msgstr "Mostrar esta capa al cargar." @@ -407,9 +407,9 @@ msgstr "Su contraseña fue guardada." #, python-format msgid "%(count)s map found:" msgid_plural "%(count)s maps found:" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(count)s mapa encontrado:" +msgstr[1] "%(count)s mapas encontrados:" +msgstr[2] "%(count)s mapas encontrados:" #: templates/umap/search.html:18 msgid "No map found." @@ -443,48 +443,48 @@ msgstr "Aún no tiene mapa." msgid "View the map" msgstr "Ver el mapa" -#: views.py:658 +#: views.py:659 msgid "Map has been updated!" msgstr "¡El mapa ha sido actualizado!" -#: views.py:683 +#: views.py:684 msgid "Map editors updated with success!" msgstr "¡Los editores del mapas han sido actualizados con éxito!" -#: views.py:721 +#: views.py:722 #, 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:724 +#: views.py:725 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "Aquí está tu enlace secreto de edición: %(link)s" -#: views.py:730 +#: views.py:731 #, python-format msgid "Email sent to %(email)s" msgstr "Correo electrónico enviado a %(email)s" -#: views.py:741 +#: views.py:742 msgid "Only its owner can delete the map." msgstr "Sólo el propietario puede borrar el mapa." -#: views.py:764 +#: views.py:765 #, 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:769 +#: views.py:770 msgid "Congratulations, your map has been cloned!" msgstr "¡Enhorabuena! ¡Tu mapa ha sido clonado!" -#: views.py:958 +#: views.py:959 msgid "Layer successfully deleted." msgstr "Se eliminó la capa con éxito." -#: views.py:980 +#: views.py:981 msgid "Permissions updated with success!" msgstr "¡Permisos actualizados con éxito!" diff --git a/umap/locale/fr/LC_MESSAGES/django.po b/umap/locale/fr/LC_MESSAGES/django.po index fb88cad2..8fcdf0a3 100644 --- a/umap/locale/fr/LC_MESSAGES/django.po +++ b/umap/locale/fr/LC_MESSAGES/django.po @@ -14,6 +14,7 @@ # severin.menard , 2014 # spf, 2019 # spf, 2019 +# Syl Martin, 2023 # Philippe Verdy, 2017 # yohanboniface , 2013-2014,2018-2019,2023 # YOHAN BONIFACE , 2012 @@ -22,9 +23,9 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2023-10-12 06:55+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" -"Last-Translator: yohanboniface , 2013-2014,2018-2019,2023\n" +"Last-Translator: Syl Martin, 2023\n" "Language-Team: French (http://app.transifex.com/openstreetmap/umap/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -40,7 +41,7 @@ msgstr "Modifiable seulement avec le lien de modification secret" msgid "Everyone can edit" msgstr "Tout le monde peut modifier" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:318 msgid "Inherit" msgstr "Par défaut" @@ -68,15 +69,15 @@ msgstr "Modèle d'URL au format des tuiles OSM" msgid "Order of the tilelayers in the edit box" msgstr "Ordre des calques de tuiles dans le panneau de modification" -#: models.py:142 models.py:318 +#: models.py:142 models.py:319 msgid "Everyone" msgstr "Tout le monde" -#: models.py:143 models.py:149 models.py:319 +#: models.py:143 models.py:149 models.py:320 msgid "Editors only" msgstr "Éditeurs uniquement" -#: models.py:144 models.py:320 +#: models.py:144 models.py:321 msgid "Owner only" msgstr "Propriétaire uniquement" @@ -92,7 +93,7 @@ msgstr "Quiconque a le lien" msgid "Blocked" msgstr "Bloquée" -#: models.py:153 models.py:324 +#: models.py:153 models.py:325 msgid "description" msgstr "description" @@ -120,35 +121,35 @@ msgstr "Choisir une licence pour la carte" msgid "licence" msgstr "licence" -#: models.py:172 +#: models.py:173 msgid "owner" msgstr "créateur" -#: models.py:176 +#: models.py:177 msgid "editors" msgstr "éditeurs" -#: models.py:181 models.py:338 +#: models.py:182 models.py:339 msgid "edit status" msgstr "statut de modification" -#: models.py:186 +#: models.py:187 msgid "share status" msgstr "qui a accès" -#: models.py:189 models.py:333 +#: models.py:190 models.py:334 msgid "settings" msgstr "réglages" -#: models.py:268 +#: models.py:269 msgid "Clone of" msgstr "Clone de" -#: models.py:328 +#: models.py:329 msgid "display on load" msgstr "afficher au chargement." -#: models.py:329 +#: models.py:330 msgid "Display this layer on load." msgstr "Afficher ce calque au chargement." @@ -254,7 +255,7 @@ msgstr "Gérer les options de la carte : afficher une minicarte, géolocaliser l #: templates/umap/about_summary.html:25 msgid "Batch import geostructured data (geojson, gpx, kml, osm...)" -msgstr "Import des données géographiques en masse (geojson, gpx, kml, osm...)" +msgstr "Importer des données géographiques en masse (geojson, gpx, kml, osm...)" #: templates/umap/about_summary.html:26 msgid "Choose the license for your data" @@ -282,7 +283,7 @@ msgstr "Tester la démo" msgid "" "This instance of uMap is currently in read only mode, no creation/edit is " "allowed." -msgstr "uMap est actuelle en mode lecture seule, aucune création ou modification n'est possible." +msgstr "uMap est actuellement en mode lecture seule, aucune création ou modification n'est possible." #: templates/umap/content.html:31 #, python-format @@ -451,48 +452,48 @@ msgstr "Vous n'avez pas encore de carte." msgid "View the map" msgstr "Voir la carte" -#: views.py:658 +#: views.py:659 msgid "Map has been updated!" msgstr "La carte a été mise à jour !" -#: views.py:683 +#: views.py:684 msgid "Map editors updated with success!" msgstr "Éditeurs de la carte mis à jour !" -#: views.py:721 +#: views.py:722 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "La lien d'édition uMap pour votre carte %(map_name)s" -#: views.py:724 +#: views.py:725 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "Voici votre lien d'édition secret: %(link)s" -#: views.py:730 +#: views.py:731 #, python-format msgid "Email sent to %(email)s" msgstr "Courriel envoyé à %(email)s" -#: views.py:741 +#: views.py:742 msgid "Only its owner can delete the map." msgstr "Seul le créateur de la carte peut la supprimer." -#: views.py:764 +#: views.py:765 #, 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 "Votre carte a été dupliquée ! Si vous souhaitez la modifier depuis un autre ordinateur, veuillez utiliser ce lien : %(anonymous_url)s" -#: views.py:769 +#: views.py:770 msgid "Congratulations, your map has been cloned!" msgstr "Votre carte a été dupliquée !" -#: views.py:958 +#: views.py:959 msgid "Layer successfully deleted." msgstr "Calque supprimé." -#: views.py:980 +#: views.py:981 msgid "Permissions updated with success!" msgstr "Les permissions ont bien été modifiées !" diff --git a/umap/locale/it/LC_MESSAGES/django.mo b/umap/locale/it/LC_MESSAGES/django.mo index 49662cd2..640724ff 100644 Binary files a/umap/locale/it/LC_MESSAGES/django.mo and b/umap/locale/it/LC_MESSAGES/django.mo differ diff --git a/umap/locale/it/LC_MESSAGES/django.po b/umap/locale/it/LC_MESSAGES/django.po index d0920be3..14ce2122 100644 --- a/umap/locale/it/LC_MESSAGES/django.po +++ b/umap/locale/it/LC_MESSAGES/django.po @@ -4,6 +4,7 @@ # # Translators: # claudiamocci , 2013 +# Francesco Piero Paolicelli , 2023 # Marco , 2017 # lucacorsato , 2014 # lucacorsato , 2014 @@ -19,9 +20,9 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-22 16:21+0000\n" +"POT-Creation-Date: 2023-10-12 06:55+0000\n" "PO-Revision-Date: 2013-11-22 14:00+0000\n" -"Last-Translator: Maurizio Napolitano , 2013,2017,2023\n" +"Last-Translator: Francesco Piero Paolicelli , 2023\n" "Language-Team: Italian (http://app.transifex.com/openstreetmap/umap/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,9 +38,9 @@ msgstr "Modificabile solo con il link segreto" msgid "Everyone can edit" msgstr "Chiunque può modificare" -#: forms.py:69 models.py:317 +#: forms.py:69 models.py:318 msgid "Inherit" -msgstr "" +msgstr "Inherit" #: middleware.py:14 msgid "Site is readonly for maintenance" @@ -65,15 +66,15 @@ msgstr "Modello dell'URL usando il formato delle tile OSM" msgid "Order of the tilelayers in the edit box" msgstr "Ordine degli sfondi (tilelayers) nel box di modifica" -#: models.py:142 models.py:318 +#: models.py:142 models.py:319 msgid "Everyone" msgstr "Chiunque" -#: models.py:143 models.py:149 models.py:319 +#: models.py:143 models.py:149 models.py:320 msgid "Editors only" msgstr "Solamente chi contribuisce" -#: models.py:144 models.py:320 +#: models.py:144 models.py:321 msgid "Owner only" msgstr "Solo chi ha la proprietà" @@ -89,7 +90,7 @@ msgstr "Chiunque abbia il link" msgid "Blocked" msgstr "Bloccata" -#: models.py:153 models.py:324 +#: models.py:153 models.py:325 msgid "description" msgstr "descrizione" @@ -117,35 +118,35 @@ msgstr "Scegliere una licenza per la mappa." msgid "licence" msgstr "licenza" -#: models.py:172 +#: models.py:173 msgid "owner" msgstr "proprietario" -#: models.py:176 +#: models.py:177 msgid "editors" msgstr "contributore" -#: models.py:181 models.py:338 +#: models.py:182 models.py:339 msgid "edit status" msgstr "stato della modifica" -#: models.py:186 +#: models.py:187 msgid "share status" msgstr "stato condivisione" -#: models.py:189 models.py:333 +#: models.py:190 models.py:334 msgid "settings" msgstr "impostazioni" -#: models.py:268 +#: models.py:269 msgid "Clone of" msgstr "Duplicata da " -#: models.py:328 +#: models.py:329 msgid "display on load" msgstr "mostra al caricamento" -#: models.py:329 +#: models.py:330 msgid "Display this layer on load." msgstr "Visualizza questo layer al caricamento." @@ -448,48 +449,48 @@ msgstr "Non hai ancora alcuna mappa." msgid "View the map" msgstr "Visualizza la mappa" -#: views.py:658 +#: views.py:659 msgid "Map has been updated!" msgstr "La mappa è stata aggiornata!" -#: views.py:683 +#: views.py:684 msgid "Map editors updated with success!" msgstr "Aggiornato l'elenco degli editor abilitati alla modifica della mappa!" -#: views.py:721 +#: views.py:722 #, python-format msgid "The uMap edit link for your map: %(map_name)s" msgstr "Link uMap per la modifica della tua mappa: %(map_name)s" -#: views.py:724 +#: views.py:725 #, python-format msgid "Here is your secret edit link: %(link)s" msgstr "Qui il tuo link segreto: %(link)s" -#: views.py:730 +#: views.py:731 #, python-format msgid "Email sent to %(email)s" msgstr "Email inviata a %(email)s" -#: views.py:741 +#: views.py:742 msgid "Only its owner can delete the map." msgstr "Solo il proprietario può eliminare la mappa." -#: views.py:764 +#: views.py:765 #, 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 "La mappa è stata clonata! Per modificarla usando un altro computer, si deve utilizzare questo link: %(anonymous_url)s" -#: views.py:769 +#: views.py:770 msgid "Congratulations, your map has been cloned!" msgstr "Perfetto, la tua mappa è stata clonata!" -#: views.py:958 +#: views.py:959 msgid "Layer successfully deleted." msgstr "Layer eliminato correttamente" -#: views.py:980 +#: views.py:981 msgid "Permissions updated with success!" -msgstr "" +msgstr "Autorizzazioni aggiornate con successo!" diff --git a/umap/management/commands/import_pictograms.py b/umap/management/commands/import_pictograms.py index 80cd6799..caa1ceb4 100644 --- a/umap/management/commands/import_pictograms.py +++ b/umap/management/commands/import_pictograms.py @@ -1,4 +1,4 @@ -import os +from pathlib import Path from django.core.files import File from django.core.management.base import BaseCommand @@ -7,40 +7,61 @@ from umap.models import Pictogram class Command(BaseCommand): - help = 'Import pictograms from a folder' + help = "Import pictograms from a folder" def add_arguments(self, parser): - parser.add_argument('path') - parser.add_argument('--attribution', required=True, - help='Attribution of the imported pictograms') - parser.add_argument('--suffix', - help='Optional suffix to add to each name') - parser.add_argument('--force', action='store_true', - help='Update picto if it already exists.') + parser.add_argument("path") + parser.add_argument( + "--attribution", + required=True, + help="Attribution of the imported pictograms", + ) + parser.add_argument( + "--extensions", + help="Optional list of extensins to process", + nargs="+", + default=[".svg"], + ) + parser.add_argument( + "--exclude", + help="Optional list of files or dirs to exclude", + nargs="+", + default=["font"], + ) + parser.add_argument( + "--force", action="store_true", help="Update picto if it already exists." + ) def handle(self, *args, **options): - path = options['path'] - attribution = options['attribution'] - suffix = options['suffix'] - force = options['force'] - for filename in os.listdir(path): - if filename.endswith("-24.png"): - name = self.extract_name(filename) - if suffix: - name = '{name}{suffix}'.format(name=name, suffix=suffix) + self.path = Path(options["path"]) + self.attribution = options["attribution"] + self.extensions = options["extensions"] + self.force = options["force"] + self.exclude = options["exclude"] + self.handle_directory(self.path) + + def handle_directory(self, path): + for filename in path.iterdir(): + if filename.name in self.exclude: + continue + if filename.is_dir(): + self.handle_directory(filename) + continue + if filename.suffix in self.extensions: + name = filename.stem picto = Pictogram.objects.filter(name=name).last() if picto: - if not force: - self.stdout.write(u"⚠ Pictogram with name '{name}' already exists. Skipping.".format(name=name)) # noqa + if not self.force: + self.stdout.write( + f"⚠ Pictogram with name '{name}' already exists. Skipping." + ) continue else: picto = Pictogram() picto.name = name - filepath = os.path.join(path, filename) - with open(filepath, 'rb') as f: - picto.attribution = attribution - picto.pictogram.save(filename, File(f), save=True) - self.stdout.write(u"✔ Imported pictogram {filename}.".format(filename=filename)) # noqa - - def extract_name(self, filename): - return filename[:-7].replace('-', ' ') + if (path.name != self.path.name): # Subfolders only + picto.category = path.name + picto.attribution = self.attribution + with (path / filename).open("rb") as f: + picto.pictogram.save(filename.name, File(f), save=True) + self.stdout.write(f"✔ Imported pictogram {filename}.") diff --git a/umap/migrations/0015_alter_pictogram_pictogram.py b/umap/migrations/0015_alter_pictogram_pictogram.py new file mode 100644 index 00000000..9e60a3c4 --- /dev/null +++ b/umap/migrations/0015_alter_pictogram_pictogram.py @@ -0,0 +1,17 @@ +# Generated by Django 4.2.2 on 2023-10-30 11:27 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("umap", "0014_map_created_at"), + ] + + operations = [ + migrations.AlterField( + model_name="pictogram", + name="pictogram", + field=models.FileField(upload_to="pictogram"), + ), + ] diff --git a/umap/migrations/0016_pictogram_category.py b/umap/migrations/0016_pictogram_category.py new file mode 100644 index 00000000..88db888c --- /dev/null +++ b/umap/migrations/0016_pictogram_category.py @@ -0,0 +1,17 @@ +# Generated by Django 4.2.2 on 2023-10-30 17:22 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("umap", "0015_alter_pictogram_pictogram"), + ] + + operations = [ + migrations.AddField( + model_name="pictogram", + name="category", + field=models.CharField(blank=True, max_length=300, null=True), + ), + ] diff --git a/umap/models.py b/umap/models.py index b2d1a9a6..cc676602 100644 --- a/umap/models.py +++ b/umap/models.py @@ -284,7 +284,8 @@ class Pictogram(NamedModel): """ attribution = models.CharField(max_length=300) - pictogram = models.ImageField(upload_to="pictogram") + category = models.CharField(max_length=300, null=True, blank=True) + pictogram = models.FileField(upload_to="pictogram") @property def json(self): @@ -292,6 +293,7 @@ class Pictogram(NamedModel): "id": self.pk, "attribution": self.attribution, "name": self.name, + "category": self.category, "src": self.pictogram.url, } diff --git a/umap/static/favicon.ico b/umap/static/favicon.ico deleted file mode 100644 index 0aa459cc..00000000 Binary files a/umap/static/favicon.ico and /dev/null differ diff --git a/umap/static/umap/base.css b/umap/static/umap/base.css index b5f1ce9a..6a7b8677 100644 --- a/umap/static/umap/base.css +++ b/umap/static/umap/base.css @@ -163,7 +163,9 @@ select { select[multiple="multiple"] { height: auto; } -.button, input[type="submit"] { +.button, +[type="button"], +input[type="submit"] { display: block; margin-bottom: 14px; text-align: center; @@ -176,18 +178,31 @@ select[multiple="multiple"] { line-height: 32px; border: none; text-decoration: none; + background-color: white; } -.dark .button { +.dark .button, +.dark [type="button"] { background-color: #2a2e30; color: #eeeeec; border: 1px solid #1b1f20; } -.dark .button:hover, .dark input[type="submit"]:hover { +.dark .button:hover, +.dark [type="button"]:hover, +.dark input[type="submit"]:hover { background-color: #2e3436; } .dark a { color: #eeeeec; } +[type="button"].flat, +.dark [type="button"].flat { + border: none; + background-color: inherit; + padding: 0; + text-align: left; + min-height: inherit; + text-decoration: underline; +} .help-text, .helptext { display: block; padding: 7px 7px; @@ -263,7 +278,7 @@ input[type="file"] + .error { padding: 10px; } .fieldset.toggle .legend { - text-align: center; + text-align: left; display: block; cursor: pointer; background-color: #232729; @@ -276,6 +291,20 @@ input[type="file"] + .error { font-size: 1.2em; padding: 0 5px; } +.fieldset.toggle .legend:before { + background-repeat: no-repeat; + text-indent: 24px; + height: 24px; + line-height: 24px; + display: inline-block; + background-image: url('./img/16-white.svg'); + vertical-align: bottom; + content: " "; + background-position: -144px -76px; +} +.fieldset.toggle.on .legend:before { + background-position: -144px -51px; +} /* Switch */ input.switch:empty { display: none; @@ -354,13 +383,15 @@ input.switch:checked ~ label:after { .button-bar.half { grid-template-columns: 1fr 1fr; } -.umap-multiplechoice.by3 { +.umap-multiplechoice.by3, +.umap-multiplechoice.by5 { grid-template-columns: 1fr 1fr 1fr; } .umap-multiplechoice.by4 { grid-template-columns: 1fr 1fr 1fr 1fr; } -.button-bar .button { +.button-bar .button, +.button-bar [type="button"] { display: inline-block; } .umap-multiplechoice input[type='radio'] { @@ -449,7 +480,7 @@ i.info { .umap-clone:before, .umap-edit:before, .umap-download:before, .umap-to-polyline:before { background-repeat: no-repeat; - text-indent: 38px; + text-indent: 36px; height: 24px; line-height: 24px; display: inline-block; @@ -504,33 +535,30 @@ i.info { margin-top: -8px; padding: 0 5px; } -.umap-icon-list, .umap-pictogram-list { - clear: both; +.umap-pictogram-grid { + display: flex; + flex-wrap: wrap; } -.umap-icon-choice { - display: block; - float: left; +.umap-pictogram-choice { width: 30px; height: 30px; line-height: 30px; - position: relative; cursor: pointer; - background-image: url('./img/icon-bg.png'); + background-color: #999; text-align: center; - box-shadow: 0 0 4px 0 black inset; margin-bottom: 5px; margin-right: 5px; } -.umap-icon-choice img { +.umap-pictogram-choice img { vertical-align: middle; max-width: 24px; } -.umap-icon-choice:hover, -.umap-icon-choice.selected, +.umap-pictogram-choice:hover, +.umap-pictogram-choice.selected, .umap-color-picker span:hover { box-shadow: 0 0 4px 0 black; } -.umap-icon-choice .leaflet-marker-icon { +.umap-pictogram-choice .leaflet-marker-icon { bottom: 0; left: 30px; position: absolute; @@ -557,10 +585,12 @@ input.blur { border-top-right-radius: 0; border-bottom-right-radius: 0; } -.blur + .button:before { +.blur + .button:before, +.blur + [type="button"]:before { content: '✔'; } -.blur + .button { +.blur + .button, +.blur + [type="button"] { width: 40px; height: 18px; display: inline-block; @@ -570,7 +600,8 @@ input.blur { border-bottom-left-radius: 0; box-sizing: border-box; } -input[type=hidden].blur + .button { +input[type=hidden].blur + .button, +input[type=hidden].blur + [type="button"] { display: none; } @@ -705,26 +736,27 @@ input:invalid { visibility: visible; top: 23px; } -.umap-alert .umap-action { +.umap-alert-container .umap-action { margin-left: 10px; background-color: #fff; color: #000; padding: 5px; border-radius: 4px; } -.umap-alert .umap-action:hover { +.umap-alert-container .umap-action:hover { color: #000; } -.umap-alert .error .umap-action { +.umap-alert-container .error .umap-action { background-color: #666; color: #eee; } -.umap-alert .error .umap-action:hover { +.umap-alert-container .error .umap-action:hover { color: #fff; } -.umap-alert input { +.umap-alert-container input { padding: 5px; border-radius: 4px; + width: 100%; } /* *********** */ @@ -741,7 +773,7 @@ input:invalid { color: #eeeeec; font-size: 0.8em; border-radius: 2px; - z-index: 1004; + z-index: 1011; font-weight: normal; max-width: 300px; } @@ -761,6 +793,19 @@ input:invalid { border-width: 11px; margin-left: calc(-50% + 21px); } +#umap-tooltip-container.tooltip-bottom:before { + top: -22px; + left: calc(50% - 11px); + border: solid transparent; + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; + border-top-color: rgba(30, 30, 30, 0.7); + border-width: 11px; + transform: rotate(180deg); +} #umap-tooltip-container.tooltip.tooltip-left:after { left: 100%; top: 50%; @@ -806,10 +851,41 @@ input:invalid { color: #fff; float: right; padding-right: 10px; + width: 100px; + line-height: 1; + margin: .5rem; + background-color: #202425; + font-size: .7rem; } #umap-alert-container .umap-close-icon { background-position: -74px -55px; } +#umap-alert-container .umap-alert-actions { + display: flex; + margin: 1rem; +} +#umap-alert-container .umap-alert-actions .umap-action { + margin-bottom: 0; +} + + +/* *********** */ +/* Various */ +/* *********** */ + +.umap-dragover:before { + content: ' '; + background-image: url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" width="200" height="200" viewBox="0 0 24 24" fill="none" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="arcs">%3Cpath d="M3 15v4c0 1.1.9 2 2 2h14a2 2 0 0 0 2-2v-4M17 9l-5 5-5-5M12 12.8V2.5"/>%3C/svg>'); + background-repeat: no-repeat; + background-position: center; + background-color: #323e56; + z-index: 401; + display: block; + position: absolute; + width: 100vw; + height: 100vh; + opacity: 0.5; +} /* *********** */ diff --git a/umap/static/umap/content.css b/umap/static/umap/content.css index bbee8364..50f3a9cd 100644 --- a/umap/static/umap/content.css +++ b/umap/static/umap/content.css @@ -175,14 +175,14 @@ body.content #umap-ui-container { input[type="submit"], .button { background-color: #79c1c0; - color: #eeeeec; + color: #323737; } .wrapper input[type="submit"]:hover { background-color: #689191; } .wrapper .neutral, .wrapper input[type="submit"].neutral { background-color: #ddd; - color: #666; + color: #323737; } .wrapper.somber { background-color: #2E3641; @@ -319,7 +319,8 @@ table.maps thead tr { display: none; } .leaflet-container a.button { - color: #eeeeec; + color: #323737; + font-size: 13.3px; } /* ************************************************* */ diff --git a/umap/static/umap/favicons/apple-touch-icon.png b/umap/static/umap/favicons/apple-touch-icon.png new file mode 100644 index 00000000..0f2ff064 Binary files /dev/null and b/umap/static/umap/favicons/apple-touch-icon.png differ diff --git a/umap/static/umap/favicons/favicon.ico b/umap/static/umap/favicons/favicon.ico new file mode 100644 index 00000000..39affe5c Binary files /dev/null and b/umap/static/umap/favicons/favicon.ico differ diff --git a/umap/static/umap/favicons/icon-192.png b/umap/static/umap/favicons/icon-192.png new file mode 100644 index 00000000..5a4175dd Binary files /dev/null and b/umap/static/umap/favicons/icon-192.png differ diff --git a/umap/static/umap/favicons/icon-512.png b/umap/static/umap/favicons/icon-512.png new file mode 100644 index 00000000..3103a0c2 Binary files /dev/null and b/umap/static/umap/favicons/icon-512.png differ diff --git a/umap/static/umap/favicons/icon.svg b/umap/static/umap/favicons/icon.svg new file mode 100644 index 00000000..f7fbf130 --- /dev/null +++ b/umap/static/umap/favicons/icon.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/umap/static/umap/img/16-white.svg b/umap/static/umap/img/16-white.svg index 2d484d8a..96e30d4f 100644 --- a/umap/static/umap/img/16-white.svg +++ b/umap/static/umap/img/16-white.svg @@ -1,8 +1,14 @@ - + + + + + + + @@ -20,11 +26,6 @@ - - - - - @@ -133,7 +134,7 @@ - + @@ -142,8 +143,26 @@ - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/umap/static/umap/img/24-white.svg b/umap/static/umap/img/24-white.svg index 98e4bf9a..3ee202b4 100644 --- a/umap/static/umap/img/24-white.svg +++ b/umap/static/umap/img/24-white.svg @@ -38,8 +38,8 @@ - - + + diff --git a/umap/static/umap/img/source/16-white.svg b/umap/static/umap/img/source/16-white.svg index 269d82e4..1ee9b790 100644 --- a/umap/static/umap/img/source/16-white.svg +++ b/umap/static/umap/img/source/16-white.svg @@ -1,13 +1,19 @@ - + + + + + + + - + @@ -19,6 +25,7 @@ + @@ -36,11 +43,6 @@ - - - - - @@ -151,9 +153,9 @@ - + - + @@ -162,8 +164,26 @@ - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/umap/static/umap/img/source/24-white.svg b/umap/static/umap/img/source/24-white.svg index 5113d7fd..baa2be5c 100644 --- a/umap/static/umap/img/source/24-white.svg +++ b/umap/static/umap/img/source/24-white.svg @@ -1,9 +1,9 @@ - - - + + + @@ -59,8 +59,8 @@ - - + + diff --git a/umap/static/umap/js/umap.controls.js b/umap/static/umap/js/umap.controls.js index a364b231..3eb2ba30 100644 --- a/umap/static/umap/js/umap.controls.js +++ b/umap/static/umap/js/umap.controls.js @@ -313,24 +313,81 @@ L.U.DrawToolbar = L.Toolbar.Control.extend({ }, }) +L.U.DropControl = L.Class.extend({ + initialize: function (map) { + this.map = map + this.dropzone = map._container + }, + + enable: function () { + L.DomEvent.on(this.dropzone, 'dragenter', this.dragenter, this) + L.DomEvent.on(this.dropzone, 'dragover', this.dragover, this) + L.DomEvent.on(this.dropzone, 'drop', this.drop, this) + L.DomEvent.on(this.dropzone, 'dragleave', this.dragleave, this) + }, + + disable: function () { + L.DomEvent.off(this.dropzone, 'dragenter', this.dragenter, this) + L.DomEvent.off(this.dropzone, 'dragover', this.dragover, this) + L.DomEvent.off(this.dropzone, 'drop', this.drop, this) + L.DomEvent.off(this.dropzone, 'dragleave', this.dragleave, this) + }, + + dragenter: function (e) { + L.DomEvent.stop(e) + this.map.scrollWheelZoom.disable() + this.dropzone.classList.add('umap-dragover') + }, + + dragover: function (e) { + L.DomEvent.stop(e) + }, + + drop: function (e) { + this.map.scrollWheelZoom.enable() + this.dropzone.classList.remove('umap-dragover') + L.DomEvent.stop(e) + for (let i = 0, file; (file = e.dataTransfer.files[i]); i++) { + this.map.processFileToImport(file) + } + this.map.onceDataLoaded(this.map.fitDataBounds) + }, + + dragleave: function () { + this.map.scrollWheelZoom.enable() + this.dropzone.classList.remove('umap-dragover') + }, +}) + L.U.EditControl = L.Control.extend({ options: { position: 'topright', }, onAdd: function (map) { - const container = L.DomUtil.create('div', 'leaflet-control-edit-enable'), - edit = L.DomUtil.create('a', '', container) - edit.href = '#' - edit.title = `${L._('Enable editing')} (Ctrl+E)` - edit.textContent = L._('Edit') - - L.DomEvent.addListener(edit, 'click', L.DomEvent.stop).addListener( - edit, - 'click', + const container = L.DomUtil.create('div', 'leaflet-control-edit-enable') + const enableEditing = L.DomUtil.createButton( + '', + container, + L._('Edit'), map.enableEdit, map ) + L.DomEvent.on( + enableEditing, + 'mouseover', + function () { + map.ui.tooltip({ + content: `${L._('Switch to edit mode')} (Ctrl+E)`, + anchor: enableEditing, + position: 'bottom', + delay: 750, + duration: 5000, + }) + }, + this + ) + return container }, }) @@ -343,15 +400,14 @@ L.Control.Embed = L.Control.extend({ onAdd: function (map) { const container = L.DomUtil.create('div', 'leaflet-control-embed umap-control') - - const link = L.DomUtil.create('a', '', container) - link.href = '#' - link.title = L._('Embed and share this map') - - L.DomEvent.on(link, 'click', L.DomEvent.stop) - .on(link, 'click', map.renderShareBox, map) - .on(link, 'dblclick', L.DomEvent.stopPropagation) - + const shareButton = L.DomUtil.createButton( + '', + container, + L._('Embed and share this map'), + map.renderShareBox, + map + ) + L.DomEvent.on(shareButton, 'dblclick', L.DomEvent.stopPropagation) return container }, }) @@ -362,19 +418,21 @@ L.U.MoreControls = L.Control.extend({ }, onAdd: function () { - const container = L.DomUtil.create('div', 'umap-control-text'), - more = L.DomUtil.create('a', 'umap-control-more', container), - less = L.DomUtil.create('a', 'umap-control-less', container) - more.href = '#' - more.title = L._('More controls') - - L.DomEvent.on(more, 'click', L.DomEvent.stop).on(more, 'click', this.toggle, this) - - less.href = '#' - less.title = L._('Hide controls') - - L.DomEvent.on(less, 'click', L.DomEvent.stop).on(less, 'click', this.toggle, this) - + 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 }, @@ -452,23 +510,21 @@ L.U.DataLayersControl = L.Control.extend({ actions ) - const link = L.DomUtil.create('a', 'umap-browse-link', actions) - link.href = '#' - link.title = link.textContent = L._('Browse data') - - const toggle = L.DomUtil.create('a', 'umap-browse-toggle', container) - toggle.href = '#' - toggle.title = L._('See data layers') - - L.DomEvent.on(toggle, 'click', L.DomEvent.stop) - - L.DomEvent.on(link, 'click', L.DomEvent.stop).on( - link, - 'click', + L.DomUtil.createButton( + 'umap-browse-link', + actions, + L._('Browse data'), map.openBrowser, map ) + const toggleButton = L.DomUtil.createButton( + 'umap-browse-toggle', + container, + L._('See data layers') + ) + L.DomEvent.on(toggleButton, 'click', L.DomEvent.stop) + map.whenReady(function () { this.update() }, this) @@ -489,8 +545,8 @@ L.U.DataLayersControl = L.Control.extend({ ) } else { L.DomEvent.on(container, 'click', L.DomEvent.stopPropagation) - L.DomEvent.on(toggle, 'click', L.DomEvent.stop).on( - toggle, + L.DomEvent.on(toggleButton, 'click', L.DomEvent.stop).on( + toggleButton, 'click', this.expand, this @@ -514,7 +570,7 @@ L.U.DataLayersControl = L.Control.extend({ update: function () { if (this._datalayers_container && this._map) { this._datalayers_container.innerHTML = '' - this._map.eachDataLayerReverse(function (datalayer) { + this.map.eachDataLayerReverse(function (datalayer) { this.addDataLayer(this._datalayers_container, datalayer) }, this) } @@ -525,7 +581,7 @@ L.U.DataLayersControl = L.Control.extend({ }, collapse: function () { - if (this._map.options.datalayersControl === 'expanded') return + if (this.map.options.datalayersControl === 'expanded') return L.DomUtil.removeClass(this._container, 'expanded') }, @@ -580,14 +636,11 @@ L.U.DataLayersControl = L.Control.extend({ this ) - const bar = L.DomUtil.create('div', 'button-bar', container), - add = L.DomUtil.create('a', 'show-on-edit block add-datalayer button', bar) - add.href = '#' - add.textContent = add.title = L._('Add a layer') - - L.DomEvent.on(add, 'click', L.DomEvent.stop).on( - add, - 'click', + const bar = L.DomUtil.create('div', 'button-bar', container) + L.DomUtil.createButton( + 'show-on-edit block add-datalayer button', + bar, + L._('Add a layer'), this.newDataLayer, this ) @@ -598,6 +651,7 @@ L.U.DataLayersControl = L.Control.extend({ L.U.DataLayer.include({ renderLegend: function (container) { + if (this.layer.renderLegend) return this.layer.renderLegend(container) const color = L.DomUtil.create('span', 'datalayer-color', container) color.style.backgroundColor = this.getColor() }, @@ -676,7 +730,6 @@ L.U.DataLayer.addInitHook(function () { }) L.U.Map.include({ - _openFacet: function () { const container = L.DomUtil.create('div', 'umap-facet-search'), title = L.DomUtil.add('h3', 'umap-filter-title', container, L._('Facet search')), @@ -749,6 +802,7 @@ L.U.Map.include({ } const datalayerContainer = L.DomUtil.create('div', 'datalayer-container', container) this.eachVisibleDataLayer((datalayer) => { + if (!datalayer.options.inCaption) return const p = L.DomUtil.create('p', 'datalayer-legend', datalayerContainer), legend = L.DomUtil.create('span', '', p), headline = L.DomUtil.create('strong', '', p), @@ -775,13 +829,17 @@ L.U.Map.include({ } if (this.options.licence) { const licence = L.DomUtil.add( - 'p', - '', - credits, - `${L._('Map user content has been published under licence')} ` - ), - link = L.DomUtil.add('a', '', licence, this.options.licence.name) - link.href = this.options.licence.url + 'p', + '', + credits, + `${L._('Map user content has been published under licence')} ` + ) + L.DomUtil.createLink( + '', + licence, + this.options.licence.name, + this.options.licence.url + ) } else { L.DomUtil.add('p', '', credits, L._('No licence has been set')) } @@ -850,89 +908,168 @@ L.U.Map.include({ ext: '.kml', filetype: 'application/vnd.google-earth.kml+xml', }, - umap: { - name: L._('Full map data'), + csv: { formatter: function (map) { - return map.serialize() + const table = [] + map.eachFeature((feature) => { + const row = feature.toGeoJSON()['properties'], + center = feature.getCenter() + delete row['_umap_options'] + row['Latitude'] = center.lat + row['Longitude'] = center.lng + table.push(row) + }) + return csv2geojson.dsv.csvFormat(table) }, - ext: '.umap', - filetype: 'application/json', - selected: true, + ext: '.csv', + filetype: 'text/csv', }, }, renderEditToolbar: function () { const container = L.DomUtil.create( - 'div', - 'umap-main-edit-toolbox with-transition dark', - this._controlContainer - ), - logo = L.DomUtil.add('a', 'logo', container), - name = L.DomUtil.create('a', 'map-name', container), - share_status = L.DomUtil.create('a', 'share-status', container), - update = () => { - const status = this.permissions.getShareStatusDisplay() - name.textContent = this.getDisplayName() - // status is not set until map is saved once - if (status) - share_status.textContent = L._('Visibility: {status}', { - status: status, - }) + 'div', + 'umap-main-edit-toolbox with-transition dark', + this._controlContainer + ) + const leftContainer = L.DomUtil.create('div', 'umap-left-edit-toolbox', container) + const rightContainer = L.DomUtil.create('div', 'umap-right-edit-toolbox', container) + const logo = L.DomUtil.create('div', 'logo', leftContainer) + L.DomUtil.createLink('', logo, 'uMap', '/', null, L._('Go to the homepage')) + const nameButton = L.DomUtil.createButton( + 'map-name', + leftContainer, + '', + this.edit, + this + ) + L.DomEvent.on( + nameButton, + 'mouseover', + function () { + this.ui.tooltip({ + content: L._('Edit the title of the map'), + anchor: nameButton, + position: 'bottom', + delay: 500, + duration: 5000, + }) + }, + this + ) + const shareStatusButton = L.DomUtil.createButton( + 'share-status', + leftContainer, + '', + this.permissions.edit, + this.permissions + ) + L.DomEvent.on( + shareStatusButton, + 'mouseover', + function () { + this.ui.tooltip({ + content: L._('Update who can see and edit the map'), + anchor: shareStatusButton, + position: 'bottom', + delay: 500, + duration: 5000, + }) + }, + this + ) + const update = () => { + const status = this.permissions.getShareStatusDisplay() + nameButton.textContent = this.getDisplayName() + // status is not set until map is saved once + if (status) { + shareStatusButton.textContent = L._('Visibility: {status}', { + status: status, + }) } + } update() this.once('saved', L.bind(update, this)) - logo.href = '/' if (this.options.editMode === 'advanced') { - name.href = '#' - share_status.href = '#' - L.DomEvent.on(name, 'click', this.edit, this) - L.DomEvent.on(share_status, 'click', this.permissions.edit, this.permissions) + L.DomEvent.on(nameButton, 'click', this.edit, this) + L.DomEvent.on(shareStatusButton, 'click', this.permissions.edit, this.permissions) } this.on('postsync', L.bind(update, this)) - const save = L.DomUtil.create('a', 'leaflet-control-edit-save button', container) - save.href = '#' - save.title = `${L._('Save current edits')} (Ctrl+S)` - save.textContent = L._('Save') - const cancel = L.DomUtil.create('a', 'leaflet-control-edit-cancel', container) - cancel.href = '#' - cancel.title = `${L._('Cancel edits')} (Ctrl+Z)` - cancel.textContent = L._('Cancel all') - const disable = L.DomUtil.create('a', 'leaflet-control-edit-disable', container) - disable.href = '#' - disable.textContent = L._('Disable editing') - disable.title = `${disable.textContent} (Ctrl+E)` - this.help.link(container, 'edit') if (this.options.user) { - const userLabel = L.DomUtil.add( - 'a', + L.DomUtil.createLink( 'umap-user', - container, - L._(`My Dashboard ({username})`, { username: this.options.user.name }) + rightContainer, + L._(`My Dashboard ({username})`, { + username: this.options.user.name, + }), + this.options.user.url ) - userLabel.href = this.options.user.url } - - L.DomEvent.addListener(disable, 'click', L.DomEvent.stop).addListener( - disable, - 'click', + this.help.link(rightContainer, 'edit') + const controlEditCancel = L.DomUtil.createButton( + 'leaflet-control-edit-cancel', + rightContainer, + L.DomUtil.add('span', '', null, L._('Cancel edits')), + this.askForReset, + this + ) + L.DomEvent.on( + controlEditCancel, + 'mouseover', + function () { + this.ui.tooltip({ + content: `${L._('Cancel')} (Ctrl+Z)`, + anchor: controlEditCancel, + position: 'bottom', + delay: 500, + duration: 5000, + }) + }, + this + ) + const controlEditDisable = L.DomUtil.createButton( + 'leaflet-control-edit-disable', + rightContainer, + L.DomUtil.add('span', '', null, L._('View')), function (e) { this.disableEdit(e) this.ui.closePanel() }, this ) - - L.DomEvent.addListener(save, 'click', L.DomEvent.stop).addListener( - save, - 'click', + L.DomEvent.on( + controlEditDisable, + 'mouseover', + function () { + this.ui.tooltip({ + content: `${L._('Back to preview')} (Ctrl+E)`, + anchor: controlEditDisable, + position: 'bottom', + delay: 500, + duration: 5000, + }) + }, + this + ) + const controlEditSave = L.DomUtil.createButton( + 'leaflet-control-edit-save button', + rightContainer, + L.DomUtil.add('span', '', null, L._('Save')), this.save, this ) - - L.DomEvent.addListener(cancel, 'click', L.DomEvent.stop).addListener( - cancel, - 'click', - this.askForReset, + L.DomEvent.on( + controlEditSave, + 'mouseover', + function () { + this.ui.tooltip({ + content: `${L._('Save current edits')} (Ctrl+S)`, + anchor: controlEditSave, + position: 'bottom', + delay: 500, + duration: 5000, + }) + }, this ) }, @@ -994,6 +1131,20 @@ L.U.Map.include({ shortUrl.value = this.options.shortUrl } L.DomUtil.create('hr', '', container) + L.DomUtil.add('h4', '', container, L._('Backup data')) + const downloadUrl = L.Util.template(this.options.urls.map_download, { + map_id: this.options.umap_id, + }) + const link = L.DomUtil.createLink( + 'button', + container, + L._('Download full data'), + downloadUrl + ) + let name = this.options.name || 'data' + name = name.replace(/[^a-z0-9]/gi, '_').toLowerCase() + link.setAttribute('download', `${name}.umap`) + L.DomUtil.create('hr', '', container) L.DomUtil.add('h4', '', container, L._('Download data')) const typeInput = L.DomUtil.create('select', '', container) typeInput.name = 'format' @@ -1003,12 +1154,6 @@ L.U.Map.include({ container, L._('Only visible features will be downloaded.') ) - exportCaveat.id = 'export_caveat_text' - const toggleCaveat = () => { - if (typeInput.value === 'umap') exportCaveat.style.display = 'none' - else exportCaveat.style.display = 'inherit' - } - L.DomEvent.on(typeInput, 'change', toggleCaveat) for (const key in this.EXPORT_TYPES) { if (this.EXPORT_TYPES.hasOwnProperty(key)) { option = L.DomUtil.create('option', '', typeInput) @@ -1017,42 +1162,143 @@ L.U.Map.include({ if (this.EXPORT_TYPES[key].selected) option.selected = true } } - toggleCaveat() - const download = L.DomUtil.create('a', 'button', container) - download.textContent = L._('Download data') - L.DomEvent.on(download, 'click', () => { - if (typeInput.value === 'umap') this.fullDownload() - else this.download(typeInput.value) - }) + L.DomUtil.createButton( + 'button', + container, + L._('Download data'), + () => this.download(typeInput.value), + this + ) this.ui.openPanel({ data: { html: container } }) }, - fullDownload: function () { - // Make sure all data is loaded before downloading - this.once('dataloaded', () => this.download()) - this.loadDatalayers(true) // Force load - }, + importPanel: function () { + const container = L.DomUtil.create('div', 'umap-upload') + const title = L.DomUtil.create('h4', '', container) + const presetBox = L.DomUtil.create('div', 'formbox', container) + const presetSelect = L.DomUtil.create('select', '', presetBox) + const fileBox = L.DomUtil.create('div', 'formbox', container) + const fileInput = L.DomUtil.create('input', '', fileBox) + const urlInput = L.DomUtil.create('input', '', container) + const rawInput = L.DomUtil.create('textarea', '', container) + const typeLabel = L.DomUtil.create('label', '', container) + const layerLabel = L.DomUtil.create('label', '', container) + const clearLabel = L.DomUtil.create('label', '', container) + const submitInput = L.DomUtil.create('input', '', container) + const map = this + let option + const types = ['geojson', 'csv', 'gpx', 'kml', 'osm', 'georss', 'umap'] + title.textContent = L._('Import data') + fileInput.type = 'file' + fileInput.multiple = 'multiple' + submitInput.type = 'button' + submitInput.value = L._('Import') + submitInput.className = 'button' + typeLabel.textContent = L._('Choose the format of the data to import') + this.help.button(typeLabel, 'importFormats') + const typeInput = L.DomUtil.create('select', '', typeLabel) + typeInput.name = 'format' + layerLabel.textContent = L._('Choose the layer to import in') + const layerInput = L.DomUtil.create('select', '', layerLabel) + layerInput.name = 'datalayer' + urlInput.type = 'text' + urlInput.placeholder = L._('Provide an URL here') + rawInput.placeholder = L._('Paste your data here') + clearLabel.textContent = L._('Replace layer content') + const clearFlag = L.DomUtil.create('input', '', clearLabel) + clearFlag.type = 'checkbox' + clearFlag.name = 'clear' + this.eachDataLayerReverse((datalayer) => { + if (datalayer.isLoaded() && !datalayer.isRemoteLayer()) { + const id = L.stamp(datalayer) + option = L.DomUtil.create('option', '', layerInput) + option.value = id + option.textContent = datalayer.options.name + } + }) + L.DomUtil.element( + 'option', + { value: '', textContent: L._('Import in a new layer') }, + layerInput + ) + L.DomUtil.element( + 'option', + { value: '', textContent: L._('Choose the data format') }, + typeInput + ) + for (let i = 0; i < types.length; i++) { + option = L.DomUtil.create('option', '', typeInput) + option.value = option.textContent = types[i] + } + if (this.options.importPresets.length) { + const noPreset = L.DomUtil.create('option', '', presetSelect) + noPreset.value = noPreset.textContent = L._('Choose a preset') + for (let j = 0; j < this.options.importPresets.length; j++) { + option = L.DomUtil.create('option', '', presetSelect) + option.value = this.options.importPresets[j].url + option.textContent = this.options.importPresets[j].label + } + } else { + presetBox.style.display = 'none' + } - format: function (mode) { - const type = this.EXPORT_TYPES[mode || 'umap'] - const content = type.formatter(this) - let name = this.options.name || 'data' - name = name.replace(/[^a-z0-9]/gi, '_').toLowerCase() - const filename = name + type.ext - return { content, filetype: type.filetype, filename } - }, - - download: function (mode) { - const { content, filetype, filename } = this.format(mode) - const blob = new Blob([content], { type: filetype }) - window.URL = window.URL || window.webkitURL - const el = document.createElement('a') - el.download = filename - el.href = window.URL.createObjectURL(blob) - el.style.display = 'none' - document.body.appendChild(el) - el.click() - document.body.removeChild(el) + const submit = function () { + let type = typeInput.value + const layerId = layerInput[layerInput.selectedIndex].value + let layer + if (type === 'umap') { + this.once('postsync', function () { + this.setView(this.latLng(this.options.center), this.options.zoom) + }) + } + if (layerId) layer = map.datalayers[layerId] + if (layer && clearFlag.checked) layer.empty() + if (fileInput.files.length) { + for (let i = 0, file; (file = fileInput.files[i]); i++) { + this.processFileToImport(file, layer, type) + } + } else { + if (!type) + return this.ui.alert({ + content: L._('Please choose a format'), + level: 'error', + }) + if (rawInput.value && type === 'umap') { + try { + this.importRaw(rawInput.value, type) + } catch (e) { + this.ui.alert({ content: L._('Invalid umap data'), level: 'error' }) + console.error(e) + } + } else { + if (!layer) layer = this.createDataLayer() + if (rawInput.value) layer.importRaw(rawInput.value, type) + else if (urlInput.value) layer.importFromUrl(urlInput.value, type) + else if (presetSelect.selectedIndex > 0) + layer.importFromUrl(presetSelect[presetSelect.selectedIndex].value, type) + } + } + } + L.DomEvent.on(submitInput, 'click', submit, this) + L.DomEvent.on( + fileInput, + 'change', + (e) => { + let type = '', + newType + for (let i = 0; i < e.target.files.length; i++) { + newType = L.Util.detectFileType(e.target.files[i]) + if (!type && newType) type = newType + if (type && newType !== type) { + type = '' + break + } + } + typeInput.value = type + }, + this + ) + this.ui.openPanel({ data: { html: container }, className: 'dark' }) }, }) @@ -1068,15 +1314,14 @@ L.U.TileLayerControl = L.Control.extend({ onAdd: function () { const container = L.DomUtil.create('div', 'leaflet-control-tilelayers umap-control') - - const link = L.DomUtil.create('a', '', container) - link.href = '#' - link.title = L._('Change map background') - - L.DomEvent.on(link, 'click', L.DomEvent.stop) - .on(link, 'click', this.openSwitcher, this) - .on(link, 'dblclick', L.DomEvent.stopPropagation) - + const changeMapBackgroundButton = L.DomUtil.createButton( + '', + container, + L._('Change map background'), + this.openSwitcher, + this + ) + L.DomEvent.on(changeMapBackgroundButton, 'dblclick', L.DomEvent.stopPropagation) return container }, @@ -1130,34 +1375,42 @@ L.U.AttributionControl = L.Control.Attribution.extend({ _update: function () { L.Control.Attribution.prototype._update.call(this) + // Use our how container, so we can hide/show on small screens + const credits = this._container.innerHTML + this._container.innerHTML = '' + const container = L.DomUtil.add( + 'div', + 'attribution-container', + this._container, + credits + ) if (this._map.options.shortCredit) { L.DomUtil.add( 'span', '', - this._container, + container, ` — ${L.Util.toHTML(this._map.options.shortCredit)}` ) } if (this._map.options.captionMenus) { - const link = L.DomUtil.add('a', '', this._container, ` — ${L._('About')}`) + const link = L.DomUtil.add('a', '', container, ` — ${L._('About')}`) L.DomEvent.on(link, 'click', L.DomEvent.stop) .on(link, 'click', this._map.displayCaption, this._map) .on(link, 'dblclick', L.DomEvent.stop) } if (window.top === window.self && this._map.options.captionMenus) { // We are not in iframe mode - const home = L.DomUtil.add('a', '', this._container, ` — ${L._('Home')}`) - home.href = '/' + L.DomUtil.createLink('', container, ` — ${L._('Home')}`, '/') } if (this._map.options.captionMenus) { - const poweredBy = L.DomUtil.add( - 'a', + L.DomUtil.createLink( '', - this._container, - ` — ${L._('Powered by uMap')}` + container, + ` — ${L._('Powered by uMap')}`, + 'https://github.com/umap-project/umap/' ) - poweredBy.href = 'https://github.com/umap-project/umap/' } + L.DomUtil.createLink('attribution-toggle', this._container, '') }, }) @@ -1169,16 +1422,17 @@ L.U.StarControl = L.Control.extend({ onAdd: function (map) { const status = map.options.starred ? ' starred' : '' const container = L.DomUtil.create( - 'div', - `leaflet-control-star umap-control${status}` - ), - link = L.DomUtil.create('a', '', container) - link.href = '#' - link.title = L._('Star this map') - L.DomEvent.on(link, 'click', L.DomEvent.stop) - .on(link, 'click', map.star, map) - .on(link, 'dblclick', L.DomEvent.stopPropagation) - + 'div', + `leaflet-control-star umap-control${status}` + ) + const starMapButton = L.DomUtil.createButton( + '', + container, + L._('Star this map'), + map.star, + map + ) + L.DomEvent.on(starMapButton, 'dblclick', L.DomEvent.stopPropagation) return container }, }) @@ -1210,7 +1464,7 @@ L.U.Search = L.PhotonSearch.extend({ }) L.DomEvent.on(edit, 'mousedown', (e) => { L.DomEvent.stop(e) - const datalayer = self.map.defaultDataLayer() + const datalayer = self.map.defaultEditDataLayer() const layer = datalayer.geojsonToFeatures(feature) layer.isDirty = true layer.edit() @@ -1238,17 +1492,18 @@ L.U.SearchControl = L.Control.extend({ }, onAdd: function (map) { - const container = L.DomUtil.create('div', 'leaflet-control-search umap-control'), - self = this - + const container = L.DomUtil.create('div', 'leaflet-control-search umap-control') L.DomEvent.disableClickPropagation(container) - const link = L.DomUtil.create('a', '', container) - link.href = '#' - link.title = L._('Search a place name') - L.DomEvent.on(link, 'click', (e) => { - L.DomEvent.stop(e) - self.openPanel(map) - }) + L.DomUtil.createButton( + '', + container, + L._('Search a place name'), + (e) => { + L.DomEvent.stop(e) + this.openPanel(map) + }, + this + ) return container }, @@ -1454,7 +1709,7 @@ L.U.Editable = L.Editable.extend({ return new L.U.Marker(this.map, latlng, this._getDefaultProperties()) }, - _getDefaultProperties: function() { + _getDefaultProperties: function () { const result = {} if (this.map.options.featuresHaveOwner && this.map.options.hasOwnProperty('user')) { result.geojson = { properties: { owner: this.map.options.user.id } } @@ -1464,14 +1719,14 @@ L.U.Editable = L.Editable.extend({ connectCreatedToMap: function (layer) { // Overrided from Leaflet.Editable - const datalayer = this.map.defaultDataLayer() + const datalayer = this.map.defaultEditDataLayer() datalayer.addLayer(layer) layer.isDirty = true return layer }, drawingTooltip: function (e) { - if (e.layer instanceof L.Marker && e.type != 'editable:drawing:move') { + if (e.layer instanceof L.Marker && e.type == 'editable:drawing:start') { this.map.ui.tooltip({ content: L._('Click to add a marker') }) } if (!(e.layer instanceof L.Polyline)) { @@ -1479,7 +1734,7 @@ L.U.Editable = L.Editable.extend({ return } - let content + let content = L._('Drawing') let measure if (e.layer.editor._drawnLatLngs) { // when drawing (a Polyline or Polygon) diff --git a/umap/static/umap/js/umap.core.js b/umap/static/umap/js/umap.core.js index a9398945..f392322a 100644 --- a/umap/static/umap/js/umap.core.js +++ b/umap/static/umap/js/umap.core.js @@ -129,7 +129,10 @@ L.Util.toHTML = (r, options) => { // images r = r.replace(/{{([^\]|]*?)}}/g, '') - r = r.replace(/{{([^|]*?)\|(\d*?)(px)?}}/g, '') + r = r.replace( + /{{([^|]*?)\|(\d*?)(px)?}}/g, + '' + ) //Unescape http r = r.replace(/(h_t_t_p)/g, 'http') @@ -198,6 +201,16 @@ L.Util.greedyTemplate = (str, data, ignore) => { ) } +L.Util.naturalSort = (a, b) => { + return a + .toString() + .toLowerCase() + .localeCompare(b.toString().toLowerCase(), L.lang || 'en', { + sensitivity: 'base', + numeric: true, + }) +} + L.Util.sortFeatures = (features, sortKey) => { const sortKeys = (sortKey || 'name').split(',') @@ -211,19 +224,9 @@ L.Util.sortFeatures = (features, sortKey) => { let score const valA = a.properties[sortKey] || '' const valB = b.properties[sortKey] || '' - if (!valA) { - score = -1 - } else if (!valB) { - score = 1 - } else { - score = valA - .toString() - .toLowerCase() - .localeCompare(valB.toString().toLowerCase(), L.lang || 'en', { - sensitivity: 'base', - numeric: true, - }) - } + if (!valA) score = -1 + else if (!valB) score = 1 + else score = L.Util.naturalSort(valA, valB) if (score === 0 && sortKeys[i + 1]) return sort(a, b, i + 1) return score * reverse } @@ -258,32 +261,31 @@ L.Util.hasVar = (value) => { } L.Util.copyToClipboard = function (textToCopy) { - // https://stackoverflow.com/a/65996386 - // Navigator clipboard api needs a secure context (https) - if (navigator.clipboard && window.isSecureContext) { - navigator.clipboard.writeText(textToCopy) - } else { - // Use the 'out of viewport hidden text area' trick - const textArea = document.createElement('textarea') - textArea.value = textToCopy + // https://stackoverflow.com/a/65996386 + // Navigator clipboard api needs a secure context (https) + if (navigator.clipboard && window.isSecureContext) { + navigator.clipboard.writeText(textToCopy) + } else { + // Use the 'out of viewport hidden text area' trick + const textArea = document.createElement('textarea') + textArea.value = textToCopy - // Move textarea out of the viewport so it's not visible - textArea.style.position = 'absolute' - textArea.style.left = '-999999px' + // Move textarea out of the viewport so it's not visible + textArea.style.position = 'absolute' + textArea.style.left = '-999999px' - document.body.prepend(textArea) - textArea.select() + document.body.prepend(textArea) + textArea.select() - try { - document.execCommand('copy') - } catch (error) { - console.error(error) - } finally { - textArea.remove() - } - } + try { + document.execCommand('copy') + } catch (error) { + console.error(error) + } finally { + textArea.remove() } - + } +} L.DomUtil.add = (tagName, className, container, content) => { const el = L.DomUtil.create(tagName, className, container) @@ -314,14 +316,26 @@ L.DomUtil.createFieldset = (container, legend, options) => { } L.DomUtil.createButton = (className, container, content, callback, context) => { - const el = L.DomUtil.add('a', className, container, content) - el.href = '#' + const el = L.DomUtil.add('button', className, container, content) + el.type = 'button' if (callback) { L.DomEvent.on(el, 'click', L.DomEvent.stop).on(el, 'click', 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.classIf = (el, className, bool) => { if (bool) L.DomUtil.addClass(el, className) else L.DomUtil.removeClass(el, className) @@ -349,21 +363,21 @@ L.DomUtil.after = (target, el) => { } L.DomUtil.RGBRegex = /rgb *\( *([0-9]{1,3}) *, *([0-9]{1,3}) *, *([0-9]{1,3}) *\)/ - L.DomUtil.TextColorFromBackgroundColor = (el) => { - let out = '#000000' - if (!window.getComputedStyle) { - return out - } + return L.DomUtil.contrastedColor(el) ? '#ffffff' : '#000000' +} +const _CACHE_CONSTRAST = {} +L.DomUtil.contrastedColor = (el, bgcolor) => { + // Return 0 for black and 1 for white + // bgcolor is a human color, it can be a any keyword (purple…) + if (typeof _CACHE_CONSTRAST[bgcolor] !== 'undefined') return _CACHE_CONSTRAST[bgcolor] + let out = 0 let rgb = window.getComputedStyle(el).getPropertyValue('background-color') rgb = L.DomUtil.RGBRegex.exec(rgb) - if (!rgb || rgb.length !== 4) { - return out - } + if (!rgb || rgb.length !== 4) return out rgb = parseInt(rgb[1], 10) + parseInt(rgb[2], 10) + parseInt(rgb[3], 10) - if (rgb < (255 * 3) / 2) { - out = '#ffffff' - } + if (rgb < (255 * 3) / 2) out = 1 + if (bgcolor) _CACHE_CONSTRAST[bgcolor] = out return out } L.DomEvent.once = (el, types, fn, context) => { @@ -418,13 +432,17 @@ L.U.Help = L.Class.extend({ 'umap-help-box with-transition dark', document.body ) - const closeLink = L.DomUtil.create('a', 'umap-close-link', this.box) - closeLink.href = '#' - L.DomUtil.add('i', 'umap-close-icon', closeLink) - const label = L.DomUtil.create('span', '', closeLink) + const closeButton = L.DomUtil.createButton( + 'umap-close-link', + this.box, + '', + this.hide, + this + ) + L.DomUtil.add('i', 'umap-close-icon', closeButton) + const label = L.DomUtil.create('span', '', closeButton) label.title = label.textContent = L._('Close') this.content = L.DomUtil.create('div', 'umap-help-content', this.box) - L.DomEvent.on(closeLink, 'click', this.hide, this) }, onKeyDown: function (e) { @@ -457,8 +475,11 @@ L.U.Help = L.Class.extend({ }, button: function (container, entries, classname) { - const helpButton = L.DomUtil.create('a', classname || 'umap-help-button', container) - helpButton.href = '#' + const helpButton = L.DomUtil.createButton( + classname || 'umap-help-button', + container, + L._('Help') + ) if (entries) { L.DomEvent.on(helpButton, 'click', L.DomEvent.stop).on( helpButton, @@ -475,7 +496,7 @@ L.U.Help = L.Class.extend({ link: function (container, entries) { const helpButton = this.button(container, entries, 'umap-help-link') - helpButton.textContent = L._("Help") + helpButton.textContent = L._('Help') return helpButton }, diff --git a/umap/static/umap/js/umap.features.js b/umap/static/umap/js/umap.features.js index 76cbdb7f..8815b6a0 100644 --- a/umap/static/umap/js/umap.features.js +++ b/umap/static/umap/js/umap.features.js @@ -1,5 +1,5 @@ L.U.FeatureMixin = { - staticOptions: {}, + staticOptions: { mainColor: 'color' }, initialize: function (map, latlng, options) { this.map = map @@ -130,12 +130,10 @@ L.U.FeatureMixin = { }, getAdvancedEditActions: function (container) { - const deleteLink = L.DomUtil.create('a', 'button umap-delete', container) - deleteLink.href = '#' - deleteLink.textContent = L._('Delete') - L.DomEvent.on( - deleteLink, - 'click', + const deleteButton = L.DomUtil.createButton( + 'button umap-delete', + container, + L._('Delete'), function (e) { L.DomEvent.stop(e) if (this.confirmDelete()) this.map.ui.closePanel() @@ -283,7 +281,7 @@ L.U.FeatureMixin = { } else if (L.Util.usableOption(this.properties._umap_options, option)) { value = this.properties._umap_options[option] } else if (this.datalayer) { - value = this.datalayer.getOption(option) + value = this.datalayer.getOption(option, this) } else { value = this.map.getOption(option) } @@ -478,9 +476,9 @@ L.U.FeatureMixin = { matchFilter: function (filter, keys) { filter = filter.toLowerCase() - for (let i = 0; i < keys.length; i++) { - if ((this.properties[keys[i]] || '').toLowerCase().indexOf(filter) !== -1) - return true + for (let i = 0, value; i < keys.length; i++) { + value = (this.properties[keys[i]] || '') + '' + if (value.toLowerCase().indexOf(filter) !== -1) return true } return false }, @@ -620,6 +618,8 @@ L.U.Marker = L.Marker.extend({ _initIcon: function () { this.options.icon = this.getIcon() L.Marker.prototype._initIcon.call(this) + // Allow to run code when icon is actually part of the DOM + this.options.icon.onAdd() this.resetTooltip() }, @@ -680,8 +680,8 @@ L.U.Marker = L.Marker.extend({ appendEditFieldsets: function (container) { L.U.FeatureMixin.appendEditFieldsets.call(this, container) const coordinatesOptions = [ - ['_latlng.lat', { handler: 'FloatInput', label: L._('Latitude') }], - ['_latlng.lng', { handler: 'FloatInput', label: L._('Longitude') }], + ['_latlng.lat', { handler: 'FloatInput', label: L._('Latitude'), step: 'any' }], + ['_latlng.lng', { handler: 'FloatInput', label: L._('Longitude'), step: 'any' }], ] const builder = new L.U.FormBuilder(this, coordinatesOptions, { callback: function () { @@ -968,6 +968,7 @@ L.U.Polyline = L.Polyline.extend({ staticOptions: { stroke: true, fill: false, + mainColor: 'color', }, isSameClass: function (other) { @@ -1036,10 +1037,13 @@ L.U.Polyline = L.Polyline.extend({ getAdvancedEditActions: function (container) { L.U.FeatureMixin.getAdvancedEditActions.call(this, container) - const toPolygon = L.DomUtil.create('a', 'button umap-to-polygon', container) - toPolygon.href = '#' - toPolygon.textContent = L._('Transform to polygon') - L.DomEvent.on(toPolygon, 'click', this.toPolygon, this) + const toPolygon = L.DomUtil.createButton( + 'button umap-to-polygon', + container, + L._('Transform to polygon'), + this.toPolygon, + this + ) }, _mergeShapes: function (from, to) { @@ -1104,6 +1108,9 @@ L.U.Polyline = L.Polyline.extend({ L.U.Polygon = L.Polygon.extend({ parentClass: L.Polygon, includes: [L.U.FeatureMixin, L.U.PathMixin], + staticOptions: { + mainColor: 'fillColor', + }, isSameClass: function (other) { return other instanceof L.U.Polygon @@ -1180,10 +1187,13 @@ L.U.Polygon = L.Polygon.extend({ getAdvancedEditActions: function (container) { L.U.FeatureMixin.getAdvancedEditActions.call(this, container) - const toPolyline = L.DomUtil.create('a', 'button umap-to-polyline', container) - toPolyline.href = '#' - toPolyline.textContent = L._('Transform to lines') - L.DomEvent.on(toPolyline, 'click', this.toPolyline, this) + const toPolyline = L.DomUtil.createButton( + 'button umap-to-polyline', + container, + L._('Transform to lines'), + this.toPolyline, + this + ) }, isMulti: function () { diff --git a/umap/static/umap/js/umap.forms.js b/umap/static/umap/js/umap.forms.js index 0d983e67..20cd99b3 100644 --- a/umap/static/umap/js/umap.forms.js +++ b/umap/static/umap/js/umap.forms.js @@ -379,6 +379,7 @@ L.FormBuilder.LayerTypeChooser = L.FormBuilder.Select.extend({ ['Default', L._('Default')], ['Cluster', L._('Clustered')], ['Heat', L._('Heatmap')], + ['Choropleth', L._('Choropleth')], ], }) @@ -396,7 +397,11 @@ L.FormBuilder.DataLayerSwitcher = L.FormBuilder.Select.extend({ getOptions: function () { const options = [] this.builder.map.eachDataLayerReverse((datalayer) => { - if (datalayer.isLoaded() && !datalayer.isDataReadOnly() && datalayer.canBrowse()) { + if ( + datalayer.isLoaded() && + !datalayer.isDataReadOnly() && + datalayer.canBrowse() + ) { options.push([L.stamp(datalayer), datalayer.getName()]) } }) @@ -542,7 +547,7 @@ L.FormBuilder.IconUrl = L.FormBuilder.BlurInput.extend({ const img = L.DomUtil.create( 'img', '', - L.DomUtil.create('div', 'umap-icon-choice', this.buttonsContainer) + L.DomUtil.create('div', 'umap-pictogram-choice', this.buttonsContainer) ) img.src = this.value() L.DomEvent.on(img, 'click', this.fetchIconList, this) @@ -550,28 +555,26 @@ L.FormBuilder.IconUrl = L.FormBuilder.BlurInput.extend({ const el = L.DomUtil.create( 'span', '', - L.DomUtil.create('div', 'umap-icon-choice', this.buttonsContainer) + L.DomUtil.create('div', 'umap-pictogram-choice', this.buttonsContainer) ) el.textContent = this.value() L.DomEvent.on(el, 'click', this.fetchIconList, this) } } - this.button = L.DomUtil.create('a', 'button action-button', this.buttonsContainer) - this.button.textContent = this.value() ? L._('Change') : L._('Add') - this.button.href = '#' - L.DomEvent.on(this.button, 'click', L.DomEvent.stop).on( - this.button, - 'click', + this.button = L.DomUtil.createButton( + 'button action-button', + this.buttonsContainer, + this.value() ? L._('Change') : L._('Add'), this.fetchIconList, this ) }, - addIconPreview: function (pictogram) { - const baseClass = 'umap-icon-choice', + addIconPreview: function (pictogram, parent) { + const baseClass = 'umap-pictogram-choice', value = pictogram.src, className = value === this.value() ? `${baseClass} selected` : baseClass, - container = L.DomUtil.create('div', className, this.pictogramsContainer), + container = L.DomUtil.create('div', className, parent), img = L.DomUtil.create('img', '', container) img.src = value if (pictogram.name && pictogram.attribution) { @@ -599,7 +602,7 @@ L.FormBuilder.IconUrl = L.FormBuilder.BlurInput.extend({ }, search: function (e) { - const icons = [...this.parentNode.querySelectorAll('.umap-icon-choice')], + const icons = [...this.parentNode.querySelectorAll('.umap-pictogram-choice')], search = this.searchInput.value.toLowerCase() icons.forEach((el) => { if (el.title.toLowerCase().indexOf(search) != -1) el.style.display = 'block' @@ -607,42 +610,60 @@ L.FormBuilder.IconUrl = L.FormBuilder.BlurInput.extend({ }) }, + addCategory: function (category, items) { + const parent = L.DomUtil.create( + 'div', + 'umap-pictogram-category', + this.pictogramsContainer + ), + title = L.DomUtil.add('h6', '', parent, category), + grid = L.DomUtil.create('div', 'umap-pictogram-grid', parent) + for (let item of items) { + this.addIconPreview(item, grid) + } + }, + buildIconList: function (data) { this.searchInput = L.DomUtil.create('input', '', this.pictogramsContainer) this.searchInput.type = 'search' this.searchInput.placeholder = L._('Search') L.DomEvent.on(this.searchInput, 'input', this.search, this) - for (const idx in data.pictogram_list) { - this.addIconPreview(data.pictogram_list[idx]) + const categories = {} + let category + for (const props of data.pictogram_list) { + category = props.category || L._('Generic') + categories[category] = categories[category] || [] + categories[category].push(props) } - const closeButton = L.DomUtil.create('a', 'button action-button', this.pictogramsContainer) - closeButton.textContent = L._('Close') - closeButton.href = '#' - closeButton.style.display = 'block' - closeButton.style.clear = 'both' - L.DomEvent.on(closeButton, 'click', L.DomEvent.stop).on( - closeButton, - 'click', + const sorted = Object.entries(categories).toSorted(([a], [b]) => + L.Util.naturalSort(a, b) + ) + for (let [category, items] of sorted) { + this.addCategory(category, items) + } + const closeButton = L.DomUtil.createButton( + 'button action-button', + this.pictogramsContainer, + L._('Close'), function (e) { this.pictogramsContainer.innerHTML = '' this.udpatePreview() }, this ) - const customButton = L.DomUtil.create('a', '', this.pictogramsContainer) - customButton.textContent = L._('Toggle direct input (advanced)') - customButton.href = '#' - customButton.style.display = 'block' - customButton.style.clear = 'both' - this.builder.map.help.button(customButton, 'formatIconSymbol') - L.DomEvent.on(customButton, 'click', L.DomEvent.stop).on( - customButton, - 'click', + closeButton.style.display = 'block' + closeButton.style.clear = 'both' + + const customButton = L.DomUtil.createButton( + 'flat', + this.pictogramsContainer, + L._('Toggle direct input (advanced)'), function (e) { this.input.type = this.input.type === 'text' ? 'hidden' : 'text' }, this ) + this.builder.map.help.button(customButton, 'formatIconSymbol') }, fetchIconList: function (e) { @@ -732,7 +753,10 @@ L.FormBuilder.MultiChoice = L.FormBuilder.Element.extend({ fetch: function () { let value = (this.backup = this.toHTML()) if (!this.container.querySelector(`input[type="radio"][value="${value}"]`)) - value = this.default + value = + typeof this.options.default !== 'undefined' + ? this.options.default + : this.default this.container.querySelector(`input[type="radio"][value="${value}"]`).checked = true }, @@ -836,13 +860,15 @@ L.FormBuilder.OutlinkTarget = L.FormBuilder.MultiChoice.extend({ ], }) -L.FormBuilder.Range = L.FormBuilder.Input.extend({ +L.FormBuilder.Range = L.FormBuilder.FloatInput.extend({ type: function () { return 'range' }, value: function () { - return L.DomUtil.hasClass(this.wrapper, 'undefined') ? undefined : this.input.value + return L.DomUtil.hasClass(this.wrapper, 'undefined') + ? undefined + : L.FormBuilder.FloatInput.prototype.value.call(this) }, buildHelpText: function () { @@ -854,12 +880,15 @@ L.FormBuilder.Range = L.FormBuilder.Input.extend({ datalist.id = `range-${this.options.label || this.name}` this.input.setAttribute('list', datalist.id) let options = '' + const step = this.options.step || 1, + digits = step < 1 ? 1 : 0 for (let i = this.options.min; i <= this.options.max; i += this.options.step) { - options += `` } datalist.innerHTML = options + L.FormBuilder.Input.prototype.buildHelpText.call(this) }, }) diff --git a/umap/static/umap/js/umap.icon.js b/umap/static/umap/js/umap.icon.js index 87fb7e36..2effda1c 100644 --- a/umap/static/umap/js/umap.icon.js +++ b/umap/static/umap/js/umap.icon.js @@ -38,6 +38,8 @@ L.U.Icon = L.DivIcon.extend({ formatUrl: function (url, feature) { return L.Util.greedyTemplate(url || '', feature ? feature.extendedProperties() : {}) }, + + onAdd: function () {}, }) L.U.Icon.Default = L.U.Icon.extend({ @@ -63,6 +65,19 @@ L.U.Icon.Default = L.U.Icon.extend({ this.elements.arrow.style.opacity = opacity }, + onAdd: function () { + const src = this._getIconUrl('icon') + // Decide whether to switch svg to white or not, but do it + // only for internal SVG, as invert could do weird things + if (src.startsWith('/') && src.endsWith('.svg')) { + const bgcolor = this._getColor() + // Must be called after icon container is added to the DOM + if (L.DomUtil.contrastedColor(this.elements.container, bgcolor)) { + this.elements.img.style.filter = 'invert(1)' + } + } + }, + createIcon: function () { this.elements = {} this.elements.main = L.DomUtil.create('div') @@ -76,9 +91,9 @@ L.U.Icon.Default = L.U.Icon.extend({ if (src) { // An url. if ( - src.indexOf('http') === 0 || - src.indexOf('/') === 0 || - src.indexOf('data:image') === 0 + src.startsWith('http') || + src.startsWith('/') || + src.startsWith('data:image') ) { this.elements.img = L.DomUtil.create('img', null, this.elements.container) this.elements.img.src = src @@ -164,7 +179,6 @@ L.U.Icon.Ball = L.U.Icon.Default.extend({ }, }) -const _CACHE_COLOR = {} L.U.Icon.Cluster = L.DivIcon.extend({ options: { iconSize: [40, 40], @@ -191,14 +205,6 @@ L.U.Icon.Cluster = L.DivIcon.extend({ if (this.datalayer.options.cluster && this.datalayer.options.cluster.textColor) { color = this.datalayer.options.cluster.textColor } - if (!color) { - if (typeof _CACHE_COLOR[backgroundColor] === 'undefined') { - color = L.DomUtil.TextColorFromBackgroundColor(el) - _CACHE_COLOR[backgroundColor] = color - } else { - color = _CACHE_COLOR[backgroundColor] - } - } - return color + return color || L.DomUtil.TextColorFromBackgroundColor(el, backgroundColor) }, }) diff --git a/umap/static/umap/js/umap.js b/umap/static/umap/js/umap.js index 87ff4e1d..ed54f43b 100644 --- a/umap/static/umap/js/umap.js +++ b/umap/static/umap/js/umap.js @@ -14,7 +14,7 @@ L.Map.mergeOptions({ default_popupContentTemplate: '# {name}\n{description}', default_interactive: true, default_labelDirection: 'auto', - maxZoomLimit: 20, + maxZoomLimit: 24, attributionControl: false, editMode: 'advanced', embedControl: true, @@ -272,7 +272,10 @@ L.U.Map.include({ url.searchParams.delete('edit') history.pushState({}, '', url) } - if (L.Util.queryString('download')) this.download() + if (L.Util.queryString('download')) + window.location = L.Util.template(this.options.urls.map_download, { + map_id: this.options.umap_id, + }) }) window.onbeforeunload = () => this.isDirty || null @@ -340,6 +343,7 @@ L.U.Map.include({ if (this.options.scrollWheelZoom) this.scrollWheelZoom.enable() else this.scrollWheelZoom.disable() this.browser = new L.U.Browser(this) + this.drop = new L.U.DropControl(this) this.renderControls() }, @@ -395,8 +399,11 @@ L.U.Map.include({ }, loadDatalayers: function (force) { - force = force || L.Util.queryString('download') // In case we are in download mode, let's go strait to loading all data - let toload = (dataToload = total = this.datalayers_index.length) + const total = this.datalayers_index.length + // toload => datalayer metadata remaining to load (synchronous) + // dataToload => datalayer data remaining to load (asynchronous) + let toload = total, + dataToload = total let datalayer const loaded = () => { this.datalayersLoaded = true @@ -670,6 +677,12 @@ L.U.Map.include({ } }, + fitDataBounds: function () { + const bounds = this.getLayersBounds() + if (!this.hasData() || !bounds.isValid()) return false + this.fitBounds(bounds) + }, + initCenter: function () { if (this.options.hash && this._hash.parseHash(location.hash)) { // FIXME An invalid hash will cause the load to fail @@ -679,12 +692,7 @@ L.U.Map.include({ this._controls.locate.start() } else if (this.options.defaultView === 'data') { this.onceDataLoaded(() => { - const bounds = this.getLayersBounds() - if (!this.hasData() || !bounds.isValid()) { - this._setDefaultCenter() - return - } - this.fitBounds(bounds) + if (!this.fitDataBounds()) return this._setDefaultCenter() }) } else if (this.options.defaultView === 'latest') { this.onceDataLoaded(() => { @@ -692,9 +700,17 @@ L.U.Map.include({ this._setDefaultCenter() return } - const datalayer = this.defaultDataLayer(), - feature = datalayer.getFeatureByIndex(-1) - if (feature) feature.zoomTo() + const datalayer = this.firstVisibleDatalayer() + let feature + if (datalayer) { + const feature = datalayer.getFeatureByIndex(-1) + if (feature) { + feature.zoomTo() + return + } + } + // Fallback, no datalayer or no feature found + this._setDefaultCenter() }) } else { this._setDefaultCenter() @@ -804,150 +820,51 @@ L.U.Map.include({ return geojson }, - importPanel: function () { - const container = L.DomUtil.create('div', 'umap-upload') - const title = L.DomUtil.create('h4', '', container) - const presetBox = L.DomUtil.create('div', 'formbox', container) - const presetSelect = L.DomUtil.create('select', '', presetBox) - const fileBox = L.DomUtil.create('div', 'formbox', container) - const fileInput = L.DomUtil.create('input', '', fileBox) - const urlInput = L.DomUtil.create('input', '', container) - const rawInput = L.DomUtil.create('textarea', '', container) - const typeLabel = L.DomUtil.create('label', '', container) - const layerLabel = L.DomUtil.create('label', '', container) - const clearLabel = L.DomUtil.create('label', '', container) - const submitInput = L.DomUtil.create('input', '', container) - const map = this - let option - const types = ['geojson', 'csv', 'gpx', 'kml', 'osm', 'georss', 'umap'] - title.textContent = L._('Import data') - fileInput.type = 'file' - fileInput.multiple = 'multiple' - submitInput.type = 'button' - submitInput.value = L._('Import') - submitInput.className = 'button' - typeLabel.textContent = L._('Choose the format of the data to import') - this.help.button(typeLabel, 'importFormats') - const typeInput = L.DomUtil.create('select', '', typeLabel) - typeInput.name = 'format' - layerLabel.textContent = L._('Choose the layer to import in') - const layerInput = L.DomUtil.create('select', '', layerLabel) - layerInput.name = 'datalayer' - urlInput.type = 'text' - urlInput.placeholder = L._('Provide an URL here') - rawInput.placeholder = L._('Paste your data here') - clearLabel.textContent = L._('Replace layer content') - const clearFlag = L.DomUtil.create('input', '', clearLabel) - clearFlag.type = 'checkbox' - clearFlag.name = 'clear' - this.eachDataLayerReverse((datalayer) => { - if (datalayer.isLoaded() && !datalayer.isRemoteLayer()) { - const id = L.stamp(datalayer) - option = L.DomUtil.create('option', '', layerInput) - option.value = id - option.textContent = datalayer.options.name - } + eachFeature: function (callback, context) { + this.eachDataLayer((datalayer) => { + if (datalayer.isVisible()) datalayer.eachFeature(callback, context) }) - L.DomUtil.element( - 'option', - { value: '', textContent: L._('Import in a new layer') }, - layerInput - ) - L.DomUtil.element( - 'option', - { value: '', textContent: L._('Choose the data format') }, - typeInput - ) - for (let i = 0; i < types.length; i++) { - option = L.DomUtil.create('option', '', typeInput) - option.value = option.textContent = types[i] - } - if (this.options.importPresets.length) { - const noPreset = L.DomUtil.create('option', '', presetSelect) - noPreset.value = noPreset.textContent = L._('Choose a preset') - for (let j = 0; j < this.options.importPresets.length; j++) { - option = L.DomUtil.create('option', '', presetSelect) - option.value = this.options.importPresets[j].url - option.textContent = this.options.importPresets[j].label - } - } else { - presetBox.style.display = 'none' - } + }, - const submit = function () { - let type = typeInput.value - const layerId = layerInput[layerInput.selectedIndex].value - let layer - if (type === 'umap') { - this.once('postsync', function () { - this.setView(this.latLng(this.options.center), this.options.zoom) - }) - } - if (layerId) layer = map.datalayers[layerId] - if (layer && clearFlag.checked) layer.empty() - if (fileInput.files.length) { - let file - for (let i = 0, file; (file = fileInput.files[i]); i++) { - type = type || L.Util.detectFileType(file) - if (!type) { - this.ui.alert({ - content: L._('Unable to detect format of file {filename}', { - filename: file.name, - }), - level: 'error', - }) - continue - } - if (type === 'umap') { - this.importFromFile(file, 'umap') - } else { - let importLayer = layer - if (!layer) importLayer = this.createDataLayer({ name: file.name }) - importLayer.importFromFile(file, type) - } - } - } else { - if (!type) - return this.ui.alert({ - content: L._('Please choose a format'), - level: 'error', - }) - if (rawInput.value && type === 'umap') { - try { - this.importRaw(rawInput.value, type) - } catch (e) { - this.ui.alert({ content: L._('Invalid umap data'), level: 'error' }) - console.error(e) - } - } else { - if (!layer) layer = this.createDataLayer() - if (rawInput.value) layer.importRaw(rawInput.value, type) - else if (urlInput.value) layer.importFromUrl(urlInput.value, type) - else if (presetSelect.selectedIndex > 0) - layer.importFromUrl(presetSelect[presetSelect.selectedIndex].value, type) - } - } + format: function (mode) { + const type = this.EXPORT_TYPES[mode] + const content = type.formatter(this) + let name = this.options.name || 'data' + name = name.replace(/[^a-z0-9]/gi, '_').toLowerCase() + const filename = name + type.ext + return { content, filetype: type.filetype, filename } + }, + + download: function (mode) { + const { content, filetype, filename } = this.format(mode) + const blob = new Blob([content], { type: filetype }) + window.URL = window.URL || window.webkitURL + const el = document.createElement('a') + el.download = filename + el.href = window.URL.createObjectURL(blob) + el.style.display = 'none' + document.body.appendChild(el) + el.click() + document.body.removeChild(el) + }, + + processFileToImport: function (file, layer, type) { + type = type || L.Util.detectFileType(file) + if (!type) { + this.ui.alert({ + content: L._('Unable to detect format of file {filename}', { + filename: file.name, + }), + level: 'error', + }) + return + } + if (type === 'umap') { + this.importFromFile(file, 'umap') + } else { + if (!layer) layer = this.createDataLayer({ name: file.name }) + layer.importFromFile(file, type) } - L.DomEvent.on(submitInput, 'click', submit, this) - L.DomEvent.on( - fileInput, - 'change', - (e) => { - let type = '', - newType - for (let i = 0; i < e.target.files.length; i++) { - newType = L.Util.detectFileType(e.target.files[i]) - if (!type && newType) type = newType - if (type && newType !== type) { - type = '' - break - } - } - typeInput.value = type - }, - this - ) - this.ui.openPanel({ data: { html: container }, className: 'dark' }) }, importRaw: function (rawData) { @@ -1153,24 +1070,6 @@ L.U.Map.include({ return properties }, - serialize: function () { - // Do not use local path during unit tests - const uri = window.location.protocol === 'file:' ? null : window.location.href - const umapfile = { - type: 'umap', - uri: uri, - properties: this.exportOptions(), - geometry: this.geometry(), - layers: [], - } - - this.eachDataLayer((datalayer) => { - umapfile.layers.push(datalayer.umapGeoJSON()) - }) - - return JSON.stringify(umapfile, null, 2) - }, - saveSelf: function () { const geojson = { type: 'Feature', @@ -1315,10 +1214,16 @@ L.U.Map.include({ } }, + firstVisibleDatalayer: function () { + return this.findDataLayer((datalayer) => { + if (datalayer.isVisible()) return true + }) + }, + // TODO: allow to control the default datalayer // (edit and viewing) // cf https://github.com/umap-project/umap/issues/585 - defaultDataLayer: function () { + defaultEditDataLayer: function () { let datalayer, fallback datalayer = this.lastUsedDataLayer if ( @@ -1389,11 +1294,13 @@ L.U.Map.include({ 'options.fill', 'options.fillColor', 'options.fillOpacity', + 'options.smoothFactor', + 'options.dashArray', ] builder = new L.U.FormBuilder(this, shapeOptions, { callback: function (e) { - this.eachDataLayer((datalayer) => { + this.eachVisibleDataLayer((datalayer) => { datalayer.redraw() }) }, @@ -1407,8 +1314,6 @@ L.U.Map.include({ _editDefaultProperties: function (container) { const optionsFields = [ - 'options.smoothFactor', - 'options.dashArray', 'options.zoomTo', ['options.easing', { handler: 'Switch', label: L._('Animated transitions') }], 'options.labelKey', @@ -1455,10 +1360,9 @@ L.U.Map.include({ builder = new L.U.FormBuilder(this, optionsFields, { callback: function (e) { this.initCaptionBar() - this.eachDataLayer((datalayer) => { - if (e.helper.field === 'options.sortKey') datalayer.reindex() - datalayer.redraw() - }) + if (e.helper.field === 'options.sortKey') { + this.eachDataLayer((datalayer) => datalayer.reindex()) + } }, }) const defaultProperties = L.DomUtil.createFieldset( @@ -1483,10 +1387,11 @@ L.U.Map.include({ if ( e.helper.field === 'options.popupTemplate' || e.helper.field === 'options.popupContentTemplate' || - e.helper.field === 'options.popupShape' + e.helper.field === 'options.popupShape' || + e.helper.field === 'options.outlinkTarget' ) return - this.eachDataLayer((datalayer) => { + this.eachVisibleDataLayer((datalayer) => { datalayer.redraw() }) }, @@ -1631,16 +1536,10 @@ L.U.Map.include({ }) limitBounds.appendChild(boundsBuilder.build()) const boundsButtons = L.DomUtil.create('div', 'button-bar half', limitBounds) - const setCurrentButton = L.DomUtil.add( - 'a', + L.DomUtil.createButton( 'button', boundsButtons, - L._('Use current bounds') - ) - setCurrentButton.href = '#' - L.DomEvent.on( - setCurrentButton, - 'click', + L._('Use current bounds'), function () { const bounds = this.getBounds() this.options.limitBounds.south = L.Util.formatNum(bounds.getSouth()) @@ -1653,11 +1552,10 @@ L.U.Map.include({ }, this ) - const emptyBounds = L.DomUtil.add('a', 'button', boundsButtons, L._('Empty')) - emptyBounds.href = '#' - L.DomEvent.on( - emptyBounds, - 'click', + L.DomUtil.createButton( + 'button', + boundsButtons, + L._('Empty'), function () { this.options.limitBounds.south = null this.options.limitBounds.west = null @@ -1749,34 +1647,39 @@ L.U.Map.include({ const advancedActions = L.DomUtil.createFieldset(container, L._('Advanced actions')) const advancedButtons = L.DomUtil.create('div', 'button-bar half', advancedActions) if (this.permissions.isOwner()) { - const del = L.DomUtil.create('a', 'button umap-delete', advancedButtons) - del.href = '#' - del.title = L._('Delete map') - del.textContent = L._('Delete') - L.DomEvent.on(del, 'click', L.DomEvent.stop).on(del, 'click', this.del, this) - const empty = L.DomUtil.create('a', 'button umap-empty', advancedButtons) - empty.href = '#' - empty.textContent = L._('Empty') - empty.title = L._('Delete all layers') - L.DomEvent.on(empty, 'click', L.DomEvent.stop).on( - empty, - 'click', + L.DomUtil.createButton( + 'button umap-delete', + advancedButtons, + L._('Delete'), + this.del, + this + ) + L.DomUtil.createButton( + 'button umap-empty', + advancedButtons, + L._('Empty'), this.empty, this ) } - const clone = L.DomUtil.create('a', 'button umap-clone', advancedButtons) - clone.href = '#' - clone.textContent = L._('Clone') - clone.title = L._('Clone this map') - L.DomEvent.on(clone, 'click', L.DomEvent.stop).on(clone, 'click', this.clone, this) - const download = L.DomUtil.create('a', 'button umap-download', advancedButtons) - download.href = '#' - download.textContent = L._('Download') - download.title = L._('Open download panel') - L.DomEvent.on(download, 'click', L.DomEvent.stop).on( - download, - 'click', + L.DomUtil.createButton( + 'button umap-clone', + advancedButtons, + L._('Clone this map'), + this.clone, + this + ) + L.DomUtil.createButton( + 'button umap-empty', + advancedButtons, + L._('Delete all layers'), + this.empty, + this + ) + L.DomUtil.createButton( + 'button umap-download', + advancedButtons, + L._('Open download panel'), this.renderShareBox, this ) @@ -1809,11 +1712,13 @@ L.U.Map.include({ enableEdit: function () { L.DomUtil.addClass(document.body, 'umap-edit-enabled') this.editEnabled = true + this.drop.enable() this.fire('edit:enabled') }, disableEdit: function () { if (this.isDirty) return + this.drop.disable() L.DomUtil.removeClass(document.body, 'umap-edit-enabled') this.editedFeature = null this.editEnabled = false @@ -1838,38 +1743,25 @@ L.U.Map.include({ L.DomEvent.disableClickPropagation(container) this.permissions.addOwnerLink('span', container) if (this.options.captionMenus) { - const about = L.DomUtil.add( - 'a', + L.DomUtil.createButton( 'umap-about-link', container, - ` — ${L._('About')}` + ` — ${L._('About')}`, + this.displayCaption, + this ) - about.href = '#' - L.DomEvent.on(about, 'click', this.displayCaption, this) - const browser = L.DomUtil.add( - 'a', + L.DomUtil.createButton( 'umap-open-browser-link', container, - ` | ${L._('Browse data')}` - ) - browser.href = '#' - L.DomEvent.on(browser, 'click', L.DomEvent.stop).on( - browser, - 'click', + ` | ${L._('Browse data')}`, this.openBrowser, this ) if (this.options.facetKey) { - const filter = L.DomUtil.add( - 'a', + L.DomUtil.createButton( 'umap-open-filter-link', container, - ` | ${L._('Select data')}` - ) - filter.href = '#' - L.DomEvent.on(filter, 'click', L.DomEvent.stop).on( - filter, - 'click', + ` | ${L._('Select data')}`, this.openFacet, this ) diff --git a/umap/static/umap/js/umap.layer.js b/umap/static/umap/js/umap.layer.js index 7f0b03fc..bcd16a61 100644 --- a/umap/static/umap/js/umap.layer.js +++ b/umap/static/umap/js/umap.layer.js @@ -60,6 +60,16 @@ L.U.Layer.Cluster = L.MarkerClusterGroup.extend({ this._layers = [] }, + onRemove: function (map) { + // In some situation, the onRemove is called before the layer is really + // added to the map: basically when combining a defaultView=data + max/minZoom + // and loading the map at a zoom outside of that zoom range. + // FIXME: move this upstream (_unbindEvents should accept a map parameter + // instead of relying on this._map) + this._map = map + return L.MarkerClusterGroup.prototype.onRemove.call(this, map) + }, + addLayer: function (layer) { this._layers.push(layer) return L.MarkerClusterGroup.prototype.addLayer.call(this, layer) @@ -106,6 +116,197 @@ L.U.Layer.Cluster = L.MarkerClusterGroup.extend({ }, }) +L.U.Layer.Choropleth = L.FeatureGroup.extend({ + _type: 'Choropleth', + includes: [L.U.Layer], + canBrowse: true, + // Have defaults that better suit the choropleth mode. + defaults: { + color: 'white', + fillColor: 'red', + fillOpacity: 0.7, + weight: 2, + }, + MODES: { + kmeans: L._('K-means'), + equidistant: L._('Equidistant'), + jenks: L._('Jenks-Fisher'), + quantiles: L._('Quantiles'), + manual: L._('Manual'), + }, + + initialize: function (datalayer) { + this.datalayer = datalayer + if (!L.Util.isObject(this.datalayer.options.choropleth)) { + this.datalayer.options.choropleth = {} + } + L.FeatureGroup.prototype.initialize.call( + this, + [], + this.datalayer.options.choropleth + ) + this.datalayer.onceDataLoaded(() => { + this.redraw() + this.datalayer.on('datachanged', this.redraw, this) + }) + }, + + redraw: function () { + this.computeBreaks() + if (this._map) this.eachLayer(this._map.addLayer, this._map) + }, + + _getValue: function (feature) { + const key = this.datalayer.options.choropleth.property || 'value' + return +feature.properties[key] // TODO: should we catch values non castable to int ? + }, + + computeBreaks: function () { + const values = [] + this.datalayer.eachLayer((layer) => { + let value = this._getValue(layer) + if (!isNaN(value)) values.push(value) + }) + if (!values.length) { + this.options.breaks = [] + this.options.colors = [] + return + } + let mode = this.datalayer.options.choropleth.mode, + classes = +this.datalayer.options.choropleth.classes || 5, + breaks + if (mode === 'manual') { + const manualBreaks = this.datalayer.options.choropleth.breaks + if (manualBreaks) { + breaks = manualBreaks.split(",").map(b => +b).filter(b => !isNaN(b)) + } + } else if (mode === 'equidistant') { + breaks = ss.equalIntervalBreaks(values, classes) + } else if (mode === 'jenks') { + breaks = ss.jenks(values, classes) + } else if (mode === 'quantiles') { + const quantiles = [...Array(classes)].map((e, i) => i/classes).concat(1) + breaks = ss.quantile(values, quantiles) + } else { + breaks = ss.ckmeans(values, classes).map((cluster) => cluster[0]) + breaks.push(ss.max(values)) // Needed for computing the legend + } + this.options.breaks = breaks || [] + this.datalayer.options.choropleth.breaks = this.options.breaks.map(b => +b.toFixed(2)).join(',') + const fillColor = this.datalayer.getOption('fillColor') || this.defaults.fillColor + let colorScheme = this.datalayer.options.choropleth.brewer + if (!colorbrewer[colorScheme]) colorScheme = 'Blues' + this.options.colors = colorbrewer[colorScheme][this.options.breaks.length - 1] || [] + }, + + getColor: function (feature) { + if (!feature) return // FIXME shold not happen + const featureValue = this._getValue(feature) + // Find the bucket/step/limit that this value is less than and give it that color + for (let i = 1; i < this.options.breaks.length; i++) { + if (featureValue <= this.options.breaks[i]) { + return this.options.colors[i - 1] + } + } + }, + + getOption: function (option, feature) { + if (feature && option === feature.staticOptions.mainColor) return this.getColor(feature) + }, + + addLayer: function (layer) { + // Do not add yet the layer to the map + // wait for datachanged event, so we want compute breaks once + var id = this.getLayerId(layer) + this._layers[id] = layer + return this + }, + + onAdd: function (map) { + this.computeBreaks() + L.FeatureGroup.prototype.onAdd.call(this, map) + }, + + postUpdate: function (e) { + if (e.helper.field === 'options.choropleth.breaks') { + this.datalayer.options.choropleth.mode = 'manual' + e.helper.builder.helpers["options.choropleth.mode"].fetch() + } + this.computeBreaks() + if (e.helper.field !== 'options.choropleth.breaks') { + e.helper.builder.helpers["options.choropleth.breaks"].fetch() + } + }, + + getEditableOptions: function () { + const brewerSchemes = Object.keys(colorbrewer) + .filter((k) => k !== 'schemeGroups') + .sort() + + return [ + [ + 'options.choropleth.property', + { + handler: 'Select', + selectOptions: this.datalayer._propertiesIndex, + label: L._('Choropleth property value'), + }, + ], + [ + 'options.choropleth.brewer', + { + handler: 'Select', + label: L._('Choropleth color palette'), + selectOptions: brewerSchemes, + }, + ], + [ + 'options.choropleth.classes', + { + handler: 'Range', + min: 3, + max: 9, + step: 1, + label: L._('Choropleth classes'), + helpText: L._('Number of desired classes (default 5)'), + }, + ], + [ + 'options.choropleth.breaks', + { + handler: 'BlurInput', + label: L._('Choropleth breakpoints'), + helpText: L._('Comma separated list of numbers, including min and max values.'), + }, + ], + [ + 'options.choropleth.mode', + { + handler: 'MultiChoice', + default: 'kmeans', + choices: Object.entries(this.MODES), + label: L._('Choropleth mode'), + }, + ], + ] + }, + + renderLegend: function (container) { + const parent = L.DomUtil.create('ul', '', container) + let li, color, label + + this.options.breaks.slice(0, -1).forEach((limit, index) => { + li = L.DomUtil.create('li', '', parent) + color = L.DomUtil.create('span', 'datalayer-color', li) + color.style.backgroundColor = this.options.colors[index] + label = L.DomUtil.create('span', '', li) + label.textContent = `${+this.options.breaks[index].toFixed( + 1 + )} - ${+this.options.breaks[index + 1].toFixed(1)}` + }) + }, +}) + L.U.Layer.Heat = L.HeatLayer.extend({ _type: 'Heat', includes: [L.U.Layer], @@ -137,14 +338,6 @@ L.U.Layer.Heat = L.HeatLayer.extend({ this.setLatLngs([]) }, - redraw: function () { - // setlalngs call _redraw through setAnimFrame, thus async, so this - // can ends with race condition if we remove the layer very faslty after. - // Remove me when https://github.com/Leaflet/Leaflet.heat/pull/53 is released. - if (!this._map) return - L.HeatLayer.prototype.redraw.call(this) - }, - getFeatures: function () { return {} }, @@ -161,8 +354,11 @@ L.U.Layer.Heat = L.HeatLayer.extend({ [ 'options.heat.radius', { - handler: 'BlurIntInput', - placeholder: L._('Heatmap radius'), + handler: 'Range', + min: 10, + max: 100, + step: 5, + label: L._('Heatmap radius'), helpText: L._('Override heatmap radius (default 25)'), }, ], @@ -187,11 +383,98 @@ L.U.Layer.Heat = L.HeatLayer.extend({ } this._updateOptions() }, + + redraw: function () { + // setlalngs call _redraw through setAnimFrame, thus async, so this + // can ends with race condition if we remove the layer very faslty after. + // TODO: PR in upstream Leaflet.heat + if (!this._map) return + L.HeatLayer.prototype.redraw.call(this) + }, + + _redraw: function () { + // Import patch from https://github.com/Leaflet/Leaflet.heat/pull/78 + // Remove me when this get merged and released. + if (!this._map) { + return + } + var data = [], + r = this._heat._r, + size = this._map.getSize(), + bounds = new L.Bounds(L.point([-r, -r]), size.add([r, r])), + cellSize = r / 2, + grid = [], + panePos = this._map._getMapPanePos(), + offsetX = panePos.x % cellSize, + offsetY = panePos.y % cellSize, + i, + len, + p, + cell, + x, + y, + j, + len2 + + this._max = 1 + + for (i = 0, len = this._latlngs.length; i < len; i++) { + p = this._map.latLngToContainerPoint(this._latlngs[i]) + x = Math.floor((p.x - offsetX) / cellSize) + 2 + y = Math.floor((p.y - offsetY) / cellSize) + 2 + + var alt = + this._latlngs[i].alt !== undefined + ? this._latlngs[i].alt + : this._latlngs[i][2] !== undefined + ? +this._latlngs[i][2] + : 1 + + grid[y] = grid[y] || [] + cell = grid[y][x] + + if (!cell) { + cell = grid[y][x] = [p.x, p.y, alt] + cell.p = p + } else { + cell[0] = (cell[0] * cell[2] + p.x * alt) / (cell[2] + alt) // x + cell[1] = (cell[1] * cell[2] + p.y * alt) / (cell[2] + alt) // y + cell[2] += alt // cumulated intensity value + } + + // Set the max for the current zoom level + if (cell[2] > this._max) { + this._max = cell[2] + } + } + + this._heat.max(this._max) + + for (i = 0, len = grid.length; i < len; i++) { + if (grid[i]) { + for (j = 0, len2 = grid[i].length; j < len2; j++) { + cell = grid[i][j] + if (cell && bounds.contains(cell.p)) { + data.push([ + Math.round(cell[0]), + Math.round(cell[1]), + Math.min(cell[2], this._max), + ]) + } + } + } + } + + this._heat.data(data).draw(this.options.minOpacity) + + this._frame = null + }, }) L.U.DataLayer = L.Evented.extend({ options: { displayOnLoad: true, + inCaption: true, browsable: true, editMode: 'advanced', }, @@ -325,7 +608,7 @@ L.U.DataLayer = L.Evented.extend({ if (visible) this.map.removeLayer(this.layer) const Class = L.U.Layer[this.options.type] || L.U.Layer.Default this.layer = new Class(this) - this.eachLayer((feature) => this.showFeature(feature)) + this.eachLayer(this.showFeature) if (visible) this.show() this.propagateRemote() }, @@ -455,7 +738,7 @@ L.U.DataLayer = L.Evented.extend({ }, hasDataLoaded: function () { - return !this.umap_id || this._dataloaded + return this._dataloaded }, setUmapId: function (id) { @@ -841,6 +1124,7 @@ L.U.DataLayer = L.Evented.extend({ }, redraw: function () { + if (!this.isVisible()) return this.hide() this.show() }, @@ -863,6 +1147,13 @@ L.U.DataLayer = L.Evented.extend({ helpEntries: 'browsable', }, ], + [ + 'options.inCaption', + { + label: L._('Show this layer in the caption'), + handler: 'Switch', + }, + ], ] const title = L.DomUtil.add('h3', '', container, L._('Layer properties')) let builder = new L.U.FormBuilder(this, metadataFields, { @@ -889,11 +1180,9 @@ L.U.DataLayer = L.Evented.extend({ 'options.fillOpacity', ] - shapeOptions = shapeOptions.concat(this.layer.getEditableOptions()) - - const redrawCallback = function (field) { + const redrawCallback = function (e) { this.hide() - this.layer.postUpdate(field) + this.layer.postUpdate(e) this.show() } @@ -994,16 +1283,10 @@ L.U.DataLayer = L.Evented.extend({ const advancedActions = L.DomUtil.createFieldset(container, L._('Advanced actions')) const advancedButtons = L.DomUtil.create('div', 'button-bar half', advancedActions) - const deleteLink = L.DomUtil.create( - 'a', + const deleteLink = L.DomUtil.createButton( 'button delete_datalayer_button umap-delete', - advancedButtons - ) - deleteLink.textContent = L._('Delete') - deleteLink.href = '#' - L.DomEvent.on(deleteLink, 'click', L.DomEvent.stop).on( - deleteLink, - 'click', + advancedButtons, + L._('Delete'), function () { this._delete() this.map.ui.closePanel() @@ -1011,22 +1294,18 @@ L.U.DataLayer = L.Evented.extend({ this ) if (!this.isRemoteLayer()) { - const emptyLink = L.DomUtil.create('a', 'button umap-empty', advancedButtons) - emptyLink.textContent = L._('Empty') - emptyLink.href = '#' - L.DomEvent.on(emptyLink, 'click', L.DomEvent.stop).on( - emptyLink, - 'click', + const emptyLink = L.DomUtil.createButton( + 'button umap-empty', + advancedButtons, + L._('Empty'), this.empty, this ) } - const cloneLink = L.DomUtil.create('a', 'button umap-clone', advancedButtons) - cloneLink.textContent = L._('Clone') - cloneLink.href = '#' - L.DomEvent.on(cloneLink, 'click', L.DomEvent.stop).on( - cloneLink, - 'click', + const cloneLink = L.DomUtil.createButton( + 'button umap-clone', + advancedButtons, + L._('Clone'), function () { const datalayer = this.clone() datalayer.edit() @@ -1034,17 +1313,33 @@ L.U.DataLayer = L.Evented.extend({ this ) if (this.umap_id) { - const download = L.DomUtil.create('a', 'button umap-download', advancedButtons) - download.textContent = L._('Download') - download.href = this._dataUrl() - download.target = '_blank' + const download = L.DomUtil.createLink( + 'button umap-download', + advancedButtons, + L._('Download'), + this._dataUrl(), + '_blank' + ) } this.map.ui.openPanel({ data: { html: container }, className: 'dark' }) }, - getOption: function (option) { + getOwnOption: function (option) { if (L.Util.usableOption(this.options, option)) return this.options[option] - else return this.map.getOption(option) + }, + + getOption: function (option, feature) { + if (this.layer && this.layer.getOption) { + const value = this.layer.getOption(option, feature) + if (typeof value !== 'undefined') return value + } + if (typeof this.getOwnOption(option) !== 'undefined') { + return this.getOwnOption(option) + } else if (this.layer && this.layer.defaults && this.layer.defaults[option]) { + return this.layer.defaults[option] + } else { + return this.map.getOption(option) + } }, buildVersionsFieldset: function (container) { @@ -1052,16 +1347,14 @@ L.U.DataLayer = L.Evented.extend({ const date = new Date(parseInt(data.at, 10)) const content = `${date.toLocaleString(L.lang)} (${parseInt(data.size) / 1000}Kb)` const el = L.DomUtil.create('div', 'umap-datalayer-version', versionsContainer) - const a = L.DomUtil.create('a', '', el) - L.DomUtil.add('span', '', el, content) - a.href = '#' - a.title = L._('Restore this version') - L.DomEvent.on(a, 'click', L.DomEvent.stop).on( - a, - 'click', + const a = L.DomUtil.createButton( + '', + el, + L._('Restore this version'), () => this.restore(data.name), this ) + L.DomUtil.add('span', '', el, content) } const versionsContainer = L.DomUtil.createFieldset(container, L._('Versions'), { diff --git a/umap/static/umap/js/umap.permissions.js b/umap/static/umap/js/umap.permissions.js index 7e277503..1687e142 100644 --- a/umap/static/umap/js/umap.permissions.js +++ b/umap/static/umap/js/umap.permissions.js @@ -116,12 +116,10 @@ L.U.MapPermissions = L.Class.extend({ L._('Advanced actions') ) const advancedButtons = L.DomUtil.create('div', 'button-bar', advancedActions) - const download = L.DomUtil.create('a', 'button', advancedButtons) - download.href = '#' - download.textContent = L._('Attach the map to my account') - L.DomEvent.on(download, 'click', L.DomEvent.stop).on( - download, - 'click', + const download = L.DomUtil.createButton( + 'button', + advancedButtons, + L._('Attach the map to my account'), this.attach, this ) @@ -188,15 +186,17 @@ L.U.MapPermissions = L.Class.extend({ addOwnerLink: function (element, container) { if (this.options.owner && this.options.owner.name && this.options.owner.url) { const ownerContainer = L.DomUtil.add( - element, - 'umap-map-owner', - container, - ` ${L._('by')} ` - ), - owner = L.DomUtil.create('a') - owner.href = this.options.owner.url - owner.textContent = this.options.owner.name - ownerContainer.appendChild(owner) + element, + 'umap-map-owner', + container, + ` ${L._('by')} ` + ) + L.DomUtil.createLink( + '', + ownerContainer, + this.options.owner.name, + this.options.owner.url + ) } }, diff --git a/umap/static/umap/js/umap.popup.js b/umap/static/umap/js/umap.popup.js index c79c618b..6bccceed 100644 --- a/umap/static/umap/js/umap.popup.js +++ b/umap/static/umap/js/umap.popup.js @@ -138,6 +138,9 @@ L.U.PopupTemplate.Default = L.Class.extend({ nextLi = L.DomUtil.create('li', 'next', footer), next = this.feature.getNext(), prev = this.feature.getPrevious() + // Fixme: remove me when this is merged and released + // https://github.com/Leaflet/Leaflet/pull/9052 + L.DomEvent.disableClickPropagation(footer) if (next) nextLi.title = L._('Go to «{feature}»', { feature: next.properties.name || L._('next'), diff --git a/umap/static/umap/js/umap.ui.js b/umap/static/umap/js/umap.ui.js index 28bb6403..501ec3d2 100644 --- a/umap/static/umap/js/umap.ui.js +++ b/umap/static/umap/js/umap.ui.js @@ -93,41 +93,36 @@ L.U.UI = L.Evented.extend({ if (timeoutID) window.clearTimeout(timeoutID) this.popAlert() } - const closeLink = L.DomUtil.create('a', 'umap-close-link', this._alert) - closeLink.href = '#' - L.DomUtil.add('i', 'umap-close-icon', closeLink) - const label = L.DomUtil.create('span', '', closeLink) - label.title = label.textContent = L._('Close') - L.DomEvent.on(closeLink, 'click', L.DomEvent.stop).on( - closeLink, - 'click', + const closeButton = L.DomUtil.createButton( + 'umap-close-link', + this._alert, + '', close, this ) + L.DomUtil.add('i', 'umap-close-icon', closeButton) + const label = L.DomUtil.create('span', '', closeButton) + label.title = label.textContent = L._('Close') L.DomUtil.add('div', '', this._alert, e.content) if (e.actions) { let action, el, input + const form = L.DomUtil.add('div', 'umap-alert-actions', this._alert) for (let i = 0; i < e.actions.length; i++) { action = e.actions[i] if (action.input) { input = L.DomUtil.element( 'input', { className: 'umap-alert-input', placeholder: action.input }, - this._alert - ) - } - el = L.DomUtil.element('a', { className: 'umap-action' }, this._alert) - el.href = '#' - el.textContent = action.label - L.DomEvent.on(el, 'click', L.DomEvent.stop) - if (action.callback) { - L.DomEvent.on( - el, - 'click', - action.callback, - action.callbackContext || this.map + form ) } + el = L.DomUtil.createButton( + 'umap-action', + form, + action.label, + action.callback, + action.callbackContext || this.map + ) L.DomEvent.on(el, 'click', close, this) } } @@ -139,20 +134,31 @@ L.U.UI = L.Evented.extend({ } }, - tooltip: function (e) { - this.TOOLTIP_ID = Math.random() + tooltip: function (opts) { + function showIt() { + if (opts.anchor && opts.position === 'top') { + this.anchorTooltipTop(opts.anchor) + } else if (opts.anchor && opts.position === 'left') { + this.anchorTooltipLeft(opts.anchor) + } else if (opts.anchor && opts.position === 'bottom') { + this.anchorTooltipBottom(opts.anchor) + } else { + this.anchorTooltipAbsolute() + } + L.DomUtil.addClass(this.parent, 'umap-tooltip') + this._tooltip.innerHTML = opts.content + } + this.TOOLTIP_ID = window.setTimeout(L.bind(showIt, this), opts.delay || 0) const id = this.TOOLTIP_ID - L.DomUtil.addClass(this.parent, 'umap-tooltip') - if (e.anchor && e.position === 'top') this.anchorTooltipTop(e.anchor) - else if (e.anchor && e.position === 'left') this.anchorTooltipLeft(e.anchor) - else this.anchorTooltipAbsolute() - this._tooltip.innerHTML = e.content function closeIt() { this.closeTooltip(id) } - if (e.anchor) L.DomEvent.once(e.anchor, 'mouseout', closeIt, this) - if (e.duration !== Infinity) - window.setTimeout(L.bind(closeIt, this), e.duration || 3000) + if (opts.anchor) { + L.DomEvent.once(opts.anchor, 'mouseout', closeIt, this) + } + if (opts.duration !== Infinity) { + window.setTimeout(L.bind(closeIt, this), opts.duration || 3000) + } }, anchorTooltipAbsolute: function () { @@ -174,6 +180,15 @@ L.U.UI = L.Evented.extend({ }) }, + anchorTooltipBottom: function (el) { + this._tooltip.className = 'tooltip-bottom' + const coords = this.getPosition(el) + this.setTooltipPosition({ + left: coords.left, + top: coords.bottom + 11, + }) + }, + anchorTooltipLeft: function (el) { this._tooltip.className = 'tooltip-left' const coords = this.getPosition(el) @@ -184,8 +199,13 @@ L.U.UI = L.Evented.extend({ }, closeTooltip: function (id) { + // Clear timetout even if a new tooltip has been added + // in the meantime. Eg. after a mouseout from the anchor. + window.clearTimeout(id) if (id && id !== this.TOOLTIP_ID) return + this._tooltip.className = '' this._tooltip.innerHTML = '' + this.setTooltipPosition({}) L.DomUtil.removeClass(this.parent, 'umap-tooltip') }, diff --git a/umap/static/umap/locale/am_ET.js b/umap/static/umap/locale/am_ET.js index e6c9e351..72bf7797 100644 --- a/umap/static/umap/locale/am_ET.js +++ b/umap/static/umap/locale/am_ET.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "ይህንን ቅርፅ ሰርዝ", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "ከዚህ የሚነሱ አቅጣጫዎች", - "Disable editing": "ማረም ከልክል ነው", "Display measure": "Display measure", "Display on load": "በመጫን ላይ እያለ አሳይ", "Download": "Download", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "ይህንን ካርታ አካትት እና ሼር አድርግ", "Embed the map": "ካርታውን አካትት", "Empty": "ባዶ", - "Enable editing": "እርማትን ፍቀድ", "Error in the tilelayer URL": "በታይልሌየሩ የድረ-ገፅ መገኛ ላይ ስህተት ተፈጥሯል", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("am_ET", locale) L.setLocale("am_ET") diff --git a/umap/static/umap/locale/am_ET.json b/umap/static/umap/locale/am_ET.json index 87898a54..9735239d 100644 --- a/umap/static/umap/locale/am_ET.json +++ b/umap/static/umap/locale/am_ET.json @@ -143,7 +143,6 @@ "Delete this shape": "ይህንን ቅርፅ ሰርዝ", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "ከዚህ የሚነሱ አቅጣጫዎች", - "Disable editing": "ማረም ከልክል ነው", "Display measure": "Display measure", "Display on load": "በመጫን ላይ እያለ አሳይ", "Download": "Download", @@ -164,7 +163,6 @@ "Embed and share this map": "ይህንን ካርታ አካትት እና ሼር አድርግ", "Embed the map": "ካርታውን አካትት", "Empty": "ባዶ", - "Enable editing": "እርማትን ፍቀድ", "Error in the tilelayer URL": "በታይልሌየሩ የድረ-ገፅ መገኛ ላይ ስህተት ተፈጥሯል", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/ar.js b/umap/static/umap/locale/ar.js index 9b8f7c69..4414c8a9 100644 --- a/umap/static/umap/locale/ar.js +++ b/umap/static/umap/locale/ar.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "حذف هذا الشكل", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Disable editing", "Display measure": "Display measure", "Display on load": "Display on load", "Download": "Download", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Embed and share this map", "Embed the map": "Embed the map", "Empty": "Empty", - "Enable editing": "Enable editing", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "الخروج من الشاشة الكاملة", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("ar", locale) L.setLocale("ar") diff --git a/umap/static/umap/locale/ar.json b/umap/static/umap/locale/ar.json index e9e5aff6..ead216ec 100644 --- a/umap/static/umap/locale/ar.json +++ b/umap/static/umap/locale/ar.json @@ -143,7 +143,6 @@ "Delete this shape": "حذف هذا الشكل", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Disable editing", "Display measure": "Display measure", "Display on load": "Display on load", "Download": "Download", @@ -164,7 +163,6 @@ "Embed and share this map": "Embed and share this map", "Embed the map": "Embed the map", "Empty": "Empty", - "Enable editing": "Enable editing", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "الخروج من الشاشة الكاملة", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/ast.js b/umap/static/umap/locale/ast.js index 5f0fd83c..46db7b4c 100644 --- a/umap/static/umap/locale/ast.js +++ b/umap/static/umap/locale/ast.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Disable editing", "Display measure": "Display measure", "Display on load": "Display on load", "Download": "Download", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Embed and share this map", "Embed the map": "Embed the map", "Empty": "Empty", - "Enable editing": "Enable editing", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("ast", locale) L.setLocale("ast") diff --git a/umap/static/umap/locale/ast.json b/umap/static/umap/locale/ast.json index 59035faf..f8ba8b07 100644 --- a/umap/static/umap/locale/ast.json +++ b/umap/static/umap/locale/ast.json @@ -143,7 +143,6 @@ "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Disable editing", "Display measure": "Display measure", "Display on load": "Display on load", "Download": "Download", @@ -164,7 +163,6 @@ "Embed and share this map": "Embed and share this map", "Embed the map": "Embed the map", "Empty": "Empty", - "Enable editing": "Enable editing", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/bg.js b/umap/static/umap/locale/bg.js index 6b5d2fb9..583ef12f 100644 --- a/umap/static/umap/locale/bg.js +++ b/umap/static/umap/locale/bg.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Упътвания от тук", - "Disable editing": "Забранете редакция", "Display measure": "Display measure", "Display on load": "Дисплей на зареждане", "Download": "Download", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Вграждане и споделяне тази карта", "Embed the map": "Вграждане на карта", "Empty": "Празно", - "Enable editing": "Разрешаване на редактирането", "Error in the tilelayer URL": "Грешка в URL адреса на слоя", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("bg", locale) L.setLocale("bg") diff --git a/umap/static/umap/locale/bg.json b/umap/static/umap/locale/bg.json index 9d5a44a1..7b446505 100644 --- a/umap/static/umap/locale/bg.json +++ b/umap/static/umap/locale/bg.json @@ -143,7 +143,6 @@ "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Упътвания от тук", - "Disable editing": "Забранете редакция", "Display measure": "Display measure", "Display on load": "Дисплей на зареждане", "Download": "Download", @@ -164,7 +163,6 @@ "Embed and share this map": "Вграждане и споделяне тази карта", "Embed the map": "Вграждане на карта", "Empty": "Празно", - "Enable editing": "Разрешаване на редактирането", "Error in the tilelayer URL": "Грешка в URL адреса на слоя", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/br.js b/umap/static/umap/locale/br.js index 75524758..b38ee6f0 100644 --- a/umap/static/umap/locale/br.js +++ b/umap/static/umap/locale/br.js @@ -88,7 +88,7 @@ const locale = { "Advanced actions": "Oberoù araokaet", "Advanced properties": "Perzhioù araokaet", "All properties are imported.": "Enporzhiet eo bet an holl berzhioù.", - "Allow interactions": "Allow interactions", + "Allow interactions": "Aotren an etreoberiadennoù", "An error occured": "Ur fazi ez eus bet", "Are you sure you want to cancel your changes?": "Ha sur oc'h e faot deoc'h nullañ ho kemmoù?", "Are you sure you want to clone this map and all its datalayers?": "Ha sur oc'h e faot deoc'h arredaoliñ ar gartenn-mañ hag he holl wiskadoù roadennoù?", @@ -130,7 +130,7 @@ const locale = { "Current view instead of default map view?": "Gwel a-vremañ e-lec'h ar gwel dre ziouer?", "Custom background": "Foñs personelaet", "Data is browsable": "Ar roadennoù a c'haller merdeiñ", - "Default interaction options": "Default interaction options", + "Default interaction options": "Dibarzhioù etreoberiañ dre ziouer", "Default properties": "Perzhioù dre ziouer", "Default shape properties": "Default shape properties", "Define link to open in a new window on polygon click.": "Define link to open in a new window on polygon click.", @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Dilemel an tres-mañ", "Delete this vertex (Alt+Click)": "Dilemel ar poent-mañ (Erl+Klik)", "Directions from here": "Heñchadurioù adalek amañ", - "Disable editing": "Paouez da aozañ", "Display measure": "Diskouez ar muzulioù", "Display on load": "Diskwel en ur gargañ", "Download": "Pellgargañ", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Ezporzhiañ ha rannañ ar gartenn", "Embed the map": "Enframmañ ar gartenn", "Empty": "Goullonderiñ", - "Enable editing": "Kregiñ da aozañ", "Error in the tilelayer URL": "Ur fazi zo en URL foñs ar gartenn", "Error while fetching {url}": "Ur fazi ez eus bet en ur c'hervel an URL {url}", "Exit Fullscreen": "Kuitaat ar mod skramm a-bezh", @@ -190,7 +188,7 @@ const locale = { "Import": "Enporzhiañ", "Import data": "Enporzhiañ roadennoù", "Import in a new layer": "Enporzhiañ ur gwiskad nevez", - "Imports all umap data, including layers and settings.": "Enporzhiañ an holl roadennoù ar gartenn, ar gwiskadoù hag an arventennoù en o zouez.", + "Imports all umap data, including layers and settings.": "Enporzhiañ holl roadennoù ar gartenn, ar gwiskadoù hag an arventennoù en o zouez.", "Include full screen link?": "Lakaat ul liamm \"skramm a-bezh\" e-barzh?", "Interaction options": "Interaction options", "Invalid umap data": "Roadennoù umap direizh", @@ -276,8 +274,8 @@ const locale = { "Transform to polygon": "Treiñ d'ul lieskorn", "Type of layer": "Seurt ar gwiskad", "Unable to detect format of file {filename}": "N'haller ket anavezout furmad ar restr {filename}", - "Untitled layer": "Gwiskad dizanv", - "Untitled map": "Kartenn dizanv", + "Untitled layer": "Gwiskad hep anv", + "Untitled map": "Kartenn hep anv", "Update permissions": "Kemmañ an aotreoù", "Update permissions and editors": "Kemmañ an aotreoù hag an aozerien", "Url": "URL", @@ -387,31 +385,50 @@ const locale = { "*single star for italic*": "*ur steredennig simpl evit italek*", "--- for a horizontal rule": "--- evit ul linenn-disparti a-blaen", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", - "Default view": "Default view", + "Default view": "Gwel dre ziouer", "Facet keys": "Facet keys", "Facet search": "Facet search", - "Feature properties": "Feature properties", + "Feature properties": "Perzhioù an elfenn", "Issue reaching that URL (network problem or CORS protection): {url}": "Issue reaching that URL (network problem or CORS protection): {url}", - "Latest feature": "Latest feature", + "Latest feature": "Elfenn diwezhañ", "No results for these facets": "No results for these facets", "Saved center and zoom": "Saved center and zoom", - "User location": "User location", - "Visibility: {status}": "Visibility: {status}", + "User location": "Lec'hiadur an implijer", + "Visibility: {status}": "Gwelusted: {status}", "Fit all data": "Fit all data", - "Verify remote URL": "Verify remote URL", - "Add": "Add", - "Change": "Change", - "Powered by uMap": "Powered by uMap", - "Search": "Search", + "Verify remote URL": "Gwiriañ an URL", + "Add": "Ouzhpennañ", + "Change": "Kemmañ", + "Powered by uMap": "Lusket gant uMap", + "Search": "Klask", "Toggle direct input (advanced)": "Toggle direct input (advanced)", - "Datalayers": "Datalayers", - "Delete map": "Delete map", - "Secret edit link:": "Secret edit link:", - "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", - "Current map view": "Current map view", - "Filter": "Filter" + "Datalayers": "Gwiskadoù", + "Secret edit link:": "Liamm aozañ kuzh:", + "Who can edit \"{layer}\"": "Piv a c'hall aozañ \"{layer}\"", + "Current map view": "Listenn an objedoù a c'haller gwelet", + "Filter": "Silañ", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("br", locale) L.setLocale("br") diff --git a/umap/static/umap/locale/br.json b/umap/static/umap/locale/br.json index 366e7526..1bd32bf5 100644 --- a/umap/static/umap/locale/br.json +++ b/umap/static/umap/locale/br.json @@ -88,7 +88,7 @@ "Advanced actions": "Oberoù araokaet", "Advanced properties": "Perzhioù araokaet", "All properties are imported.": "Enporzhiet eo bet an holl berzhioù.", - "Allow interactions": "Allow interactions", + "Allow interactions": "Aotren an etreoberiadennoù", "An error occured": "Ur fazi ez eus bet", "Are you sure you want to cancel your changes?": "Ha sur oc'h e faot deoc'h nullañ ho kemmoù?", "Are you sure you want to clone this map and all its datalayers?": "Ha sur oc'h e faot deoc'h arredaoliñ ar gartenn-mañ hag he holl wiskadoù roadennoù?", @@ -130,7 +130,7 @@ "Current view instead of default map view?": "Gwel a-vremañ e-lec'h ar gwel dre ziouer?", "Custom background": "Foñs personelaet", "Data is browsable": "Ar roadennoù a c'haller merdeiñ", - "Default interaction options": "Default interaction options", + "Default interaction options": "Dibarzhioù etreoberiañ dre ziouer", "Default properties": "Perzhioù dre ziouer", "Default shape properties": "Default shape properties", "Define link to open in a new window on polygon click.": "Define link to open in a new window on polygon click.", @@ -143,7 +143,6 @@ "Delete this shape": "Dilemel an tres-mañ", "Delete this vertex (Alt+Click)": "Dilemel ar poent-mañ (Erl+Klik)", "Directions from here": "Heñchadurioù adalek amañ", - "Disable editing": "Paouez da aozañ", "Display measure": "Diskouez ar muzulioù", "Display on load": "Diskwel en ur gargañ", "Download": "Pellgargañ", @@ -164,7 +163,6 @@ "Embed and share this map": "Ezporzhiañ ha rannañ ar gartenn", "Embed the map": "Enframmañ ar gartenn", "Empty": "Goullonderiñ", - "Enable editing": "Kregiñ da aozañ", "Error in the tilelayer URL": "Ur fazi zo en URL foñs ar gartenn", "Error while fetching {url}": "Ur fazi ez eus bet en ur c'hervel an URL {url}", "Exit Fullscreen": "Kuitaat ar mod skramm a-bezh", @@ -190,7 +188,7 @@ "Import": "Enporzhiañ", "Import data": "Enporzhiañ roadennoù", "Import in a new layer": "Enporzhiañ ur gwiskad nevez", - "Imports all umap data, including layers and settings.": "Enporzhiañ an holl roadennoù ar gartenn, ar gwiskadoù hag an arventennoù en o zouez.", + "Imports all umap data, including layers and settings.": "Enporzhiañ holl roadennoù ar gartenn, ar gwiskadoù hag an arventennoù en o zouez.", "Include full screen link?": "Lakaat ul liamm \"skramm a-bezh\" e-barzh?", "Interaction options": "Interaction options", "Invalid umap data": "Roadennoù umap direizh", @@ -276,8 +274,8 @@ "Transform to polygon": "Treiñ d'ul lieskorn", "Type of layer": "Seurt ar gwiskad", "Unable to detect format of file {filename}": "N'haller ket anavezout furmad ar restr {filename}", - "Untitled layer": "Gwiskad dizanv", - "Untitled map": "Kartenn dizanv", + "Untitled layer": "Gwiskad hep anv", + "Untitled map": "Kartenn hep anv", "Update permissions": "Kemmañ an aotreoù", "Update permissions and editors": "Kemmañ an aotreoù hag an aozerien", "Url": "URL", @@ -387,29 +385,48 @@ "*single star for italic*": "*ur steredennig simpl evit italek*", "--- for a horizontal rule": "--- evit ul linenn-disparti a-blaen", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", - "Default view": "Default view", + "Default view": "Gwel dre ziouer", "Facet keys": "Facet keys", "Facet search": "Facet search", - "Feature properties": "Feature properties", + "Feature properties": "Perzhioù an elfenn", "Issue reaching that URL (network problem or CORS protection): {url}": "Issue reaching that URL (network problem or CORS protection): {url}", - "Latest feature": "Latest feature", + "Latest feature": "Elfenn diwezhañ", "No results for these facets": "No results for these facets", "Saved center and zoom": "Saved center and zoom", - "User location": "User location", - "Visibility: {status}": "Visibility: {status}", + "User location": "Lec'hiadur an implijer", + "Visibility: {status}": "Gwelusted: {status}", "Fit all data": "Fit all data", - "Verify remote URL": "Verify remote URL", - "Add": "Add", - "Change": "Change", - "Powered by uMap": "Powered by uMap", - "Search": "Search", + "Verify remote URL": "Gwiriañ an URL", + "Add": "Ouzhpennañ", + "Change": "Kemmañ", + "Powered by uMap": "Lusket gant uMap", + "Search": "Klask", "Toggle direct input (advanced)": "Toggle direct input (advanced)", - "Datalayers": "Datalayers", - "Delete map": "Delete map", - "Secret edit link:": "Secret edit link:", - "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", - "Current map view": "Current map view", - "Filter": "Filter" + "Datalayers": "Gwiskadoù", + "Secret edit link:": "Liamm aozañ kuzh:", + "Who can edit \"{layer}\"": "Piv a c'hall aozañ \"{layer}\"", + "Current map view": "Listenn an objedoù a c'haller gwelet", + "Filter": "Silañ", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/ca.js b/umap/static/umap/locale/ca.js index 309b5969..662c788a 100644 --- a/umap/static/umap/locale/ca.js +++ b/umap/static/umap/locale/ca.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Direccions des d'aquí", - "Disable editing": "Inhabilita l'edició", "Display measure": "Display measure", "Display on load": "Mostrar en carregar", "Download": "Baixa", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Incrusta i comparteix aquest mapa", "Embed the map": "Incrusta el mapa", "Empty": "Buit", - "Enable editing": "Habilita l'edició", "Error in the tilelayer URL": "Hi ha un error en l'URL de la cap de tessel·les", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("ca", locale) L.setLocale("ca") diff --git a/umap/static/umap/locale/ca.json b/umap/static/umap/locale/ca.json index 389f86b5..dae06970 100644 --- a/umap/static/umap/locale/ca.json +++ b/umap/static/umap/locale/ca.json @@ -143,7 +143,6 @@ "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Direccions des d'aquí", - "Disable editing": "Inhabilita l'edició", "Display measure": "Display measure", "Display on load": "Mostrar en carregar", "Download": "Baixa", @@ -164,7 +163,6 @@ "Embed and share this map": "Incrusta i comparteix aquest mapa", "Embed the map": "Incrusta el mapa", "Empty": "Buit", - "Enable editing": "Habilita l'edició", "Error in the tilelayer URL": "Hi ha un error en l'URL de la cap de tessel·les", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/cs_CZ.js b/umap/static/umap/locale/cs_CZ.js index 785fcbee..caa410b8 100644 --- a/umap/static/umap/locale/cs_CZ.js +++ b/umap/static/umap/locale/cs_CZ.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Smazat tento tvar", "Delete this vertex (Alt+Click)": "Smazat tento bod (Alt+Klik)", "Directions from here": "Navigovat odsud", - "Disable editing": "Zakázat úpravy", "Display measure": "Zobrazit měřítko", "Display on load": "Zobrazit při startu", "Download": "Stažení", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Sdílet mapu nebo ji vložit do jiného webu", "Embed the map": "Vložit mapu do jiného webu", "Empty": "Vyprázdnit", - "Enable editing": "Povolit úpravy", "Error in the tilelayer URL": "Chyba v URL vrstvy dlaždic", "Error while fetching {url}": "Chyba při načítání {url}", "Exit Fullscreen": "Ukončit režim celé obrazovky", @@ -387,31 +385,50 @@ const locale = { "*single star for italic*": "*vše mezi hvězdičkami bude kurzívou*", "--- for a horizontal rule": "--- vytvoří vodorovnou linku", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "Název vlastnosti, která se má použít jako popis funkce (např.: \"nom\"). Můžete také použít vlastnosti uvnitř hranatých závorek a použít více než jednu nebo je kombinovat se statickým obsahem (např.: \"{jméno} v {místo}\")", - "Cancel all": "Cancel all", - "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", - "Default view": "Default view", - "Facet keys": "Facet keys", - "Facet search": "Facet search", - "Feature properties": "Feature properties", - "Issue reaching that URL (network problem or CORS protection): {url}": "Issue reaching that URL (network problem or CORS protection): {url}", - "Latest feature": "Latest feature", - "No results for these facets": "No results for these facets", - "Saved center and zoom": "Saved center and zoom", - "User location": "User location", - "Visibility: {status}": "Visibility: {status}", - "Fit all data": "Fit all data", - "Verify remote URL": "Verify remote URL", - "Add": "Add", - "Change": "Change", - "Powered by uMap": "Powered by uMap", - "Search": "Search", - "Toggle direct input (advanced)": "Toggle direct input (advanced)", - "Datalayers": "Datalayers", - "Delete map": "Delete map", - "Secret edit link:": "Secret edit link:", - "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", - "Current map view": "Current map view", - "Filter": "Filter" + "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Seznam vlastností oddělených čárkou, které se mají použít pro hledání aspektů (např.: mykey,otherkey). Chcete-li změnit popisek, přidejte jej za | (např.: mykey|Můj klíč,otherkey|Jiný klíč)", + "Default view": "Výchozí zobrazení", + "Facet keys": "Aspekty klíče", + "Facet search": "hledání aspektů", + "Feature properties": "Vlastnosti funkce", + "Issue reaching that URL (network problem or CORS protection): {url}": "Problém s dosažením této adresy URL (síťový problém nebo ochrana CORS): {url}", + "Latest feature": "Nejnovější funkce", + "No results for these facets": "Žádné výsledky pro tyto aspekty", + "Saved center and zoom": "Uložený střed a zoom", + "User location": "Poloha uživatele", + "Visibility: {status}": "Viditelnost: {status}", + "Fit all data": "Přizpůsobení všech dat", + "Verify remote URL": "Ověřit vzdálenou adresu URL", + "Add": "Přidat", + "Change": "Změnit", + "Powered by uMap": "Běží na uMap", + "Search": "Hledat", + "Toggle direct input (advanced)": "Přepínání přímého vstupu (pokročilé)", + "Datalayers": "Datové vrstvy", + "Secret edit link:": "Tajný odkaz na úpravy:", + "Who can edit \"{layer}\"": "Kdo může upravovat \"{layer}\"", + "Current map view": "Aktuální zobrazení mapy", + "Filter": "Filtr", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth třídy", + "Choropleth color palette": "Choropleth paleta barev", + "Choropleth mode": "Choropleth režim", + "Choropleth property value": "Choropleth hodnota objektu", + "Comma separated list of numbers, including min and max values.": "Seznam čísel oddělených čárkou, včetně minimálních a maximálních hodnot.", + "Equidistant": "Stejně vzdálené", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Ručně", + "Number of desired classes (default 5)": "Počet požadovaných tříd (výchozí 5)", + "Quantiles": "Kvantily", + "Show this layer in the caption": "Zobrazit tuto vrstvu v nadpisu", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("cs_CZ", locale) L.setLocale("cs_CZ") diff --git a/umap/static/umap/locale/cs_CZ.json b/umap/static/umap/locale/cs_CZ.json index 9a600641..1851a760 100644 --- a/umap/static/umap/locale/cs_CZ.json +++ b/umap/static/umap/locale/cs_CZ.json @@ -143,7 +143,6 @@ "Delete this shape": "Smazat tento tvar", "Delete this vertex (Alt+Click)": "Smazat tento bod (Alt+Klik)", "Directions from here": "Navigovat odsud", - "Disable editing": "Zakázat úpravy", "Display measure": "Zobrazit měřítko", "Display on load": "Zobrazit při startu", "Download": "Stažení", @@ -164,7 +163,6 @@ "Embed and share this map": "Sdílet mapu nebo ji vložit do jiného webu", "Embed the map": "Vložit mapu do jiného webu", "Empty": "Vyprázdnit", - "Enable editing": "Povolit úpravy", "Error in the tilelayer URL": "Chyba v URL vrstvy dlaždic", "Error while fetching {url}": "Chyba při načítání {url}", "Exit Fullscreen": "Ukončit režim celé obrazovky", @@ -387,29 +385,48 @@ "*single star for italic*": "*vše mezi hvězdičkami bude kurzívou*", "--- for a horizontal rule": "--- vytvoří vodorovnou linku", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "Název vlastnosti, která se má použít jako popis funkce (např.: \"nom\"). Můžete také použít vlastnosti uvnitř hranatých závorek a použít více než jednu nebo je kombinovat se statickým obsahem (např.: \"{jméno} v {místo}\")", - "Cancel all": "Cancel all", - "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", - "Default view": "Default view", - "Facet keys": "Facet keys", - "Facet search": "Facet search", - "Feature properties": "Feature properties", - "Issue reaching that URL (network problem or CORS protection): {url}": "Issue reaching that URL (network problem or CORS protection): {url}", - "Latest feature": "Latest feature", - "No results for these facets": "No results for these facets", - "Saved center and zoom": "Saved center and zoom", - "User location": "User location", - "Visibility: {status}": "Visibility: {status}", - "Fit all data": "Fit all data", - "Verify remote URL": "Verify remote URL", - "Add": "Add", - "Change": "Change", - "Powered by uMap": "Powered by uMap", - "Search": "Search", - "Toggle direct input (advanced)": "Toggle direct input (advanced)", - "Datalayers": "Datalayers", - "Delete map": "Delete map", - "Secret edit link:": "Secret edit link:", - "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", - "Current map view": "Current map view", - "Filter": "Filter" + "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Seznam vlastností oddělených čárkou, které se mají použít pro hledání aspektů (např.: mykey,otherkey). Chcete-li změnit popisek, přidejte jej za | (např.: mykey|Můj klíč,otherkey|Jiný klíč)", + "Default view": "Výchozí zobrazení", + "Facet keys": "Aspekty klíče", + "Facet search": "hledání aspektů", + "Feature properties": "Vlastnosti funkce", + "Issue reaching that URL (network problem or CORS protection): {url}": "Problém s dosažením této adresy URL (síťový problém nebo ochrana CORS): {url}", + "Latest feature": "Nejnovější funkce", + "No results for these facets": "Žádné výsledky pro tyto aspekty", + "Saved center and zoom": "Uložený střed a zoom", + "User location": "Poloha uživatele", + "Visibility: {status}": "Viditelnost: {status}", + "Fit all data": "Přizpůsobení všech dat", + "Verify remote URL": "Ověřit vzdálenou adresu URL", + "Add": "Přidat", + "Change": "Změnit", + "Powered by uMap": "Běží na uMap", + "Search": "Hledat", + "Toggle direct input (advanced)": "Přepínání přímého vstupu (pokročilé)", + "Datalayers": "Datové vrstvy", + "Secret edit link:": "Tajný odkaz na úpravy:", + "Who can edit \"{layer}\"": "Kdo může upravovat \"{layer}\"", + "Current map view": "Aktuální zobrazení mapy", + "Filter": "Filtr", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth třídy", + "Choropleth color palette": "Choropleth paleta barev", + "Choropleth mode": "Choropleth režim", + "Choropleth property value": "Choropleth hodnota objektu", + "Comma separated list of numbers, including min and max values.": "Seznam čísel oddělených čárkou, včetně minimálních a maximálních hodnot.", + "Equidistant": "Stejně vzdálené", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Ručně", + "Number of desired classes (default 5)": "Počet požadovaných tříd (výchozí 5)", + "Quantiles": "Kvantily", + "Show this layer in the caption": "Zobrazit tuto vrstvu v nadpisu", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/da.js b/umap/static/umap/locale/da.js index da3b8332..b3353ffc 100644 --- a/umap/static/umap/locale/da.js +++ b/umap/static/umap/locale/da.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Slet denne figur", "Delete this vertex (Alt+Click)": "Slet denne vertex (Alt+Click)", "Directions from here": "Kørselsvejledning herfra", - "Disable editing": "Deaktiver redigering", "Display measure": "Vis opmåling", "Display on load": "Vis ved indlæsning", "Download": "Download", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Indlejr og del dette kort", "Embed the map": "Indlejring af kortet", "Empty": "Tomt", - "Enable editing": "Aktiver redigering", "Error in the tilelayer URL": "Fejl i fliselags-URL'en", "Error while fetching {url}": "Fejl ved hentning af {url}", "Exit Fullscreen": "Afslut fuldskærm", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("da", locale) L.setLocale("da") diff --git a/umap/static/umap/locale/da.json b/umap/static/umap/locale/da.json index 5db823e7..585c8327 100644 --- a/umap/static/umap/locale/da.json +++ b/umap/static/umap/locale/da.json @@ -143,7 +143,6 @@ "Delete this shape": "Slet denne figur", "Delete this vertex (Alt+Click)": "Slet denne vertex (Alt+Click)", "Directions from here": "Kørselsvejledning herfra", - "Disable editing": "Deaktiver redigering", "Display measure": "Vis opmåling", "Display on load": "Vis ved indlæsning", "Download": "Download", @@ -164,7 +163,6 @@ "Embed and share this map": "Indlejr og del dette kort", "Embed the map": "Indlejring af kortet", "Empty": "Tomt", - "Enable editing": "Aktiver redigering", "Error in the tilelayer URL": "Fejl i fliselags-URL'en", "Error while fetching {url}": "Fejl ved hentning af {url}", "Exit Fullscreen": "Afslut fuldskærm", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/de.js b/umap/static/umap/locale/de.js index 4c30919f..cafda689 100644 --- a/umap/static/umap/locale/de.js +++ b/umap/static/umap/locale/de.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Diese Form löschen", "Delete this vertex (Alt+Click)": "Diesen Eckpunkt löschen (Alt+Klick)", "Directions from here": "Route von hier", - "Disable editing": "Bearbeiten deaktivieren", "Display measure": "Display measure", "Display on load": "Beim Seitenaufruf anzeigen.", "Download": "Herunterladen", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Teile und binde diese Karte ein.", "Embed the map": "Karte einbinden", "Empty": "Leeren", - "Enable editing": "Bearbeiten aktivieren", "Error in the tilelayer URL": "Fehler in der Kachelebenen-URL", "Error while fetching {url}": "Fehler beim Abrufen von {url}", "Exit Fullscreen": "Vollbild beenden", @@ -369,13 +367,13 @@ const locale = { "Error in the overlay URL": "Error in the overlay URL", "Map has been starred": "Map has been starred", "Map has been unstarred": "Map has been unstarred", - "Opacity": "Opacity", + "Opacity": "Deckkraft", "Star this map": "Star this map", "Symbol can be either a unicode character or an URL. You can use feature properties as variables: ex.: with \"http://myserver.org/images/{name}.png\", the {name} variable will be replaced by the \"name\" value of each marker.": "Symbol can be either a unicode character or an URL. You can use feature properties as variables: ex.: with \"http://myserver.org/images/{name}.png\", the {name} variable will be replaced by the \"name\" value of each marker.", - "Direct link": "Direct link", + "Direct link": "Direktlink", "Export options": "Export options", "The zoom and center have been modified.": "The zoom and center have been modified.", - "Congratulations, your map has been created!": "Congratulations, your map has been created!", + "Congratulations, your map has been created!": "Glückwunsch, deine Karte wurde erstellt!", "Copy link": "Copy link", "Email": "Email", "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("de", locale) L.setLocale("de") diff --git a/umap/static/umap/locale/de.json b/umap/static/umap/locale/de.json index ee8d1cc1..06bf3245 100644 --- a/umap/static/umap/locale/de.json +++ b/umap/static/umap/locale/de.json @@ -143,7 +143,6 @@ "Delete this shape": "Diese Form löschen", "Delete this vertex (Alt+Click)": "Diesen Eckpunkt löschen (Alt+Klick)", "Directions from here": "Route von hier", - "Disable editing": "Bearbeiten deaktivieren", "Display measure": "Display measure", "Display on load": "Beim Seitenaufruf anzeigen.", "Download": "Herunterladen", @@ -164,7 +163,6 @@ "Embed and share this map": "Teile und binde diese Karte ein.", "Embed the map": "Karte einbinden", "Empty": "Leeren", - "Enable editing": "Bearbeiten aktivieren", "Error in the tilelayer URL": "Fehler in der Kachelebenen-URL", "Error while fetching {url}": "Fehler beim Abrufen von {url}", "Exit Fullscreen": "Vollbild beenden", @@ -369,13 +367,13 @@ "Error in the overlay URL": "Error in the overlay URL", "Map has been starred": "Map has been starred", "Map has been unstarred": "Map has been unstarred", - "Opacity": "Opacity", + "Opacity": "Deckkraft", "Star this map": "Star this map", "Symbol can be either a unicode character or an URL. You can use feature properties as variables: ex.: with \"http://myserver.org/images/{name}.png\", the {name} variable will be replaced by the \"name\" value of each marker.": "Symbol can be either a unicode character or an URL. You can use feature properties as variables: ex.: with \"http://myserver.org/images/{name}.png\", the {name} variable will be replaced by the \"name\" value of each marker.", - "Direct link": "Direct link", + "Direct link": "Direktlink", "Export options": "Export options", "The zoom and center have been modified.": "The zoom and center have been modified.", - "Congratulations, your map has been created!": "Congratulations, your map has been created!", + "Congratulations, your map has been created!": "Glückwunsch, deine Karte wurde erstellt!", "Copy link": "Copy link", "Email": "Email", "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/el.js b/umap/static/umap/locale/el.js index f4528a5d..2d9225b9 100644 --- a/umap/static/umap/locale/el.js +++ b/umap/static/umap/locale/el.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Διαγραφή σχήματος", "Delete this vertex (Alt+Click)": "Διαγραφή αυτής της κορυφής (Alt+Click)", "Directions from here": "Κατευθύνσεις από εδώ", - "Disable editing": "Απενεργοποίηση επεξεργασίας", "Display measure": "Εμφάνιση μέτρησης", "Display on load": "Εμφάνιση κατά την φόρτωση", "Download": "Λήψη", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Ένθεση και διαμοιρασμός του χάρτη", "Embed the map": "Ένθεση του χάρτη", "Empty": "Κενό", - "Enable editing": "Ενεργοποίηση επεξεργασίας", "Error in the tilelayer URL": "Σφάλμα συνδέσμου υποβάθρου", "Error while fetching {url}": "Σφάλμα κατά την ανάκτηση {url}", "Exit Fullscreen": "Κλείσιμο πλήρους οθόνης", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- για οριζόντιο χάρακα", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("el", locale) L.setLocale("el") diff --git a/umap/static/umap/locale/el.json b/umap/static/umap/locale/el.json index a0089cde..762ee7ed 100644 --- a/umap/static/umap/locale/el.json +++ b/umap/static/umap/locale/el.json @@ -143,7 +143,6 @@ "Delete this shape": "Διαγραφή σχήματος", "Delete this vertex (Alt+Click)": "Διαγραφή αυτής της κορυφής (Alt+Click)", "Directions from here": "Κατευθύνσεις από εδώ", - "Disable editing": "Απενεργοποίηση επεξεργασίας", "Display measure": "Εμφάνιση μέτρησης", "Display on load": "Εμφάνιση κατά την φόρτωση", "Download": "Λήψη", @@ -164,7 +163,6 @@ "Embed and share this map": "Ένθεση και διαμοιρασμός του χάρτη", "Embed the map": "Ένθεση του χάρτη", "Empty": "Κενό", - "Enable editing": "Ενεργοποίηση επεξεργασίας", "Error in the tilelayer URL": "Σφάλμα συνδέσμου υποβάθρου", "Error while fetching {url}": "Σφάλμα κατά την ανάκτηση {url}", "Exit Fullscreen": "Κλείσιμο πλήρους οθόνης", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- για οριζόντιο χάρακα", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/en.js b/umap/static/umap/locale/en.js index 511d670d..cda3a4db 100644 --- a/umap/static/umap/locale/en.js +++ b/umap/static/umap/locale/en.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Disable editing", "Display measure": "Display measure", "Display on load": "Display on load", "Download": "Download", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Embed and share this map", "Embed the map": "Embed the map", "Empty": "Empty", - "Enable editing": "Enable editing", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("en", locale) L.setLocale("en") diff --git a/umap/static/umap/locale/en.json b/umap/static/umap/locale/en.json index df3b2a47..578a61b1 100644 --- a/umap/static/umap/locale/en.json +++ b/umap/static/umap/locale/en.json @@ -143,7 +143,6 @@ "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Disable editing", "Display measure": "Display measure", "Display on load": "Display on load", "Download": "Download", @@ -164,7 +163,6 @@ "Embed and share this map": "Embed and share this map", "Embed the map": "Embed the map", "Empty": "Empty", - "Enable editing": "Enable editing", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/en_US.json b/umap/static/umap/locale/en_US.json index cad80737..14c326ec 100644 --- a/umap/static/umap/locale/en_US.json +++ b/umap/static/umap/locale/en_US.json @@ -143,7 +143,6 @@ "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Finish editing", "Display measure": "Display measure", "Display on load": "Display on load", "Download": "Download", @@ -164,7 +163,6 @@ "Embed and share this map": "Embed and share this map", "Embed the map": "Embed map", "Empty": "Empty", - "Enable editing": "Edit map", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/es.js b/umap/static/umap/locale/es.js index b55a3c13..bb27bc07 100644 --- a/umap/static/umap/locale/es.js +++ b/umap/static/umap/locale/es.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Borrar esta figura", "Delete this vertex (Alt+Click)": "Borrar este vértice (Alt+Clic)", "Directions from here": "Direcciones desde aquí", - "Disable editing": "Deshabilitar la edición", "Display measure": "Mostrar medición", "Display on load": "Mostrar al cargar", "Download": "Descargar", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Embeber y compartir este mapa", "Embed the map": "Embeber el mapa", "Empty": "Vaciar", - "Enable editing": "Habilitar la edición", "Error in the tilelayer URL": "Error en la URL del la capa de teselas", "Error while fetching {url}": "Error al traer {url}", "Exit Fullscreen": "Salir de la pantalla completa", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*una estrella para cursiva*", "--- for a horizontal rule": "--- para una regla horizontal", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "El nombre de la propiedad a utilizar como etiqueta de la característica (ej.: \"nom\"). También puede utilizar propiedades entre paréntesis para utilizar más de una o mezclarlas con contenido estático (p. ej.: \"{nombre} en {lugar}\").", - "Cancel all": "Cancelar todo", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Lista separada por comas de las propiedades a utilizar para la búsqueda de facetas (ej.: miclave,otraclave). Para controlar la etiqueta, añádala después de | (ej.: mykey|Mi Clave,otherkey|Otra Clave)", "Default view": "Vista predeterminada", "Facet keys": "Claves de facetas", @@ -407,11 +404,31 @@ const locale = { "Search": "Buscar", "Toggle direct input (advanced)": "Conmutar entrada directa (avanzado)", "Datalayers": "Capas de datos", - "Delete map": "Borrar mapa", "Secret edit link:": "Enlace secreto de edición:", "Who can edit \"{layer}\"": "Quién puede editar \"{layer}\"", - "Current map view": "Current map view", - "Filter": "Filter" + "Current map view": "Vista actual del mapa", + "Filter": "Filtro", + "Choropleth": "Coropleto", + "Choropleth breakpoints": "Puntos de ruptura de la Coropleta", + "Choropleth classes": "Clases de coropletas", + "Choropleth color palette": "Paleta de colores Coropleta", + "Choropleth mode": "Modo Coropleta", + "Choropleth property value": "Valor de la propiedad Choropleta", + "Comma separated list of numbers, including min and max values.": "Lista de números separados por comas, incluidos los valores mínimo y máximo.", + "Equidistant": "Equidistante", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-medias", + "Manual": "Manual", + "Number of desired classes (default 5)": "Número de clases deseadas (predeterminadas 5)", + "Quantiles": "Cuantiles", + "Show this layer in the caption": "Mostrar esta capa en la leyenda", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("es", locale) L.setLocale("es") diff --git a/umap/static/umap/locale/es.json b/umap/static/umap/locale/es.json index a0b4262e..e4da09f6 100644 --- a/umap/static/umap/locale/es.json +++ b/umap/static/umap/locale/es.json @@ -143,7 +143,6 @@ "Delete this shape": "Borrar esta figura", "Delete this vertex (Alt+Click)": "Borrar este vértice (Alt+Clic)", "Directions from here": "Direcciones desde aquí", - "Disable editing": "Deshabilitar la edición", "Display measure": "Mostrar medición", "Display on load": "Mostrar al cargar", "Download": "Descargar", @@ -164,7 +163,6 @@ "Embed and share this map": "Embeber y compartir este mapa", "Embed the map": "Embeber el mapa", "Empty": "Vaciar", - "Enable editing": "Habilitar la edición", "Error in the tilelayer URL": "Error en la URL del la capa de teselas", "Error while fetching {url}": "Error al traer {url}", "Exit Fullscreen": "Salir de la pantalla completa", @@ -387,7 +385,6 @@ "*single star for italic*": "*una estrella para cursiva*", "--- for a horizontal rule": "--- para una regla horizontal", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "El nombre de la propiedad a utilizar como etiqueta de la característica (ej.: \"nom\"). También puede utilizar propiedades entre paréntesis para utilizar más de una o mezclarlas con contenido estático (p. ej.: \"{nombre} en {lugar}\").", - "Cancel all": "Cancelar todo", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Lista separada por comas de las propiedades a utilizar para la búsqueda de facetas (ej.: miclave,otraclave). Para controlar la etiqueta, añádala después de | (ej.: mykey|Mi Clave,otherkey|Otra Clave)", "Default view": "Vista predeterminada", "Facet keys": "Claves de facetas", @@ -407,9 +404,29 @@ "Search": "Buscar", "Toggle direct input (advanced)": "Conmutar entrada directa (avanzado)", "Datalayers": "Capas de datos", - "Delete map": "Borrar mapa", "Secret edit link:": "Enlace secreto de edición:", "Who can edit \"{layer}\"": "Quién puede editar \"{layer}\"", - "Current map view": "Current map view", - "Filter": "Filter" + "Current map view": "Vista actual del mapa", + "Filter": "Filtro", + "Choropleth": "Coropleto", + "Choropleth breakpoints": "Puntos de ruptura de la Coropleta", + "Choropleth classes": "Clases de coropletas", + "Choropleth color palette": "Paleta de colores Coropleta", + "Choropleth mode": "Modo Coropleta", + "Choropleth property value": "Valor de la propiedad Choropleta", + "Comma separated list of numbers, including min and max values.": "Lista de números separados por comas, incluidos los valores mínimo y máximo.", + "Equidistant": "Equidistante", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-medias", + "Manual": "Manual", + "Number of desired classes (default 5)": "Número de clases deseadas (predeterminadas 5)", + "Quantiles": "Cuantiles", + "Show this layer in the caption": "Mostrar esta capa en la leyenda", + "Back to preview": "Volver a la vista previa", + "Drawing": "Dibujo", + "Edit the title of the map": "Editar el título del mapa", + "Go to the homepage": "Ir a la página de inicio", + "Switch to edit mode": "Cambiar al modo de edición", + "Update who can see and edit the map": "Actualizar quién puede ver y editar el mapa", + "View": "Vista" } \ No newline at end of file diff --git a/umap/static/umap/locale/et.js b/umap/static/umap/locale/et.js index e6b387c5..e33a75bf 100644 --- a/umap/static/umap/locale/et.js +++ b/umap/static/umap/locale/et.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Kustuta see kujund", "Delete this vertex (Alt+Click)": "Kustuta see tipp (Alt+Klõps)", "Directions from here": "Juhised siit", - "Disable editing": "Lõpeta muutmine", "Display measure": "Kuva suurus", "Display on load": "Kuva laadimisel", "Download": "Laadi alla", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Manusta ja jaga seda kaarti", "Embed the map": "Manusta kaart", "Empty": "Tühjenda", - "Enable editing": "Luba muutmine", "Error in the tilelayer URL": "Vigane tausta URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Välju täisekraanist", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("et", locale) L.setLocale("et") diff --git a/umap/static/umap/locale/et.json b/umap/static/umap/locale/et.json index 10178351..a0fb4957 100644 --- a/umap/static/umap/locale/et.json +++ b/umap/static/umap/locale/et.json @@ -143,7 +143,6 @@ "Delete this shape": "Kustuta see kujund", "Delete this vertex (Alt+Click)": "Kustuta see tipp (Alt+Klõps)", "Directions from here": "Juhised siit", - "Disable editing": "Lõpeta muutmine", "Display measure": "Kuva suurus", "Display on load": "Kuva laadimisel", "Download": "Laadi alla", @@ -164,7 +163,6 @@ "Embed and share this map": "Manusta ja jaga seda kaarti", "Embed the map": "Manusta kaart", "Empty": "Tühjenda", - "Enable editing": "Luba muutmine", "Error in the tilelayer URL": "Vigane tausta URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Välju täisekraanist", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/fa_IR.js b/umap/static/umap/locale/fa_IR.js index 08ffb669..f393ce32 100644 --- a/umap/static/umap/locale/fa_IR.js +++ b/umap/static/umap/locale/fa_IR.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "این شکل را حذف کنید", "Delete this vertex (Alt+Click)": "حذف این راس (Alt+Click)", "Directions from here": "مسیرها از اینجا", - "Disable editing": "ویرایش را غیرفعال کنید", "Display measure": "اندازه نمایش", "Display on load": "نمایش روی بارگذاری", "Download": "دانلود", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "این نقشه را جاسازی کرده و به اشتراک بگذارید", "Embed the map": "نقشه را جاسازی کنید", "Empty": "خالی", - "Enable editing": "ویرایش را فعال کنید", "Error in the tilelayer URL": "خطا در آدرس اینترنتی لایه کاشی", "Error while fetching {url}": "خطا هنگام واکشی {آدرس اینترنتی}", "Exit Fullscreen": "خروج از تمام صفحه", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("fa_IR", locale) L.setLocale("fa_IR") diff --git a/umap/static/umap/locale/fa_IR.json b/umap/static/umap/locale/fa_IR.json index 552e6976..e1964a63 100644 --- a/umap/static/umap/locale/fa_IR.json +++ b/umap/static/umap/locale/fa_IR.json @@ -143,7 +143,6 @@ "Delete this shape": "این شکل را حذف کنید", "Delete this vertex (Alt+Click)": "حذف این راس (Alt+Click)", "Directions from here": "مسیرها از اینجا", - "Disable editing": "ویرایش را غیرفعال کنید", "Display measure": "اندازه نمایش", "Display on load": "نمایش روی بارگذاری", "Download": "دانلود", @@ -164,7 +163,6 @@ "Embed and share this map": "این نقشه را جاسازی کرده و به اشتراک بگذارید", "Embed the map": "نقشه را جاسازی کنید", "Empty": "خالی", - "Enable editing": "ویرایش را فعال کنید", "Error in the tilelayer URL": "خطا در آدرس اینترنتی لایه کاشی", "Error while fetching {url}": "خطا هنگام واکشی {آدرس اینترنتی}", "Exit Fullscreen": "خروج از تمام صفحه", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/fi.js b/umap/static/umap/locale/fi.js index c5ee3561..7d5b90ed 100644 --- a/umap/static/umap/locale/fi.js +++ b/umap/static/umap/locale/fi.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Poista tämä muoto", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Ohjeet täältä", - "Disable editing": "Lopeta kartan muokaaminen", "Display measure": "Display measure", "Display on load": "Näytä ladattaessa", "Download": "Download", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Jaa tämä kartta tai käytä sitä muualla", "Embed the map": "Liitä kartta", "Empty": "Tyhjä", - "Enable editing": "Aktivoi kartan muokkaus", "Error in the tilelayer URL": "Virhe karttalaattojen URL:ssä", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("fi", locale) L.setLocale("fi") diff --git a/umap/static/umap/locale/fi.json b/umap/static/umap/locale/fi.json index 1134a934..85e583de 100644 --- a/umap/static/umap/locale/fi.json +++ b/umap/static/umap/locale/fi.json @@ -143,7 +143,6 @@ "Delete this shape": "Poista tämä muoto", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Ohjeet täältä", - "Disable editing": "Lopeta kartan muokaaminen", "Display measure": "Display measure", "Display on load": "Näytä ladattaessa", "Download": "Download", @@ -164,7 +163,6 @@ "Embed and share this map": "Jaa tämä kartta tai käytä sitä muualla", "Embed the map": "Liitä kartta", "Empty": "Tyhjä", - "Enable editing": "Aktivoi kartan muokkaus", "Error in the tilelayer URL": "Virhe karttalaattojen URL:ssä", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/fr.js b/umap/static/umap/locale/fr.js index 38f31f03..4749c6e0 100644 --- a/umap/static/umap/locale/fr.js +++ b/umap/static/umap/locale/fr.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Supprimer ce tracé", "Delete this vertex (Alt+Click)": "Supprimer ce point (Alt+Clic)", "Directions from here": "Itinéraire à partir de ce lieu", - "Disable editing": "Désactiver l'édition", "Display measure": "Afficher les dimensions", "Display on load": "Afficher au chargement", "Download": "Télécharger", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Exporter et partager la carte", "Embed the map": "Intégrer la carte dans une iframe", "Empty": "Vider", - "Enable editing": "Activer l'édition", "Error in the tilelayer URL": "Erreur dans l'URL du fond de carte", "Error while fetching {url}": "Erreur en appelant l'URL {url}", "Exit Fullscreen": "Quitter le plein écran", @@ -225,7 +223,7 @@ const locale = { "Optional intensity property for heatmap": "Propriété optionnelle à utiliser pour calculer l'intensité de la heatmap", "Optional. Same as color if not set.": "Optionnel. La couleur principale sera utilisée si laissé vide.", "Override clustering radius (default 80)": "Valeur de rayon personnalisée pour le cluster (par défaut : 80)", - "Override heatmap radius (default 25)": "Valeur de rayon personnalisée pour la heatmap (par défaut : 80)", + "Override heatmap radius (default 25)": "Valeur de rayon personnalisée pour la heatmap (par défaut : 25)", "Please be sure the licence is compliant with your use.": "Pensez à vérifier que la licence de ces données vous autorise à les utiliser.", "Please choose a format": "Merci de choisir un format", "Please enter the name of the property": "Merci d'entrer le nom de la propriété", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*simple astérisque pour italique*", "--- for a horizontal rule": "--- pour un séparateur horizontal", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "Nom de la propriété utilisée pour le libellé (ex.: \"nom\"). Il est possible d'utiliser des propriétés entre accolades pour en utiliser plusieurs ou ajouter du texte (ex.: \"{nom} à {lieu}\")", - "Cancel all": "Tout annuler", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Liste de propriétés séparées par des virgules pour calculer les facettes (ex.: macle,monautrecle). Pour définir un libellé, on peut l'ajouter après un | (ex.: macle|Ma Clé,monautrecle|Mon Autre Clé)", "Default view": "Vue par défaut", "Facet keys": "Clés pour les facettes", @@ -407,11 +404,31 @@ const locale = { "Search": "Chercher", "Toggle direct input (advanced)": "Afficher le champ libre (avancé)", "Datalayers": "Calques", - "Delete map": "Supprimer la carte", "Secret edit link:": "Lien d'édition secret :", "Who can edit \"{layer}\"": "Qui peut modifier « {layer} »", "Current map view": "Lister seulement les éléments visibles", - "Filter": "Filtrer" + "Filter": "Filtrer", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Seuils choropleth", + "Choropleth classes": "Classes choropleth", + "Choropleth color palette": "Palettes de couleurs choropleth", + "Choropleth mode": "Mode choropleth", + "Choropleth property value": "Propriété choropleth", + "Comma separated list of numbers, including min and max values.": "Liste de nombres séparés par des virgules, y compris les valeurs minimale et maximale.", + "Equidistant": "Équidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-moyennes", + "Manual": "Manuel", + "Number of desired classes (default 5)": "Nombre désiré de classes (par défaut 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Montrer ce calque dans la légende", + "Back to preview": "Voir l'aperçu", + "Drawing": "Modification", + "Edit the title of the map": "Modifier le titre de la carte", + "Go to the homepage": "Retour à la page d'accueil", + "Switch to edit mode": "Basculer en mode édition", + "Update who can see and edit the map": "Définir qui peut voir et modifier la carte", + "View": "Aperçu" } L.registerLocale("fr", locale) L.setLocale("fr") diff --git a/umap/static/umap/locale/fr.json b/umap/static/umap/locale/fr.json index a30f9cf8..ceb17e94 100644 --- a/umap/static/umap/locale/fr.json +++ b/umap/static/umap/locale/fr.json @@ -143,7 +143,6 @@ "Delete this shape": "Supprimer ce tracé", "Delete this vertex (Alt+Click)": "Supprimer ce point (Alt+Clic)", "Directions from here": "Itinéraire à partir de ce lieu", - "Disable editing": "Désactiver l'édition", "Display measure": "Afficher les dimensions", "Display on load": "Afficher au chargement", "Download": "Télécharger", @@ -164,7 +163,6 @@ "Embed and share this map": "Exporter et partager la carte", "Embed the map": "Intégrer la carte dans une iframe", "Empty": "Vider", - "Enable editing": "Activer l'édition", "Error in the tilelayer URL": "Erreur dans l'URL du fond de carte", "Error while fetching {url}": "Erreur en appelant l'URL {url}", "Exit Fullscreen": "Quitter le plein écran", @@ -225,7 +223,7 @@ "Optional intensity property for heatmap": "Propriété optionnelle à utiliser pour calculer l'intensité de la heatmap", "Optional. Same as color if not set.": "Optionnel. La couleur principale sera utilisée si laissé vide.", "Override clustering radius (default 80)": "Valeur de rayon personnalisée pour le cluster (par défaut : 80)", - "Override heatmap radius (default 25)": "Valeur de rayon personnalisée pour la heatmap (par défaut : 80)", + "Override heatmap radius (default 25)": "Valeur de rayon personnalisée pour la heatmap (par défaut : 25)", "Please be sure the licence is compliant with your use.": "Pensez à vérifier que la licence de ces données vous autorise à les utiliser.", "Please choose a format": "Merci de choisir un format", "Please enter the name of the property": "Merci d'entrer le nom de la propriété", @@ -387,7 +385,6 @@ "*single star for italic*": "*simple astérisque pour italique*", "--- for a horizontal rule": "--- pour un séparateur horizontal", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "Nom de la propriété utilisée pour le libellé (ex.: \"nom\"). Il est possible d'utiliser des propriétés entre accolades pour en utiliser plusieurs ou ajouter du texte (ex.: \"{nom} à {lieu}\")", - "Cancel all": "Tout annuler", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Liste de propriétés séparées par des virgules pour calculer les facettes (ex.: macle,monautrecle). Pour définir un libellé, on peut l'ajouter après un | (ex.: macle|Ma Clé,monautrecle|Mon Autre Clé)", "Default view": "Vue par défaut", "Facet keys": "Clés pour les facettes", @@ -407,9 +404,29 @@ "Search": "Chercher", "Toggle direct input (advanced)": "Afficher le champ libre (avancé)", "Datalayers": "Calques", - "Delete map": "Supprimer la carte", "Secret edit link:": "Lien d'édition secret :", "Who can edit \"{layer}\"": "Qui peut modifier « {layer} »", "Current map view": "Lister seulement les éléments visibles", - "Filter": "Filtrer" + "Filter": "Filtrer", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Seuils choropleth", + "Choropleth classes": "Classes choropleth", + "Choropleth color palette": "Palettes de couleurs choropleth", + "Choropleth mode": "Mode choropleth", + "Choropleth property value": "Propriété choropleth", + "Comma separated list of numbers, including min and max values.": "Liste de nombres séparés par des virgules, y compris les valeurs minimale et maximale.", + "Equidistant": "Équidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-moyennes", + "Manual": "Manuel", + "Number of desired classes (default 5)": "Nombre désiré de classes (par défaut 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Montrer ce calque dans la légende", + "Back to preview": "Voir l'aperçu", + "Drawing": "Modification", + "Edit the title of the map": "Modifier le titre de la carte", + "Go to the homepage": "Retour à la page d'accueil", + "Switch to edit mode": "Basculer en mode édition", + "Update who can see and edit the map": "Définir qui peut voir et modifier la carte", + "View": "Aperçu" } \ No newline at end of file diff --git a/umap/static/umap/locale/gl.js b/umap/static/umap/locale/gl.js index 1052a3d3..c686c901 100644 --- a/umap/static/umap/locale/gl.js +++ b/umap/static/umap/locale/gl.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Eliminar esta forma", "Delete this vertex (Alt+Click)": "Eliminar este vértice (Alt+Clic)", "Directions from here": "Direccións dende aquí", - "Disable editing": "Desabilitar a edición", "Display measure": "Amosar medida", "Display on load": "Amosar ó cargar", "Download": "Baixar", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Incorporar e compartir este mapa", "Embed the map": "Incorporar o mapa", "Empty": "Baleirar", - "Enable editing": "Activar a edición", "Error in the tilelayer URL": "Erro na URL da capa de teselas", "Error while fetching {url}": "Erro ó recuperar {url}", "Exit Fullscreen": "Saír da pantalla completa", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("gl", locale) L.setLocale("gl") diff --git a/umap/static/umap/locale/gl.json b/umap/static/umap/locale/gl.json index b8de5717..b057d429 100644 --- a/umap/static/umap/locale/gl.json +++ b/umap/static/umap/locale/gl.json @@ -143,7 +143,6 @@ "Delete this shape": "Eliminar esta forma", "Delete this vertex (Alt+Click)": "Eliminar este vértice (Alt+Clic)", "Directions from here": "Direccións dende aquí", - "Disable editing": "Desabilitar a edición", "Display measure": "Amosar medida", "Display on load": "Amosar ó cargar", "Download": "Baixar", @@ -164,7 +163,6 @@ "Embed and share this map": "Incorporar e compartir este mapa", "Embed the map": "Incorporar o mapa", "Empty": "Baleirar", - "Enable editing": "Activar a edición", "Error in the tilelayer URL": "Erro na URL da capa de teselas", "Error while fetching {url}": "Erro ó recuperar {url}", "Exit Fullscreen": "Saír da pantalla completa", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/he.js b/umap/static/umap/locale/he.js index 5e220dea..e50bba05 100644 --- a/umap/static/umap/locale/he.js +++ b/umap/static/umap/locale/he.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "מחיקת הצורה הזו", "Delete this vertex (Alt+Click)": "מחיקת הקודקוד הזה ‪(Alt+לחיצה)", "Directions from here": "הכוונה מכאן", - "Disable editing": "השבתת עריכה", "Display measure": "הצגת מדידה", "Display on load": "הצגה עם הטעינה", "Download": "הורדה", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "הטמעה ושיתוף מפה זו", "Embed the map": "הטמעת המפה", "Empty": "לרוקן", - "Enable editing": "הפעלת עריכה", "Error in the tilelayer URL": "שגיאה בכתובת שכבת האריחים", "Error while fetching {url}": "שגיאה בקבלת {url}", "Exit Fullscreen": "יציאה ממסך מלא", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("he", locale) L.setLocale("he") diff --git a/umap/static/umap/locale/he.json b/umap/static/umap/locale/he.json index 947aa0a0..6210efbe 100644 --- a/umap/static/umap/locale/he.json +++ b/umap/static/umap/locale/he.json @@ -143,7 +143,6 @@ "Delete this shape": "מחיקת הצורה הזו", "Delete this vertex (Alt+Click)": "מחיקת הקודקוד הזה ‪(Alt+לחיצה)", "Directions from here": "הכוונה מכאן", - "Disable editing": "השבתת עריכה", "Display measure": "הצגת מדידה", "Display on load": "הצגה עם הטעינה", "Download": "הורדה", @@ -164,7 +163,6 @@ "Embed and share this map": "הטמעה ושיתוף מפה זו", "Embed the map": "הטמעת המפה", "Empty": "לרוקן", - "Enable editing": "הפעלת עריכה", "Error in the tilelayer URL": "שגיאה בכתובת שכבת האריחים", "Error while fetching {url}": "שגיאה בקבלת {url}", "Exit Fullscreen": "יציאה ממסך מלא", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/hr.js b/umap/static/umap/locale/hr.js index 77ccaff5..65969457 100644 --- a/umap/static/umap/locale/hr.js +++ b/umap/static/umap/locale/hr.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Onemogući uređivanje", "Display measure": "Display measure", "Display on load": "Prikaži kod učitavanja", "Download": "Download", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Embed and share this map", "Embed the map": "Ugradi kartu", "Empty": "Empty", - "Enable editing": "Omogući uređivanje", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("hr", locale) L.setLocale("hr") diff --git a/umap/static/umap/locale/hr.json b/umap/static/umap/locale/hr.json index 38040c6c..77f4694e 100644 --- a/umap/static/umap/locale/hr.json +++ b/umap/static/umap/locale/hr.json @@ -143,7 +143,6 @@ "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Onemogući uređivanje", "Display measure": "Display measure", "Display on load": "Prikaži kod učitavanja", "Download": "Download", @@ -164,7 +163,6 @@ "Embed and share this map": "Embed and share this map", "Embed the map": "Ugradi kartu", "Empty": "Empty", - "Enable editing": "Omogući uređivanje", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/hu.js b/umap/static/umap/locale/hu.js index ea247538..ab7d396e 100644 --- a/umap/static/umap/locale/hu.js +++ b/umap/static/umap/locale/hu.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Alakzat törlése", "Delete this vertex (Alt+Click)": "Sarokpont törlése (Alt+Klikk)", "Directions from here": "Irányok innen", - "Disable editing": "Szerkesztés befejezése", "Display measure": "Távolságmérő megjelenítése", "Display on load": "Megjelenítés betöltéskor", "Download": "Letöltés", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Térkép beágyazása és megosztása", "Embed the map": "Térkép beágyazása", "Empty": "Kiürítés", - "Enable editing": "Szerkesztés engedélyezése", "Error in the tilelayer URL": "Hiba a mozaikréteg URL-jében", "Error while fetching {url}": "Hiba történt e webcím beolvasásakor: {url}", "Exit Fullscreen": "Kilépés a teljes képernyős nézetből", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("hu", locale) L.setLocale("hu") diff --git a/umap/static/umap/locale/hu.json b/umap/static/umap/locale/hu.json index 407944fa..8e611a67 100644 --- a/umap/static/umap/locale/hu.json +++ b/umap/static/umap/locale/hu.json @@ -143,7 +143,6 @@ "Delete this shape": "Alakzat törlése", "Delete this vertex (Alt+Click)": "Sarokpont törlése (Alt+Klikk)", "Directions from here": "Irányok innen", - "Disable editing": "Szerkesztés befejezése", "Display measure": "Távolságmérő megjelenítése", "Display on load": "Megjelenítés betöltéskor", "Download": "Letöltés", @@ -164,7 +163,6 @@ "Embed and share this map": "Térkép beágyazása és megosztása", "Embed the map": "Térkép beágyazása", "Empty": "Kiürítés", - "Enable editing": "Szerkesztés engedélyezése", "Error in the tilelayer URL": "Hiba a mozaikréteg URL-jében", "Error while fetching {url}": "Hiba történt e webcím beolvasásakor: {url}", "Exit Fullscreen": "Kilépés a teljes képernyős nézetből", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/id.js b/umap/static/umap/locale/id.js index 5961bc93..933aed33 100644 --- a/umap/static/umap/locale/id.js +++ b/umap/static/umap/locale/id.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Disable editing", "Display measure": "Display measure", "Display on load": "Display on load", "Download": "Download", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Embed and share this map", "Embed the map": "Embed the map", "Empty": "Empty", - "Enable editing": "Enable editing", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("id", locale) L.setLocale("id") diff --git a/umap/static/umap/locale/id.json b/umap/static/umap/locale/id.json index 59035faf..f8ba8b07 100644 --- a/umap/static/umap/locale/id.json +++ b/umap/static/umap/locale/id.json @@ -143,7 +143,6 @@ "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Disable editing", "Display measure": "Display measure", "Display on load": "Display on load", "Download": "Download", @@ -164,7 +163,6 @@ "Embed and share this map": "Embed and share this map", "Embed the map": "Embed the map", "Empty": "Empty", - "Enable editing": "Enable editing", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/is.js b/umap/static/umap/locale/is.js index cbb54c10..141f2637 100644 --- a/umap/static/umap/locale/is.js +++ b/umap/static/umap/locale/is.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Eyða þessari lögun", "Delete this vertex (Alt+Click)": "Eyða þessum brotpunkti (Alt+Smella)", "Directions from here": "Leiðir héðan", - "Disable editing": "Gera breytingar óvirkar", "Display measure": "Birta lengdarmæli", "Display on load": "Birta við innhleðslu", "Download": "Sækja", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Setja inn á vefsíðu og deila þessu korti", "Embed the map": "Setja landakortið inn á vefsíðu", "Empty": "Tómt", - "Enable editing": "Virkja breytingar", "Error in the tilelayer URL": "Villa í slóð kortatíglalags", "Error while fetching {url}": "Villa við að sækja {url}", "Exit Fullscreen": "Hætta í skjáfylli", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("is", locale) L.setLocale("is") diff --git a/umap/static/umap/locale/is.json b/umap/static/umap/locale/is.json index 3cb38c1c..6b070f9e 100644 --- a/umap/static/umap/locale/is.json +++ b/umap/static/umap/locale/is.json @@ -143,7 +143,6 @@ "Delete this shape": "Eyða þessari lögun", "Delete this vertex (Alt+Click)": "Eyða þessum brotpunkti (Alt+Smella)", "Directions from here": "Leiðir héðan", - "Disable editing": "Gera breytingar óvirkar", "Display measure": "Birta lengdarmæli", "Display on load": "Birta við innhleðslu", "Download": "Sækja", @@ -164,7 +163,6 @@ "Embed and share this map": "Setja inn á vefsíðu og deila þessu korti", "Embed the map": "Setja landakortið inn á vefsíðu", "Empty": "Tómt", - "Enable editing": "Virkja breytingar", "Error in the tilelayer URL": "Villa í slóð kortatíglalags", "Error while fetching {url}": "Villa við að sækja {url}", "Exit Fullscreen": "Hætta í skjáfylli", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/it.js b/umap/static/umap/locale/it.js index 209a51f8..ceafa7e3 100644 --- a/umap/static/umap/locale/it.js +++ b/umap/static/umap/locale/it.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Cancella questa forma", "Delete this vertex (Alt+Click)": "Elimina questo vertice (Alt+Clic)", "Directions from here": "Indicazioni stradali da qui", - "Disable editing": "Disabilita la modifica", "Display measure": "Calcola le distanze", "Display on load": "Mostra al caricamento", "Download": "Download", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Includi e condividi questa mappa", "Embed the map": "Includi la mappa", "Empty": "Vuoto", - "Enable editing": "Abilita la modifica", "Error in the tilelayer URL": "Errore nell'URL nel servizio di tile", "Error while fetching {url}": "Errore nel nel recupero da {url}", "Exit Fullscreen": "Esci da Schermo intero", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*un solo asterisco per il corsivo*", "--- for a horizontal rule": "--- per una linea orizzontale", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "Il nome della proprietà da utilizzare come etichetta (es.: \"nome\"). Puoi anche essere utilizzata una proprietà tra parentesi per usarne più di una o combinarle con contenuto statico (ad esempio: \"{nome} in {luogo}\")", - "Cancel all": "Cancella tutto", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Elenco separato da virgole di proprietà da utilizzare per la ricerca a faccette (es.: miocampo,altrocampo). Per personalizzare l'etichetta va messo un | subito dopo (es.: miocampo|Il mio campo, altrocampo|Altro campo)", "Default view": "Vista predefinita", "Facet keys": "Campi delle faccette", @@ -401,17 +398,37 @@ const locale = { "Visibility: {status}": "Visibilità: {status}", "Fit all data": "Adatta tutti i dati", "Verify remote URL": "Verifica URL remota", - "Add": "Add", - "Change": "Change", - "Powered by uMap": "Powered by uMap", - "Search": "Search", - "Toggle direct input (advanced)": "Toggle direct input (advanced)", - "Datalayers": "Datalayers", - "Delete map": "Delete map", - "Secret edit link:": "Secret edit link:", - "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", - "Current map view": "Current map view", - "Filter": "Filter" + "Add": "Aggiungi", + "Change": "Cambia", + "Powered by uMap": "Alimentato da uMap", + "Search": "Ricerca", + "Toggle direct input (advanced)": "Attiva/disattiva input diretto (avanzato)", + "Datalayers": "Strati di dati", + "Secret edit link:": "Link segreto per editare:", + "Who can edit \"{layer}\"": "Chi può editare \"{layer}\"", + "Current map view": "Vista corrente della mappa", + "Filter": "Filtra", + "Choropleth": "Coropletica", + "Choropleth breakpoints": "Punti di interruzione coropletici", + "Choropleth classes": "Classi coropletiche", + "Choropleth color palette": "Palett dei colori coropletici", + "Choropleth mode": "Modo coropletico", + "Choropleth property value": "Valore della proprietà coropletica", + "Comma separated list of numbers, including min and max values.": "Lista dei numeri separati da virgola, che includono i valori minimi e massimi", + "Equidistant": "Equidistante", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manuale", + "Number of desired classes (default 5)": "Numero di classi desiderate (default 5)", + "Quantiles": "Quantili", + "Show this layer in the caption": "Mostra questo livello nella didascalia", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("it", locale) L.setLocale("it") diff --git a/umap/static/umap/locale/it.json b/umap/static/umap/locale/it.json index 0f196899..0896312e 100644 --- a/umap/static/umap/locale/it.json +++ b/umap/static/umap/locale/it.json @@ -143,7 +143,6 @@ "Delete this shape": "Cancella questa forma", "Delete this vertex (Alt+Click)": "Elimina questo vertice (Alt+Clic)", "Directions from here": "Indicazioni stradali da qui", - "Disable editing": "Disabilita la modifica", "Display measure": "Calcola le distanze", "Display on load": "Mostra al caricamento", "Download": "Download", @@ -164,7 +163,6 @@ "Embed and share this map": "Includi e condividi questa mappa", "Embed the map": "Includi la mappa", "Empty": "Vuoto", - "Enable editing": "Abilita la modifica", "Error in the tilelayer URL": "Errore nell'URL nel servizio di tile", "Error while fetching {url}": "Errore nel nel recupero da {url}", "Exit Fullscreen": "Esci da Schermo intero", @@ -387,7 +385,6 @@ "*single star for italic*": "*un solo asterisco per il corsivo*", "--- for a horizontal rule": "--- per una linea orizzontale", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "Il nome della proprietà da utilizzare come etichetta (es.: \"nome\"). Puoi anche essere utilizzata una proprietà tra parentesi per usarne più di una o combinarle con contenuto statico (ad esempio: \"{nome} in {luogo}\")", - "Cancel all": "Cancella tutto", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Elenco separato da virgole di proprietà da utilizzare per la ricerca a faccette (es.: miocampo,altrocampo). Per personalizzare l'etichetta va messo un | subito dopo (es.: miocampo|Il mio campo, altrocampo|Altro campo)", "Default view": "Vista predefinita", "Facet keys": "Campi delle faccette", @@ -401,15 +398,35 @@ "Visibility: {status}": "Visibilità: {status}", "Fit all data": "Adatta tutti i dati", "Verify remote URL": "Verifica URL remota", - "Add": "Add", - "Change": "Change", - "Powered by uMap": "Powered by uMap", - "Search": "Search", - "Toggle direct input (advanced)": "Toggle direct input (advanced)", - "Datalayers": "Datalayers", - "Delete map": "Delete map", - "Secret edit link:": "Secret edit link:", - "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", - "Current map view": "Current map view", - "Filter": "Filter" + "Add": "Aggiungi", + "Change": "Cambia", + "Powered by uMap": "Alimentato da uMap", + "Search": "Ricerca", + "Toggle direct input (advanced)": "Attiva/disattiva input diretto (avanzato)", + "Datalayers": "Strati di dati", + "Secret edit link:": "Link segreto per editare:", + "Who can edit \"{layer}\"": "Chi può editare \"{layer}\"", + "Current map view": "Vista corrente della mappa", + "Filter": "Filtra", + "Choropleth": "Coropletica", + "Choropleth breakpoints": "Punti di interruzione coropletici", + "Choropleth classes": "Classi coropletiche", + "Choropleth color palette": "Palett dei colori coropletici", + "Choropleth mode": "Modo coropletico", + "Choropleth property value": "Valore della proprietà coropletica", + "Comma separated list of numbers, including min and max values.": "Lista dei numeri separati da virgola, che includono i valori minimi e massimi", + "Equidistant": "Equidistante", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manuale", + "Number of desired classes (default 5)": "Numero di classi desiderate (default 5)", + "Quantiles": "Quantili", + "Show this layer in the caption": "Mostra questo livello nella didascalia", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/ja.js b/umap/static/umap/locale/ja.js index ec5e429c..9157f28f 100644 --- a/umap/static/umap/locale/ja.js +++ b/umap/static/umap/locale/ja.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "このシェイプを削除", "Delete this vertex (Alt+Click)": "このポイントを削除(Altを押しながらクリック)", "Directions from here": "ここからの距離", - "Disable editing": "編集を終了", "Display measure": "Display measure", "Display on load": "読み込み時に表示", "Download": "ダンロード", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "サイトへのマップ埋め込みと共有", "Embed the map": "マップ埋め込み", "Empty": "内容なし", - "Enable editing": "編集を有効化", "Error in the tilelayer URL": "タイルレイヤのURLに誤りがあります", "Error while fetching {url}": "{url} の取得エラー", "Exit Fullscreen": "フルスクリーン表示を解除", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("ja", locale) L.setLocale("ja") diff --git a/umap/static/umap/locale/ja.json b/umap/static/umap/locale/ja.json index e728ed75..6974e10b 100644 --- a/umap/static/umap/locale/ja.json +++ b/umap/static/umap/locale/ja.json @@ -143,7 +143,6 @@ "Delete this shape": "このシェイプを削除", "Delete this vertex (Alt+Click)": "このポイントを削除(Altを押しながらクリック)", "Directions from here": "ここからの距離", - "Disable editing": "編集を終了", "Display measure": "Display measure", "Display on load": "読み込み時に表示", "Download": "ダンロード", @@ -164,7 +163,6 @@ "Embed and share this map": "サイトへのマップ埋め込みと共有", "Embed the map": "マップ埋め込み", "Empty": "内容なし", - "Enable editing": "編集を有効化", "Error in the tilelayer URL": "タイルレイヤのURLに誤りがあります", "Error while fetching {url}": "{url} の取得エラー", "Exit Fullscreen": "フルスクリーン表示を解除", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/ko.js b/umap/static/umap/locale/ko.js index dea6f60a..0b834a58 100644 --- a/umap/static/umap/locale/ko.js +++ b/umap/static/umap/locale/ko.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Disable editing", "Display measure": "Display measure", "Display on load": "Display on load", "Download": "Download", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Embed and share this map", "Embed the map": "Embed the map", "Empty": "Empty", - "Enable editing": "Enable editing", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("ko", locale) L.setLocale("ko") diff --git a/umap/static/umap/locale/ko.json b/umap/static/umap/locale/ko.json index f5ed3cc0..8fcdff24 100644 --- a/umap/static/umap/locale/ko.json +++ b/umap/static/umap/locale/ko.json @@ -143,7 +143,6 @@ "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Disable editing", "Display measure": "Display measure", "Display on load": "Display on load", "Download": "Download", @@ -164,7 +163,6 @@ "Embed and share this map": "Embed and share this map", "Embed the map": "Embed the map", "Empty": "Empty", - "Enable editing": "Enable editing", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/lt.js b/umap/static/umap/locale/lt.js index 20898fc3..b7982063 100644 --- a/umap/static/umap/locale/lt.js +++ b/umap/static/umap/locale/lt.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Nuorodos iš šio taško", - "Disable editing": "Uždrausti redagavimą", "Display measure": "Display measure", "Display on load": "Rodyti pasikrovus", "Download": "Download", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Įkelti ir dalintis šiuo žemėlapiu", "Embed the map": "Įsikelti šį žemėlapį", "Empty": "Tuščias", - "Enable editing": "Leisti redaguoti", "Error in the tilelayer URL": "Klaida tile-sluoksnio URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("lt", locale) L.setLocale("lt") diff --git a/umap/static/umap/locale/lt.json b/umap/static/umap/locale/lt.json index ede7aa92..ce9dfd98 100644 --- a/umap/static/umap/locale/lt.json +++ b/umap/static/umap/locale/lt.json @@ -143,7 +143,6 @@ "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Nuorodos iš šio taško", - "Disable editing": "Uždrausti redagavimą", "Display measure": "Display measure", "Display on load": "Rodyti pasikrovus", "Download": "Download", @@ -164,7 +163,6 @@ "Embed and share this map": "Įkelti ir dalintis šiuo žemėlapiu", "Embed the map": "Įsikelti šį žemėlapį", "Empty": "Tuščias", - "Enable editing": "Leisti redaguoti", "Error in the tilelayer URL": "Klaida tile-sluoksnio URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/ms.js b/umap/static/umap/locale/ms.js index 22ec9092..a208019c 100644 --- a/umap/static/umap/locale/ms.js +++ b/umap/static/umap/locale/ms.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Padam bentuk ini", "Delete this vertex (Alt+Click)": "Padam bucu ini (Alt+Klik)", "Directions from here": "Arah dari sini", - "Disable editing": "Lumpuhkan suntingan", "Display measure": "Paparkan ukuran", "Display on load": "Paparkan semasa dimuatkan", "Download": "Muat turun", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Benam dan kongsi peta ini", "Embed the map": "Benamkan peta", "Empty": "Kosongkan", - "Enable editing": "Bolehkan suntingan", "Error in the tilelayer URL": "Ralat dalam URL lapisan jubin", "Error while fetching {url}": "Ralat ketika mengambil {url}", "Exit Fullscreen": "Keluar Skrin Penuh", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*bintang tunggal untuk tulisan condong*", "--- for a horizontal rule": "--- untuk garis melintang", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "Nama bagi ciri untuk digunakan sebagai label sifat (cth.: \"nom\"). Anda juga boleh gunakan ciri-ciri dalam kurungan dakap untuk guna lebih daripada satu ciri atau untuk gabung dengan kandungan statik (cth.: \"{name} di {place}\")", - "Cancel all": "Batal semua", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Senarai berpisahkan koma bagi ciri-ciri untuk digunakan ketika menggelintar faset (cth.: kekuncisaya,kekuncilain). Untuk mengawal label, tambahkannya selepas tanda | (cth.: kekuncisaya|Kekunci Saya,kekuncilain|Kekunci Lain)", "Default view": "Paparan lalai", "Facet keys": "Kekunci faset", @@ -407,11 +404,31 @@ const locale = { "Search": "Cari", "Toggle direct input (advanced)": "Togol input terus (lanjutan)", "Datalayers": "Lapisan data", - "Delete map": "Padam peta", "Secret edit link:": "Pautan suntingan rahsia:", "Who can edit \"{layer}\"": "Siapa boleh sunting \"{layer}\"", - "Current map view": "Current map view", - "Filter": "Filter" + "Current map view": "Paparan peta semasa", + "Filter": "Tapis", + "Choropleth": "Koroplet", + "Choropleth breakpoints": "Titik putus koroplet", + "Choropleth classes": "Kelas koroplet", + "Choropleth color palette": "Palet warna koroplet", + "Choropleth mode": "Mod koroplet", + "Choropleth property value": "Nilai ciri koroplet", + "Comma separated list of numbers, including min and max values.": "Senarai nombor, dipisahkan dengan koma, termasuk nilai minimum dan maksimum.", + "Equidistant": "Sama jarak", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "Cara K", + "Manual": "Manual", + "Number of desired classes (default 5)": "Jumlah kelas yang diingini (lalainya 5)", + "Quantiles": "Kuantil", + "Show this layer in the caption": "Tunjuk lapisan ini dalam keterangan", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("ms", locale) L.setLocale("ms") diff --git a/umap/static/umap/locale/ms.json b/umap/static/umap/locale/ms.json index fffb559c..6351a702 100644 --- a/umap/static/umap/locale/ms.json +++ b/umap/static/umap/locale/ms.json @@ -143,7 +143,6 @@ "Delete this shape": "Padam bentuk ini", "Delete this vertex (Alt+Click)": "Padam bucu ini (Alt+Klik)", "Directions from here": "Arah dari sini", - "Disable editing": "Lumpuhkan suntingan", "Display measure": "Paparkan ukuran", "Display on load": "Paparkan semasa dimuatkan", "Download": "Muat turun", @@ -164,7 +163,6 @@ "Embed and share this map": "Benam dan kongsi peta ini", "Embed the map": "Benamkan peta", "Empty": "Kosongkan", - "Enable editing": "Bolehkan suntingan", "Error in the tilelayer URL": "Ralat dalam URL lapisan jubin", "Error while fetching {url}": "Ralat ketika mengambil {url}", "Exit Fullscreen": "Keluar Skrin Penuh", @@ -387,7 +385,6 @@ "*single star for italic*": "*bintang tunggal untuk tulisan condong*", "--- for a horizontal rule": "--- untuk garis melintang", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "Nama bagi ciri untuk digunakan sebagai label sifat (cth.: \"nom\"). Anda juga boleh gunakan ciri-ciri dalam kurungan dakap untuk guna lebih daripada satu ciri atau untuk gabung dengan kandungan statik (cth.: \"{name} di {place}\")", - "Cancel all": "Batal semua", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Senarai berpisahkan koma bagi ciri-ciri untuk digunakan ketika menggelintar faset (cth.: kekuncisaya,kekuncilain). Untuk mengawal label, tambahkannya selepas tanda | (cth.: kekuncisaya|Kekunci Saya,kekuncilain|Kekunci Lain)", "Default view": "Paparan lalai", "Facet keys": "Kekunci faset", @@ -407,9 +404,29 @@ "Search": "Cari", "Toggle direct input (advanced)": "Togol input terus (lanjutan)", "Datalayers": "Lapisan data", - "Delete map": "Padam peta", "Secret edit link:": "Pautan suntingan rahsia:", "Who can edit \"{layer}\"": "Siapa boleh sunting \"{layer}\"", - "Current map view": "Current map view", - "Filter": "Filter" + "Current map view": "Paparan peta semasa", + "Filter": "Tapis", + "Choropleth": "Koroplet", + "Choropleth breakpoints": "Titik putus koroplet", + "Choropleth classes": "Kelas koroplet", + "Choropleth color palette": "Palet warna koroplet", + "Choropleth mode": "Mod koroplet", + "Choropleth property value": "Nilai ciri koroplet", + "Comma separated list of numbers, including min and max values.": "Senarai nombor, dipisahkan dengan koma, termasuk nilai minimum dan maksimum.", + "Equidistant": "Sama jarak", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "Cara K", + "Manual": "Manual", + "Number of desired classes (default 5)": "Jumlah kelas yang diingini (lalainya 5)", + "Quantiles": "Kuantil", + "Show this layer in the caption": "Tunjuk lapisan ini dalam keterangan", + "Back to preview": "Kembali ke pralihat", + "Drawing": "Lukisan", + "Edit the title of the map": "Sunting tajuk peta", + "Go to the homepage": "Pergi ke halaman utama", + "Switch to edit mode": "Tukar ke mod suntingan", + "Update who can see and edit the map": "Kemas kini siapa boleh lihat dan sunting peta", + "View": "Lihat" } \ No newline at end of file diff --git a/umap/static/umap/locale/nl.js b/umap/static/umap/locale/nl.js index bf16684e..d30b00db 100644 --- a/umap/static/umap/locale/nl.js +++ b/umap/static/umap/locale/nl.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Verwijder deze vorm", "Delete this vertex (Alt+Click)": "Verwijder dit knooppunt (Alt+Click)", "Directions from here": "Wegbeschrijving vanaf hier", - "Disable editing": "Bewerken uitschakelen", "Display measure": "Toon meting", "Display on load": "Tonen bij laden", "Download": "Downloaden", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Deze kaart insluiten en delen", "Embed the map": "Kaart inbedden", "Empty": "Leeg", - "Enable editing": "Bewerken inschakelen", "Error in the tilelayer URL": "Er is een fout opgetreden met de achtergrondtegels", "Error while fetching {url}": "Fout bij ophalen {url}", "Exit Fullscreen": "Verlaat volledig scherm", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("nl", locale) L.setLocale("nl") diff --git a/umap/static/umap/locale/nl.json b/umap/static/umap/locale/nl.json index 2bfb53ec..b522cd2c 100644 --- a/umap/static/umap/locale/nl.json +++ b/umap/static/umap/locale/nl.json @@ -143,7 +143,6 @@ "Delete this shape": "Verwijder deze vorm", "Delete this vertex (Alt+Click)": "Verwijder dit knooppunt (Alt+Click)", "Directions from here": "Wegbeschrijving vanaf hier", - "Disable editing": "Bewerken uitschakelen", "Display measure": "Toon meting", "Display on load": "Tonen bij laden", "Download": "Downloaden", @@ -164,7 +163,6 @@ "Embed and share this map": "Deze kaart insluiten en delen", "Embed the map": "Kaart inbedden", "Empty": "Leeg", - "Enable editing": "Bewerken inschakelen", "Error in the tilelayer URL": "Er is een fout opgetreden met de achtergrondtegels", "Error while fetching {url}": "Fout bij ophalen {url}", "Exit Fullscreen": "Verlaat volledig scherm", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/no.js b/umap/static/umap/locale/no.js index 56962be7..1efd085c 100644 --- a/umap/static/umap/locale/no.js +++ b/umap/static/umap/locale/no.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Slett denne figuren", "Delete this vertex (Alt+Click)": "Slett denne noden (Alt+Klikk)", "Directions from here": "Navigasjon herfra", - "Disable editing": "Deaktiver redigering", "Display measure": "Vis måling", "Display on load": "Vis ved innlasting", "Download": "Last ned", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Bygg inn og del dette kartet", "Embed the map": "Bygg inn kartet", "Empty": "Tøm", - "Enable editing": "Aktiver redigering", "Error in the tilelayer URL": "Feil i flislag-URLen", "Error while fetching {url}": "Feil under henting av {url}", "Exit Fullscreen": "Gå ut av fullskjerm", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("no", locale) L.setLocale("no") diff --git a/umap/static/umap/locale/no.json b/umap/static/umap/locale/no.json index c0ee6fd2..8a995a04 100644 --- a/umap/static/umap/locale/no.json +++ b/umap/static/umap/locale/no.json @@ -143,7 +143,6 @@ "Delete this shape": "Slett denne figuren", "Delete this vertex (Alt+Click)": "Slett denne noden (Alt+Klikk)", "Directions from here": "Navigasjon herfra", - "Disable editing": "Deaktiver redigering", "Display measure": "Vis måling", "Display on load": "Vis ved innlasting", "Download": "Last ned", @@ -164,7 +163,6 @@ "Embed and share this map": "Bygg inn og del dette kartet", "Embed the map": "Bygg inn kartet", "Empty": "Tøm", - "Enable editing": "Aktiver redigering", "Error in the tilelayer URL": "Feil i flislag-URLen", "Error while fetching {url}": "Feil under henting av {url}", "Exit Fullscreen": "Gå ut av fullskjerm", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/pl.js b/umap/static/umap/locale/pl.js index cc4aacf6..e06e8804 100644 --- a/umap/static/umap/locale/pl.js +++ b/umap/static/umap/locale/pl.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Usuń tę figurę", "Delete this vertex (Alt+Click)": "Usuń ten wierzchołek (Alt+Klik)", "Directions from here": "Kierunki stąd", - "Disable editing": "Wyłącz edytor", "Display measure": "Wyświetl pomiar", "Display on load": "Wyświetl przy ładowaniu", "Download": "Pobieranie", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Osadź i udostępnij tę mapę", "Embed the map": "Osadź mapę na stronie", "Empty": "Wyczyść", - "Enable editing": "Włącz edytor", "Error in the tilelayer URL": "Błąd w adresie URL podkładu", "Error while fetching {url}": "Błąd wczytywania {url}", "Exit Fullscreen": "Zamknij pełny ekran", @@ -378,16 +376,15 @@ const locale = { "Congratulations, your map has been created!": "Gratulacje, twoja mapa została utworzona!", "Copy link": "Skopiuj link", "Email": "Email", - "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", + "Secret edit link copied to clipboard!": "Tajny odnośnik do edycji skopiowany do schowka!", "Send me the link": "Wyślij mi link", "Your map has been created! As you are not logged in, here is your secret link to edit the map, please keep it safe:": "Your map has been created! As you are not logged in, here is your secret link to edit the map, please keep it safe:", "Comma separated list of properties to use for sorting features. To reverse the sort, put a minus sign (-) before. Eg. mykey,-otherkey.": "Comma separated list of properties to use for sorting features. To reverse the sort, put a minus sign (-) before. Eg. mykey,-otherkey.", "Toggle edit mode (⇧+Click)": "Przełącz tryb edycji (Shift+Klik)", - "icon opacity": "icon opacity", - "*single star for italic*": "*single star for italic*", + "icon opacity": "nieprzezroczystość ikony", + "*single star for italic*": "*pojedyncza gwiazdka dla kursywy*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Anuluj wszystko", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Domyślny widok", "Facet keys": "Facet keys", @@ -395,23 +392,43 @@ const locale = { "Feature properties": "Feature properties", "Issue reaching that URL (network problem or CORS protection): {url}": "Issue reaching that URL (network problem or CORS protection): {url}", "Latest feature": "Latest feature", - "No results for these facets": "No results for these facets", + "No results for these facets": "Brak wyników dla tych aspektów", "Saved center and zoom": "Zapisano pozycję i przybliżenie", "User location": "Lokalizacja użytkownika", "Visibility: {status}": "Widoczność: {status}", "Fit all data": "Fit all data", - "Verify remote URL": "Verify remote URL", + "Verify remote URL": "Zweryfikuj zdalny URL", "Add": "Dodawać", "Change": "Zmiana", - "Powered by uMap": "Powered by uMap", + "Powered by uMap": "Napędzane przez uMap", "Search": "Szukaj", "Toggle direct input (advanced)": "Toggle direct input (advanced)", - "Datalayers": "Datalayers", - "Delete map": "Delete map", - "Secret edit link:": "Secret edit link:", - "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", - "Current map view": "Current map view", - "Filter": "Filter" + "Datalayers": "Warstwy danych", + "Secret edit link:": "Sekretny odnośnik edycji:", + "Who can edit \"{layer}\"": "Kto może edytować \"{layer}\"", + "Current map view": "Bieżący widok mapy", + "Filter": "Filtr", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Pokaż tę warstwę w podpisie", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("pl", locale) L.setLocale("pl") diff --git a/umap/static/umap/locale/pl.json b/umap/static/umap/locale/pl.json index 773185fd..d755e920 100644 --- a/umap/static/umap/locale/pl.json +++ b/umap/static/umap/locale/pl.json @@ -143,7 +143,6 @@ "Delete this shape": "Usuń tę figurę", "Delete this vertex (Alt+Click)": "Usuń ten wierzchołek (Alt+Klik)", "Directions from here": "Kierunki stąd", - "Disable editing": "Wyłącz edytor", "Display measure": "Wyświetl pomiar", "Display on load": "Wyświetl przy ładowaniu", "Download": "Pobieranie", @@ -164,7 +163,6 @@ "Embed and share this map": "Osadź i udostępnij tę mapę", "Embed the map": "Osadź mapę na stronie", "Empty": "Wyczyść", - "Enable editing": "Włącz edytor", "Error in the tilelayer URL": "Błąd w adresie URL podkładu", "Error while fetching {url}": "Błąd wczytywania {url}", "Exit Fullscreen": "Zamknij pełny ekran", @@ -378,16 +376,15 @@ "Congratulations, your map has been created!": "Gratulacje, twoja mapa została utworzona!", "Copy link": "Skopiuj link", "Email": "Email", - "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", + "Secret edit link copied to clipboard!": "Tajny odnośnik do edycji skopiowany do schowka!", "Send me the link": "Wyślij mi link", "Your map has been created! As you are not logged in, here is your secret link to edit the map, please keep it safe:": "Your map has been created! As you are not logged in, here is your secret link to edit the map, please keep it safe:", "Comma separated list of properties to use for sorting features. To reverse the sort, put a minus sign (-) before. Eg. mykey,-otherkey.": "Comma separated list of properties to use for sorting features. To reverse the sort, put a minus sign (-) before. Eg. mykey,-otherkey.", "Toggle edit mode (⇧+Click)": "Przełącz tryb edycji (Shift+Klik)", - "icon opacity": "icon opacity", - "*single star for italic*": "*single star for italic*", + "icon opacity": "nieprzezroczystość ikony", + "*single star for italic*": "*pojedyncza gwiazdka dla kursywy*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Anuluj wszystko", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Domyślny widok", "Facet keys": "Facet keys", @@ -395,21 +392,41 @@ "Feature properties": "Feature properties", "Issue reaching that URL (network problem or CORS protection): {url}": "Issue reaching that URL (network problem or CORS protection): {url}", "Latest feature": "Latest feature", - "No results for these facets": "No results for these facets", + "No results for these facets": "Brak wyników dla tych aspektów", "Saved center and zoom": "Zapisano pozycję i przybliżenie", "User location": "Lokalizacja użytkownika", "Visibility: {status}": "Widoczność: {status}", "Fit all data": "Fit all data", - "Verify remote URL": "Verify remote URL", + "Verify remote URL": "Zweryfikuj zdalny URL", "Add": "Dodawać", "Change": "Zmiana", - "Powered by uMap": "Powered by uMap", + "Powered by uMap": "Napędzane przez uMap", "Search": "Szukaj", "Toggle direct input (advanced)": "Toggle direct input (advanced)", - "Datalayers": "Datalayers", - "Delete map": "Delete map", - "Secret edit link:": "Secret edit link:", - "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", - "Current map view": "Current map view", - "Filter": "Filter" + "Datalayers": "Warstwy danych", + "Secret edit link:": "Sekretny odnośnik edycji:", + "Who can edit \"{layer}\"": "Kto może edytować \"{layer}\"", + "Current map view": "Bieżący widok mapy", + "Filter": "Filtr", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Pokaż tę warstwę w podpisie", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/pl_PL.json b/umap/static/umap/locale/pl_PL.json index 59035faf..f8ba8b07 100644 --- a/umap/static/umap/locale/pl_PL.json +++ b/umap/static/umap/locale/pl_PL.json @@ -143,7 +143,6 @@ "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Disable editing", "Display measure": "Display measure", "Display on load": "Display on load", "Download": "Download", @@ -164,7 +163,6 @@ "Embed and share this map": "Embed and share this map", "Embed the map": "Embed the map", "Empty": "Empty", - "Enable editing": "Enable editing", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/pt.js b/umap/static/umap/locale/pt.js index 1a0a95d8..875b796c 100644 --- a/umap/static/umap/locale/pt.js +++ b/umap/static/umap/locale/pt.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Eliminar esta forma geométrica", "Delete this vertex (Alt+Click)": "Eliminar este vértice (Alt+Clique)", "Directions from here": "Direções a partir daqui", - "Disable editing": "Desativar edição", "Display measure": "Mostrar medição", "Display on load": "Mostrar ao carregar", "Download": "Descarregar", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Exportar e partilhar este mapa", "Embed the map": "Embeber o mapa", "Empty": "Vazio", - "Enable editing": "Ativar edição", "Error in the tilelayer URL": "Erro no URL de telas", "Error while fetching {url}": "Erro ao processar {url}", "Exit Fullscreen": "Sair de Ecrã Total", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("pt", locale) L.setLocale("pt") diff --git a/umap/static/umap/locale/pt.json b/umap/static/umap/locale/pt.json index 266e88be..92076006 100644 --- a/umap/static/umap/locale/pt.json +++ b/umap/static/umap/locale/pt.json @@ -143,7 +143,6 @@ "Delete this shape": "Eliminar esta forma geométrica", "Delete this vertex (Alt+Click)": "Eliminar este vértice (Alt+Clique)", "Directions from here": "Direções a partir daqui", - "Disable editing": "Desativar edição", "Display measure": "Mostrar medição", "Display on load": "Mostrar ao carregar", "Download": "Descarregar", @@ -164,7 +163,6 @@ "Embed and share this map": "Exportar e partilhar este mapa", "Embed the map": "Embeber o mapa", "Empty": "Vazio", - "Enable editing": "Ativar edição", "Error in the tilelayer URL": "Erro no URL de telas", "Error while fetching {url}": "Erro ao processar {url}", "Exit Fullscreen": "Sair de Ecrã Total", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/pt_BR.js b/umap/static/umap/locale/pt_BR.js index ef2b9de9..58f72c54 100644 --- a/umap/static/umap/locale/pt_BR.js +++ b/umap/static/umap/locale/pt_BR.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Eliminar esta forma geométrica", "Delete this vertex (Alt+Click)": "Eliminar este vértice (Alt+Clique)", "Directions from here": "Direções a partir daqui", - "Disable editing": "Desativar edição", "Display measure": "Mostrar medição", "Display on load": "Mostrar ao carregar", "Download": "Descarregar", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Exportar e partilhar este mapa", "Embed the map": "Embeber o mapa", "Empty": "Vazio", - "Enable editing": "Ativar edição", "Error in the tilelayer URL": "Erro no URL de telas", "Error while fetching {url}": "Erro ao processar {url}", "Exit Fullscreen": "Sair de Ecrã Total", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("pt_BR", locale) L.setLocale("pt_BR") diff --git a/umap/static/umap/locale/pt_BR.json b/umap/static/umap/locale/pt_BR.json index 9759ccf1..a18366b3 100644 --- a/umap/static/umap/locale/pt_BR.json +++ b/umap/static/umap/locale/pt_BR.json @@ -143,7 +143,6 @@ "Delete this shape": "Eliminar esta forma geométrica", "Delete this vertex (Alt+Click)": "Eliminar este vértice (Alt+Clique)", "Directions from here": "Direções a partir daqui", - "Disable editing": "Desativar edição", "Display measure": "Mostrar medição", "Display on load": "Mostrar ao carregar", "Download": "Descarregar", @@ -164,7 +163,6 @@ "Embed and share this map": "Exportar e partilhar este mapa", "Embed the map": "Embeber o mapa", "Empty": "Vazio", - "Enable editing": "Ativar edição", "Error in the tilelayer URL": "Erro no URL de telas", "Error while fetching {url}": "Erro ao processar {url}", "Exit Fullscreen": "Sair de Ecrã Total", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/pt_PT.js b/umap/static/umap/locale/pt_PT.js index 0b0b5f1d..c5d16486 100644 --- a/umap/static/umap/locale/pt_PT.js +++ b/umap/static/umap/locale/pt_PT.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Eliminar esta forma geométrica", "Delete this vertex (Alt+Click)": "Eliminar este vértice (Alt+Clique)", "Directions from here": "Direções a partir daqui", - "Disable editing": "Desativar edição", "Display measure": "Mostrar medição", "Display on load": "Mostrar ao carregar", "Download": "Descarregar", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Exportar e partilhar este mapa", "Embed the map": "Embeber o mapa", "Empty": "Vazio", - "Enable editing": "Ativar edição", "Error in the tilelayer URL": "Erro no URL de telas", "Error while fetching {url}": "Erro ao processar {url}", "Exit Fullscreen": "Sair de Ecrã Total", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("pt_PT", locale) L.setLocale("pt_PT") diff --git a/umap/static/umap/locale/pt_PT.json b/umap/static/umap/locale/pt_PT.json index 17dc7ce3..42fca368 100644 --- a/umap/static/umap/locale/pt_PT.json +++ b/umap/static/umap/locale/pt_PT.json @@ -143,7 +143,6 @@ "Delete this shape": "Eliminar esta forma geométrica", "Delete this vertex (Alt+Click)": "Eliminar este vértice (Alt+Clique)", "Directions from here": "Direções a partir daqui", - "Disable editing": "Desativar edição", "Display measure": "Mostrar medição", "Display on load": "Mostrar ao carregar", "Download": "Descarregar", @@ -164,7 +163,6 @@ "Embed and share this map": "Exportar e partilhar este mapa", "Embed the map": "Embeber o mapa", "Empty": "Vazio", - "Enable editing": "Ativar edição", "Error in the tilelayer URL": "Erro no URL de telas", "Error while fetching {url}": "Erro ao processar {url}", "Exit Fullscreen": "Sair de Ecrã Total", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/ro.js b/umap/static/umap/locale/ro.js index f9b84fff..86582441 100644 --- a/umap/static/umap/locale/ro.js +++ b/umap/static/umap/locale/ro.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Dezactivează editarea", "Display measure": "Display measure", "Display on load": "Display on load", "Download": "Descarcă", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Embed and share this map", "Embed the map": "Embed the map", "Empty": "Empty", - "Enable editing": "Enable editing", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("ro", locale) L.setLocale("ro") diff --git a/umap/static/umap/locale/ro.json b/umap/static/umap/locale/ro.json index 3affa91f..18addcef 100644 --- a/umap/static/umap/locale/ro.json +++ b/umap/static/umap/locale/ro.json @@ -143,7 +143,6 @@ "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Dezactivează editarea", "Display measure": "Display measure", "Display on load": "Display on load", "Download": "Descarcă", @@ -164,7 +163,6 @@ "Embed and share this map": "Embed and share this map", "Embed the map": "Embed the map", "Empty": "Empty", - "Enable editing": "Enable editing", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/ru.js b/umap/static/umap/locale/ru.js index 80c80c5b..182b8726 100644 --- a/umap/static/umap/locale/ru.js +++ b/umap/static/umap/locale/ru.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Удалить эту фигуру", "Delete this vertex (Alt+Click)": "Удалить эту точку (Alt+клик)", "Directions from here": "Навигация отсюда", - "Disable editing": "Отключить редактирование", "Display measure": "Display measure", "Display on load": "Показывать при загрузке", "Download": "Скачать", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Встроить карту или поделиться ей", "Embed the map": "Встроить карту", "Empty": "Очистить", - "Enable editing": "Разрешить редактирование", "Error in the tilelayer URL": "Ошибка в ссылке на слой карты", "Error while fetching {url}": "Ошибка при обработке {url}", "Exit Fullscreen": "Выйти из полноэкранного режима", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("ru", locale) L.setLocale("ru") diff --git a/umap/static/umap/locale/ru.json b/umap/static/umap/locale/ru.json index 50cd490d..fdaf280e 100644 --- a/umap/static/umap/locale/ru.json +++ b/umap/static/umap/locale/ru.json @@ -143,7 +143,6 @@ "Delete this shape": "Удалить эту фигуру", "Delete this vertex (Alt+Click)": "Удалить эту точку (Alt+клик)", "Directions from here": "Навигация отсюда", - "Disable editing": "Отключить редактирование", "Display measure": "Display measure", "Display on load": "Показывать при загрузке", "Download": "Скачать", @@ -164,7 +163,6 @@ "Embed and share this map": "Встроить карту или поделиться ей", "Embed the map": "Встроить карту", "Empty": "Очистить", - "Enable editing": "Разрешить редактирование", "Error in the tilelayer URL": "Ошибка в ссылке на слой карты", "Error while fetching {url}": "Ошибка при обработке {url}", "Exit Fullscreen": "Выйти из полноэкранного режима", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/sk_SK.js b/umap/static/umap/locale/sk_SK.js index 58d8c317..a820ff52 100644 --- a/umap/static/umap/locale/sk_SK.js +++ b/umap/static/umap/locale/sk_SK.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Vymazať tento tvar", "Delete this vertex (Alt+Click)": "Vymazať tento bod (Alt+Klik)", "Directions from here": "Navigovať odtiaľto", - "Disable editing": "Zakázať úpravy", "Display measure": "Display measure", "Display on load": "Zobraziť pri štarte", "Download": "Download", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Zdieľaj alebo vlož mapu do iného webu", "Embed the map": "Vložiť mapu na iný web", "Empty": "Vyprázdniť", - "Enable editing": "Povoliť úpravy", "Error in the tilelayer URL": "Chyba URL dlaždicovej vrstvy", "Error while fetching {url}": "Vyskytla sa chyba počas načítania {url}", "Exit Fullscreen": "Ukončiť režim celej obrazovky", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("sk_SK", locale) L.setLocale("sk_SK") diff --git a/umap/static/umap/locale/sk_SK.json b/umap/static/umap/locale/sk_SK.json index 8f2a0f60..d229f115 100644 --- a/umap/static/umap/locale/sk_SK.json +++ b/umap/static/umap/locale/sk_SK.json @@ -143,7 +143,6 @@ "Delete this shape": "Vymazať tento tvar", "Delete this vertex (Alt+Click)": "Vymazať tento bod (Alt+Klik)", "Directions from here": "Navigovať odtiaľto", - "Disable editing": "Zakázať úpravy", "Display measure": "Display measure", "Display on load": "Zobraziť pri štarte", "Download": "Download", @@ -164,7 +163,6 @@ "Embed and share this map": "Zdieľaj alebo vlož mapu do iného webu", "Embed the map": "Vložiť mapu na iný web", "Empty": "Vyprázdniť", - "Enable editing": "Povoliť úpravy", "Error in the tilelayer URL": "Chyba URL dlaždicovej vrstvy", "Error while fetching {url}": "Vyskytla sa chyba počas načítania {url}", "Exit Fullscreen": "Ukončiť režim celej obrazovky", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/sl.js b/umap/static/umap/locale/sl.js index 7037ce10..0b6939aa 100644 --- a/umap/static/umap/locale/sl.js +++ b/umap/static/umap/locale/sl.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Izbriši ta predmet", "Delete this vertex (Alt+Click)": "Izbriši to točko (Alt+Klik)", "Directions from here": "Navigacija od tu", - "Disable editing": "Onemogoči urejanje", "Display measure": "Pokaži merilo", "Display on load": "Prikaži ob nalaganju", "Download": "Prenos", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Vstavi in objavi zemljevid", "Embed the map": "Vstavi zemljevid", "Empty": "Prazno", - "Enable editing": "Omogoči urejanje", "Error in the tilelayer URL": "Napaka v naslovu URL plasti", "Error while fetching {url}": "Napaka pridobivanja naslova URL {url}", "Exit Fullscreen": "Končaj celozaslonski način", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("sl", locale) L.setLocale("sl") diff --git a/umap/static/umap/locale/sl.json b/umap/static/umap/locale/sl.json index 89edb51a..4a13a798 100644 --- a/umap/static/umap/locale/sl.json +++ b/umap/static/umap/locale/sl.json @@ -143,7 +143,6 @@ "Delete this shape": "Izbriši ta predmet", "Delete this vertex (Alt+Click)": "Izbriši to točko (Alt+Klik)", "Directions from here": "Navigacija od tu", - "Disable editing": "Onemogoči urejanje", "Display measure": "Pokaži merilo", "Display on load": "Prikaži ob nalaganju", "Download": "Prenos", @@ -164,7 +163,6 @@ "Embed and share this map": "Vstavi in objavi zemljevid", "Embed the map": "Vstavi zemljevid", "Empty": "Prazno", - "Enable editing": "Omogoči urejanje", "Error in the tilelayer URL": "Napaka v naslovu URL plasti", "Error while fetching {url}": "Napaka pridobivanja naslova URL {url}", "Exit Fullscreen": "Končaj celozaslonski način", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/sr.js b/umap/static/umap/locale/sr.js index a5a9da7e..c592a815 100644 --- a/umap/static/umap/locale/sr.js +++ b/umap/static/umap/locale/sr.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Обриши облик", "Delete this vertex (Alt+Click)": "Обриши овај врх (Alt+Click)", "Directions from here": "Упутства одавде", - "Disable editing": "Онемогући уређивање", "Display measure": "Мера приказа", "Display on load": "Приказ при учитавању", "Download": "Преузимање", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Embed and share this map", "Embed the map": "Embed the map", "Empty": "Empty", - "Enable editing": "Омогући уређивање", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Умањи увећање", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("sr", locale) L.setLocale("sr") diff --git a/umap/static/umap/locale/sr.json b/umap/static/umap/locale/sr.json index 92725a36..a5c0d94e 100644 --- a/umap/static/umap/locale/sr.json +++ b/umap/static/umap/locale/sr.json @@ -143,7 +143,6 @@ "Delete this shape": "Обриши облик", "Delete this vertex (Alt+Click)": "Обриши овај врх (Alt+Click)", "Directions from here": "Упутства одавде", - "Disable editing": "Онемогући уређивање", "Display measure": "Мера приказа", "Display on load": "Приказ при учитавању", "Download": "Преузимање", @@ -164,7 +163,6 @@ "Embed and share this map": "Embed and share this map", "Embed the map": "Embed the map", "Empty": "Empty", - "Enable editing": "Омогући уређивање", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Умањи увећање", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/sv.js b/umap/static/umap/locale/sv.js index d40ebec5..751eb000 100644 --- a/umap/static/umap/locale/sv.js +++ b/umap/static/umap/locale/sv.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Radera figuren", "Delete this vertex (Alt+Click)": "Radera noden (Alt+klick)", "Directions from here": "Vägbeskrivning härifrån", - "Disable editing": "Inaktivera redigering", "Display measure": "Visa mått", "Display on load": "Visa vid uppstart", "Download": "Ladda ned", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Bädda in och dela den här kartan", "Embed the map": "Bädda in kartan", "Empty": "Töm", - "Enable editing": "Aktivera redigering", "Error in the tilelayer URL": "Fel i webbadressen för bakgrundskartan (tile-lagret)", "Error while fetching {url}": "Fel vid hämtning av {url}", "Exit Fullscreen": "Lämna helskärmsläge", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*en asterisk för kursivt*", "--- for a horizontal rule": "--- för en vågrät linje", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("sv", locale) L.setLocale("sv") diff --git a/umap/static/umap/locale/sv.json b/umap/static/umap/locale/sv.json index 03e6ed81..04bf459f 100644 --- a/umap/static/umap/locale/sv.json +++ b/umap/static/umap/locale/sv.json @@ -143,7 +143,6 @@ "Delete this shape": "Radera figuren", "Delete this vertex (Alt+Click)": "Radera noden (Alt+klick)", "Directions from here": "Vägbeskrivning härifrån", - "Disable editing": "Inaktivera redigering", "Display measure": "Visa mått", "Display on load": "Visa vid uppstart", "Download": "Ladda ned", @@ -164,7 +163,6 @@ "Embed and share this map": "Bädda in och dela den här kartan", "Embed the map": "Bädda in kartan", "Empty": "Töm", - "Enable editing": "Aktivera redigering", "Error in the tilelayer URL": "Fel i webbadressen för bakgrundskartan (tile-lagret)", "Error while fetching {url}": "Fel vid hämtning av {url}", "Exit Fullscreen": "Lämna helskärmsläge", @@ -387,7 +385,6 @@ "*single star for italic*": "*en asterisk för kursivt*", "--- for a horizontal rule": "--- för en vågrät linje", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/th_TH.js b/umap/static/umap/locale/th_TH.js index bb08f8cb..ab553de8 100644 --- a/umap/static/umap/locale/th_TH.js +++ b/umap/static/umap/locale/th_TH.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Disable editing", "Display measure": "Display measure", "Display on load": "Display on load", "Download": "Download", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Embed and share this map", "Embed the map": "Embed the map", "Empty": "Empty", - "Enable editing": "Enable editing", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("th_TH", locale) L.setLocale("th_TH") diff --git a/umap/static/umap/locale/th_TH.json b/umap/static/umap/locale/th_TH.json index 59035faf..f8ba8b07 100644 --- a/umap/static/umap/locale/th_TH.json +++ b/umap/static/umap/locale/th_TH.json @@ -143,7 +143,6 @@ "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Disable editing", "Display measure": "Display measure", "Display on load": "Display on load", "Download": "Download", @@ -164,7 +163,6 @@ "Embed and share this map": "Embed and share this map", "Embed the map": "Embed the map", "Empty": "Empty", - "Enable editing": "Enable editing", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/tr.js b/umap/static/umap/locale/tr.js index 5bebe3b8..11d19088 100644 --- a/umap/static/umap/locale/tr.js +++ b/umap/static/umap/locale/tr.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Bu şekli sil", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Düzenlemeyi devre dışı bırak", "Display measure": "Ölçüyü göster", "Display on load": "Yüklerken görüntüle", "Download": "İndir", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Bu haritayı yerleştir ve paylaş", "Embed the map": "Haritayı yerleştir", "Empty": "Boşalt", - "Enable editing": "Düzenlemeyi etkinleştir", "Error in the tilelayer URL": "Katman URL'sinde hata", "Error while fetching {url}": "{url} getirilirken hata oluştu", "Exit Fullscreen": "Tam ekrandan çık", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("tr", locale) L.setLocale("tr") diff --git a/umap/static/umap/locale/tr.json b/umap/static/umap/locale/tr.json index c1eef13a..6e7b93a9 100644 --- a/umap/static/umap/locale/tr.json +++ b/umap/static/umap/locale/tr.json @@ -143,7 +143,6 @@ "Delete this shape": "Bu şekli sil", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Düzenlemeyi devre dışı bırak", "Display measure": "Ölçüyü göster", "Display on load": "Yüklerken görüntüle", "Download": "İndir", @@ -164,7 +163,6 @@ "Embed and share this map": "Bu haritayı yerleştir ve paylaş", "Embed the map": "Haritayı yerleştir", "Empty": "Boşalt", - "Enable editing": "Düzenlemeyi etkinleştir", "Error in the tilelayer URL": "Katman URL'sinde hata", "Error while fetching {url}": "{url} getirilirken hata oluştu", "Exit Fullscreen": "Tam ekrandan çık", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/uk_UA.js b/umap/static/umap/locale/uk_UA.js index 117b8265..e0b895ec 100644 --- a/umap/static/umap/locale/uk_UA.js +++ b/umap/static/umap/locale/uk_UA.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Вилучити цей полігон", "Delete this vertex (Alt+Click)": "Вилучити цю вершину (Alt+клік)", "Directions from here": "Маршрут звідси", - "Disable editing": "Вимкнути редагування", "Display measure": "Показати вимірювання", "Display on load": "Показувати під час завантаження", "Download": "Звантажити", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Вбудувати мапу та поділитися нею", "Embed the map": "Вбудувати мапу", "Empty": "Очистити", - "Enable editing": "Увімкнути редагування", "Error in the tilelayer URL": "Помилка в посиланні на шар мапи", "Error while fetching {url}": "Помилка при отриманні {url}", "Exit Fullscreen": "Вийти з повноекранного режиму", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("uk_UA", locale) L.setLocale("uk_UA") diff --git a/umap/static/umap/locale/uk_UA.json b/umap/static/umap/locale/uk_UA.json index de74351d..c165cf8b 100644 --- a/umap/static/umap/locale/uk_UA.json +++ b/umap/static/umap/locale/uk_UA.json @@ -143,7 +143,6 @@ "Delete this shape": "Вилучити цей полігон", "Delete this vertex (Alt+Click)": "Вилучити цю вершину (Alt+клік)", "Directions from here": "Маршрут звідси", - "Disable editing": "Вимкнути редагування", "Display measure": "Показати вимірювання", "Display on load": "Показувати під час завантаження", "Download": "Звантажити", @@ -164,7 +163,6 @@ "Embed and share this map": "Вбудувати мапу та поділитися нею", "Embed the map": "Вбудувати мапу", "Empty": "Очистити", - "Enable editing": "Увімкнути редагування", "Error in the tilelayer URL": "Помилка в посиланні на шар мапи", "Error while fetching {url}": "Помилка при отриманні {url}", "Exit Fullscreen": "Вийти з повноекранного режиму", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/vi.js b/umap/static/umap/locale/vi.js index 66c6f245..63372681 100644 --- a/umap/static/umap/locale/vi.js +++ b/umap/static/umap/locale/vi.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Tắt chỉnh sửa", "Display measure": "Display measure", "Display on load": "Hiển thị khi tải", "Download": "Download", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "Nhúng và chia sẽ bản đồ này", "Embed the map": "Embed the map", "Empty": "Empty", - "Enable editing": "Bật chức năng chỉnh sửa", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("vi", locale) L.setLocale("vi") diff --git a/umap/static/umap/locale/vi.json b/umap/static/umap/locale/vi.json index f078504d..1525895e 100644 --- a/umap/static/umap/locale/vi.json +++ b/umap/static/umap/locale/vi.json @@ -143,7 +143,6 @@ "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Tắt chỉnh sửa", "Display measure": "Display measure", "Display on load": "Hiển thị khi tải", "Download": "Download", @@ -164,7 +163,6 @@ "Embed and share this map": "Nhúng và chia sẽ bản đồ này", "Embed the map": "Embed the map", "Empty": "Empty", - "Enable editing": "Bật chức năng chỉnh sửa", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/vi_VN.json b/umap/static/umap/locale/vi_VN.json index 59035faf..f8ba8b07 100644 --- a/umap/static/umap/locale/vi_VN.json +++ b/umap/static/umap/locale/vi_VN.json @@ -143,7 +143,6 @@ "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Disable editing", "Display measure": "Display measure", "Display on load": "Display on load", "Download": "Download", @@ -164,7 +163,6 @@ "Embed and share this map": "Embed and share this map", "Embed the map": "Embed the map", "Empty": "Empty", - "Enable editing": "Enable editing", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/zh.js b/umap/static/umap/locale/zh.js index 903f114e..1a29546d 100644 --- a/umap/static/umap/locale/zh.js +++ b/umap/static/umap/locale/zh.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "方向", - "Disable editing": "不可编辑", "Display measure": "Display measure", "Display on load": "加载时显示", "Download": "Download", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "嵌入与分享地图", "Embed the map": "嵌入地图", "Empty": "空", - "Enable editing": "可编辑", "Error in the tilelayer URL": "瓦片图层URL错误", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("zh", locale) L.setLocale("zh") diff --git a/umap/static/umap/locale/zh.json b/umap/static/umap/locale/zh.json index 0a2d0c3f..e9ba78b4 100644 --- a/umap/static/umap/locale/zh.json +++ b/umap/static/umap/locale/zh.json @@ -143,7 +143,6 @@ "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "方向", - "Disable editing": "不可编辑", "Display measure": "Display measure", "Display on load": "加载时显示", "Download": "Download", @@ -164,7 +163,6 @@ "Embed and share this map": "嵌入与分享地图", "Embed the map": "嵌入地图", "Empty": "空", - "Enable editing": "可编辑", "Error in the tilelayer URL": "瓦片图层URL错误", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/zh_CN.json b/umap/static/umap/locale/zh_CN.json index 59035faf..f8ba8b07 100644 --- a/umap/static/umap/locale/zh_CN.json +++ b/umap/static/umap/locale/zh_CN.json @@ -143,7 +143,6 @@ "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Disable editing", "Display measure": "Display measure", "Display on load": "Display on load", "Download": "Download", @@ -164,7 +163,6 @@ "Embed and share this map": "Embed and share this map", "Embed the map": "Embed the map", "Empty": "Empty", - "Enable editing": "Enable editing", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/zh_TW.Big5.json b/umap/static/umap/locale/zh_TW.Big5.json index 59035faf..f8ba8b07 100644 --- a/umap/static/umap/locale/zh_TW.Big5.json +++ b/umap/static/umap/locale/zh_TW.Big5.json @@ -143,7 +143,6 @@ "Delete this shape": "Delete this shape", "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)", "Directions from here": "Directions from here", - "Disable editing": "Disable editing", "Display measure": "Display measure", "Display on load": "Display on load", "Download": "Download", @@ -164,7 +163,6 @@ "Embed and share this map": "Embed and share this map", "Embed the map": "Embed the map", "Empty": "Empty", - "Enable editing": "Enable editing", "Error in the tilelayer URL": "Error in the tilelayer URL", "Error while fetching {url}": "Error while fetching {url}", "Exit Fullscreen": "Exit Fullscreen", @@ -387,7 +385,6 @@ "*single star for italic*": "*single star for italic*", "--- for a horizontal rule": "--- for a horizontal rule", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")", - "Cancel all": "Cancel all", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)", "Default view": "Default view", "Facet keys": "Facet keys", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/locale/zh_TW.js b/umap/static/umap/locale/zh_TW.js index 386318c9..ad410ec0 100644 --- a/umap/static/umap/locale/zh_TW.js +++ b/umap/static/umap/locale/zh_TW.js @@ -143,7 +143,6 @@ const locale = { "Delete this shape": "刪除外形", "Delete this vertex (Alt+Click)": "刪除頂點 (Alt+Click)", "Directions from here": "從此處開始導航", - "Disable editing": "停用編輯功能", "Display measure": "Display measure", "Display on load": "載入時顯示", "Download": "下載", @@ -164,7 +163,6 @@ const locale = { "Embed and share this map": "將地圖內嵌並分享", "Embed the map": "嵌入地圖", "Empty": "空白", - "Enable editing": "啟用編輯功能", "Error in the tilelayer URL": "地圖磚圖層 URL 錯誤", "Error while fetching {url}": "擷取網址時發生錯誤 {url}", "Exit Fullscreen": "結束全螢幕模式", @@ -387,7 +385,6 @@ const locale = { "*single star for italic*": "*一個星代表斜體*", "--- for a horizontal rule": "--- 代表水平線", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "要在圖徵標籤使用的屬性名稱 (例如：\"nom\")。你可以在括號內使用超過一個屬性或是使用靜態內容 (例如：\"{name} in {place}\")", - "Cancel all": "取消所有", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "逗號分隔屬性清單會用在方面搜尋 (例如：mykey,otherkey)。要控制標籤，則是之後新增 (例如：mykey|My Key,otherkey|Other Key)", "Default view": "預設檢視", "Facet keys": "方面鍵", @@ -407,11 +404,31 @@ const locale = { "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } L.registerLocale("zh_TW", locale) L.setLocale("zh_TW") diff --git a/umap/static/umap/locale/zh_TW.json b/umap/static/umap/locale/zh_TW.json index a6047c09..896f2c0f 100644 --- a/umap/static/umap/locale/zh_TW.json +++ b/umap/static/umap/locale/zh_TW.json @@ -143,7 +143,6 @@ "Delete this shape": "刪除外形", "Delete this vertex (Alt+Click)": "刪除頂點 (Alt+Click)", "Directions from here": "從此處開始導航", - "Disable editing": "停用編輯功能", "Display measure": "Display measure", "Display on load": "載入時顯示", "Download": "下載", @@ -164,7 +163,6 @@ "Embed and share this map": "將地圖內嵌並分享", "Embed the map": "嵌入地圖", "Empty": "空白", - "Enable editing": "啟用編輯功能", "Error in the tilelayer URL": "地圖磚圖層 URL 錯誤", "Error while fetching {url}": "擷取網址時發生錯誤 {url}", "Exit Fullscreen": "結束全螢幕模式", @@ -387,7 +385,6 @@ "*single star for italic*": "*一個星代表斜體*", "--- for a horizontal rule": "--- 代表水平線", "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "要在圖徵標籤使用的屬性名稱 (例如：\"nom\")。你可以在括號內使用超過一個屬性或是使用靜態內容 (例如：\"{name} in {place}\")", - "Cancel all": "取消所有", "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key)": "逗號分隔屬性清單會用在方面搜尋 (例如：mykey,otherkey)。要控制標籤，則是之後新增 (例如：mykey|My Key,otherkey|Other Key)", "Default view": "預設檢視", "Facet keys": "方面鍵", @@ -407,9 +404,29 @@ "Search": "Search", "Toggle direct input (advanced)": "Toggle direct input (advanced)", "Datalayers": "Datalayers", - "Delete map": "Delete map", "Secret edit link:": "Secret edit link:", "Who can edit \"{layer}\"": "Who can edit \"{layer}\"", "Current map view": "Current map view", - "Filter": "Filter" + "Filter": "Filter", + "Choropleth": "Choropleth", + "Choropleth breakpoints": "Choropleth breakpoints", + "Choropleth classes": "Choropleth classes", + "Choropleth color palette": "Choropleth color palette", + "Choropleth mode": "Choropleth mode", + "Choropleth property value": "Choropleth property value", + "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.", + "Equidistant": "Equidistant", + "Jenks-Fisher": "Jenks-Fisher", + "K-means": "K-means", + "Manual": "Manual", + "Number of desired classes (default 5)": "Number of desired classes (default 5)", + "Quantiles": "Quantiles", + "Show this layer in the caption": "Show this layer in the caption", + "Back to preview": "Back to preview", + "Drawing": "Drawing", + "Edit the title of the map": "Edit the title of the map", + "Go to the homepage": "Go to the homepage", + "Switch to edit mode": "Switch to edit mode", + "Update who can see and edit the map": "Update who can see and edit the map", + "View": "View" } \ No newline at end of file diff --git a/umap/static/umap/map.css b/umap/static/umap/map.css index 35de2c82..b28026d6 100644 --- a/umap/static/umap/map.css +++ b/umap/static/umap/map.css @@ -42,7 +42,8 @@ } .leaflet-measure-control a, .leaflet-control-locate a, -.umap-control a { +.umap-control a, +.umap-control [type="button"] { background-position: 50% 50%; background-repeat: no-repeat; display: block; @@ -50,15 +51,19 @@ width: 36px; line-height: 36px; background-image: url('./img/24.svg'); + text-indent: -9999px; + margin-bottom: 0; } .leaflet-control.display-on-more, -a.umap-control-less { +.umap-control-less { display: none; } .umap-control-more, .umap-control-less { background-image: url('./img/24-white.svg'); background-position: -72px -474px; + text-indent: -9999px; + margin-bottom: 0; } .umap-control-less { background-position: -108px -476px; @@ -70,13 +75,13 @@ a.umap-control-less { .umap-more-controls .umap-control-more { display: none; } -.leaflet-control-embed a { +.leaflet-control-embed [type="button"] { background-position: -72px -108px; } -.leaflet-control-tilelayers a { +.leaflet-control-tilelayers [type="button"] { background-position: -72px 0; } -.leaflet-control-home a { +.leaflet-control-home [type="button"] { background-position: -122px -82px; } .leaflet-control-locate a { @@ -88,17 +93,17 @@ a.umap-control-less { background-position: -72px -144px; box-shadow: 0 0 4px 0 black inset; } -.leaflet-control-star a { +.leaflet-control-star [type="button"] { background-position: -108px -144px; } -.leaflet-control-star.starred a { +.leaflet-control-star.starred [type="button"] { background-position: -144px -144px; } -.leaflet-control-search a { +.leaflet-control-search [type="button"] { background-position: -36px -108px; display: block; } -.leaflet-control-search a.loading { +.leaflet-control-search [type="button"].loading { background-image: url('./img/search.gif'); } .umap-control-text { @@ -109,14 +114,15 @@ a.umap-control-less { text-align: center; font-size: 0.8em; } -.umap-control-text a { +.umap-control-text [type="button"] { float: right; + background-color: #666; margin: 0; width: 36px; + min-height: 23px; height: 23px; - line-height: 23px; } -.leaflet-control-edit-enable a:before { +.leaflet-control-edit-enable [type="button"]:before { content: ' '; width: 24px; height: 24px; @@ -126,7 +132,7 @@ a.umap-control-less { background-position: -52px -49px; } -.leaflet-control-edit-enable a { +.leaflet-control-edit-enable [type="button"] { width: initial; padding: 0 20px; background-color: #353c3e; @@ -138,7 +144,7 @@ a.umap-control-less { display: block; } .leaflet-control-toolbar .leaflet-toolbar-icon.dark:hover, -.leaflet-control-edit-enable a:hover { +.leaflet-control-edit-enable [type="button"]:hover { background-color: #4d5759; } .umap-permanent-credits-container { @@ -147,7 +153,14 @@ a.umap-control-less { margin-bottom: 5px!important; padding: 0.5rem; } - +.attribution-toggle { + display: none; + width: 24px; + height: 24px; + vertical-align: middle; + background-image: url('./img/16.svg'); + background-position: 0px 0px; +} @@ -313,6 +326,7 @@ ul.photon-autocomplete { border: 1px solid #bbb; border-radius: 4px; box-shadow: none; + background-color: white; } .leaflet-measure-control a { background-position: 0 -72px; @@ -346,6 +360,7 @@ ul.photon-autocomplete { } .umap-help-box .umap-close-link { float: right; + width: 100px; } .umap-help-button { display: inline-block; @@ -355,15 +370,16 @@ ul.photon-autocomplete { background-position: -4px -4px; background-repeat: no-repeat; background-image: url('./img/16.svg'); + background-color: #323737 !important; vertical-align: middle; + text-indent: -9999px; + min-height: inherit; + padding-top: 5px; + border: none !important; } .dark .umap-help-button { background-image: url('./img/16-white.svg'); } -.umap-help-link { - float: right; - margin-right: 20px; -} .umap-help-on .umap-help-box { visibility: visible; top: 100px; @@ -404,67 +420,105 @@ ul.photon-autocomplete { /* ********************************* */ /* Edit main toolbox */ /* ********************************* */ +.umap-main-edit-toolbox [type="button"] { + color: #fff; + font-size: 1.2em; + border: none; + background-color: #323737; + width: auto; + margin-bottom: 0; +} +.umap-main-edit-toolbox [type="button"]:hover { + text-decoration: underline; +} -.leaflet-container a.leaflet-control-edit-save, -.leaflet-container a.leaflet-control-edit-cancel, -.leaflet-container a.leaflet-control-edit-disable { +.leaflet-container [type="button"].umap-help-link { + font-size: 12px; + padding-bottom: 3px; + background-color: inherit; +} +.leaflet-container .leaflet-control-edit-save, +.leaflet-container .leaflet-control-edit-cancel, +.leaflet-container .leaflet-control-edit-disable { display: block; border: none; - font-size: 11px; - margin-left: 10px; - float: right; + font-size: 12px; border-radius: 20px; color: #f8f8f8; - width: auto; - height: 36px; - line-height: 36px; - min-height: 36px; + height: 32px; + line-height: 30px; padding: 0 20px; - min-width: 100px; } -.leaflet-container a.leaflet-control-edit-disable:before, -.leaflet-container a.leaflet-control-edit-save:before, -.leaflet-container a.leaflet-control-edit-cancel:before { +.leaflet-container .leaflet-control-edit-disable:before, +.leaflet-container .leaflet-control-edit-save:before, +.leaflet-container .leaflet-control-edit-cancel:before { display: inline-block; - width: 24px; + width: 19px; height: 24px; background-position: -50px -122px; background-repeat: no-repeat; background-image: url('./img/16-white.svg'); vertical-align: middle; content: ' '; + text-align: center; } -.leaflet-container a.leaflet-control-edit-save:before { - background-position: -2px -25px; +.leaflet-container .leaflet-control-edit-disable span, +.leaflet-container .leaflet-control-edit-save span, +.leaflet-container .leaflet-control-edit-cancel span { + margin-left: 10px; } -.leaflet-container a.leaflet-control-edit-disable:before { - background-position: -26px -1px; +.leaflet-container .leaflet-control-edit-save:before { + background-position: -148px -2px; } -.leaflet-container a.leaflet-control-edit-cancel, -.leaflet-container a.leaflet-control-edit-disable { - border: 1px solid #555; +.leaflet-container .leaflet-control-edit-disable:before { + background-position: -50px -25px; } -.leaflet-container a.leaflet-control-edit-save { +.leaflet-container .leaflet-control-edit-cancel, +.leaflet-container .leaflet-control-edit-disable { + border: 0.5px solid rgba(153, 153, 153, 0.40); +} +.leaflet-container .leaflet-control-edit-cancel:hover, +.leaflet-container .leaflet-control-edit-disable:hover { + border: 0.5px solid rgba(153, 153, 153, 0.80); + text-decoration: none; +} +.leaflet-container .leaflet-control-edit-save { opacity: 0.5; cursor: not-allowed; - background-color: #215d9c; + border-radius: 16px; + border: 0.5px solid rgba(153, 153, 153, 0.40); + background: rgba(153, 153, 153, 0.10); } -.umap-is-dirty a.leaflet-control-edit-save { +.dark [type="button"].leaflet-control-edit-save:hover { + background: rgba(153, 153, 153, 0.10); + text-decoration: none; +} +.umap-is-dirty .leaflet-control-edit-save { opacity: 1; cursor: pointer; + border: 0.5px solid rgba(66, 236, 230, 0.40); + background: rgba(66, 236, 230, 0.10); + color: #42ECE6; } -.leaflet-container a.leaflet-control-edit-save, -.leaflet-container a.leaflet-control-edit-cancel, -.leaflet-container a.leaflet-control-edit-disable, +.umap-is-dirty .leaflet-control-edit-save:before { + background-position: -148px -26px; +} +.umap-is-dirty .dark [type="button"].leaflet-control-edit-save:hover { + border-color: rgba(66, 236, 230, 0.80); + background: rgba(66, 236, 230, 0.10); +} +.leaflet-container .leaflet-control-edit-save, +.leaflet-container .leaflet-control-edit-cancel, +.leaflet-container .leaflet-control-edit-disable, .umap-edit-enabled .leaflet-control-edit-enable { display: none; } -.umap-edit-enabled a.leaflet-control-edit-save, -.umap-edit-enabled a.leaflet-control-edit-disable, -.umap-edit-enabled .umap-is-dirty a.leaflet-control-edit-cancel { +.umap-edit-enabled .leaflet-control-edit-save, +.umap-edit-enabled .leaflet-control-edit-disable, +.umap-edit-enabled .umap-is-dirty .leaflet-control-edit-cancel { display: inline-block; } -.umap-is-dirty a.leaflet-control-edit-disable { +.umap-is-dirty .leaflet-control-edit-disable { display: none; } .umap-caption-bar { @@ -478,7 +532,7 @@ ul.photon-autocomplete { right: 0; height: 46px; background-color: #323737; - padding: 5px 10px; + padding: 0 10px; text-align: left; line-height: 36px; cursor: auto; @@ -486,45 +540,56 @@ ul.photon-autocomplete { z-index: 1000; opacity: 0.98; color: #fff; + display: flex; + justify-content: space-between; } +.umap-left-edit-toolbox, +.umap-right-edit-toolbox { + display: flex; + column-gap: 10px; +} +.umap-right-edit-toolbox { + align-items: baseline; +} + .umap-main-edit-toolbox .logo { + width: 39px; + height: 100%; +} +.umap-main-edit-toolbox .logo a { background-image: url('./img/logo_small.svg'); background-position: 0 center; background-repeat: no-repeat; - width: 60px; display: inline-block; + width: 39px; height: 100%; vertical-align: middle; -} -.umap-main-edit-toolbox a { - color: #fff; - font-size: 1.2em; - vertical-align: middle; -} -.umap-main-edit-toolbox a:hover { - text-decoration: underline; + text-indent: -9999px; } .umap-main-edit-toolbox .map-name { display: inline-block; - max-width: 200px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; - margin-right: 5px; font-weight: bold; + text-align: left; } -a.map-name:after { +.umap-main-edit-toolbox .share-status { + font-size: 1em; + font-style: italic; + overflow: hidden; + text-overflow: ellipsis; +} + +.map-name:after { content: '\00a0'; padding-left: 3px; width: 1ch; display: inline-block; } -.umap-is-dirty a.map-name:after { +.umap-is-dirty .map-name:after { content: '*'; } -.umap-main-edit-toolbox .share-status { - margin: 0 20px; -} .umap-edit-enabled .umap-main-edit-toolbox { top: 0; } @@ -536,12 +601,15 @@ a.map-name:after { display: inline; } .umap-main-edit-toolbox .umap-user { - margin-right: 20px; - float: right; + color: #fff; +} +.umap-main-edit-toolbox .umap-user:hover { + text-decoration: underline; } .umap-main-edit-toolbox .umap-user:after { content: '|'; padding-left: 20px; + display: inline-block; /* Prevents underline on hover. */ } .umap-edit-enabled .leaflet-top { top: 48px; @@ -762,7 +830,7 @@ a.map-name:after { } .readonly .layer-edit, .off .layer-edit { - background-position: -51px -72px; + background-position: -50px -73px; } .off .layer-zoom_to { background-position: -25px -54px; @@ -782,13 +850,13 @@ a.map-name:after { background-position: -119px -48px; } .umap-delete-vertex { - background-position: -119px -22px; + background-position: -119px -94px; } .umap-continue-line { background-position: -96px 1px; } .umap-split-line { - background-position: -120px 1px; + background-position: -119px -22px; } .umap-extract-shape-from-multi{ background-position: -119px 2px; @@ -806,13 +874,14 @@ a.map-name:after { .leaflet-control-browse .umap-browse-actions .off .layer-title { color: rgb(179, 179, 179); } -.leaflet-control-browse.expanded > a { +.leaflet-control-browse.expanded > a, +.leaflet-control-browse.expanded > button { display: none; } .leaflet-control-browse.expanded .umap-browse-actions { display: block; } -.leaflet-control-browse a.umap-browse-link { +.leaflet-control-browse .umap-browse-link { background-image: none; background-color: rgb(68, 68, 68); color: white; @@ -827,7 +896,7 @@ a.map-name:after { border-radius: 2px; } a.add-datalayer:before, -.leaflet-control-browse a.umap-browse-link:before { +.leaflet-control-browse .umap-browse-link:before { background-image: url('./img/16.svg'); background-repeat: no-repeat; background-position: -45px -96px; @@ -838,10 +907,10 @@ a.add-datalayer:before, float: left; } a.add-datalayer:before { - background-position: -45px -45px; + background-position: -20px -20px; } a.add-datalayer:hover, -.leaflet-control-browse a.umap-browse-link:hover { +.leaflet-control-browse .umap-browse-link:hover { background-color: rgb(99, 99, 99); } .umap-browse-data .off .feature { @@ -1080,6 +1149,17 @@ a.add-datalayer:hover, vertical-align: middle; } +.datalayer-legend { + color: #555; + padding: 6px 8px; + box-shadow: 0 0 3px rgba(0,0,0,0.2); + border-radius: 1px; +} +.datalayer-legend ul { + list-style-type: none; + padding: 0; + margin: 0; +} /* ********************************* */ /* Popup */ @@ -1546,14 +1626,12 @@ a.add-datalayer:hover, @media all and (max-width: 980px) { - .leaflet-container a.leaflet-control-edit-save, - .leaflet-container a.leaflet-control-edit-disable, - .leaflet-container a.leaflet-control-edit-cancel { - text-indent: calc(100% - 10px); - width: 35px; - min-width: initial; + .umap-main-edit-toolbox .umap-user span, + .leaflet-container .leaflet-control-edit-save span, + .leaflet-container .leaflet-control-edit-disable span, + .leaflet-container .leaflet-control-edit-cancel span { + display: none; } - .umap-main-edit-toolbox .umap-help-button { display: none; } @@ -1563,7 +1641,15 @@ a.add-datalayer:hover, .umap-main-edit-toolbox .umap-user:after { display: none; } +} +@media all and (max-width: 640px) { + .umap-main-edit-toolbox .umap-user { + display: none; + } + .umap-main-edit-toolbox .map-name { + max-width: 150px; + } } @media all and (max-width: 480px) { @@ -1593,6 +1679,23 @@ a.add-datalayer:hover, .umap-popup-large .umap-popup-content { width: 300px; } + + .attribution-toggle { + display: inline-block; + } + .attribution-container { + display: none; + } + .leaflet-control-attribution:active .attribution-container, + .leaflet-control-attribution:hover .attribution-container { + display: inline; + background-color: #fff; + } + .leaflet-control-attribution:hover .attribution-toggle { + display: none; + } + + } /* ****** */ diff --git a/umap/static/umap/nav.css b/umap/static/umap/nav.css index 0c2e09f0..66f33151 100644 --- a/umap/static/umap/nav.css +++ b/umap/static/umap/nav.css @@ -63,7 +63,6 @@ footer .i18n_switch { } .umap-nav .button, .umap-nav .button:hover { - color: #fff; text-decoration: none; min-width: 150px; } diff --git a/umap/static/umap/test/Choropleth.js b/umap/static/umap/test/Choropleth.js new file mode 100644 index 00000000..1cd8c2ec --- /dev/null +++ b/umap/static/umap/test/Choropleth.js @@ -0,0 +1,243 @@ +const POLYGONS = { + _umap_options: defaultDatalayerData(), + type: 'FeatureCollection', + features: [ + { + type: 'Feature', + properties: { + name: 'number 1', + value: 45, + }, + geometry: { + type: 'Polygon', + coordinates: [ + [ + [0, 49], + [-2, 47], + [1, 46], + [3, 47], + [0, 49], + ], + ], + }, + }, + { + type: 'Feature', + properties: { + name: 'number 2', + value: 87, + }, + geometry: { + type: 'Polygon', + coordinates: [ + [ + [0, 49], + [2, 50], + [6, 49], + [4, 47], + [0, 49], + ], + ], + }, + }, + { + type: 'Feature', + properties: { + name: 'number 3', + value: 673, + }, + geometry: { + type: 'Polygon', + coordinates: [ + [ + [4, 47], + [6, 49], + [11, 47], + [9, 45], + [4, 47], + ], + ], + }, + }, + { + type: 'Feature', + properties: { + name: 'number 4', + value: 674, + }, + geometry: { + type: 'Polygon', + coordinates: [ + [ + [2, 46], + [4, 47], + [8, 45], + [6, 43], + [2, 46], + ], + ], + }, + }, + { + type: 'Feature', + properties: { + name: 'number 5', + value: 839, + }, + geometry: { + type: 'Polygon', + coordinates: [ + [ + [-2, 47], + [1, 46], + [0, 44], + [-4, 45], + [-2, 47], + ], + ], + }, + }, + { + type: 'Feature', + properties: { + name: 'number 6', + value: 3829, + }, + geometry: { + type: 'Polygon', + coordinates: [ + [ + [1, 45], + [5, 43], + [4, 42], + [0, 44], + [1, 45], + ], + ], + }, + }, + { + type: 'Feature', + properties: { + name: 'number 7', + value: 4900, + }, + geometry: { + type: 'Polygon', + coordinates: [ + [ + [9, 45], + [12, 47], + [15, 45], + [13, 43], + [9, 45], + ], + ], + }, + }, + { + type: 'Feature', + properties: { + name: 'number 8', + value: 4988, + }, + geometry: { + type: 'Polygon', + coordinates: [ + [ + [7, 43], + [9, 45], + [12, 43], + [10, 42], + [7, 43], + ], + ], + }, + }, + { + type: 'Feature', + properties: { + name: 'number 9', + value: 9898, + }, + geometry: { + type: 'Polygon', + coordinates: [ + [ + [4, 42], + [6, 43], + [9, 41], + [7, 40], + [4, 42], + ], + ], + }, + }, + ], +} + +describe('L.U.Choropleth', function () { + let path = '/map/99/datalayer/edit/62/', + poly1, + poly4, + poly9 + + before(function () { + this.server = sinon.fakeServer.create() + this.server.respondWith(/\/datalayer\/62\/\?.*/, JSON.stringify(POLYGONS)) + this.map = initMap({ umap_id: 99 }) + this.datalayer = this.map.getDataLayerByUmapId(62) + this.server.respond() + this.datalayer.options.type = 'Choropleth' + this.datalayer.options.choropleth = { + property: 'value', + } + enableEdit() + this.datalayer.eachLayer(function (layer) { + if (layer.properties.name === 'number 1') { + poly1 = layer + } else if (layer.properties.name === 'number 4') { + poly4 = layer + } else if (layer.properties.name === 'number 9') { + poly9 = layer + } + }) + }) + after(function () { + this.server.restore() + resetMap() + }) + + describe('#init()', function () { + it('datalayer should have 9 features', function () { + assert.equal(this.datalayer._index.length, 9) + }) + }) + describe('#compute()', function () { + it('choropleth should compute default colors', function () { + this.datalayer.resetLayer(true) + assert.deepEqual( + this.datalayer.layer.options.breaks, + [45, 673, 3829, 4900, 9898, 9898] + ) + assert.equal(poly1._path.attributes.fill.value, '#eff3ff') + assert.equal(poly4._path.attributes.fill.value, '#bdd7e7') + assert.equal(poly9._path.attributes.fill.value, '#3182bd') + }) + it('can change brewer scheme', function () { + this.datalayer.options.choropleth.brewer = 'Reds' + this.datalayer.resetLayer(true) + assert.equal(poly1._path.attributes.fill.value, '#fee5d9') + assert.equal(poly4._path.attributes.fill.value, '#fcae91') + assert.equal(poly9._path.attributes.fill.value, '#de2d26') + }) + it('choropleth should allow to change steps', function () { + this.datalayer.options.choropleth.brewer = 'Blues' + this.datalayer.options.choropleth.classes = 6 + this.datalayer.resetLayer(true) + assert.equal(poly1._path.attributes.fill.value, '#eff3ff') + assert.equal(poly4._path.attributes.fill.value, '#c6dbef') + assert.equal(poly9._path.attributes.fill.value, '#3182bd') + }) + }) +}) diff --git a/umap/static/umap/test/Controls.js b/umap/static/umap/test/Controls.js index 5541376b..ff18cf74 100644 --- a/umap/static/umap/test/Controls.js +++ b/umap/static/umap/test/Controls.js @@ -73,12 +73,11 @@ describe('L.U.Controls', function () { happen.click(qs('.umap-browse-actions .umap-browse-link')) assert.equal(qsa('#browse_data_datalayer_62 ul li').length, 3) }) - }) describe('#exportPanel()', function () { it('should be opened at datalayer button click', function () { - let button = qs('.leaflet-control-embed a') + let button = qs('.leaflet-control-embed button') assert.ok(button) happen.click(button) assert.ok(qs('#umap-ui-container .umap-share')) diff --git a/umap/static/umap/test/DataLayer.js b/umap/static/umap/test/DataLayer.js index c2094f90..3c545ff8 100644 --- a/umap/static/umap/test/DataLayer.js +++ b/umap/static/umap/test/DataLayer.js @@ -341,7 +341,7 @@ describe('L.U.DataLayer', function () { happen.click( qs('#browse_data_toggle_' + L.stamp(this.datalayer) + ' .layer-edit') ) - deleteLink = qs('a.delete_datalayer_button') + deleteLink = qs('button.delete_datalayer_button') assert.ok(deleteLink) }) diff --git a/umap/static/umap/test/Map.Export.js b/umap/static/umap/test/Map.Export.js index 23028192..1020f5c4 100644 --- a/umap/static/umap/test/Map.Export.js +++ b/umap/static/umap/test/Map.Export.js @@ -102,132 +102,5 @@ describe('L.U.Map.Export', function () { 'name polyname poly11.25,53.585984 10.151367,52.975108 12.689209,52.167194 14.084473,53.199452 12.634277,53.618579 11.25,53.585984 11.25,53.585984test[object Object]test-0.274658,52.57635test[object Object]test-0.571289,54.476422 0.439453,54.610255 1.724854,53.448807 4.163818,53.988395 5.306396,53.533778 6.591797,53.709714 7.042236,53.350551' assert.equal(content, expected) }) - - it('should export to umap', function () { - const { content, filetype, filename } = this.map.format('umap') - assert.equal(filetype, 'application/json') - assert.equal(filename, 'name_of_the_map.umap') - const expected = { - type: 'umap', - uri: null, - properties: { - easing: false, - embedControl: true, - fullscreenControl: true, - searchControl: true, - datalayersControl: true, - zoomControl: true, - permanentCreditBackground: true, - slideshow: {}, - captionMenus: true, - captionBar: false, - limitBounds: {}, - overlay: null, - tilelayer: { - attribution: 'HOT and friends', - name: 'HOT OSM-fr server', - url_template: 'http://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png', - rank: 99, - minZoom: 0, - maxZoom: 20, - id: 2, - }, - licence: '', - description: 'The description of the map', - name: 'name of the map', - displayPopupFooter: false, - miniMap: false, - moreControl: true, - scaleControl: true, - scrollWheelZoom: true, - zoom: 6, - }, - geometry: { - type: 'Point', - coordinates: [5.0592041015625, 52.05924589011585], - }, - layers: [ - { - type: 'FeatureCollection', - features: [ - { - type: 'Feature', - properties: { - name: 'name poly', - }, - geometry: { - type: 'Polygon', - coordinates: [ - [ - [11.25, 53.585984], - [10.151367, 52.975108], - [12.689209, 52.167194], - [14.084473, 53.199452], - [12.634277, 53.618579], - [11.25, 53.585984], - [11.25, 53.585984], - ], - ], - }, - }, - { - type: 'Feature', - properties: { - _umap_options: { - color: 'OliveDrab', - }, - name: 'test', - }, - geometry: { - type: 'Point', - coordinates: [-0.274658, 52.57635], - }, - }, - { - type: 'Feature', - properties: { - _umap_options: { - fill: false, - opacity: 0.6, - }, - name: 'test', - }, - geometry: { - type: 'LineString', - coordinates: [ - [-0.571289, 54.476422], - [0.439453, 54.610255], - [1.724854, 53.448807], - [4.163818, 53.988395], - [5.306396, 53.533778], - [6.591797, 53.709714], - [7.042236, 53.350551], - ], - }, - }, - ], - _umap_options: { - displayOnLoad: true, - browsable: true, - editMode: 'advanced', - iconClass: 'Default', - name: 'Elephants', - id: 62, - pictogram_url: null, - opacity: null, - weight: null, - fillColor: '', - color: '', - stroke: true, - smoothFactor: null, - dashArray: '', - fillOpacity: null, - fill: true, - }, - }, - ], - } - assert.deepEqual(JSON.parse(content), expected) - }) }) }) diff --git a/umap/static/umap/test/Map.js b/umap/static/umap/test/Map.js index 9bcc7cfb..12b64d73 100644 --- a/umap/static/umap/test/Map.js +++ b/umap/static/umap/test/Map.js @@ -50,7 +50,7 @@ describe('L.U.Map', function () { }) it('enable edit on click on toggle button', function () { - var el = qs('div.leaflet-control-edit-enable a') + var el = qs('div.leaflet-control-edit-enable button') happen.click(el) assert.isTrue(L.DomUtil.hasClass(document.body, 'umap-edit-enabled')) }) @@ -109,7 +109,7 @@ describe('L.U.Map', function () { var button = qs('a.update-map-settings') assert.ok(button, 'update map info button exists') happen.click(button) - var deleteLink = qs('a.umap-delete') + var deleteLink = qs('button.umap-delete') assert.ok(deleteLink, 'delete map button exists') sinon.spy(window, 'confirm') this.server.respondWith('POST', path, JSON.stringify({ redirect: '#' })) @@ -301,7 +301,7 @@ describe('L.U.Map', function () { }) it('should update title bar (umap format import)', function () { - var title = qs('#map div.umap-main-edit-toolbox a.map-name') + var title = qs('#map div.umap-main-edit-toolbox button.map-name') assert.equal(title.innerHTML, 'Imported map') }) diff --git a/umap/static/umap/test/Permissions.js b/umap/static/umap/test/Permissions.js index 4fb2ae70..979dcd03 100644 --- a/umap/static/umap/test/Permissions.js +++ b/umap/static/umap/test/Permissions.js @@ -36,7 +36,7 @@ describe('L.Permissions', function () { it('should not allow share_status nor owner', function () { this.map.permissions.options.anonymous_edit_url = 'http://anonymous.url' - delete this.map.permissions.options.owner + delete this.map.options.permissions.owner button = qs('a.update-map-permissions') happen.click(button) expect(qs('select[name="share_status"]')).not.to.be.ok @@ -48,8 +48,8 @@ describe('L.Permissions', function () { var button it('should only allow editors', function () { - this.map.permissions.options.owner = { id: 1, url: '/url', name: 'jojo' } - delete this.map.permissions.options.anonymous_edit_url + this.map.options.permissions.owner = { id: 1, url: '/url', name: 'jojo' } + delete this.map.options.permissions.anonymous_edit_url delete this.map.options.user button = qs('a.update-map-permissions') happen.click(button) diff --git a/umap/static/umap/test/_pre.js b/umap/static/umap/test/_pre.js index 4c8d244f..22e519c2 100644 --- a/umap/static/umap/test/_pre.js +++ b/umap/static/umap/test/_pre.js @@ -44,20 +44,20 @@ var resetMap = function () { document.body.className = '' } var enableEdit = function () { - happen.click(qs('div.leaflet-control-edit-enable a')) + happen.click(qs('div.leaflet-control-edit-enable button')) } var disableEdit = function () { - happen.click(qs('a.leaflet-control-edit-disable')) + happen.click(qs('.leaflet-control-edit-disable')) } var clickSave = function () { - happen.click(qs('a.leaflet-control-edit-save')) + happen.click(qs('.leaflet-control-edit-save')) } var clickCancel = function () { var _confirm = window.confirm window.confirm = function (text) { return true } - happen.click(qs('a.leaflet-control-edit-cancel')) + happen.click(qs('button.leaflet-control-edit-cancel')) happen.once(document.body, { type: 'keypress', keyCode: 13 }) window.confirm = _confirm } @@ -130,6 +130,7 @@ function initMap(options) { datalayer_version: '/datalayer/{pk}/{name}', pictogram_list_json: '/pictogram/json/', map_update_permissions: '/map/{map_id}/update/permissions/', + map_download: '/map/{map_id}/download/', }, default_iconUrl: '../src/img/marker.png', zoom: 6, diff --git a/umap/static/umap/test/index.html b/umap/static/umap/test/index.html index 620d0274..e56ff9b5 100644 --- a/umap/static/umap/test/index.html +++ b/umap/static/umap/test/index.html @@ -25,6 +25,8 @@ + + @@ -82,6 +84,7 @@ +